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 1AF57C7EE23 for ; Wed, 24 May 2023 02:44:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97D85900003; Tue, 23 May 2023 22:44:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92CD66B0078; Tue, 23 May 2023 22:44:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CEA0900003; Tue, 23 May 2023 22:44:47 -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 66F036B0075 for ; Tue, 23 May 2023 22:44:47 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 41A70120534 for ; Wed, 24 May 2023 02:44:47 +0000 (UTC) X-FDA: 80823605814.11.614A2C7 Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) by imf29.hostedemail.com (Postfix) with ESMTP id 6787812000E for ; Wed, 24 May 2023 02:44:45 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hrm8eV4F; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of hughd@google.com designates 209.85.219.173 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=1684896285; 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=3If+wNKDpztgamuvwXQbsQHi3AsIclBz5NcCQV3CYi4=; b=gwsHhr2J8Tzr37RNpODHvvbkhkfls+bPJ/wFZRTG3jZBfv8sxai+ZG90EghgNNAquJxn25 gWkK0E9yxcBZEvAKtXwwg+W9MEjnWHwED0tR3EOznRG4Uzu0nETqQW/EuwDxoeEHqUJQsS OfoBEOud57o/IJb2yTgXYI82wlsKH4g= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hrm8eV4F; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of hughd@google.com designates 209.85.219.173 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684896285; a=rsa-sha256; cv=none; b=dnxs1u71v4XBoIi/wWvmB/GiVeFeSKa/nL/bsX/sJmtS5oEAQUP1QEBTjR1Yu5aOkcye/l SrjdTJ7235gEatM6jPMbY3ia1vGrLYXrdDRdJ426H7tOWMuPVy6n+HXbuqhb4qNAHuqbT2 /2kioDt+42QgbK3eEJCWuWaNwo6iR6s= Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-ba8151a744fso675457276.2 for ; Tue, 23 May 2023 19:44:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684896284; x=1687488284; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=3If+wNKDpztgamuvwXQbsQHi3AsIclBz5NcCQV3CYi4=; b=hrm8eV4Fq6VAAV1GxKh0FyrU8o4JWflrPTKLcjcBt6GHqGBUZgjEwPtBTGs49KMeO7 E+1IyOO5I/1GKz9vC5+8+/f6AbZqhYPgs9grMTqpvaYG3v2VhmjovMDDpy/iU5jey7V0 6oqVRDxrV0HyWz3HBkEmkWT0oxlkZBfQw6wiT67vFipyzTrQQplQiiQhCCEVWvbnA0WT 76rmKqPHPE7ZcxwcwitoT7UUmP8wyfixdR3hH2X0VofCs+JWLmDuCl39lEWw2LrImLFh Dfg/3CV6de1VFP0QOdKlPEDMpdJm/yt2YKlA6wqgdE9udjCSyapNT4/WHex1qDf4EiQi brpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684896284; x=1687488284; 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=3If+wNKDpztgamuvwXQbsQHi3AsIclBz5NcCQV3CYi4=; b=aJXji/kbIivTYWs85YE7VXiQsSjSNfLvsumgkA8HQ8k6MaeDcUkut7PwDb3mxch6Cd tH0Jmr2EAx62+Ci325Q4Tf53r+zowH6nK89H1wU6IJhKpIq0iTj1IJAsxS8VaIqoLTgE MPlPDSk5DW3p3wV70bLjhahCAyet5NMnu+2A20f69f8WJduxMwWKp0dixY6b3d1qqoRw 00NgFLi6TxoHm9DUJuWunitU3NcgyL1Kw1SdbvYskjERogKjyvcB0MbY34j6QIJ01Dmo ixZRKeSPEEhOd6fmVTYlwcOmY+4kGHIk4iyBxpWSFKw8kozgXhlZ/b1dPywxds7qBWve x0pQ== X-Gm-Message-State: AC+VfDwfZNnOKxlvDF5fjw+/ZrAzaJ+OYATlHSUAz1f5mvPFmcaz10iz T16J3GhnwV2XXnnKkXQnDseujA== X-Google-Smtp-Source: ACHHUZ6gIKhhAwV7VzJZ+VjYAmN1m1JqAsACzn5Xl0TpbWituX+QnPRD/b4+0EBRgkw7jWvonN7X7w== X-Received: by 2002:a81:d548:0:b0:561:949d:f9a7 with SMTP id l8-20020a81d548000000b00561949df9a7mr20238915ywj.20.1684896284333; Tue, 23 May 2023 19:44:44 -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 i16-20020a0ddf10000000b0054f80928ea4sm3324271ywe.140.2023.05.23.19.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 19:44:43 -0700 (PDT) Date: Tue, 23 May 2023 19:44:40 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Qi Zheng 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 , 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: Re: [PATCH 08/31] mm/page_vma_mapped: pte_offset_map_nolock() not pte_lockptr() In-Reply-To: <10e58e7e-a52e-751d-f693-cd4e05ac10ca@linux.dev> Message-ID: <83ec98e0-d17-6d59-e276-557c13ac58ea@google.com> References: <68a97fbe-5c1e-7ac6-72c-7b9c6290b370@google.com> <8fa3fb6e-2e39-cbea-c529-ee9e64c7d2d0@google.com> <10e58e7e-a52e-751d-f693-cd4e05ac10ca@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 6787812000E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: df9b133cn9unwr7s1yxh8qj8bjpc7jgo X-HE-Tag: 1684896285-334850 X-HE-Meta: U2FsdGVkX1+1WgFyOXma+8JkNeshKiwkwAtaNBEUnyIGKO+BTMCns2UD6h1B9DW1Wtwm0PBtZf0vWiWPjnCAUfmVF4/F3MjoBZKwVkzo5pbf7sAIDKppmZ2qe9MB1lkaf1nnPV+TAZaSdi0X9TiKxJz5zM6waKurwUpnpTh5Hu285OIfDCTGrNVg9NsMvdDBoLdYlhqslDLjPiBrtXxJcxmGxlWu4Q/E/p841oO3PKImDb3IgezYpsdyeoW5Rr6fl8TUcLbv4jeq9D+rDn6X7ipMi6FOQcMTkvYgRvUV5lHdzfw6Li6pSCGcbyoG5i1DPdLYDewHxlhr5bZi/3Bci1encQdzcMdufBTxiG9tRzte4YDxYGsy7etYVy9EQbCqQk94m0TsEv68LF1kLOJppuBxJEgZ/lRMjO10HuC3wwCYnACZZZr/YkxVNI+82ApwjFIh8lHWktFzgDnEzTDYi5qU3jzkNuTP9BP9rfTbyFoIOTMOBsXztejRVJPKHSJsIQEAdSYKCHbCRCLoEJ9uURVCufnwmACDWeHF9URmUlx7UEXW2R1BmANQ6R58tWMQB55y9QGO60C+A+vPJtyxOmiZjJ/YJrwNgeTLDmg+hpxqZIz3ivE6wNwxpc8tZih9FbY0ELkkny5Kq3X2L3HwHIkAIElOas1nfHQjherLC/D8H/x8RlZ/z0WBcmRCdphsav/oJ3Qeq2aKf6M+M9Y3+WWBst0ZPVrDiDui8z6DQJLTTvJTbSyoZiI7W5HF7z+W3+1IfuxEIiha78lDdjWXcDtQ6Xgt+vnEYN9gJQyJAedWopg5h/cL/F/nILyZLuv5JA/nAQOxWWbDqk0mR+A+y1mALhE72sAnwviii1VlLFXj5u3CG25eBLozv6ECmh481SF555nZ9DYO1lDFFI+GIuvINDNs9ZsG72RDF8qzgx8RIBdJlAidtY/iVLKXDDEdSM7ZsHI3MpRNHjLfprK lkqisjmt 257E2+dVAK3jDiLlCogv6DFTf3HSfDENyuDDsSYJu91jRTfyVAKjFJ0yJTSFZWUUSF7NclWn/OoBzFIQKRquw276z+SkCdo4Jet0TFcG4ca1E31Io9FxyzwYVjEEctCczUgcUes/eSIeuvIgPHKsR9FtoqpVukIBIqYd4SvIV2X1G0hjzrhqLoUdwNZNNnq+vTYRN89kTX34WuxYRDgZRbENvZr0zOIqQKGK/yeGCBFUkiZJA3QN1UNbbWAPadRqJOx/jxt4vOMNY/JCjtSMC0eh1QexA3DCnckhGm8Adnpq81h89TizA5+hig+N2vRS+qqfH/mcxPXwpw9RR9b8QjRnEFxI6cl9YttkpzwSLQC8wRwnljqb50jc//himS1bImhhLm7za0GIfj2i3Ky2k8L2hYXjkqMkCR95ZxwCSC2KRRozbmiU4YMvWNw== 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 Mon, 22 May 2023, Qi Zheng wrote: > On 2023/5/22 12:58, Hugh Dickins wrote: > > 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 > > @@ -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; > > Could pvmw->pmd be changed? Otherwise, how about just jumping to the > retry label below? > > @@ -205,6 +205,8 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk > *pvmw) > } > > pvmw->pmd = pmd_offset(pud, pvmw->address); > + > +retry: > /* > * Make sure the pmd value isn't cached in a register by the > * compiler and used as a stale value after we've observed a You're right, that could be done, and that's where I'd have inserted the label if there were none already. I just thought the fewer goto labels the better, so reused the restart already there. If you feel strongly that it's actively misleading, I can certainly make that change; but it's too rare an occurrence to be worth optimizing for. Hugh