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 E60BBCD5BB6 for ; Thu, 5 Sep 2024 12:07:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ACC96B0346; Thu, 5 Sep 2024 08:07:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BF996B034A; Thu, 5 Sep 2024 08:07:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 339B66B034B; Thu, 5 Sep 2024 08:07:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 07B596B0346 for ; Thu, 5 Sep 2024 08:07:19 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 727F3121C26 for ; Thu, 5 Sep 2024 12:07:18 +0000 (UTC) X-FDA: 82530559356.13.EC0CA97 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) by imf05.hostedemail.com (Postfix) with ESMTP id 6018C10001E for ; Thu, 5 Sep 2024 12:07:16 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JFyaLw6V; spf=pass (imf05.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=muchun.song@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725537908; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HPUN+LftKuZr9srXj9cbq7IzfWnEz1/nVI7Ulrm9sGw=; b=vNOBr6R4GiSqpznpGR2UdyD+5NCKvY6a0xtjfyxxtvwHMH7pVmsZduSszhjIDBicUnNECl CxVTYarUNsl9k5MsffqEQkQeTnP7y3zzuVPDxIsBcEm9/ac9wTs0rFvGZ9DclNtvNX0yz3 CVfAePrhP2jgpx4JhuCX7HRVZ/utmtY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JFyaLw6V; spf=pass (imf05.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.188 as permitted sender) smtp.mailfrom=muchun.song@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725537908; a=rsa-sha256; cv=none; b=SAPol5nakjhtqcQ521YBnOML5Nt8gB31gmZKiQVk1Ub3uXnDkh8VFAZSY7njIPLNv8QG20 vgY3+vwtBSxsdVTxd1aiQhUyu0jz4eajmdCKAU/uxmTlxIHqnLGffwNaTltV6NEdvNkQSb ZfNknsiOcZtimaUpsMWMvwI4F6rxfyM= Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1725538034; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HPUN+LftKuZr9srXj9cbq7IzfWnEz1/nVI7Ulrm9sGw=; b=JFyaLw6VOQxfB3bon8tNTAbaoyQOjbkkFr9E7c5BXZrhpSY87szyM6HhPhLdhveialXUBU DqzRCadpsUll9LREIS1K/RXRPcaIokvVnVnPDzXmSVZJ2/ObX6ocR1K2ZGP/5TkdOHxCq1 ELIYL97JJZy+oNEpgveNV8ZUXppn1Vk= Date: Thu, 5 Sep 2024 20:07:00 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v3 10/14] mm: page_vma_mapped_walk: map_pte() use pte_offset_map_rw_nolock() To: Qi Zheng Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, david@redhat.com, hughd@google.com, willy@infradead.org, vbabka@kernel.org, akpm@linux-foundation.org, rppt@kernel.org, vishal.moola@gmail.com, peterx@redhat.com, ryan.roberts@arm.com, christophe.leroy2@cs-soprasteria.com References: <20240904084022.32728-1-zhengqi.arch@bytedance.com> <20240904084022.32728-11-zhengqi.arch@bytedance.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20240904084022.32728-11-zhengqi.arch@bytedance.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6018C10001E X-Stat-Signature: x9rt47qe5hfcewfubmaeciqaqqzeq6qw X-Rspam-User: X-HE-Tag: 1725538036-575067 X-HE-Meta: U2FsdGVkX1+rBuOavrz5bg/OBGaVvZw8xUvkm5FOUpIcaWAKpBfM8emQqg5uu5qyPYHs7LI7MJIlvYGpEI+1N8AhB4Llf5dkuf8cVeG7MNAp9hROQu6cqqsPUEhZRAgcign1w6UH9ivZxAeTmZWMJ94OFhvAbANb+YhYTtLReSkr4VwjmEsE2B01pRcmzD4L24HFMAwgFfcAYsMTvacFaI+IBdnSaCEwjywhFPPh5cQSIp1InhLxn/0AJn3IxB0aRVMo5rxVzVNxDQ5Qqohqp98r7Ibl9UCws/5UA+2WIawPeibRI+yeWhAlnBeST2wKv9EKjdqTsrCDMWgPVENuSPc6CCkEkdoyJ9/jviX+b4iCb5mm9ZPx/NXJde97UixaUF9CYUibLHI9fwKJdUZybH23b1cBBOxGqNWkDeAOovmHna8gSc6o19P5SThbN4BZKJryXrPJV2hLo7g63zjig9Cjb/MJR40iaLkky2yE7Be+GROXLgVjRg7Rms9aWPgXLmp2tlrAd4Z8ZMZA7YYU5JmHENwpJtjEYMrODHjPtIDQmqiK/3k15xazB924ObCSJd2pDTazGSIKahcXFeAzo2vnxVfQuRoQ1XhugobLEGSDLcc6ALGvSsy9tGjOpvBQPHA74tMuhdLKPwPhhejBxjfUjwmkdN8wlDXFwiKKy6S8kmvWzUdu/pjP5ta8YT272F6814NBx/EMwRL2Cr5OvkaXZrwiVoDZT+q6ATQoqjtg1cZL2Ux1VYkywpKspVgB265Q/GNX4lb3GYACDTias7Jni9v7+1PT+WxLrmlMMz6XLVNYmtmHILHKmxF6izUlHDIobhV/L+tG9JaXRhijuu6+OwtUfYncs+ENuqKBJNy+3xOLvTBPxE74rKk15PJ7TcRRqOF2f9+k1+i6WVIMKmyb5Gao37GExzV3upyieAWbPhGB/kVP/GrFNgEqCw6DXo25pFe6lKmUBKaGGy7 k7Vr9hrN 2TN7xHsPnNWwVM+YhwxZpoER7D+8p2DfWweuJlvHOgExV7GXK/Itw2GNm4Tyljk45vasSbf29M4vyPUebRcxVQF07BZUy89nE+EIR7XaghLfoYuZK01DTEnoFxt39W2PPKOnHUn9Lu8zcwr4pLLAXGJCH/nVj/uVSpWZCHlnh8uSXh6ab/ca5gMHgaBgqqTlL9W/7DH3o9QZ0NndV3qxRNWKlzI4lfa2JBCuufgVcH5G5xfRbv2rzfNuOsJ/kfGVkL0Kk1dzE5UkGSF43HrzQw3cUXNtDkkw+1G/+yfWMUDbGK90= 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: On 2024/9/4 16:40, Qi Zheng wrote: > In the caller of map_pte(), we may modify the pvmw->pte after acquiring > the pvmw->ptl, so convert it to using pte_offset_map_rw_nolock(). At > this time, the pte_same() check is not performed after the pvmw->ptl held, > so we should get pmdval and do pmd_same() check to ensure the stability of > pvmw->pmd. > > Signed-off-by: Qi Zheng > --- > mm/page_vma_mapped.c | 24 ++++++++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > > diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c > index ae5cc42aa2087..f1d73fd448708 100644 > --- a/mm/page_vma_mapped.c > +++ b/mm/page_vma_mapped.c > @@ -13,9 +13,11 @@ static inline bool not_found(struct page_vma_mapped_walk *pvmw) > return false; > } > > -static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) > +static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp, > + spinlock_t **ptlp) > { > pte_t ptent; > + pmd_t pmdval; > > if (pvmw->flags & PVMW_SYNC) { > /* Use the stricter lookup */ > @@ -25,6 +27,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) > return !!pvmw->pte; > } > > +again: > /* > * It is important to return the ptl corresponding to pte, > * in case *pvmw->pmd changes underneath us; so we need to > @@ -32,10 +35,11 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) > * 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); > + pvmw->pte = pte_offset_map_rw_nolock(pvmw->vma->vm_mm, pvmw->pmd, > + pvmw->address, &pmdval, ptlp); > if (!pvmw->pte) > return false; > + *pmdvalp = pmdval; > > ptent = ptep_get(pvmw->pte); > > @@ -69,6 +73,12 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) > } > pvmw->ptl = *ptlp; > spin_lock(pvmw->ptl); > + > + if (unlikely(!pmd_same(pmdval, pmdp_get_lockless(pvmw->pmd)))) { > + spin_unlock(pvmw->ptl); Forgot to clear pvmw->ptl? Or how about moving the assignment for it to the place where the pmd_same check is successful? > + goto again; > + } > + Maybe here is the right place to assign pvmw->ptl. Muchun, Thanks. > return true; > } > > @@ -278,7 +288,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) > step_forward(pvmw, PMD_SIZE); > continue; > } > - if (!map_pte(pvmw, &ptl)) { > + if (!map_pte(pvmw, &pmde, &ptl)) { > if (!pvmw->pte) > goto restart; > goto next_pte; > @@ -307,6 +317,12 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) > if (!pvmw->ptl) { > pvmw->ptl = ptl; > spin_lock(pvmw->ptl); > + if (unlikely(!pmd_same(pmde, pmdp_get_lockless(pvmw->pmd)))) { > + pte_unmap_unlock(pvmw->pte, pvmw->ptl); > + pvmw->ptl = NULL; > + pvmw->pte = NULL; > + goto restart; > + } > } > goto this_pte; > } while (pvmw->address < end);