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); From patchwork Mon Apr 29 13:23:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13646956 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 EF3E2C4345F for ; Mon, 29 Apr 2024 13:28:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 843876B008C; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CCA76B0092; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6453F6B0093; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 430526B008C for ; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CC490160312 for ; Mon, 29 Apr 2024 13:28:33 +0000 (UTC) X-FDA: 82062648906.09.0F00406 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf01.hostedemail.com (Postfix) with ESMTP id DDFAE40010 for ; Mon, 29 Apr 2024 13:28:31 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iMR3Ipca; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.45 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=1714397311; 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=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=eZ7mlT0+Cp0HS8fdF3KVX8mge5rTSdFh+Jt78w6or50kqsXIsCo+gVEQWl3Q6ykq8r/iz/ ZeHVzxtSJBePVirC2pLgp19goNYwJ2dbOFqVsvDbCuu1AtkNUcdBweGsAhJvBQ+9rZCAEt zeQT8Iqku0fwS411ILcy+TWRAOuMelE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714397311; a=rsa-sha256; cv=none; b=fReczOZkZm4qzTknTYV2z2WuZfbm15/rtYFxnHhZ8mzYm7QoTyLf+5RHfCdO66mCsJT9Mz 5GqZMtV9X6ZCvKcrZbfjaOAnUFgyzP4VqBOchGh6BFKv2grXF2OaYdo55t9UZifOg9Houh qIGiXGu/qZABpa4OJOI/i6S92GKfCPI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iMR3Ipca; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=ioworker0@gmail.com Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2a7e19c440dso3270220a91.3 for ; Mon, 29 Apr 2024 06:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714397011; x=1715001811; 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=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=iMR3IpcaLfArtrEb6TkM9Cc9kIau5Ez6ZjR+QuAPBzSnHR5la8JlLOP0WwMOpvi4mZ CPeZXcUcTz+Hk0F+G5mUy8okqOpzr1eabKmFjFZT6fG/ueZaX3QayPMjNmPmclsk8aiH pYToMeVX/G+I5gtgF4YwavpYVcoxu6nwZY+mhof+WjWvWHm2ApyoEEIk8qtGxRZJVoHO gKWdmbNOioJ2lQrZpH7u85qDfiF092/YfTDI7vathivm620kduxGsxuah92qaAlj90bx +GM4HS4LqPUuC7ez31aKOX8jCTGWLLceJume9j/qXSTD2oYjwS762tEWvRHEEGL3Plrz REgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714397011; x=1715001811; 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=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=kWUPRcpH+IW/pf2CmoKmT9/LXKtc+L4421iSaNWluaSgFiA87IQPyid1iQph8jgUoU +J9f+hHSAqScYIjL8fDZpIzd/twrgPZvv+0OSGYTA4QXnnFLKY7hW0pdJsVs9Dlzj3Ca oSTiD0o+0ORe9wn8EGnQe7DaTDKiaZImmni0UvapdCDVhp/syODcXED66xy6wF/LNnY2 yk8jgSpyNW4y5mkRBfvjohJ4bA1mEuHziViC56kL0CgFqLEco4bHRDVrdyOFyvN6qz7t 9byGJTjtPKriNn+ma8SrFl9VPJW7qjv1SWUDGmw96arGGKfmR9MdqKJfeZ3PKXWF1HH7 CgvQ== X-Forwarded-Encrypted: i=1; AJvYcCUzZt04PcpL9Gn4+RHyTYbBv1XxZwG9xmjhVFxW8hanXo4TCQJZLDRNvvce0Kza0lNNdorDbcbmMRruhhVzUEKkMcY= X-Gm-Message-State: AOJu0Yz0153aPYhqXf0B3WlR0YuYbMWy5SmpDxbwVn3EecpnBEJ4VyKK icIO6ypNuvYS5fwvT/Uaq4MEx2gktZ/cIlD+4GmKrT5m471KWfIN X-Google-Smtp-Source: AGHT+IH00XT4RfnkbDwUikAke+mh2nPnvqKZSzC4cJaeYd/fumPPlELDwUFfWyS2bd6+sld6pIyFMg== X-Received: by 2002:a17:90b:4387:b0:2af:e1f8:11a4 with SMTP id in7-20020a17090b438700b002afe1f811a4mr8642414pjb.19.1714397010666; Mon, 29 Apr 2024 06:23:30 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:23:30 -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 2/3] mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop Date: Mon, 29 Apr 2024 21:23:07 +0800 Message-Id: <20240429132308.38794-3-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DDFAE40010 X-Stat-Signature: 9b1m5jg1bfjfe51bky5gsfhcsu7qwyrt X-Rspam-User: X-HE-Tag: 1714397311-93011 X-HE-Meta: U2FsdGVkX1++l3NoqzfzV2stIrn/dTGWd+VLCgarpmQJcobnkaKbBz+fGKQDrUBK/gh158cJm912Ue3G1rZ+eo+0jQqKOicIY2jIgkqQqP4lYzTqze17dvL4hJsqJjx0qMlcToN0Rr1jYTaFetb7qEoUEmidGscsKaHQpeYfWq3uSUwIw9ytKy67cPF2QSpffbzjdQxrMNJfqdiUUHN6cX0rIERgXlY8daj5gTTW54Az0KkI/g7uim04ks0+9xpk1EOYG2Jp39R39sshonxhUBviHREe6moFm3acoWNRyvXqEg9OJyA9qkMpheaHXP/L9uTiHi8jOJaBa8TZPruzBkRAFgsQu3OX/stnx8XDmzrt+CENRJrNKC6dGNXu/8rgAE7UoH8egQ61TtZsU1SmCFKuxiBLcQVfNnGZDm0fOQBMr1dzsioe8mQWrivO0t+TGMOtx7htjulLXpw0lrhZcXYEwlYDzD/XxC2uLo6eVhGkurGtQzlpWh4cLhILtbkntTRqb90qk4mrdrJm4/rSfnzlR38txYN9xraW2wa/XfiTljFXPV36RHVcRh2Uc8PxnxwPi8qf5YjwPD6YCg5ZpmLJOe2gpczCMkyvMLdsQK0NBZL7saV3WP1++GKNP1wOf20RN4EckAw3fWzWpo/EUZRTiJGzYC6sulKBvk/jPr3JywUYl/oQInXCFQ0wcecPkgR371w+vjhHEkM6aZx/WijHFDmRlNvnWQpYWMJSP20RT3E6tTTiNUxSnF6UuN11159XprlZIKhvynQwwU9AinNqL9Obu7NWIgWwEPeW8+QUVh59Z/uSG6wbeq2iwQZnLSAXl4wSuAPo3KgxXM96Xfi4f7OK6rWxj0UOV6HdUVEpr6++OpwPO+8zIRQ4zhibMsqq60QC6xnDCBT+dGP4Ej6a8xhq7540QzjteB+n6GFi2uG8TxcaMLsbkPC333CXG+G5ZMzA8CSAvra82ev 6gq2As2j x4GgtxD5j3tJwHWupJTWvHLpgQ5S5Ldiax6/086wQENN3P8/DGYPtoR07rwDiIFmeE1jv4ilsiT1x06mBqTvn7UPOccu20z0MwX4HLIDdXHNwnqscxJEu5vWYkLefa78sCdvpdufMu2QdYmh5+6cMU0K/AAu2LYLpzeXenx6F3V0cgsi7MAAHVs2ZokhUVStP40eg62FM6s0XC7+Y3ToufAlVklmZQm+RfCGR292hMHCj1SUQTTnQeSpX6kOiAmaVm3mesbnpbtiLehAUWuLKqR4w7G1PQ8/AM7Rjo8HqPeRpjUCvpfASesPXfmyinhf6ZYBkovmReR8CXGY9kA5tCj//Wed7gqQrSk4sCOep8mZVOXD8qOKJH/cuw6K1WXtwDhPM9gwKwd+qQbWPejvLFwXKY73y5Ku12RSb3aqGJxc++gEaeDOgW/yfzemn/dKMn/uRQsffs0vSg+pPDPySyXW+8g== 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: In preparation for supporting try_to_unmap_one() to unmap PMD-mapped folios, start the pagewalk first, then call split_huge_pmd_address() to split the folio. Suggested-by: David Hildenbrand Signed-off-by: Lance Yang --- include/linux/huge_mm.h | 2 ++ mm/huge_memory.c | 42 +++++++++++++++++++++-------------------- mm/rmap.c | 26 +++++++++++++++++++------ 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c8d3ec116e29..2daadfcc6776 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -36,6 +36,8 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, pgprot_t newprot, unsigned long cp_flags); +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio); vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8261b5669397..145505a1dd05 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2584,6 +2584,27 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, pmd_populate(mm, pmd, pgtable); } +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio) +{ + VM_WARN_ON_ONCE(folio && !folio_test_pmd_mappable(folio)); + VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE)); + VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); + VM_BUG_ON(freeze && !folio); + + /* + * When the caller requests to set up a migration entry, we + * require a folio to check the PMD against. Otherwise, there + * is a risk of replacing the wrong folio. + */ + if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || + is_pmd_migration_entry(*pmd)) { + if (folio && folio != pmd_folio(*pmd)) + return; + __split_huge_pmd_locked(vma, pmd, address, freeze); + } +} + void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct folio *folio) { @@ -2595,26 +2616,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE); mmu_notifier_invalidate_range_start(&range); ptl = pmd_lock(vma->vm_mm, pmd); - - /* - * If caller asks to setup a migration entry, we need a folio to check - * pmd against. Otherwise we can end up replacing wrong folio. - */ - VM_BUG_ON(freeze && !folio); - VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); - - if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || - is_pmd_migration_entry(*pmd)) { - /* - * It's safe to call pmd_page when folio is set because it's - * guaranteed that pmd is present. - */ - if (folio && folio != pmd_folio(*pmd)) - goto out; - __split_huge_pmd_locked(vma, pmd, range.start, freeze); - } - -out: + split_huge_pmd_locked(vma, range.start, pmd, freeze, folio); spin_unlock(ptl); mmu_notifier_invalidate_range_end(&range); } diff --git a/mm/rmap.c b/mm/rmap.c index 7e2575d669a9..e42f436c7ff3 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1636,9 +1636,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (flags & TTU_SYNC) pvmw.flags = PVMW_SYNC; - if (flags & TTU_SPLIT_HUGE_PMD) - split_huge_pmd_address(vma, address, false, folio); - /* * For THP, we have to assume the worse case ie pmd for invalidation. * For hugetlb, it could be much worse if we need to do pud @@ -1650,6 +1647,10 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, range.end = vma_address_end(&pvmw); mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, address, range.end); + if (flags & TTU_SPLIT_HUGE_PMD) { + range.start = address & HPAGE_PMD_MASK; + range.end = (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE; + } if (folio_test_hugetlb(folio)) { /* * If sharing is possible, start and end will be adjusted @@ -1664,9 +1665,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, mmu_notifier_invalidate_range_start(&range); while (page_vma_mapped_walk(&pvmw)) { - /* Unexpected PMD-mapped THP? */ - VM_BUG_ON_FOLIO(!pvmw.pte, folio); - /* * If the folio is in an mlock()d vma, we must not swap it out. */ @@ -1678,6 +1676,22 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, goto walk_done_err; } + if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { + /* + * We temporarily have to drop the PTL and start once + * again from that now-PTE-mapped page table. + */ + split_huge_pmd_locked(vma, range.start, pvmw.pmd, false, + folio); + pvmw.pmd = NULL; + spin_unlock(pvmw.ptl); + flags &= ~TTU_SPLIT_HUGE_PMD; + continue; + } + + /* Unexpected PMD-mapped THP? */ + VM_BUG_ON_FOLIO(!pvmw.pte, folio); + pfn = pte_pfn(ptep_get(pvmw.pte)); subpage = folio_page(folio, pfn - folio_pfn(folio)); address = pvmw.address; From patchwork Mon Apr 29 13:23:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13646954 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 33288C4345F for ; Mon, 29 Apr 2024 13:23:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3CB66B009B; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9ECE96B009C; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88F816B009D; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6AEA76B009B for ; Mon, 29 Apr 2024 09:23:44 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C5542C1A81 for ; Mon, 29 Apr 2024 13:23:43 +0000 (UTC) X-FDA: 82062636726.14.B40C171 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf24.hostedemail.com (Postfix) with ESMTP id 07844180003 for ; Mon, 29 Apr 2024 13:23:41 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="LG/RvTSz"; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.44 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=1714397022; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=oHGMrX5JB9yTIf4IsMbyTJ931Q7NkV72/cdJDfVuqiagBICD771350zktSm3KeTVKTflpc cYfnuOsh5qyMzRhXQUU06YmG+qTASY6lxEY1FEeUycRDLZ3Lvhsll0wWJ9TVuSngc1vyfS A5j88mnPWTPNAG+f7dgDWdx9dETYoio= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="LG/RvTSz"; spf=pass (imf24.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714397022; a=rsa-sha256; cv=none; b=jp/WmPdb3jXbtVGQXotX+DFIQ30cl34xjMzsqmB2ukIl/r2QXmBXnbMG4k2mTxgk9EzeYy d7RTJFsWEG5hl18Bt5wSFCYbzrT0MlC0ZF/h5DBUzPIM+y3VReO5oTvlLT8X3CJLEfYeyn 2Oqf0wUQ5MTRxQbfB63PWR+VCQ3q7b4= Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2b1cfae51a5so554949a91.2 for ; Mon, 29 Apr 2024 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714397016; x=1715001816; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=LG/RvTSz19MQtdCIZ/5ZV8UPFWuqsOOA1BfOPn4rQGiTke0M8ADZTXJasKtKCIzSKg jdwU/fcokSgLJe7U9QChepN0P44eCKgUV+H9k0ovCfnRd9GiL4E0E8ZPCiJB6/I5QXxl VzoclgsO9CKyEp0BrF+ek2G+6z7dLC6uYwagvaPzXK0DhfcsA5p3T9iQGK9H1+e6wCjv r11szh41wb60sp5HX90Sq3eROVT1DHPBpE6kG8qtGSYEhxKTLsrjcmGal37xGCmCnkKl gs2RUHmJLeTzg4ZFO9UQLSzw8pZgiBeY2Ckpg0WpOo3LEPpydsGVw1QeD3SXmalPNwJh Iq3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714397016; x=1715001816; 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=Yyi8NgAotG2uQx5M1DNlDhdviU8akK6rE5R0Kl6KUlU=; b=SkFpY5qD3mlyt3cj/oRAvZ3UudGtf7KmpfnjNsnSdrQ2isktGZFyTiatyuW+Zwips7 uOtKCEcC8eoPF+Iu7ytByZ/b7gXo+byHKYs9tUFI6HGhwQbwIFdwhPhBkBdiB3fdFR72 TFN5ZRzrOjiHZXQc8Hp+/gbi0eT6vsc4uBZe2uq2uXRcTrHCWAYB773toEWVqWtVNEVi wNWT8eZSBGfiRCKgbgUhLSQBNxb0o52d89wP8CZGr1vKma1ffgi5qq1yHYGjNMYKua33 zNOoA/ZKg/6CzH29Mr3p0ui6SwVO+o3REVz/N3h/E5hj8NF/5oEH+saPlCHBDFfoK1f6 MlkQ== X-Forwarded-Encrypted: i=1; AJvYcCUPWkknhJklLIHVWkprSAar11QB3PGcrE+qp0Jphhs3Z9BNGCkf6nOgdeOfRdGYOJHbCugj82ZHVuLwS/O6Umdx2JU= X-Gm-Message-State: AOJu0YzviCbj/oT665gK4jiIvvBj9UQOtUQRzDD5rCElgXbnOH4jFdlX ykj5Y4EWRAsdyNiP8laoLTAUCeOZPyzlOxoZTvRLfQCUuUcBbCt+ X-Google-Smtp-Source: AGHT+IE3glKHvTVXbEue7ZJjzMdZwSs4YepE3f+DkJR5stamEyLLZPKJxPWIl3KdJI4v7bdaHehPKw== X-Received: by 2002:a17:90a:654c:b0:2a0:215f:dc9c with SMTP id f12-20020a17090a654c00b002a0215fdc9cmr9546775pjs.35.1714397015463; Mon, 29 Apr 2024 06:23:35 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:23:35 -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 3/3] mm/vmscan: avoid split lazyfree THP during shrink_folio_list() Date: Mon, 29 Apr 2024 21:23:08 +0800 Message-Id: <20240429132308.38794-4-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-Rspam-User: X-Rspamd-Queue-Id: 07844180003 X-Rspamd-Server: rspam06 X-Stat-Signature: 6rkuqy7zw814qb1u87ifoaicd8ti5iyu X-HE-Tag: 1714397021-853587 X-HE-Meta: U2FsdGVkX1/zSXeRQ0lfussvYVbXOu4A/BDCIF+QcBTUSHUM6SV2T424ObYjVY0ykHmMwFwC8S7w1WH5jGuZNO3c3guIi9zsvGBuWi+GvETkKndMnPJMsbXbJh1K+FHjBAH4O3jUahaiXFZC/oreHHgpv8L6CbyQR2XI/Izd9yAcJg9kgQifUz0jpWHHc5nQdej6eWp77yg4p4M83WCRPPexYX3u1t7jXxeBA7jDqWFo1v42jwL6EaqX0MBawoB3jizL4yWKbPGUgL8eapPe7Uep9Vo/hU50nWekZ45VL7CXLfYCOyVGSFUHPyV03Byem+Fy1baHmtKXD8JoGUm6e04vT4j7sYqy9/TJiD31p25+NR2lsdEtXAzDZQgxDkFyObc10W2lWmjjjcCLRZbeBE1v54gCeLsRXVbzWaegMNEKGwyQu27yFKRwewxBvOitDox6cBLHNlseyLEqdKurjGNj/icNVdAx6/tNh4LUTMxlV2pXDwgrhB5vpL0QMJOqUkyqYBKAerfrPQL9MLGuTcuVwLh0vRIvvwc7sGR1QsDq9U/VIHxgtM8bq95kseXVxp+c/fXU/Es7bvnouYwpTL1izJSoGbsX0BF2+u0FMn9CyO/QdXvvw/RwGp784bRJv7toDjUHB4LZyDGgZDRMSDNMgrytWEpCVBAT5PbQaMwD+GEnkPu8GzMHs+9WfxkC/tKeQerBMt0phEqvqt1GCkQ0YZq5vhguOWCt+4iDN8yVjkP0v0pnDu0UD9yY8W1eCvzVbLAMZke3N4k8NeZs1+zXTYlIsOi0xCWzB1Hn5Aer2BqEaQV2MwDrhH12DeF3oINxL7v4JlwzYISyaHwVPz4PBDJngBMQ3RLg5p6cOayi2CZjsvjAEHWl0mQUoqeBEyP50Eb1IPjlRXp1QWHh+wPZv3ExmmsU1zllcnqfYg7LSHN4hbmCWEcFnYtmcl/g0G02TXhBRI5U1zzory0 hpPEZyux /Epf94ubuogoGYtl3fkM7cbK5m/z8IxgYkYrKvff/BzPEbII0n2jd8UqKwDcnsE7oBnwCyALmYH+mKL/EJdvSBYIL19RFxnfOPi2CY1ZlZ75y/XVKQLOi0JuHtjTnsAwotRA/fwXjz4ZIpexr2TmrSobtp8lwsJcHPIff 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: When the user no longer requires the pages, they would use madvise(MADV_FREE) to mark the pages as lazy free. Subsequently, they typically would not re-write to that memory again. During memory reclaim, if we detect that the large folio and its PMD are both still marked as clean and there are no unexpected references (such as GUP), so we can just discard the memory lazily, improving the efficiency of memory reclamation in this case. On an Intel i5 CPU, reclaiming 1GiB of lazyfree THPs using mem_cgroup_force_empty() results in the following runtimes in seconds (shorter is better): -------------------------------------------- | Old | New | Change | -------------------------------------------- | 0.683426 | 0.049197 | -92.80% | -------------------------------------------- Suggested-by: Zi Yan Suggested-by: David Hildenbrand Signed-off-by: Lance Yang --- include/linux/huge_mm.h | 2 ++ mm/huge_memory.c | 75 +++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 3 ++ 3 files changed, 80 insertions(+) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2daadfcc6776..fd330f72b4f3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -38,6 +38,8 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long cp_flags); void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd, bool freeze, struct folio *folio); +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmdp, struct folio *folio); vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 145505a1dd05..d35d526ed48f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2690,6 +2690,81 @@ static void unmap_folio(struct folio *folio) try_to_unmap_flush(); } +static bool __discard_trans_pmd_locked(struct vm_area_struct *vma, + unsigned long addr, pmd_t *pmdp, + struct folio *folio) +{ + struct mm_struct *mm = vma->vm_mm; + int ref_count, map_count; + pmd_t orig_pmd = *pmdp; + struct mmu_gather tlb; + struct page *page; + + if (pmd_dirty(orig_pmd) || folio_test_dirty(folio)) + return false; + if (unlikely(!pmd_present(orig_pmd) || !pmd_trans_huge(orig_pmd))) + return false; + + page = pmd_page(orig_pmd); + if (unlikely(page_folio(page) != folio)) + return false; + + tlb_gather_mmu(&tlb, mm); + orig_pmd = pmdp_huge_get_and_clear(mm, addr, pmdp); + tlb_remove_pmd_tlb_entry(&tlb, pmdp, addr); + + /* + * Syncing against concurrent GUP-fast: + * - clear PMD; barrier; read refcount + * - inc refcount; barrier; read PMD + */ + smp_mb(); + + ref_count = folio_ref_count(folio); + map_count = folio_mapcount(folio); + + /* + * Order reads for folio refcount and dirty flag + * (see comments in __remove_mapping()). + */ + smp_rmb(); + + /* + * If the PMD or folio is redirtied at this point, or if there are + * unexpected references, we will give up to discard this folio + * and remap it. + * + * The only folio refs must be one from isolation plus the rmap(s). + */ + if (ref_count != map_count + 1 || folio_test_dirty(folio) || + pmd_dirty(orig_pmd)) { + set_pmd_at(mm, addr, pmdp, orig_pmd); + return false; + } + + folio_remove_rmap_pmd(folio, page, vma); + zap_deposited_table(mm, pmdp); + add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); + folio_put(folio); + + return true; +} + +bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmdp, struct folio *folio) +{ + VM_WARN_ON_FOLIO(!folio_test_pmd_mappable(folio), folio); + VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); + VM_WARN_ON_ONCE(!IS_ALIGNED(addr, HPAGE_PMD_SIZE)); + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + if (folio_test_anon(folio) && !folio_test_swapbacked(folio)) + return __discard_trans_pmd_locked(vma, addr, pmdp, folio); +#endif + + return false; +} + static void remap_page(struct folio *folio, unsigned long nr) { int i = 0; diff --git a/mm/rmap.c b/mm/rmap.c index e42f436c7ff3..ab37af4f47aa 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1677,6 +1677,9 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, } if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { + if (unmap_huge_pmd_locked(vma, range.start, pvmw.pmd, + folio)) + goto walk_done; /* * We temporarily have to drop the PTL and start once * again from that now-PTE-mapped page table.