From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 579F2C61CE8 for ; Thu, 12 Jun 2025 17:36:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D76466B0095; Thu, 12 Jun 2025 13:36:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4D806B009C; Thu, 12 Jun 2025 13:36:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEE506B009B; Thu, 12 Jun 2025 13:36:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9AE396B0092 for ; Thu, 12 Jun 2025 13:36:25 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3F55F5FF28 for ; Thu, 12 Jun 2025 17:36:25 +0000 (UTC) X-FDA: 83547452730.10.C207667 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf22.hostedemail.com (Postfix) with ESMTP id B8870C0004 for ; Thu, 12 Jun 2025 17:36:22 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ESDJHNKE; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of agordeev@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=agordeev@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749749782; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Bzq6L693jOZBbQpnkolPJGXvQrWYd1fA+nYNAUkTJK4=; b=LLig83h0U68FGKHG9VWM9rDINVGgjsgwHQ45gBym1AMcnCAAU+5X44HrJu168gB2H+/uKK UkSBtWsIxN0aMQOb7ZRZbUjsjb3mGPCsZxLQ1m4I/+JWkSvP5axPbkqLrDCWu88sski1fw 6+RlrjGZbBybet6F8U8VQNYItyxzbmA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749749783; a=rsa-sha256; cv=none; b=cO3vWDe5yEdfNv2KwyKNIEhQzLVkXGxaV3herlfIsOLLoayaXi6BfO0xm7FqLd5lFjSfeH 1tEh/iZY/1wcZEHh+nkwSfedqmHvLgyueu0n3eZvu5JN3A6HjZKwSM110TAkvnNVU2xvIs HQ6zAhNWGK06xiyQjvE/vnvEtJk79Vc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=ESDJHNKE; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of agordeev@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=agordeev@linux.ibm.com Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55CDVPIr012486; Thu, 12 Jun 2025 17:36:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Bzq6L693jOZBbQpnk olPJGXvQrWYd1fA+nYNAUkTJK4=; b=ESDJHNKEE5xuMiyIFUW6rYf02Me5a5lyb sWhbyWwUtgNFGu8PZLKdUv0/9qZAokrkZRb85d5PqBmzMqJaTlf6PYCK7ooXS42h Sq9hPT9J3MS2Gveds7bG8V2afGAi1+Bp71tEdFw4AjRsQPRDr1Umq+yV+i/+HxRz n29nAJUsXyZsJzo6atbehh0gZuHskVtQ+fWRjZb2/pbovS94Rs2p0L6Km7uhekrU 1t3NzEXRsgT+51JGwOIO1WeLGZ6quB0XBM0mrJpvTTYoJ7Z5pR4AoRk4/Ge4a+HQ k5s7CGGTEeBuimVvxzeF5PeRGYrxNKHgZgbVs7HstYNamBwuMdVew== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474cxjmf0u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jun 2025 17:36:17 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 55CHaHOc028261; Thu, 12 Jun 2025 17:36:17 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 474cxjmf0m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jun 2025 17:36:17 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55CE2lWZ014912; Thu, 12 Jun 2025 17:36:16 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4750rpdxe4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jun 2025 17:36:15 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55CHaEm611338160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Jun 2025 17:36:14 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00E3020040; Thu, 12 Jun 2025 17:36:14 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E100A2004B; Thu, 12 Jun 2025 17:36:13 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTPS; Thu, 12 Jun 2025 17:36:13 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id 9DA9BE198F; Thu, 12 Jun 2025 19:36:13 +0200 (CEST) From: Alexander Gordeev To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, sparclinux@vger.kernel.org, xen-devel@lists.xenproject.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Hugh Dickins , Nicholas Piggin , Guenter Roeck , Juergen Gross , Jeremy Fitzhardinge , Ryan Roberts Subject: [PATCH 1/6] mm: Cleanup apply_to_pte_range() routine Date: Thu, 12 Jun 2025 19:36:08 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: GFSzaItUyEu6yP3gS3meeLbrZ9VQTNp2 X-Proofpoint-GUID: sqmBLLFPSau8kX6gstpm2ABJeaMXDzrY X-Authority-Analysis: v=2.4 cv=fZWty1QF c=1 sm=1 tr=0 ts=684b1012 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=6IFa9wvqVegA:10 a=pGLkceISAAAA:8 a=VnNF1IyMAAAA:8 a=cw6LjJxz1Y3IMotYGxwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEyMDEzMiBTYWx0ZWRfX/1bjcnG+oHBr pQDvf9bYzabUNkDtJTPjUxbszAUvnuseyUY6yPMmqPawboY3JQdlIMe1zE8qPlqEMiTmIRm5hS1 dZl7AQt+DbprJCkJokCTDYCd0VMJnUOxqaxW//MoOIuKhE3bFMliw0UK15vBUQ0lRDM+mrJj2zC yUpjswXJHT+h6+EpfvFovs4dCh6L5u4Ykn2tCFCfD453NQH13H8nIpNRXk+HHxhvDrVWycEacW4 /2czHIQffp42M7ictd08dwUcFf3euUuwxOXSbJ5WuxC/Hv/Vzb/9Vv1wFBVJU+FMSP1gFiqJsd0 VvDwZoAVDaHgmVW6Mu34ZDZJ8Cw6qnhtSzv7T/Boq9y8bX+AMp7SzKTkfdMd9g5rnuiIrxSQFrI 0E24jrpYAI52CuduE9GnxB2obbmRbpdrR9rNV8uM47GqJ34ZsBxm2r2PUC1QUcejP/SHofJr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-12_10,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 impostorscore=0 priorityscore=1501 spamscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=780 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506120132 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B8870C0004 X-Stat-Signature: ssefmde8urwyytuao33o57pazdu393g5 X-Rspam-User: X-HE-Tag: 1749749782-398102 X-HE-Meta: U2FsdGVkX19VMMhMGRT6daWe3Qj2MgF/c2chmNXfxt6rIz1YuH1jCi3Ud6gXqayyAvzl8IwInxHX9Vze0PVIn1gW18G7VrHxkWWJTOQCjI/G0MEstx+Uhk3k/JvagPRaXU6jgqwck5DhFnbd5Mj0mqhqaYEJ30Q5JV34lafskIo45wx2YLAGB3ryuu5wKrmQ3FfivxLVwU/MIcVLpcD0uoLauGYPbJTq95+kd4yj/BuwG3pUCLUDCaK7fmtjHLuhTQP9KGnAuSBtAtGo/y1EVtUu/knwooDp/Q6W4T7xSp6wS3VTct2wizdjZJKBqReMUMPCHcXoTET3/uF7MgOeQ5QkJVUfDSg8SSqkAhGoco+y4Xp6oE7RAoZs9qdD2bKSEcHBXFvGA/89tUYqtoc/an1egcp5VUiwCrCs6JZtC1FoiedlDQhtBn8JR5O4l9GzTk1/G6vWro69+pmzOiO3WgHkvzgXxDbYC6+1pN8XZ9mHna/zKOykDJbSMxqJhY32XnBgcAHV83EvP46LGrg9Vi8QyKRME3bI1VT+4+jT6dV39tEqNial1hq0Sgqq6Lv6VeMIcmPyHFmEoTSFL4aaKM/ShAOVRj86hUvrSM3ZytUI0ZX/7AZ6x1JrhLSRPnIaLkndToyTWB9KVn9fYVwQIsfN6GlE/OJ6DD/a/E6133W77yOQETXe3ZwdDHbIZsgDrDnzgfqYFn4/9d4/4WtVKKZ8fmwoarLn3ttckfDy1j2IC4bH9AjgAuCCRrytlafIZvdmFCJBsGlL2C6c0zQ7beuNywDk0XbTGf9FBNYAlooiP39pM4m2aRtABRcqlQsYnNdyfF7yxnwfsbx18IAV0Rn1fAqfxc5xfX7E0eze7loBdKAEMC4N7FdkVZ3TvS8urSoTKY1h1p9ASNd6eEv6cWRGY3+1CohETa/R3Qi0iUp2JE0xy/eRbFS3p8P1TWH6KmQf+LC1QeJOcCJ8unP PKRCMhgu xjaIjDyY0M8SU7hwD+Ed+Nv71fNDu2YA+jWOrG6m814mxLqJ0jnIyjIqvpXDIe1bJvh6SvASjqFpnhGJBfSg9yrtbOG4QB+rThyFlRqwluHfvAUUl8sN1UjznfjnVpCMvzsLyjl7WuEl3p2JHLwld6aGj+1/XDM/nBUVr0HT+Xy4+J0NUaSrqOE+uyFHKyAzTcg1cF/p1I1fhcHjTky4GPBHL55B78R2BYBSDt9lHLL39qlkBnG5LiKNLBL+yIQVGXiLWfPg6WBymxr5nksu8a7cG/A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Reverse 'create' vs 'mm == &init_mm' conditions and move page table mask modification out of the atomic context. This is a prerequisite for locking kernel page tables. Reviewed-by: Nicholas Piggin Signed-off-by: Alexander Gordeev --- mm/memory.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 8eba595056fe..71b3d3f98999 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3006,24 +3006,28 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, pte_fn_t fn, void *data, bool create, pgtbl_mod_mask *mask) { + int err = create ? -ENOMEM : -EINVAL; pte_t *pte, *mapped_pte; - int err = 0; spinlock_t *ptl; - if (create) { - mapped_pte = pte = (mm == &init_mm) ? - pte_alloc_kernel_track(pmd, addr, mask) : - pte_alloc_map_lock(mm, pmd, addr, &ptl); + if (mm == &init_mm) { + if (create) + pte = pte_alloc_kernel_track(pmd, addr, mask); + else + pte = pte_offset_kernel(pmd, addr); if (!pte) - return -ENOMEM; + return err; } else { - mapped_pte = pte = (mm == &init_mm) ? - pte_offset_kernel(pmd, addr) : - pte_offset_map_lock(mm, pmd, addr, &ptl); + if (create) + pte = pte_alloc_map_lock(mm, pmd, addr, &ptl); + else + pte = pte_offset_map_lock(mm, pmd, addr, &ptl); if (!pte) - return -EINVAL; + return err; + mapped_pte = pte; } + err = 0; arch_enter_lazy_mmu_mode(); if (fn) { @@ -3035,12 +3039,14 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, } } while (pte++, addr += PAGE_SIZE, addr != end); } - *mask |= PGTBL_PTE_MODIFIED; arch_leave_lazy_mmu_mode(); if (mm != &init_mm) pte_unmap_unlock(mapped_pte, ptl); + + *mask |= PGTBL_PTE_MODIFIED; + return err; } -- 2.48.1