From patchwork Mon Apr 29 13:23:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13646953 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 3848BC4345F for ; Mon, 29 Apr 2024 13:23:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C11706B0096; Mon, 29 Apr 2024 09:23:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC1556B0098; Mon, 29 Apr 2024 09:23:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A623D6B009B; Mon, 29 Apr 2024 09:23:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 877DC6B0096 for ; Mon, 29 Apr 2024 09:23:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0273740334 for ; Mon, 29 Apr 2024 13:23:33 +0000 (UTC) X-FDA: 82062636348.07.3BE9B53 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf19.hostedemail.com (Postfix) with ESMTP id 78BBF1A0021 for ; Mon, 29 Apr 2024 13:23:27 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GzixWbkT; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714397012; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qxwHmPfQRT1njG/0ZnhsAAHKQR4nWB4DSExpUtfTagU=; b=su2ll+WGyGbreRmq8bUxQ4OnHRu2MYOhdX4wkhiPVEIggFlSVpwfdsNNzRgC7Iat63+8Fw i85/8rIyvRPOLjVoq+00oMTW2OTCFXQzykhhUcGON4Z5UbXU30BntbX/4xrlDPETMb8DhF tHFg8kM0nENLPU4fYz//LbdMv0ZVQ9E= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GzixWbkT; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714397012; a=rsa-sha256; cv=none; b=uwfWSnExTBipWseGQWbuFFtYivEu+0sDuFUp9bNw2gfEnu0GT6Wzn0xDYpIdQTjb/puoLS b8WRaOhEptG5AywgT5kHcPbY2DfIXuY7kE4CdQeqmoNBkqUhM6p97dPnSWMVS6y6uZvS0h 0NBxi1e0HVZH/pMvgCf702/cHifD4g0= Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2a2d82537efso3045233a91.2 for ; Mon, 29 Apr 2024 06:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714397006; x=1715001806; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qxwHmPfQRT1njG/0ZnhsAAHKQR4nWB4DSExpUtfTagU=; b=GzixWbkTK9VXIPEvLyCdJiw5BxLFdsoF3hzDfNz6LJiM5K4gqRmFR09AOcgzctjGN5 h9s1IZtYJE28xWRs3imgStR2rSVJuijWaApmpcBavzeaIr16wVe5hkr+ud9/BifmL9lZ lkXHMFnJOZwT0OSOQg0gvBFCY8rKHpNNAmmyuuG1PIEluEz7wYIzRSUybr2VAbXO9iyD +bghuzvXpSdnLk6AYTs1weIM5GT0++luVpGr8G9oGcSzBezk4+ZE5C/M42UgpBZhHtcw GVuW8Pu4Afmk8xCTXYaAmX0vEUURZbeEgT5VrXEUoSyen+soi/xIO2QSpGrcvsrwfOFN L0fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714397006; x=1715001806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qxwHmPfQRT1njG/0ZnhsAAHKQR4nWB4DSExpUtfTagU=; b=vcFbOiokXiAXNqebZ3+H+89zwLhjijYclSUl7JzjgnklSiWE5zgpgrDi+v8j3+8xqj D0deAiuP3YjhsBTOvA/2YtfZBInkSG0+A5YJUOCF6IJVMoaW5KGHm6XG8xRfgPf7dafV o230EmnVYm1oFnnlajACzE3PIc/cdcrUJyQkb5IA19K6cAyOQ6RTmPEFutOJTYbV+Tf9 HoZtmQWgO+Tki64gI9ptxCX59XqCeWuaGLc2vifNBWxEqHM6DAV70pl5VOUDg6I5h83P Yv/vqDsbdSLcyL0d3tPbcbL2BF5C1u4ljqwN4locqNbOrxEQXknEUAXG1Bv6eHIeCEyL 6WjA== X-Forwarded-Encrypted: i=1; AJvYcCVh6yuit425bbxfFXAeQaJAXxN1lYlAThR/bpDXwJQhBEFXZFzmLQYtxC2+DZxWDY4gOz9MoybXa2w1uw4x21KZmEI= X-Gm-Message-State: AOJu0YwMhAIIh+hH0tMX6HyRUwrsxCXeQ44mSyjmklMOZN7SofVyz/JZ V+bOqVGiPcDf1s8wqW2GGqcM9ABBjEp91ayVuhUFYnAHyE+rZ89p X-Google-Smtp-Source: AGHT+IEjqfs5Wj6xWELIlAmQgTGzpvdNiim5oTC1EPJpMg+Rn05wl3rsER6UCjgEzuJmeCUHtgU2DQ== X-Received: by 2002:a17:90b:696:b0:2b1:55b1:a58c with SMTP id m22-20020a17090b069600b002b155b1a58cmr4231189pjz.35.1714397005964; Mon, 29 Apr 2024 06:23:25 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.242]) by smtp.gmail.com with ESMTPSA id pa5-20020a17090b264500b002b113ad5f10sm3562203pjb.12.2024.04.29.06.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:23:25 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.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, Lance Yang Subject: [PATCH v3 1/3] mm/rmap: remove duplicated exit code in pagewalk loop Date: Mon, 29 Apr 2024 21:23:06 +0800 Message-Id: <20240429132308.38794-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240429132308.38794-1-ioworker0@gmail.com> References: <20240429132308.38794-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Stat-Signature: qbtkbeofwchctqi18eybanodd6c7gm1g X-Rspamd-Queue-Id: 78BBF1A0021 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714397007-376139 X-HE-Meta: U2FsdGVkX1+C2MBxvZQ7N7trvfTgONrCuKe5WKehxAv2sN6SVqmZeKkfXTmLVSPYK6f1ouz8xKcUoy0Sf/d15+XcQtecbD/FG4pjQeGSLrWfVNbbQreylApYICvuH3q2i/FHBqjWO5bYfo7LDJLp6bjDJSCG8be5mLJxja9qXvFkje8DeQqlNYVYcnSTP4VZ9y+wh9z6KLhz+2BgO2zChcTX9QXrPt626xx0RS4tnwREBURhhg5+/cRy0xbOA4NDgeC6Pb8ITbb41M/UqFXgqMVQ+znI3uOUGHMfT9Up9M/chaAZpMSWJrgFIrpmcQZElx612lq08vfnKptd95HpfOJkLVl6EPj3UyfSDet6SV8pLNkhQunRIT/Z+HFVVLOmu9Z2fSH/LB31LHetdtOmmOoajCpF3/zbUObfx29ae63CndFh7gkmBizb8xz9JFjlLm/6mRpPjuOQGs4Yhg9P2kCh3hPbFhCGnRFfzP0jkyOE5DyKczpXjMwFtqFwyELcj+UMcUwIk5rbu5aSTcaaSMEFL2fZiySRz4xPB+iOVIoZRdU2oXyG3CA7Yxv9Qd4eedVFxy7mTPzusmXOvFxiE3mzohEqi7r5tOMApys+lFq2uT6Ot65g11TAxeLneQsHv3yr6yM/EJ1r5bjd3OsUGv8Lg7W+MOvTTc536ouZv18Ll8rfQRdt5hlVOAP0uOoM1iXez0p9Bp8zP1u6wwT14GRoR33iUdF7HNlFQC7CTTJ9pcwkE2vMr16SkgED7rfhqGnPozy46iUcD32Urshuj4uhWRlBTBB6NICgmiEndaX/ZqmInVsMPg7eMnD2/EEB+BWa99l9QdcfljcL/1HfavCdu/k8gjqujnkYncepxyWs6snx381E+R2Yqevuw1ThE1sxkhlwMXqkWZL/30bH1wC8yoENHVQzuET5yWZ40x0lvoLrBNrpc7c0FUMn5yYtRPVscFjlOdgRf7YYVur +KZGJD5e 8sThAqklvxMM5jyeC//7tXBC9GdZXkqGsfa1qMFuXWw+CS9bKQLLIqkpyrqYuB1dc/28sMZOJr1ghdM1w4sGXpAZKEyyzx1+kzHYJ0Sk8BWqgmFZ2qPiWdE3N+BjOFzdrZU0W0slVj1j4hm/GdgBV9Xc+/JFMTODNJprnfzvtX1vmpvzorDWGW9VVDD+q2vlMHrIxPanrTZ7K2Hm6C/T2LmxAgXwxESdIyHoaSu8FSPiONs5gEVF7f48MCiFF26ZoGiZ4gdpVbKjryI7Rgr760VcR0r9lLUS2vuNavReEp5cuXS1FH7eiVuvZzPzo6qMrzT2fjtKxI6rZytXgMvNi4p+egWYkkUKc7/lyLylpwOUef2TQ5Af21tJSV1L6prvDkpyBTbWymRjsyv3IcHNvLgg2l8djVJ0FWHCHToC2iCy4PCzNozrJafw8kCCvfg1/gg/1 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: Introduce the labels walk_done and walk_done_err as exit points to eliminate duplicated exit code in the pagewalk loop. Signed-off-by: Lance Yang --- mm/rmap.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 7faa60bc3e4d..7e2575d669a9 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1675,9 +1675,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)); @@ -1715,11 +1713,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, @@ -1734,8 +1729,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); } @@ -1807,9 +1801,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 */ @@ -1848,23 +1840,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. */ @@ -1872,9 +1858,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); @@ -1914,6 +1898,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);