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 E6EABEB64DA for ; Wed, 19 Jul 2023 05:04:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4C7528002B; Wed, 19 Jul 2023 01:04:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF9BC8D0012; Wed, 19 Jul 2023 01:04:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9AB428002B; Wed, 19 Jul 2023 01:04:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B96B68D0012 for ; Wed, 19 Jul 2023 01:04:23 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8010F140147 for ; Wed, 19 Jul 2023 05:04:23 +0000 (UTC) X-FDA: 81027170406.02.449512B Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by imf27.hostedemail.com (Postfix) with ESMTP id A762540008 for ; Wed, 19 Jul 2023 05:04:21 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=bsfPCapy; spf=pass (imf27.hostedemail.com: domain of hughd@google.com designates 209.85.128.181 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689743061; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f4gbnMS0W6E9Awn5g41KlL6GZi3HN5/R/yFQL1nQXJg=; b=BC9+dRBILtld154zQjKbHXI8yP4dIXZ3kfdi5Ye1vPncUxmmw/2Z1xxFeF3Vr35AKSPbpj UceDIfxgX0tCadgA3Sbzd8fZI4v/Sf5bK/dKVzn6m9wCK15ZwbiwduE8+YcJVntMIKFAjP 8qXJus7NT16d2FGyR5IgOmz+7DZ/3uI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=bsfPCapy; spf=pass (imf27.hostedemail.com: domain of hughd@google.com designates 209.85.128.181 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689743061; a=rsa-sha256; cv=none; b=WB5rLZ29Hw708CA9pfaVKWI78SRKYTnsj4amaJ84dPQQgWlqdbBSiPFzJ7Ay2x0MXqQGlr YqQB02oxfjUzJTewUlZ7jhrcw/3xiq4AMnCHQHx/gXAek+uSw0z84IP5XX5F7qjaV2TKkE 21Aig8OIWQtUV1OA0rB/ILmrj4bNavk= Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-57026f4bccaso70362837b3.2 for ; Tue, 18 Jul 2023 22:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689743060; x=1692335060; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=f4gbnMS0W6E9Awn5g41KlL6GZi3HN5/R/yFQL1nQXJg=; b=bsfPCapysjnAZODvh7VQx88fm7IvMM72XC0oEOupCXke50rzUpxBzJjYQpi6er51fb D4bBL8Bh1D+h6gJQCrL3ilyuQNC5vtgJJbqXXVdUX3wGIHEmUxC4mo1pR0Z+lwJSnYwK meVLK3418dgqsYosj9vCSuNEJNkdRzYHJy0dpVlfsGSOV8HIHO4e1UNyCrc3kkrhsuYl F7Nsl4WNKMNEHKdGgWak0LJ4fwxrpogQk/dx/JNial3Rw8ApbYcti+VqcZ3cqR3TmrjR HLyZAxKWibz4mBf1B911Dg5ToxkxCT+TuKgSTuRLqJQNqiyCWpJGUeH03fYVv65KsNEv GKdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689743060; x=1692335060; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f4gbnMS0W6E9Awn5g41KlL6GZi3HN5/R/yFQL1nQXJg=; b=TymRvhqmTbJuyRrQgaASgYkkXc+e4MSdoSw+IoYlbUEd1wk98kmEdhONC7P8+Un2bj s2qmn2Qu33m6J4URnr0uLj75aNUbFEeG1tkC2hD+XCJmyK+WHz2uDn4yjnx/mnp0bWrs dW6Ev1S6xtgGJXLit+xkhRBzSIO4bITQzrxh8A4Pc0E+0vF3JWp1uRJhCFtUu/YYwknu 8wPUW6cwPWCmpJj8/EFcQisvWRbBGT0muwH4BSgJzDdx/nxX/gZZpgdq09oYGYARJuG2 KdX4ulpirgmTa/Eb6u8MOAQjQqe1I3FXlztBgi4Mkk6uqHvjHlXJAssSGmZpuU4JoiTF U8Tw== X-Gm-Message-State: ABy/qLY/RyMNPu1fhrkVVlA2QN1ufvb9dFsmzY7st5iQthM7w4mDmHxP Bd58X9PQt4Da1ULz6ti/Gr5kHg== X-Google-Smtp-Source: APBJJlFfOyYeGiVCuczZwoUNyN9JCPq13oUH5g6h02u0hokVq61z1GN7QWMboOKVDLBaFX+57WnbTA== X-Received: by 2002:a81:a00d:0:b0:573:d3cd:3d2a with SMTP id x13-20020a81a00d000000b00573d3cd3d2amr19838242ywg.28.1689743060542; Tue, 18 Jul 2023 22:04:20 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id b125-20020a0df283000000b0056d304e224dsm847329ywf.90.2023.07.18.22.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 22:04:19 -0700 (PDT) Date: Tue, 18 Jul 2023 22:04:08 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: "Aneesh Kumar K.V" cc: Hugh Dickins , Andrew Morton , Mike Kravetz , Mike Rapoport , "Kirill A. Shutemov" , Matthew Wilcox , David Hildenbrand , Suren Baghdasaryan , Qi Zheng , Yang Shi , Mel Gorman , Peter Xu , Peter Zijlstra , Will Deacon , Yu Zhao , Alistair Popple , Ralph Campbell , Ira Weiny , Steven Price , SeongJae Park , Lorenzo Stoakes , Huang Ying , Naoya Horiguchi , Christophe Leroy , Zack Rusin , Jason Gunthorpe , Axel Rasmussen , Anshuman Khandual , Pasha Tatashin , Miaohe Lin , Minchan Kim , Christoph Hellwig , Song Liu , Thomas Hellstrom , Russell King , "David S. Miller" , Michael Ellerman , Heiko Carstens , Christian Borntraeger , Claudio Imbrenda , Alexander Gordeev , Gerald Schaefer , Vasily Gorbik , Jann Horn , Vishal Moola , Vlastimil Babka , Zi Yan , linux-arm-kernel@lists.infradead.org, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v3 04/13] powerpc: assert_pte_locked() use pte_offset_map_nolock() In-Reply-To: <87msztbiy8.fsf@linux.ibm.com> Message-ID: <392f311f-83ac-a5a2-d16e-2c7736d1b577@google.com> References: <7cd843a9-aa80-14f-5eb2-33427363c20@google.com> <87msztbiy8.fsf@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: A762540008 X-Rspam-User: X-Stat-Signature: du94d4icefj8hgazjztqeoe59kqsq8o6 X-Rspamd-Server: rspam01 X-HE-Tag: 1689743061-226082 X-HE-Meta: U2FsdGVkX19TSx5p4Fdr61DSc0BQp/SY1n73oWS2KysB0bqd4dJSaJDyqTVtBhbVmKHCjRnruylFB5Mpg2q9xj9nK7iPvXBMzORFqU/HtUKkd3ztddvVO6vZcCYjX4DBE9/S99u6HT3sPFyo6++z5v5IM9rTvP1akuDTajd350osW5wXftPteJifl5sESUFvWjbWCgYmf/SvsqNLsHs7N3RZHZF5ET5fdim2Gbijsqaq/e0B7ZvrLI9coyUTjGGXEjmhJasjitiS26aZ9nrz68btirc2w48LbbijTtIAMfkob+Zzj1lIfNSZMP9rEH3oHCnj0epKwYShcQ9mwTdNEpGRUj9wJreNfae1hrmQ2KMQ3IGa2sgqLD0sfj8Bp+FgJJbbHJXEajVQYA/cZt4hVhcnMOPanXdmXjd4EOKV4uGx7VyNDJ+i7S4Fl9dfKlf4tq/U8oeLIJx5aO1YB1Rf+h4wW1zyiwoKdZE6IdqzJYqrLnvvfSJFVUYMbiJIn1xdT757fChPLqCg0ZD8y+zr2qNqxnOBjUNQvSjO9Lrf98SG6NCpllZ0uz/u1YWxicLIJsfhYd+iCn4l9VRNTm3IWfZ50nDlgjIyM3uRUjD7uxpLs6A58w53JEbbI+13Vw2OfvVRdnUrA4PjwhCNAbX8IB9ksoIVJijmZSB7Ilxv6l5EyNNDWkItd8Hf4sbFH7CCWxQsE1BAoAKslyK5xBTqV3LnZiy/DME8tYZ9HPm+TGDo1q7H8jh++7Awdv3iifF+Ui6kFCq1pdl2nFSPSlPuLTPO/UhMbunWkPbg0HQpIrZmKLAUDHRpcwn0UlxGS8LHFZ/HlIFeHa/beDRXUGnzNqMqTYdbN/kMxfIitNAs1voEOSQYSq1EHraTiOCkt2z9MK1eEe9z3rqHowuDgAkLOuswQj097IAtMAm2FNlAcvlCk3ln1kl54lj8i/WIbnAX1AeLZJO6WSSRxGptTDs cCCQLR07 Uz9XLMzVAsj+d+aFdoNBdMFgqRs6e9bTqDLKOuUuyyO6SGt6gshJq2lhmxczCB2TOrmObnXOo9sXobmsEmL7hTBTF+GAMV/q3tfoQv12GweGSSmAesx7dNxEOqjavGO4qw+uXYo3rMGhFvTNAEWbYuyw9/t+pTx2dUJ3pa4oRWfaQCg8MtO7moh5d0zkBruxpo1fIGOFOY70Ld4emdc1Of7lz7CHnvLUcnoCTGggfugTjzzdGGh6glFStzgC3mbX+te6FzKlOFRj363pb8HD6e6/kzDAHpQWrBOJB9lIWyS/WTZsJrtvc5fPjZGfHmQNAXJyxpvR5TxwsuTb+fPn+8xddeDs1U1Dptib6cfJTnmmjgN4rO9Vm5E0sDi/ycXiTes4dxfP1eHsChv8mvI9ybI7gMfRzluBnRKYf8ouGaOmY3uyBr3HCtb6AH8wsMxCt3waOaGKKtS3kFmGK0mfPAdFR4+qEWBtp90oA4881h5l9AO8HZunK1sJ4aSbszeFAbVS7 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: On Tue, 18 Jul 2023, Aneesh Kumar K.V wrote: > Hugh Dickins writes: > > > Instead of pte_lockptr(), use the recently added pte_offset_map_nolock() > > in assert_pte_locked(). BUG if pte_offset_map_nolock() fails: this is > > stricter than the previous implementation, which skipped when pmd_none() > > (with a comment on khugepaged collapse transitions): but wouldn't we want > > to know, if an assert_pte_locked() caller can be racing such transitions? > > > > The reason we had that pmd_none check there was to handle khugpaged. In > case of khugepaged we do pmdp_collapse_flush and then do a ptep_clear. > ppc64 had the assert_pte_locked check inside that ptep_clear. > > _pmd = pmdp_collapse_flush(vma, address, pmd); > .. > ptep_clear() > -> asset_ptep_locked() > ---> pmd_none > -----> BUG > > > The problem is how assert_pte_locked() verify whether we are holding > ptl. It does that by walking the page table again and in this specific > case by the time we call the function we already had cleared pmd . Aneesh, please clarify, I've spent hours on this. From all your use of past tense ("had"), I thought you were Acking my patch; but now, after looking again at v3.11 source and today's, I think you are NAKing my patch in its present form. You are pointing out that anon THP's __collapse_huge_page_copy_succeeded() uses ptep_clear() at a point after pmdp_collapse_flush() already cleared *pmd, so my patch now leads that one use of assert_pte_locked() to BUG. Is that your point? I can easily restore that khugepaged comment (which had appeared to me out of date at the time, but now looks still relevant) and pmd_none(*pmd) check: but please clarify. Thanks, Hugh > > > > This mod might cause new crashes: which either expose my ignorance, or > > indicate issues to be fixed, or limit the usage of assert_pte_locked(). > > > > Signed-off-by: Hugh Dickins > > --- > > arch/powerpc/mm/pgtable.c | 16 ++++++---------- > > 1 file changed, 6 insertions(+), 10 deletions(-) > > > > diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c > > index cb2dcdb18f8e..16b061af86d7 100644 > > --- a/arch/powerpc/mm/pgtable.c > > +++ b/arch/powerpc/mm/pgtable.c > > @@ -311,6 +311,8 @@ void assert_pte_locked(struct mm_struct *mm, unsigned long addr) > > p4d_t *p4d; > > pud_t *pud; > > pmd_t *pmd; > > + pte_t *pte; > > + spinlock_t *ptl; > > > > if (mm == &init_mm) > > return; > > @@ -321,16 +323,10 @@ void assert_pte_locked(struct mm_struct *mm, unsigned long addr) > > pud = pud_offset(p4d, addr); > > BUG_ON(pud_none(*pud)); > > pmd = pmd_offset(pud, addr); > > - /* > > - * khugepaged to collapse normal pages to hugepage, first set > > - * pmd to none to force page fault/gup to take mmap_lock. After > > - * pmd is set to none, we do a pte_clear which does this assertion > > - * so if we find pmd none, return. > > - */ > > - if (pmd_none(*pmd)) > > - return; > > - BUG_ON(!pmd_present(*pmd)); > > - assert_spin_locked(pte_lockptr(mm, pmd)); > > + pte = pte_offset_map_nolock(mm, pmd, addr, &ptl); > > + BUG_ON(!pte); > > + assert_spin_locked(ptl); > > + pte_unmap(pte); > > } > > #endif /* CONFIG_DEBUG_VM */ > > > > -- > > 2.35.3