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 6894EC369A5 for ; Tue, 8 Apr 2025 16:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CFA5280007; Tue, 8 Apr 2025 12:07:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58B68280008; Tue, 8 Apr 2025 12:07:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F7B0280007; Tue, 8 Apr 2025 12:07:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 21033280005 for ; Tue, 8 Apr 2025 12:07:41 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 67090121268 for ; Tue, 8 Apr 2025 16:07:42 +0000 (UTC) X-FDA: 83311357164.23.F3AE70A Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf01.hostedemail.com (Postfix) with ESMTP id 7FB8C4000A for ; Tue, 8 Apr 2025 16:07:39 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=tObfqwbc; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf01.hostedemail.com: domain of agordeev@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=agordeev@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744128459; a=rsa-sha256; cv=none; b=43jo3XngUBDUzUdlfjH7owL5qoL8Zo9fCVLl+vLget3GLog0sRrFL9EVnM+jRI/1B2fyFh 9hx82v2leR9YLdYgcIQSOyRDwrJDdkbnVJ0irFxhkMTqaZIsbp0UL8/lufVJ9T7joOlLxU 7XXmsqr8TnhrKJ/w4B3FAnKfcQqYRGk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=tObfqwbc; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf01.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=1744128459; 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=xkRr3rYpnf+evzsRvKXtHeEA6KSnGBV46B7GpE1ybMc=; b=BiV+C99LM6E3pbgwslvhqOQF+8d4pKUt0gNU/GBWK5HLF7xORwFhYwDvSOc96G12ueFXtR wrddeehEUm/dplPVnYy9m4ksnXC0mybdlNVWbQC90tSLMfYq6kubDVrAvOzY1nJkCUhh0L KTCwSDQNfQhWDY/6RY2+9TgbK1GkSe0= 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 538DNidV028259; Tue, 8 Apr 2025 16:07:36 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=xkRr3rYpnf+evzsRv KXtHeEA6KSnGBV46B7GpE1ybMc=; b=tObfqwbcUm2umQrlxe8oOYdzi1e0gQjiF aDe8g32J/reQTv52CrrHU7DoSqRqoHC/eOV5SgZSlBgUlqAYnSdM++/IgMp7n/cV bgkWR0rPlz0F8WdJoj4DFM38xD6xJmeWCRhyQ98SrUrzzh9YLCkd39fEWuX0PcMy euyfOwsFuQ6rqCSXBYaURGqJr8xKeZnkAiUlC4l236cVZhx+PvSC90bg4v0JQExD 5820Q7tR+S4eqPWfx18MOwO0o43pRNif9AsWMNrBMMcuEWT7+ylcsRTY4gA8LTe6 XO217yw0TDcXUi3Z3pEgb5YAA8sa7reYU2vZHGl6X3/hJDJ89Grbg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45vv6a3cmj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Apr 2025 16:07:36 +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 538G3Tpb014440; Tue, 8 Apr 2025 16:07:36 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 45vv6a3cme-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Apr 2025 16:07:35 +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 538CRs5W013915; Tue, 8 Apr 2025 16:07:34 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45ufunkd23-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Apr 2025 16:07:34 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 538G7WVI31982208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 8 Apr 2025 16:07:32 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA33A2004B; Tue, 8 Apr 2025 16:07:32 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 94D4920040; Tue, 8 Apr 2025 16:07:32 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 8 Apr 2025 16:07:32 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id 4E5B9E171E; Tue, 08 Apr 2025 18:07:32 +0200 (CEST) From: Alexander Gordeev To: Andrew Morton , Andrey Ryabinin Cc: Hugh Dickins , Nicholas Piggin , Guenter Roeck , Juergen Gross , Jeremy Fitzhardinge , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com, sparclinux@vger.kernel.org, xen-devel@lists.xenproject.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 2/3] mm: Cleanup apply_to_pte_range() routine Date: Tue, 8 Apr 2025 18:07:31 +0200 Message-ID: <0c65bc334f17ff1d7d92d31c69d7065769bbce4e.1744128123.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: T7M0AXWlw4FgItjk33f-GC1E93-9rXMH X-Proofpoint-GUID: 9N-c1pIo8G5i8QLTXcZGYOAiygpOCwa1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-08_06,2025-04-08_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 adultscore=0 clxscore=1015 suspectscore=0 bulkscore=0 mlxlogscore=909 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504080110 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7FB8C4000A X-Stat-Signature: 6c1ppmxmk5g8swqbuopme5no7ndoztqm X-Rspam-User: X-HE-Tag: 1744128459-388818 X-HE-Meta: U2FsdGVkX19z6vysZs05Z4vAfoTxTQXe8SRo4dCmBC/B90DZmQ5vPdUc9OyXiwbT8ogOHD5yKrIVDQNqFgXLyQPCZMDcb941q1IUWGMKmaCI/HouNOht1I9jrligoZfsyVU4+ppDwtoagTzxVaM8SYwyr8c5n+lAvxB8UZ4X13QnzhjtoeQV6Fe3OCDOBX3plorYZPRPDhI63Bqeq2WupegGKSCbBXlKgCJudO6E4EDdJcIQN0iEZUlplC70jlWaRR7DKj6QzfUqFhUc1bFKV7Nx/fbHHpZHkMKaJJiO08Jm1OGa9lS14igXe1wW7Ed4NInB4iPQS2UTyMFjxOdY1LpllLYyaY6eCFxW2o/k+JWCuYQqEElAzQK4GUJ9b6/OT1aN6+Ak8CJlhoFZ9i0Ucp6etyvMYfWytStNV4MnB1Mc37zj19UnW8AqCuxMROGjNjgCNkcpyTRnF6o1OVo42zf7Avox5MY/XPvepZeGY964SE8aw3QDVusyNB6ZFn5P1drGX8ZV+0b0TQT4ySwlUAf/fbR+Tj1meoDVNmf2TfzO8imiybjACRKUt07mGGRS85qWqyU27YnigUs3YGZPcIQB6KkgAt1JQdGfW8tR7nxgJX2772RmMdMVTe9nmcBYi36ZWBPoOKN2qblPw7ayEIZqVnfuvJR6cbIzNY9s1hHlrSzImxlrFdXTmPGnFYjYWPCrEszR1rcJlS7UvM+Fkhv4AFjoAryARkWanxfWhFNgOQ/QIVw1m1A+K7j2y62p7hvdWwkUhuMQVU9/JWntqJ2n0F6xs/reARRaF9flS/RORL9vLCmGahZqA2n6y4S36+n73b2OeAb/1PJcXpjuUqjsZfHd+WD07R99pK8JZEmPORkmW721D2rLWqfGmbcPoyo4W6NcSxtYARbIj6rg4MalGN9eaGWFsb5VqVOxV4A+k10BA1EnrKO0PscU7o9yGkR6PHXZN7uH4hYVeht uAfzwxB5 p5OdiTfKh4BRnSUY= 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 fixing missing kernel page tables lock. Cc: stable@vger.kernel.org Fixes: 38e0edb15bd0 ("mm/apply_to_range: call pte function with lazy updates") 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 2d8c265fc7d6..f0201c8ec1ce 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2915,24 +2915,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) { @@ -2944,12 +2948,14 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, } } while (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.45.2