From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE9743C2F for ; Fri, 26 Apr 2024 03:57:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714103848; cv=none; b=Tk9/R8Coj109i/M9eKTjGndGDcvpKApSGVVE3AB27YqkGg8jdk9eKSdfjQqjGcR+J+IZUZFpQxe0z2xu0Xm8JlGBC2IbsVZQPFFv4GmmKWXWXFrqPdR3vyil36U0diefQwvMiOBOjbFM/mo+FZMfo5qBlxcMNiFhpBXjBHbJOFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714103848; c=relaxed/simple; bh=r2VzYKoGmLXh7R1ra/NCYsduUkcs1HYHycbrwZFluCQ=; h=Date:To:From:Subject:Message-Id; b=JmHvr3NumugXG+/Zm8jWKn+Rs/KOcjQkN1Vyh69WTUNbGcATCqbWSH0ibxL/bWfawzQ8tIXXJmtXaflOLtZJWvBw8C3gz++yWvz0CBob2JXf3sSf1jDqQ9HHEdMdc2p+8NLoA89VLO8mhKpAzv50ZmVX/5CuE1I578GctNNYqnQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=UQdHEE2m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="UQdHEE2m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27D65C113CD; Fri, 26 Apr 2024 03:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1714103848; bh=r2VzYKoGmLXh7R1ra/NCYsduUkcs1HYHycbrwZFluCQ=; h=Date:To:From:Subject:From; b=UQdHEE2mNm1VBkt/+ICEFVsRbJnVAMYhOI2OGP973lK2Vom4ApXhFU+SfVzcJkzbo axXNbTTnFbELZyzDJhY9Ltp/sClpm+r9Y14NETRJ+MvPv3wfOnJ8X30ToWrRnvkxIO HaIMXOUJ5nNrPEum6cUNdlma4XwMmgX1LNMszYQA= Date: Thu, 25 Apr 2024 20:57:27 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,will@kernel.org,tglx@linutronix.de,shawnguo@kernel.org,rppt@kernel.org,npiggin@gmail.com,naveen.n.rao@linux.ibm.com,nao.horiguchi@gmail.com,muchun.song@linux.dev,msalter@redhat.com,mpe@ellerman.id.au,mingo@redhat.com,l.stach@pengutronix.de,linux@armlinux.org.uk,krzysztof.kozlowski@linaro.org,konrad.dybcio@linaro.org,jgg@nvidia.com,festevam@denx.de,davem@davemloft.net,dave.hansen@linux.intel.com,christophe.leroy@csgroup.eu,catalin.marinas@arm.com,bp@alien8.de,arnd@arndb.de,apopple@nvidia.com,aneesh.kumar@kernel.org,andreas@gaisler.com,andersson@kernel.org,peterx@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-gup-cache-p4d-in-follow_p4d_mask.patch removed from -mm tree Message-Id: <20240426035728.27D65C113CD@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/gup: cache p4d in follow_p4d_mask() has been removed from the -mm tree. Its filename was mm-gup-cache-p4d-in-follow_p4d_mask.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Peter Xu Subject: mm/gup: cache p4d in follow_p4d_mask() Date: Mon, 18 Mar 2024 16:03:52 -0400 Add a variable to cache p4d in follow_p4d_mask(). It's a good practise to make sure all the following checks will have a consistent view of the entry. Link: https://lkml.kernel.org/r/20240318200404.448346-3-peterx@redhat.com Signed-off-by: Peter Xu Cc: Alistair Popple Cc: Andreas Larsson Cc: "Aneesh Kumar K.V" Cc: Arnd Bergmann Cc: Bjorn Andersson Cc: Borislav Petkov Cc: Catalin Marinas Cc: Christophe Leroy Cc: Dave Hansen Cc: David S. Miller Cc: Fabio Estevam Cc: Ingo Molnar Cc: Jason Gunthorpe Cc: Konrad Dybcio Cc: Krzysztof Kozlowski Cc: Lucas Stach Cc: Mark Salter Cc: "Matthew Wilcox (Oracle)" Cc: Michael Ellerman Cc: Mike Rapoport (IBM) Cc: Muchun Song Cc: Naoya Horiguchi Cc: "Naveen N. Rao" Cc: Nicholas Piggin Cc: Russell King Cc: Shawn Guo Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Andrew Morton --- mm/gup.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) --- a/mm/gup.c~mm-gup-cache-p4d-in-follow_p4d_mask +++ a/mm/gup.c @@ -772,16 +772,17 @@ static struct page *follow_p4d_mask(stru unsigned int flags, struct follow_page_context *ctx) { - p4d_t *p4d; + p4d_t *p4dp, p4d; - p4d = p4d_offset(pgdp, address); - if (p4d_none(*p4d)) + p4dp = p4d_offset(pgdp, address); + p4d = READ_ONCE(*p4dp); + if (p4d_none(p4d)) return no_page_table(vma, flags); - BUILD_BUG_ON(p4d_huge(*p4d)); - if (unlikely(p4d_bad(*p4d))) + BUILD_BUG_ON(p4d_huge(p4d)); + if (unlikely(p4d_bad(p4d))) return no_page_table(vma, flags); - return follow_pud_mask(vma, address, p4d, flags, ctx); + return follow_pud_mask(vma, address, p4dp, flags, ctx); } /** _ Patches currently in -mm which might be from peterx@redhat.com are mm-userfaultfd-reset-ptes-when-close-for-wr-protected-ones.patch mm-hugetlb-assert-hugetlb_lock-in-__hugetlb_cgroup_commit_charge.patch mm-page_table_check-support-userfault-wr-protect-entries.patch