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 4CBFBC77B73 for ; Mon, 22 May 2023 04:59:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D818590000A; Mon, 22 May 2023 00:59:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D57D2900002; Mon, 22 May 2023 00:59:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF7FA90000A; Mon, 22 May 2023 00:59:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B1D0D900002 for ; Mon, 22 May 2023 00:59:04 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 788571C71C6 for ; Mon, 22 May 2023 04:59:04 +0000 (UTC) X-FDA: 80816686608.21.9301B8F Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by imf01.hostedemail.com (Postfix) with ESMTP id A08F340014 for ; Mon, 22 May 2023 04:59:02 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=TGvacnGG; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of hughd@google.com designates 209.85.128.182 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684731542; a=rsa-sha256; cv=none; b=1qbuEintHSm2TB9g2Bpi1V6QVTiysM/kg4xsjn4EAg4lr4cclKbiR9BygsWcnwZmc4+EAZ 1uzPRlKpBraTeZXpOyCPDIv8Op2b0ZzEBE1g9qgyz4rxQSuHDUxpVZbpMIo4mB8RH3ArIg JdXC+JLJMc+6gk2Zrm7z5qgTBHZQUZo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=TGvacnGG; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of hughd@google.com designates 209.85.128.182 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684731542; 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=9VYOFAJpcVHpYrrS1TQZcIVdYEqSjI0GrwCgA5USRTU=; b=6bmMIaF6z7XWfZarLf7fI9qeRo8t9rU/U7RhKOLIyAR0omqCPIlfMw0buIyh6no1jc0934 dV34BQz8dXfjwBBUkNCDdwJpjhMa5zkSE2kmCIAeBhwjbh1J0rBFYwNI4HYJ4b67Zupdup x5xmHAqzM0i1bmjjAP2yY6BuIE0wljc= Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-5621a279cbbso47448737b3.1 for ; Sun, 21 May 2023 21:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684731541; x=1687323541; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=9VYOFAJpcVHpYrrS1TQZcIVdYEqSjI0GrwCgA5USRTU=; b=TGvacnGGV6vCjNoR60zApDSkblq671aMycg9KRLogEr52U+VDqJD6c9LnImDcePwXP E+oOLSRKY3QnKjySzwhyx6yXTUVprQkKKmDGsyxWBnNRAxybbHWPE+dZuUWqHGT3elWd KJzJqVN+sTGBo7NuVZnh1kpo/iER1/+XPOJgROkPPAZo27SecID8MF0vNrn6JwCjXzCa UJM1gcqwPlnlc9FLHaIRUz/YKXEVOCkEBbD5opmzBt0US/6C6qPiSdxH6LlPD5UCxU/z zjtg+pK6HvaDdyOshiCuMXpAmIJoOt9KExIMuIDdOzn/Rpr/BNUdc7KJhSnoFWJGvEir v0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684731541; x=1687323541; 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=9VYOFAJpcVHpYrrS1TQZcIVdYEqSjI0GrwCgA5USRTU=; b=d/Fip2g73q57bU5dK+06b9nS12uIAQzBkjcMecnxAbj+ZjRl8q/vb9Avv3LOG6IHnw 60vvjWgUQGgDkLsuYoXePbdQJ6FCHotleXyh+NxrPWeUZSGFuXA/kQS8fkN414TlrjbV v+FsRhAAJwjDQ3dXQzkYWs+TP9JK1BEURBB0zu/ydM45ehlmLqwlJsNVK/zzpqeUgCMN b2r9yv9AmzkKzdFRaw/Fsg3ClpvPwq/Mbtl2wicXuSq+1wIEq7/MZ2fEH9s3si5zupY1 iB/Nv7UTWo846BBFOPaBGB6EFUm0EawpI4tqQP/3B9WbYBcAbfXO2xGHJY7rWCwI4ENB 1YcQ== X-Gm-Message-State: AC+VfDwFHBd1E9s0kOzlMCxGs/QGEaN0tUDR3TEWkfm5Z7xP4dZ1YeyX xeVLVGGaiqNgxR6AbF3V1pEOpA== X-Google-Smtp-Source: ACHHUZ4Kg3oHxKZR/9CKF00axRzhTRl1agKzGrSrlAst7zhZTlHx2mXvNeak2L2x7OdVQNGzScOvHA== X-Received: by 2002:a81:1e45:0:b0:560:d022:53ac with SMTP id e66-20020a811e45000000b00560d02253acmr10367255ywe.5.1684731541606; Sun, 21 May 2023 21:59:01 -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 g189-20020a8152c6000000b00555e1886350sm1827794ywb.78.2023.05.21.21.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 21:59:01 -0700 (PDT) Date: Sun, 21 May 2023 21:58:58 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: 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 , Naoya Horiguchi , Christophe Leroy , Zack Rusin , Jason Gunthorpe , Axel Rasmussen , Anshuman Khandual , Pasha Tatashin , Miaohe Lin , Minchan Kim , Christoph Hellwig , Song Liu , Thomas Hellstrom , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 08/31] mm/page_vma_mapped: pte_offset_map_nolock() not pte_lockptr() In-Reply-To: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> Message-ID: <8fa3fb6e-2e39-cbea-c529-ee9e64c7d2d0@google.com> References: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A08F340014 X-Stat-Signature: 99nb36eyb65zihoki38bz46oddxingxk X-HE-Tag: 1684731542-256035 X-HE-Meta: U2FsdGVkX183xsEBgNccYX5Fj2sW6ZeBWg2MH3ma3yTqITt1zV7B+ZpE7A2H8JKaf2FwLP1tcBttWhRgaC2rwU06m6oZZHl+HwPJuiQC9bPJIgPhqmy/ilV8HsXRwixffj2YoH4VzvJw0A5BPV1eAMPuNVlQRXKplgUtVPstToIOSEwHcX+HlDUmntaDKp1flcTzgtnxFTfAXDbUhAZRq0hzzB/xN0NagXvelzJ7/WA6VCtmvphUiEowF1GoE3Wdq3WV3U2qHa8zGSoZLBXs6uQi1VXr/mg8MWuEVSnpaNvKRE/48PY/vaLHezryy+mbNOYvI0pLHxPYjvGQjMmRFwliiCrzMIkD5TEgG/F3bRQdc6nWdVHAgfTBLtaIhVXM92zqpP4HZRwuUgpP4aEd1wZ7L8WaIQT291SZfr8jxRd49ENBnSWSoxhu82+rSUtERwZxOxJ6H3BHK8VmAq6Q7Nn3u7ETUD72EBMRiZ62iNvOTmTTeWbnQNmoX2IOpPEnboKmAPr2k6seWU1ehCuzSFwMR+9cuNpG4ASaJUDfqfwhoO0q51xAgWI6bWcQdZ6jK+kYUdmM2DjkKlhs1ZJDx6lgP75e0wr4FxGAzvEiSlnOqV70p8F9SbL7MqnKMbeSjc5IWgqq9nPlR8N3jvdTESr/LVo/lQD7IPvOi/65vtazpuA+idGakoemUJpyorVlJarEqAJVggbiNNm2XT0KqaE0DlDEIO5HCNagotRiK1o3Xa2Q7D2rTQ739NGk5TrX6HCqdSjonaO847IOCQHQ94h4bDibpdqdrHS+qH/dQfTh6GhIEzPzwkj9FCNAs3d3zbvuqvR8dnuES2VXAeKW2KMSNYFeOr2mhqRc39oO8mab66DjmKoOD7sxDj4q0vKBH/2i3BbQZblvbeo+KOq/9bdb1pp5szQMHriRX0ltow0CSxIlTWXjyX06+2HA5fOVLyGS1IgUzPDjHC6yBDu +5KwA8Qh 8xlMaU4VtYsRzrmCqjRk6ZH8BvXsN81IXxdU68c/ucEzpQTgK8QhI0r/VT0KdbCqmhFloRPtYNtDald3JkSXayZRQqv5QlCcETYnOrlwhAsTpnOuEY96pl1jEtvXKLF9nB7ca/bh0ejpAMk0mS0pEyQ1hW+YnOUkaflW4ho04aaFR40rUeY6MCLtxJZNU737/TicZl7RKCRO35RG2BH5+GW2wdgdeADz9ZdQXnvKgGGts0AnQ/jEL84p5cn/sbiPp6F0uXE6n6GPhN7SDcJogz4LxBTYdhjaJTTMdy72hL4aX9xZSmZp1dq0LlC7/8s3VU1mwaBFXhpKLOX4Pbiuyr7tVPLD5YsZQibgh5IpD8eC1DVnjSZJcEip6OaRwp0Y0v+H04wNQpUT96hnCawvSZ0+OuTpg9feRUaE4Ck6ff7krI1IUPID2usiOPQ== 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: map_pte() use pte_offset_map_nolock(), to make sure of the ptl belonging to pte, even if pmd entry is then changed racily: page_vma_mapped_walk() use that instead of getting pte_lockptr() later, or restart if map_pte() found no page table. Signed-off-by: Hugh Dickins --- mm/page_vma_mapped.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 947dc7491815..2af734274073 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -13,16 +13,28 @@ static inline bool not_found(struct page_vma_mapped_walk *pvmw) return false; } -static bool map_pte(struct page_vma_mapped_walk *pvmw) +static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) { if (pvmw->flags & PVMW_SYNC) { /* Use the stricter lookup */ pvmw->pte = pte_offset_map_lock(pvmw->vma->vm_mm, pvmw->pmd, pvmw->address, &pvmw->ptl); - return true; + *ptlp = pvmw->ptl; + return !!pvmw->pte; } - pvmw->pte = pte_offset_map(pvmw->pmd, pvmw->address); + /* + * It is important to return the ptl corresponding to pte, + * in case *pvmw->pmd changes underneath us; so we need to + * return it even when choosing not to lock, in case caller + * proceeds to loop over next ptes, and finds a match later. + * Though, in most cases, page lock already protects this. + */ + pvmw->pte = pte_offset_map_nolock(pvmw->vma->vm_mm, pvmw->pmd, + pvmw->address, ptlp); + if (!pvmw->pte) + return false; + if (pvmw->flags & PVMW_MIGRATION) { if (!is_swap_pte(*pvmw->pte)) return false; @@ -51,7 +63,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw) } else if (!pte_present(*pvmw->pte)) { return false; } - pvmw->ptl = pte_lockptr(pvmw->vma->vm_mm, pvmw->pmd); + pvmw->ptl = *ptlp; spin_lock(pvmw->ptl); return true; } @@ -156,6 +168,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) struct vm_area_struct *vma = pvmw->vma; struct mm_struct *mm = vma->vm_mm; unsigned long end; + spinlock_t *ptl; pgd_t *pgd; p4d_t *p4d; pud_t *pud; @@ -257,8 +270,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) step_forward(pvmw, PMD_SIZE); continue; } - if (!map_pte(pvmw)) + if (!map_pte(pvmw, &ptl)) { + if (!pvmw->pte) + goto restart; goto next_pte; + } this_pte: if (check_pte(pvmw)) return true; @@ -281,7 +297,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) } while (pte_none(*pvmw->pte)); if (!pvmw->ptl) { - pvmw->ptl = pte_lockptr(mm, pvmw->pmd); + pvmw->ptl = ptl; spin_lock(pvmw->ptl); } goto this_pte; -- 2.35.3