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 11409C25B10 for ; Mon, 13 May 2024 07:47:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A9C76B0275; Mon, 13 May 2024 03:47:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 859DC6B0276; Mon, 13 May 2024 03:47:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D4326B0277; Mon, 13 May 2024 03:47:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4F8686B0275 for ; Mon, 13 May 2024 03:47:58 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 17262A0CFD for ; Mon, 13 May 2024 07:47:58 +0000 (UTC) X-FDA: 82112593836.20.29CBD73 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf01.hostedemail.com (Postfix) with ESMTP id 469D040007 for ; Mon, 13 May 2024 07:47:55 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dMlAbzA2; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715586475; 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=CRqSGx+LZLYZmMM1dtm6DE8QjEfHEddJV2Al3d0Qb2M=; b=CARMaNwx8I4gn+LbC4qAJMRNaSsIBjjCnx4hlvtP8Zw7A+fu4ibc5CAfURIHgtVK/kzuwA 87warVfUFWLqy8Pg34rslIvOGBlk9Pon5K6FwYZz6OzTnBbbfrVlO/xpaMBA/dDczsVdn0 v2VlNlAyAZvbCKO3s/M/hJ4H8FNuH9o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715586475; a=rsa-sha256; cv=none; b=foIwuj+zEI5Bp1iTmyRYHVmW2ibyYd+7fSovuPwhZu4UZnNDhj+xMmLJgVuUFY7Al2GCMY UUma+Y6YfxIhJk1HW5RnCw5o3iedWUAw5mKsa0MtSYswGoqbPB7cFQcCOeAxWl8xAOVeDt 9oxEg3JnHayEwklvhhwgfSwKT0FlROg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dMlAbzA2; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3c999d53e04so1650915b6e.2 for ; Mon, 13 May 2024 00:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715586474; x=1716191274; 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=CRqSGx+LZLYZmMM1dtm6DE8QjEfHEddJV2Al3d0Qb2M=; b=dMlAbzA2KYces3wPl4QvwJ4+nzVECQPXUIOggiZ2lRtusGVPoEJuc41ZPeezT+YiUT f0lYE37d8ZHjNDZ6gMGryaS4piGgNR0+JaKC4XDFgn9rUD1hWtmmHyI8k6uP+97D8wNU jNmaKGfQnrUh/6fFB42QOFHrR6yaJwBoC/V0esuVyu5ZvPLxv0OJ8EZ9yZRSuvUtlu0G 1RKHv9uIo1/aMHtXa3+nSuHhhATLutwjr+vxQQ1IN03mX47Abn3abNmZm3D40+6AVX7g 7nOXVlDzujZxODxXy+4gcQOSjeoHtf3FMwfjNRVWcfYE+tFnYpBB7UxTPn71RmG27oNX 2MrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715586474; x=1716191274; 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=CRqSGx+LZLYZmMM1dtm6DE8QjEfHEddJV2Al3d0Qb2M=; b=dj+zIf6i0NHEa/gSSBiOGsSALa9hxoNdIAeMDEQVIdh6vnrAcqdZTEquGpz0LsPGCA 3JAcRD6RRJG0gTwPPvYIOYwCbc0uVTX3sIR6QfYNVDV3bCKc/rZfHt/6dHvve0gc8qbi jlgXpyQjmcYH8H7AoipBNwRNjVyqjXIOm7WYSK8xR+JEihmcd27Tz2c6l1pWGw2ZjbZv TzkVRl0I01U08167mJwSVRjuP6N48/7Dl3gEs+EgWLtaUPuG2eIaqR4t6JcbvRyJzahO IuHT2qoppGnVxzlwm3GGV8hD2q9Q8GwVcQVbDFVniCg7Bl/KZQ2iXaC+sREHWkar+l6D ZwHA== X-Forwarded-Encrypted: i=1; AJvYcCWQInEl9/XMtRslh0e+k7e2vVZ1Sl3TptNSDU6iZd2ERkTMhpX4gTl0g15rniD4FTCGnbsp1vaOUUDwhtJSu9CgKh8= X-Gm-Message-State: AOJu0YwwsdkkyhxIkd2Dv+sFIgH407KUPaukFIIVs7uz5uO6FHG6mpFr Oe/aRYXSPLlPvhRG8mdHcUhbZfdvU7EN2YkALXzAo/oM4At10JH5 X-Google-Smtp-Source: AGHT+IGY+Awn4udMPhFiQz9yDb+p0ggUx+6DZOemAXrpevayvvkrNDj+S4e4smtqNCGCuoBLk6sOgQ== X-Received: by 2002:a05:6808:3099:b0:3c7:5146:c4e5 with SMTP id 5614622812f47-3c9970b0ff3mr11673420b6e.41.1715586474027; Mon, 13 May 2024 00:47:54 -0700 (PDT) Received: from LancedeMBP.lan.lan ([2403:2c80:6::304b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm7008967b3a.13.2024.05.13.00.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:47:53 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.org, sj@kernel.org, baolin.wang@linux.alibaba.com, 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 RESEND v5 1/4] mm/rmap: remove duplicated exit code in pagewalk loop Date: Mon, 13 May 2024 15:47:09 +0800 Message-Id: <20240513074712.7608-2-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240513074712.7608-1-ioworker0@gmail.com> References: <20240513074712.7608-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 469D040007 X-Rspam-User: X-Stat-Signature: oemgx3j1i5z4w4padkbzurgoo1enjcz9 X-HE-Tag: 1715586475-807422 X-HE-Meta: U2FsdGVkX180cTG6HilAWVvjEMg+YSKYJ0GCO5at9Auo59MikNQdSuUz/xAue3GwYGeV4d9dVDiLO3aZ5I+7DTfaLZUsgiYcE1WLjkZysU2kDCNa6+0/4Oaha19RZwyQs+Rt3n076AH4jajkCAiVn+dC78vMK5c0hps8EGjB097wYvTSECkT4qXb0udjgFZszwhqd44yXZm4X04h+yhP+moUpvbDOcdq+lXRXmvrYpGXr7fGOiU+k89s06GS5dP59P7z0C1kAa5VufkQ3k+4XaXrO5OBbCT5deW77HXLQy5yIgOP5pXXN+1iKX+we0o0kxwHnmhsWJFg8nK9He/CcoMxmGfeA3Vz/xZe7fPhgn+IcSnNUPOHlTl1jK1YxMKxQpzZBg+N7ZPAEPYb++hJ33/MVrFFQF9fhJ85HVoYWNcdDkiB2p4bu6kuvX1ZbB1ZJxMZTGe+ysmdVgcjylWhMIrnAeh9+bluXpbn+KV6PK6/ZVzwKTbNq4p1pX1CbKEHm/S3/zeFjOf6rKx6mfq+AaSxjBvPLcZyslt7gWAKrSwUj/kGknAQINxDlLjqd4ws6Zl5mC93gAhKQemZkWJ1XVjsR/JBAvxO43TwFAKqldtaN+JmKRuOgIPTzswYAkvIFQO0IVhZmhDLNpCcPXJkV1SzlLJc46RC8E43XsYH3QtgMatJ+0/A5VkJICfEqjDAUfg3dkTPL2A9AGB8q43tnqitZSWMOzZRJ0hN7rZrB6rF5EHb9FD8EXRKtciXXqLZLKSQl9SHbm1kCx5IZ92CquFtv6yAnyDqqkw+GmSLQqb5XihGBYTENG1LEoyVwnKTVIRoiXlHDXug8seZ2I1RfV+kTSby1MrHioWUcADYbdYYyRMbFi5XPqsXHbI1fvPPHXSih6JdebUQUCFDywsVsb74Y9/6C0sqGjK5mXmV0euYZY3k3gMM3AH/wRbBsAD8ngAFZgCAcJ/CITw07j8 2WsOIuzX K2liri7opLRR8j1AVAIm3rijIJiGVZ1G0Qc+mH4WVP5YMtiFZMSntde/4scShlD+Wiw6vwO8wuzwYHNQ5mT1gvrl7zf93iak3JX7lXejMvn/5drWXfONGHWD/+P71zuCcj7cQhiOi+LebtmCSCq0nd0OkU2Eg1BLS4ZScMTcEqfrGv9g4moSTy/rAFoDhfxCJUMocyZDqWTcaq9pA+HubB8o6JEVy0I9W3RatnjzJoIgL0GvTcstz1+p5fCR0Gc54A7+3P8jVAmcIr1C7Zrn92bP3SSKwz4gCBbfGTplCrFARqBoNV8gVs+cAwKtmW2awS051m1L14WOy8+1jOjbPI52H8aTLq6DxGWgx9PNu00DTGfm9R14w3mKVW4BsKw7Yk+eIv0fB8hcIjZVrRD67xZHENFrkXxJqgcKgIONVe4wzVXOYOEVPd5FhKigKYzo6zg153Ma/9sFECHKoVqu2+8qpfZWNjrjcC30e 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. Reviewed-by: Zi Yan 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 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); -- 2.33.1