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 E7434C04FFE for ; Tue, 14 May 2024 06:26:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32E696B0288; Tue, 14 May 2024 02:26:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DE6E6B0289; Tue, 14 May 2024 02:26:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F4686B028A; Tue, 14 May 2024 02:26:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 022796B0288 for ; Tue, 14 May 2024 02:26:55 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8F649A1108 for ; Tue, 14 May 2024 06:26:55 +0000 (UTC) X-FDA: 82116018390.08.D69A216 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf24.hostedemail.com (Postfix) with ESMTP id 95FE918000C for ; Tue, 14 May 2024 06:26:51 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=s46wcQxN; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715668013; 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=Iaw3Fzp7EZ7n49UyApJLTDj5ana4lJ0BhvUxOfLYc/o=; b=LKf24Vu67Ak9z9SGbO5sKH7x9KTOooesFUegYyh8ryndh9EPw/HjteuB1Cd9frXaTdVdlX 1AePgBFQuwiTuIaHW5uEZGm4A+KjQ1o53UnjQIG0vzm10q170+vkFS3vCVWk41qOEwOxYr MvZ0gPTTHXyWL3YIRqwGuNab0xccWPE= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=s46wcQxN; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715668013; a=rsa-sha256; cv=none; b=AULe47x+A75CuhGyJamclT3xiqJEZLJ5aYNxaNF6OOi7YdlY/szWHQ4k0/pqZKpRqn35+U 1U2gsmaR3HlhFPmTm+A8d+odIOfLEDgiy3B1vnI6F7yZiGaAm1vO67xfveVQOT71NNovYJ 6EPsFIsC/uzzOOUu+wt8t8fYXUOgdsg= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1715668008; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=Iaw3Fzp7EZ7n49UyApJLTDj5ana4lJ0BhvUxOfLYc/o=; b=s46wcQxNX3hh7JnsZ/8BZpW9WOlkIncTCNcwWl16WHPulBkwICNF3MWw0NtlrlvHZFTSnraDYmxEULUxJT1S19ftOkVsztrfVhcw6DIkbSIWVopMMyG7xwtOihDETOaQ65FQEZaBsumMPuI+NFI3zejGrsji3wtBtnQo17hlCRA= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067111;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0W6U.btc_1715668004; Received: from 30.97.56.67(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6U.btc_1715668004) by smtp.aliyun-inc.com; Tue, 14 May 2024 14:26:46 +0800 Message-ID: <2ec286a2-4620-4e6d-ad3d-9b4c0d9e1394@linux.alibaba.com> Date: Tue, 14 May 2024 14:26:44 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RESEND v5 1/4] mm/rmap: remove duplicated exit code in pagewalk loop To: Lance Yang , akpm@linux-foundation.org Cc: willy@infradead.org, sj@kernel.org, maskray@google.com, ziy@nvidia.com, ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, libang.li@antgroup.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240513074712.7608-1-ioworker0@gmail.com> <20240513074712.7608-2-ioworker0@gmail.com> From: Baolin Wang In-Reply-To: <20240513074712.7608-2-ioworker0@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 95FE918000C X-Stat-Signature: 66sdeqjmigf1ze8n63yao8p35d75gdce X-Rspam-User: X-HE-Tag: 1715668011-568347 X-HE-Meta: U2FsdGVkX1+tIkWV1C0Jckmliqpk4eYXgIBsaSw2M7VWVNXhxrkEaBAqk02IztCJg07GpU1rZj7NB2KTbZMtuy1qi8DMc3tOPS32mNN0Drv4nI5z3e9eM3A8fsg2QfgpfpTgxzMOGda8yldaWTyBIlEyM5PTR3GbpZvTsB0rU81g8ajoB0A24600mT8w4fvVVt2KCv5BOPF5AghsReHjDaS+vU2w3ecWJrcU4yMKWs0NB0dTQfQIkLW9XYejwtbeiU0hMf+LhipGKSZPe6S3ociKdo3jYKyTavDtELMTf4nOQrQsRNiLZTfLtaxrklch+2pfqpQIVXBeHRnYqi60c2VIjmxuXhEOHWSwA5tuRnoEF8wxtqLgv8VAi5C/pfQaG3w+ldWvaMgSohj5yDZaPC/4iPQq4LDfNizZP4oL047KaNjZLA4PODscp7KAGK1ycb6rglfNaIpL2uCIKt2ydrf8cNgJF+NCVx2ZPF+rRZ03UojVXJe24fkz7GgrFPv5Obd45jft0y0ByYz6OvqX7iw0g1cFWD2/Wkoqdcan+Q0w4s5yJsLv1WbyS7sd1dRWX6ikbeUh5/UvI9i20jQ7hVHZHYEBjG9hmCeF6IHkFSPdRfa40x28i+uqZwZIMZWgwXFyUsa87EHZCnj9U1bM1AecAytwdxllFvkhPIRLkicKy3hdHC8ucVWPUZbIjrd1ixzOi/5BWoHabogLUNC0eo8AI3tY+GWOvWNNDobj6ZxTP+DNwt7TX1g1GwB6GK+Eii9z+KUW/M6E74J1an50TYEYPpBvRoG0qlyNQc86UZe3mntE/6rL2cTR4z7SjZclVzeE3Taogatdipo1afzoctYotlrpVg5CII0uLL0SZO9Z0ds2yIALHRLqdrsqDwPYg+vLmi/B675ysnoFZsv7q1My2NerK/7v6fjeylfGFulheJIngDV+cB78XZj2QtE0/ojLlHw9KbNy3nj9oDm uqsQz/XI wrdkumRV4xNb/ZZdKqm8UkWC7yaDefsZZx4WFUExD5N9r3g37zhAOO73d+bzL///FKRHODd4xDRZZfoaSINH0cT1wesNEiqkS3JAfX+VMoHhQa9fLwwKAP2hXQpvEQ5YaWoi3k+pctxpoc1tPOG2Cd6+I0c5QwdW3bKomNUXuHBIou4Hw2Q/q6cZnulk63lMHF+qAt64zLREGxpBeEdM+MrhapBXjRNyPrtKBm6+Qj8NmE18RjSyS1M/7ezyLtpKsUR2OMawTWH9Zcdj3dive9mQ5iWwA52c1q2xr4A6h4RTIiQEiyS7QTei+Pn5VlfxIv/6cXk2KHJVaGc2ZwYvf/dG5k7JASdS9bxCCygg7fyhUvrpdipjW6Hd4+w== 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/5/13 15:47, Lance Yang wrote: > Introduce the labels walk_done and walk_done_err as exit points to > eliminate duplicated exit code in the pagewalk loop. > > Reviewed-by: Zi Yan > Signed-off-by: Lance Yang LGTM. Reviewed-by: Baolin Wang > --- > mm/rmap.c | 40 +++++++++++++++------------------------- > 1 file changed, 15 insertions(+), 25 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index e8fc5ecb59b2..ddffa30c79fb 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1679,9 +1679,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > /* Restore the mlock which got missed */ > if (!folio_test_large(folio)) > mlock_vma_folio(folio, vma); > - page_vma_mapped_walk_done(&pvmw); > - ret = false; > - break; > + goto walk_done_err; > } > > pfn = pte_pfn(ptep_get(pvmw.pte)); > @@ -1719,11 +1717,8 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > */ > if (!anon) { > VM_BUG_ON(!(flags & TTU_RMAP_LOCKED)); > - if (!hugetlb_vma_trylock_write(vma)) { > - page_vma_mapped_walk_done(&pvmw); > - ret = false; > - break; > - } > + if (!hugetlb_vma_trylock_write(vma)) > + goto walk_done_err; > if (huge_pmd_unshare(mm, vma, address, pvmw.pte)) { > hugetlb_vma_unlock_write(vma); > flush_tlb_range(vma, > @@ -1738,8 +1733,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > * actual page and drop map count > * to zero. > */ > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done; > } > hugetlb_vma_unlock_write(vma); > } > @@ -1811,9 +1805,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > if (unlikely(folio_test_swapbacked(folio) != > folio_test_swapcache(folio))) { > WARN_ON_ONCE(1); > - ret = false; > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done_err; > } > > /* MADV_FREE page check */ > @@ -1852,23 +1844,17 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > */ > set_pte_at(mm, address, pvmw.pte, pteval); > folio_set_swapbacked(folio); > - ret = false; > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done_err; > } > > if (swap_duplicate(entry) < 0) { > set_pte_at(mm, address, pvmw.pte, pteval); > - ret = false; > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done_err; > } > if (arch_unmap_one(mm, vma, address, pteval) < 0) { > swap_free(entry); > set_pte_at(mm, address, pvmw.pte, pteval); > - ret = false; > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done_err; > } > > /* See folio_try_share_anon_rmap(): clear PTE first. */ > @@ -1876,9 +1862,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > folio_try_share_anon_rmap_pte(folio, subpage)) { > swap_free(entry); > set_pte_at(mm, address, pvmw.pte, pteval); > - ret = false; > - page_vma_mapped_walk_done(&pvmw); > - break; > + goto walk_done_err; > } > if (list_empty(&mm->mmlist)) { > spin_lock(&mmlist_lock); > @@ -1918,6 +1902,12 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > if (vma->vm_flags & VM_LOCKED) > mlock_drain_local(); > folio_put(folio); > + continue; > +walk_done_err: > + ret = false; > +walk_done: > + page_vma_mapped_walk_done(&pvmw); > + break; > } > > mmu_notifier_invalidate_range_end(&range);