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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B9B9CD5BA6 for ; Thu, 5 Sep 2024 11:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4DJPppfvsq3bVrU8OAZnr57xaqKDJESryIS8WamVFSc=; b=aGks+tjzHRoVgQ2tJL0pSs/paW CoT6+bpRHH9zsPMEszaG7J1IwQ6JpKVAn6SZ6WGbc0+0Hra121l2r/7MAI4v1wxMt/0puElNMrrmP 5heylQ0VBXewVL1N5SSJu+K/psluoE7BWQJ2ak9NtyAgrfTRLIpTDJ0vt2h2WBEoh//K4C5l7aA+b 1pHk0W5Br6jtcLMsNdqVVgii8A3vNkRScMdvGf2dkXgNxjaHJxpMcrhWYdFcZZJG5simSSQNJT4YO QNsYKQEjGhs5uXUwYj6maCQjoKHEX8bou1Td6kdsl47SlxGIABOK8+fJw9JsoOtLt6m89iFEWf2nH dXyRUHhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smAHO-000000084BP-3AyO; Thu, 05 Sep 2024 11:03:58 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smAA4-000000082b5-1Mqb for linux-arm-kernel@lists.infradead.org; Thu, 05 Sep 2024 10:56:30 +0000 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2d86f713557so405191a91.2 for ; Thu, 05 Sep 2024 03:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1725533780; x=1726138580; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=4DJPppfvsq3bVrU8OAZnr57xaqKDJESryIS8WamVFSc=; b=kFeCsrHhzS+cIM7QLO8TBi0fT2F96i1dAEcZK434uN93M/95SrQrzVjoQdzEC03jXQ UO8eMzVgwhfnLPjPgkVYddwEoEmV3LEwNUhO3mU7hzJE5E/AacMuTJGo8MsiEmRjRQLG nskvfPiCyd9Q1LTU8JgQ+d1ZFi7NkwlboITucNfEdy9swRtelGPAjWm6r49+S/7hCKvB YCgsC3dDkyG31PJBpxy4KvI59NgG/ZoVkTASIl6HRnTNIehlaaCgqkaFpWVsBu6tBwTN YKasZyGJMg3HIV0cBfagpkCAGI+0PO17YNX9BdJpcovOp6a9ar/DLstkdlBCJ6lC5Wwh Omsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725533780; x=1726138580; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4DJPppfvsq3bVrU8OAZnr57xaqKDJESryIS8WamVFSc=; b=ZT7vCxbUIGmgG0F96HPT24XE0VYtrbywUdanpI/jwDlB8g6PtD5uf1rKzd7+cpjGTE zPM2GD4Fap3ruFJJQTtVQ5Ez3t3hBpR/ZMSkrKKkYscamtPjFozOO96dFUNE7UhoL4vq 0vaRCJGKGqdrwQrqhkv7zD99hFdfkURiKw4xZUkWxik0MqX7ojerSMrE1nd+lG00ShCJ J5ZOYMieOePhWEzYm5hPa3M7ZGfKHOELkvlSN2TvnDM8WYIYsqGyKWwj2Trf48Z+rPbf IoFUQ8ipv024PSg7Pj2NccBcpi8Y0DnvEQW5RVISHOD0sXGVLP2MD2h++iqetLCf0aWm cg1Q== X-Forwarded-Encrypted: i=1; AJvYcCXSOw/zmX25uo8mebegnz4zv0RwJxgPxvCgacQg0SYMdSejQYjryTcCKjcldaJLwR9yhpdtV06WR6GmjJhvMHT/@lists.infradead.org X-Gm-Message-State: AOJu0YzMNSVWHgD3NjFxUqhWgk1ts0WyC4a4h49J8xSPRlTiGhuzQyl+ mOGLk280spWvFmx7lwiq4oFSDmeDufCjkVecEiDPTKqxW23GhOUez/E9XDvrU38= X-Google-Smtp-Source: AGHT+IHilYsBgfadCapwrPljiidrpCa41K0Hyb98p/0x3xNpGLLwKBsqtfV83jJC0DRLwz+P6VWrRQ== X-Received: by 2002:a17:90a:de8c:b0:2d8:7307:3f73 with SMTP id 98e67ed59e1d1-2d8906204f6mr17130275a91.39.1725533780409; Thu, 05 Sep 2024 03:56:20 -0700 (PDT) Received: from [10.4.59.158] ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d8b8fe1f68sm9312094a91.31.2024.09.05.03.56.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 05 Sep 2024 03:56:20 -0700 (PDT) Message-ID: Date: Thu, 5 Sep 2024 18:56:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 09/14] mm: mremap: move_ptes() use pte_offset_map_rw_nolock() Content-Language: en-US To: Muchun Song 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-10-zhengqi.arch@bytedance.com> <1b03a7de-1278-4e36-8068-885dd1c29742@linux.dev> From: Qi Zheng In-Reply-To: <1b03a7de-1278-4e36-8068-885dd1c29742@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240905_035626_909231_FE206F58 X-CRM114-Status: GOOD ( 18.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2024/9/5 17:25, Muchun Song wrote: > > > On 2024/9/4 16:40, Qi Zheng wrote: >> In move_ptes(), we may modify the new_pte after acquiring the new_ptl, so >> convert it to using pte_offset_map_rw_nolock(). Since we may free the PTE >> page in retract_page_tables() without holding the read lock of mmap_lock, >> so we still need to do a pmd_same() check after holding the PTL. > > retract_page_tables() and move_ptes() are synchronized with > i_mmap_lock, right? Right, will remove the pmd_same() check in v4. Thanks! > > Muchun, > Thanks. > >> >> Signed-off-by: Qi Zheng >> --- >>   mm/mremap.c | 20 ++++++++++++++++++-- >>   1 file changed, 18 insertions(+), 2 deletions(-) >> >> diff --git a/mm/mremap.c b/mm/mremap.c >> index 24712f8dbb6b5..16e54151395ad 100644 >> --- a/mm/mremap.c >> +++ b/mm/mremap.c >> @@ -143,6 +143,7 @@ static int move_ptes(struct vm_area_struct *vma, >> pmd_t *old_pmd, >>       spinlock_t *old_ptl, *new_ptl; >>       bool force_flush = false; >>       unsigned long len = old_end - old_addr; >> +    pmd_t pmdval; >>       int err = 0; >>       /* >> @@ -175,14 +176,29 @@ static int move_ptes(struct vm_area_struct *vma, >> pmd_t *old_pmd, >>           err = -EAGAIN; >>           goto out; >>       } >> -    new_pte = pte_offset_map_nolock(mm, new_pmd, new_addr, &new_ptl); >> +    /* >> +     * Since we may free the PTE page in retract_page_tables() without >> +     * holding the read lock of mmap_lock, so we still need to do a >> +     * pmd_same() check after holding the PTL. >> +     */ >> +    new_pte = pte_offset_map_rw_nolock(mm, new_pmd, new_addr, &pmdval, >> +                       &new_ptl); >>       if (!new_pte) { >>           pte_unmap_unlock(old_pte, old_ptl); >>           err = -EAGAIN; >>           goto out; >>       } >> -    if (new_ptl != old_ptl) >> +    if (new_ptl != old_ptl) { >>           spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING); >> + >> +        if (unlikely(!pmd_same(pmdval, pmdp_get_lockless(new_pmd)))) { >> +            pte_unmap_unlock(new_pte, new_ptl); >> +            pte_unmap_unlock(old_pte, old_ptl); >> +            err = -EAGAIN; >> +            goto out; >> +        } >> +    } >> + >>       flush_tlb_batched_pending(vma->vm_mm); >>       arch_enter_lazy_mmu_mode(); >