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 CC3E0C25B74 for ; Fri, 24 May 2024 03:21:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32EC56B008C; Thu, 23 May 2024 23:21:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DCBF6B0092; Thu, 23 May 2024 23:21:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A51F6B0093; Thu, 23 May 2024 23:21:03 -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 EB1806B008C for ; Thu, 23 May 2024 23:21:02 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 03F04160823 for ; Fri, 24 May 2024 03:21:01 +0000 (UTC) X-FDA: 82151837964.30.0A101DF Received: from mail-vs1-f41.google.com (mail-vs1-f41.google.com [209.85.217.41]) by imf28.hostedemail.com (Postfix) with ESMTP id 2A65DC0003 for ; Fri, 24 May 2024 03:20:59 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=N5XbGeIU; spf=pass (imf28.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.41 as permitted sender) smtp.mailfrom=21cnbao@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=1716520860; 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=dD7Lcrnvl6xxNyRpmFBAYzWTA6+HsLSgthZBHn2+y9o=; b=phYn4DSN0HZN5cqy9DNc/vmGdpGPy+qvqJpZsuYsExkTDMvukwY8L02HGujWCx4wrINFCi zp3NuyYBXabHOqR1f3i8BHh8EdlHIguxMbXLh26BZko2o86rssVrN6irso+lIWav76dzrV L4K12FpE1fC8nasDoc1l/j4OsUK6DqM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=N5XbGeIU; spf=pass (imf28.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.41 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716520860; a=rsa-sha256; cv=none; b=IR9ibIM7jOoVgh/8c+UUA4HkitBM3Rzhq4QAxK2sy9dT8kYIzRBbhn2hW+LkJZEs+WIYBq duCakrL5+wUqr8JTzEYAU4E9hixHB7HWargXLhlfi3vcPffU0mhaxdfPWQbv2cMSQt/OKJ geGYzW9j/tqVQnxQaZGtBfHvuH8g0NM= Received: by mail-vs1-f41.google.com with SMTP id ada2fe7eead31-48a395d85d4so131558137.0 for ; Thu, 23 May 2024 20:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716520859; x=1717125659; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=dD7Lcrnvl6xxNyRpmFBAYzWTA6+HsLSgthZBHn2+y9o=; b=N5XbGeIUI6tTfZbsk3dBMKD2C7WNUQl2tDQqpS0Kq803p7+JLc5xrEKwQU9O37g7b4 eW3W9vgPYh7GNAop0Uy1nB97xiILVvqHGFGyTQwI0c/TzviKhX6A7K7GG4Mq7mUI8XUx Cjs7vIApLeQsc93l+0TJo+73rBb9k8BK9OuRPX4VJoifhMyglv4tSLY4p0YB5tWePT4k wwioTQpPM2A7O29EAiQLAUgWaJIaEix0PRxyKyD/FJ48qaOXd0hTPoSDJjDQ33PPrm4E xIbuoZkhWzvD8HFL+41UNJSYDUsZOYvuqtMnhNzZIBPaTgrjyKrOp0/JFVwdveyUNWej +hJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716520859; x=1717125659; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dD7Lcrnvl6xxNyRpmFBAYzWTA6+HsLSgthZBHn2+y9o=; b=XdN8dCYat/LJmeNWtvUHJ7Y50zsqTGEI7G+cy71dGZDlWZ4abBvoeyEfzxkOHorgSS 7C0yXcjh+BkqbGEsLuffwqGW+jSyq5ISU5oAMvFJuZgCFHd9HUH93CH5ND82AKb9gwg7 LmD72+X1JD1PNsWfq9feN1UXIBWK6Qhs3y2JwlGv8hQmgUakVvzdQnb26vkzd5N+vPxm Mc1Uj+SDVal9v/BF+yvoZxJnx8/Aum2iXNTbzlNlZhb+xm23dKkyIjiegG9W+xVA1Z/8 x24yk2XPwooZ4LkMj9L58WlbKnWYcr7Oam9DXMSn45LVfj0VrKi7BN+3huKuepdGlMSI vipA== X-Forwarded-Encrypted: i=1; AJvYcCVuOkEcGD4JisgmF0/YXOIJk1mFYALmst2BI2AUb0A/SsTA8KlX9Vy0XkjuU6nZPUJYh7R4zqcEobl1oHRm3EX/OXA= X-Gm-Message-State: AOJu0YyIp8l6AR7Cl7jOTlnXvt7ODmNYMlTGOwLlbyBmbb+U6ofA8vhm INWJRWxoF7l/sX/0Y19716EKa3RiZ+WYq0AwyUfcU1lzl15Uw6Lr19L2kNOYODAx3+Dp4PcSV6l Uwg7rNfVnuoOQV8A89kFK35geefA= X-Google-Smtp-Source: AGHT+IF6VaJfFfhY70bjXNF9UJ8cBw/BLznhpQRt9RIYa37qFCEl9QDw4YcLkWtfJXXELpvFWPvqrH32FtWj7ddOxUk= X-Received: by 2002:a67:c986:0:b0:47b:cba4:42d2 with SMTP id ada2fe7eead31-48a384fbf37mr1211196137.6.1716520859037; Thu, 23 May 2024 20:20:59 -0700 (PDT) MIME-Version: 1.0 References: <20240418134435.6092-1-ioworker0@gmail.com> <20240418134435.6092-5-ioworker0@gmail.com> In-Reply-To: From: Barry Song <21cnbao@gmail.com> Date: Fri, 24 May 2024 15:20:47 +1200 Message-ID: Subject: Re: [PATCH v10 4/4] mm/madvise: optimize lazyfreeing with mTHP in madvise_free To: Lance Yang Cc: akpm@linux-foundation.org, ryan.roberts@arm.com, david@redhat.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: huuht3k4k61cfsi7c5m4w9z9susbx75m X-Rspamd-Queue-Id: 2A65DC0003 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716520859-104522 X-HE-Meta: U2FsdGVkX18D7NeGMtSC7SBwUxE/v3vbQPo7jRl65j7jy918nXvDl+PRo+uzz3V2TCN5+dKKoTu3GzsmNYCs+D/UepcJ8Tlm9noZtIRXMqM7mT7XSiq+Wnub7b9uPSGSvQgUzqFvdPu4Kz//3yeUqmdcKBcr/oU52PJiQCaZdt3yhQ3Dl9sGAyPs5CBbufbR0DRlHdsfEW6fJCbAX7h5k4qMQgB2rvqMlk9eQvzR1PY1YUOyqhyTsQOq9pQBv7ihgIdwgLCNdDzR5I3dr+5KIUr6DvX1n4xctJCDo3P7YeXfYR0Aey0HtCMiY+HoPeNkgy3jzbkU4Sa5ojasOllOiZz2MbDc/Yy36MzAua60Cms+xmNeeWHOGaLEShm4ia7WOnxoXheZJwN6myLkVr0wQHwZpsUGnVftH9Gshn23ZWlsyZQZ+YLXX7VPunFGLH3MIRtDESzmQ5Asqwze6xJjKtCDpESq5DbL9O6VwDhN6l1qO5vfGz2XCMArd9wDYqtzciBHsE6Tukf1Q7UUGnQIX1N85ycFKBbAmqzWYwcRF35y40wbiVPf120z1N+9z6eo4WY7wofdj60HiWK2CNRYVsUBYVdCIz3i+KDon/g4WBGbj7SIhjvS0BoMkPf+DYSnH0QrRuX+H9XUcpKFkscBoezHTgeSHjJ4UNcJaQUqSQJawJJVcs2hDlZ+AYxpxqeBq+1pUO1cgptldZQjH8BPNAsojI7eVOD/m/SChH/JqYwBYZ7dzgT65rITYzFM6ItkVTTlWxn3Bx35uIwdnxjXzM3EIapESoOJCgpPtOWmtAs9upK2a/NYx/CDZuywjy1Un/e5wDZmmnoiAy7VDexmOQqXRsy0zH+ca0U48CLR2BRpMCmrG3U8VLyJ5zFfdXwAEMa9ogATclvk1mUIoZ1ZSwp/UChJ68XVFILa8EC0VmeUHLjUKTSR5Zmmv/eI9y5a8a5Ix8B58cntZeiuXjJ IGbLduSm FfiHeFefE9AghXQ3IeSB3HXdmrF0P2UohHfOnv1bHQJsxT5bnEOWHeNMKnvllgXlPKNivyFiPQKH8E1iiTyQy9jinetal2tVYmFLIH+Mi8z+74YWRasNcmhTQALlyT/Fy+lFqY1TYW7mTLlek/koygpwDBy3LhqDT8CiSYd+lPPsfX1QiZ6N7AzZl8H9BawXpDLTHqJx6IknqMzBq4uo3BS9FBQB2KkHX9r9rhH3iS/gIET5ty0/83ZfgwAeA9gYnv9ZDLTNS6uDoCclSvFWJU0YrszAxHXEQf91h06ZveZ+R6O3fJjHxpw/IHt62XBJNXTc++Zo3HcdrH5GI8lsUTinEdwxWF7xz0kfZ50YNZxfVYemjsmYlE86JXZkAFvizheBHKYVRvfdsZGYzbnu3AiESddV1YwDJhh6mSv3ridS8PUVtg/ybrTeufn2n03ef8xwELm6AqMmz4sE6qrBh5Fjjd99B4DGdDddAiunhES3xVcRxgMj5jgtCOaTuaqPtptoWAMmVUFG/pkyiE9Bl2PWGzmJI2dHSvw8xBorYuYzHzomlzm1Ksm34wxZxdXdVaxqF 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 Fri, May 24, 2024 at 2:41=E2=80=AFPM Lance Yang wr= ote: > > Hi Barry, > > Thanks a lot for reporting! > > On Fri, May 24, 2024 at 6:20=E2=80=AFAM Barry Song <21cnbao@gmail.com> wr= ote: > > > > On Fri, Apr 19, 2024 at 1:44=E2=80=AFAM Lance Yang wrote: > > > > > > This patch optimizes lazyfreeing with PTE-mapped mTHP[1] > > > (Inspired by David Hildenbrand[2]). We aim to avoid unnecessary folio > > > splitting if the large folio is fully mapped within the target range. > > > > > > If a large folio is locked or shared, or if we fail to split it, we j= ust > > > leave it in place and advance to the next PTE in the range. But note = that > > > the behavior is changed; previously, any failure of this sort would c= ause > > > the entire operation to give up. As large folios become more common, > > > sticking to the old way could result in wasted opportunities. > > > > > > On an Intel I5 CPU, lazyfreeing a 1GiB VMA backed by PTE-mapped folio= s of > > > the same size results in the following runtimes for madvise(MADV_FREE= ) in > > > seconds (shorter is better): > > > > > > Folio Size | Old | New | Change > > > ------------------------------------------ > > > 4KiB | 0.590251 | 0.590259 | 0% > > > 16KiB | 2.990447 | 0.185655 | -94% > > > 32KiB | 2.547831 | 0.104870 | -95% > > > 64KiB | 2.457796 | 0.052812 | -97% > > > 128KiB | 2.281034 | 0.032777 | -99% > > > 256KiB | 2.230387 | 0.017496 | -99% > > > 512KiB | 2.189106 | 0.010781 | -99% > > > 1024KiB | 2.183949 | 0.007753 | -99% > > > 2048KiB | 0.002799 | 0.002804 | 0% > > > > > > [1] https://lkml.kernel.org/r/20231207161211.2374093-5-ryan.roberts@a= rm.com > > > [2] https://lore.kernel.org/linux-mm/20240214204435.167852-1-david@re= dhat.com > > > > > > Reviewed-by: Ryan Roberts > > > Acked-by: David Hildenbrand > > > Signed-off-by: Lance Yang > > > --- > > > > Hi Lance, > > I am getting kernel panic with this patch, > > Good spot! > > I just noticed that you posted a patch[1] to fix the bug introduced by th= e > commit 89e86854fb0a (mm/arm64: override clear_young_dirty_ptes() batch he= lper). > > Could you please try your patch and see if the kernel panic issue still o= ccurs? > > [1] https://lore.kernel.org/all/20240524005444.135417-1-21cnbao@gmail.com= / Indeed, this is all attributed to the overflow in clear_young_dirty_ptes(). I'm reaching out to update you that the issue I reported earlier has been resolved by the patch. > > > > > / # /home/barry/develop/linux/madvfree > > [ 78.345305] watchdog: BUG: soft lockup - CPU#3 stuck for 22s! [madvf= ree:101] > > [ 78.345992] Modules linked in: > > [ 78.346942] irq event stamp: 0 > > [ 78.347311] hardirqs last enabled at (0): [<0000000000000000>] 0x0 > > [ 78.348407] hardirqs last disabled at (0): [] > > copy_process+0x654/0x19a8 > > [ 78.349291] softirqs last enabled at (0): [] > > copy_process+0x654/0x19a8 > > [ 78.349851] softirqs last disabled at (0): [<0000000000000000>] 0x0 > > [ 78.350544] CPU: 3 PID: 101 Comm: madvfree Not tainted > > 6.9.0-ge51ae633c861 #253 > > [ 78.351200] Hardware name: linux,dummy-virt (DT) > > [ 78.351747] pstate: 01400005 (nzcv daif +PAN -UAO -TCO +DIT -SSBS BT= YPE=3D--) > > [ 78.352314] pc : queued_spin_lock_slowpath+0x5c/0x528 > > [ 78.352772] lr : do_raw_spin_lock+0xc8/0x120 > > [ 78.353245] sp : ffff8000863d3720 > > [ 78.353657] x29: ffff8000863d3720 x28: ffff0000c45a8ff8 x27: 0800000= 103b24003 > > [ 78.354632] x26: ffff0000c3b26080 x25: fffffdffc0000000 x24: ffff800= 0822c2d10 > > [ 78.355446] x23: ffff80008403018f x22: ffff8000863d38e0 x21: 0000fff= f7f000000 > > [ 78.356259] x20: ffff800082fbe008 x19: ffff0000c3b26080 x18: 0000000= 000000000 > > [ 78.357120] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000= 000000000 > > [ 78.357967] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000= 000000000 > > [ 78.358878] x11: ff7ffffffffffbff x10: 0040000000000041 x9 : ffff800= 080143750 > > [ 78.359818] x8 : ffff8000863d3708 x7 : 0000000000000000 x6 : ffff800= 0803b34e8 > > [ 78.360688] x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffff800= 082fbe008 > > [ 78.361602] x2 : ffff80012ac1f000 x1 : 0000000000000000 x0 : 0000000= 000000080 > > [ 78.362755] Call trace: > > [ 78.363132] queued_spin_lock_slowpath+0x5c/0x528 > > [ 78.363614] do_raw_spin_lock+0xc8/0x120 > > [ 78.364041] _raw_spin_lock+0x58/0x70 > > [ 78.364455] __pte_offset_map_lock+0x98/0x210 > > [ 78.364891] madvise_free_pte_range+0x88/0xa58 > > [ 78.365406] walk_pgd_range+0x390/0x808 > > [ 78.365829] __walk_page_range+0x1e0/0x1f0 > > [ 78.366256] walk_page_range+0x1f0/0x2c8 > > [ 78.366676] madvise_free_single_vma+0x16c/0x308 > > [ 78.367115] madvise_vma_behavior+0x504/0xa20 > > [ 78.367549] madvise_walk_vmas+0xc0/0x128 > > [ 78.367972] do_madvise.part.0+0x110/0x558 > > [ 78.368398] __arm64_sys_madvise+0x68/0x88 > > [ 78.368826] invoke_syscall+0x50/0x128 > > [ 78.369332] el0_svc_common.constprop.0+0x48/0xf8 > > [ 78.369778] do_el0_svc+0x28/0x40 > > [ 78.370184] el0_svc+0x50/0x150 > > [ 78.370583] el0t_64_sync_handler+0x13c/0x158 > > [ 78.371017] el0t_64_sync+0x1a4/0x1a8 > > [ 102.345217] watchdog: BUG: soft lockup - CPU#3 stuck for 45s! [madvf= ree:101] > > [ 102.345835] Modules linked in: > > [ 102.346290] irq event stamp: 0 > > [ 102.346715] hardirqs last enabled at (0): [<0000000000000000>] 0x0 > > [ 102.347252] hardirqs last disabled at (0): [] > > copy_process+0x654/0x19a8 > > [ 102.347796] softirqs last enabled at (0): [] > > copy_process+0x654/0x19a8 > > [ 102.348333] softirqs last disabled at (0): [<0000000000000000>] 0x0 > > [ 102.348925] CPU: 3 PID: 101 Comm: madvfree Tainted: G L > > 6.9.0-ge51ae633c861 #253 > > [ 102.349549] Hardware name: linux,dummy-virt (DT) > > [ 102.349988] pstate: 01400005 (nzcv daif +PAN -UAO -TCO +DIT -SSBS BT= YPE=3D--) > > [ 102.350535] pc : queued_spin_lock_slowpath+0x5c/0x528 > > [ 102.351010] lr : do_raw_spin_lock+0xc8/0x120 > > [ 102.351508] sp : ffff8000863d3720 > > [ 102.351939] x29: ffff8000863d3720 x28: ffff0000c45a8ff8 x27: 0800000= 103b24003 > > [ 102.352811] x26: ffff0000c3b26080 x25: fffffdffc0000000 x24: ffff800= 0822c2d10 > > [ 102.353772] x23: ffff80008403018f x22: ffff8000863d38e0 x21: 0000fff= f7f000000 > > [ 102.354625] x20: ffff800082fbe008 x19: ffff0000c3b26080 x18: 0000000= 000000000 > > [ 102.355495] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000= 000000000 > > [ 102.356370] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000= 000000000 > > [ 102.357333] x11: ff7ffffffffffbff x10: 0040000000000041 x9 : ffff800= 080143750 > > [ 102.358273] x8 : ffff8000863d3708 x7 : 0000000000000000 x6 : ffff800= 0803b34e8 > > [ 102.359112] x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffff800= 082fbe008 > > [ 102.360001] x2 : ffff80012ac1f000 x1 : 0000000000000000 x0 : 0000000= 000000080 > > [ 102.360887] Call trace: > > [ 102.361289] queued_spin_lock_slowpath+0x5c/0x528 > > [ 102.361768] do_raw_spin_lock+0xc8/0x120 > > [ 102.362294] _raw_spin_lock+0x58/0x70 > > [ 102.362825] __pte_offset_map_lock+0x98/0x210 > > [ 102.363299] madvise_free_pte_range+0x88/0xa58 > > [ 102.363771] walk_pgd_range+0x390/0x808 > > [ 102.364268] __walk_page_range+0x1e0/0x1f0 > > [ 102.364729] walk_page_range+0x1f0/0x2c8 > > [ 102.365263] madvise_free_single_vma+0x16c/0x308 > > [ 102.365786] madvise_vma_behavior+0x504/0xa20 > > [ 102.366315] madvise_walk_vmas+0xc0/0x128 > > [ 102.366779] do_madvise.part.0+0x110/0x558 > > [ 102.367269] __arm64_sys_madvise+0x68/0x88 > > [ 102.367714] invoke_syscall+0x50/0x128 > > [ 102.368110] el0_svc_common.constprop.0+0x48/0xf8 > > [ 102.368574] do_el0_svc+0x28/0x40 > > [ 102.369001] el0_svc+0x50/0x150 > > [ 102.369464] el0t_64_sync_handler+0x13c/0x158 > > [ 102.369916] el0t_64_sync+0x1a4/0x1a8 > > [ 126.345236] watchdog: BUG: soft lockup - CPU#3 stuck for 67s! [madvf= ree:101] > > > > the test code is as belows, > > > > #define MADV_PAGEOUT 21 /* reclaim these pages */ > > > > #define DATA_SIZE (128UL * 1024 * 1024) > > #define PAGE_SIZE (4UL * 1024) > > #define LARGE_FOLIO_SIZE (64UL * 1024) > > > > static void *read_data(void *addr) > > { > > unsigned long i; > > > > for (i =3D 0; i < DATA_SIZE * 2; i +=3D PAGE_SIZE) { > > if (*((char *)addr + i) !=3D (char)i) { > > } > > } > > } > > > > static void *lazyfree(void *addr) > > { > > unsigned long i; > > > > madvise(addr, DATA_SIZE * 2, MADV_FREE); > > } > > > > int main(int argc, char **argv) > > { > > void *addr =3D mmap(NULL, DATA_SIZE * 2, PROT_READ | PROT_WRITE= , > > MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); > > Could you please check the /sys/kernel/mm/transparent_hugepage/enabled? > > Is it set to 'always'? > > Also, what size of mTHP are you using here? That is 64KiB with "always" policy. > > > memset(addr, 0x11, DATA_SIZE * 2); > > lazyfree(addr); > > > > while(1) { > > sleep(1); > > read_data(addr); > > } > > return 0; > > } > > Thanks again for reaching out! No worries. please test and ack the patch which fixed clear_young_dirty_pte= s() so that it can be merged as soon as possible. > Lance > > > > > mm/madvise.c | 85 +++++++++++++++++++++++++++-----------------------= -- > > > 1 file changed, 44 insertions(+), 41 deletions(-) > > > > > > diff --git a/mm/madvise.c b/mm/madvise.c > > > index 4597a3568e7e..ed125ad8a21e 100644 > > > --- a/mm/madvise.c > > > +++ b/mm/madvise.c > > > @@ -643,6 +643,7 @@ static int madvise_free_pte_range(pmd_t *pmd, uns= igned long addr, > > > unsigned long end, struct mm_walk *wa= lk) > > > > > > { > > > + const cydp_t cydp_flags =3D CYDP_CLEAR_YOUNG | CYDP_CLEAR_DIR= TY; > > > struct mmu_gather *tlb =3D walk->private; > > > struct mm_struct *mm =3D tlb->mm; > > > struct vm_area_struct *vma =3D walk->vma; > > > @@ -697,44 +698,57 @@ static int madvise_free_pte_range(pmd_t *pmd, u= nsigned long addr, > > > continue; > > > > > > /* > > > - * If pmd isn't transhuge but the folio is large and > > > - * is owned by only this process, split it and > > > - * deactivate all pages. > > > + * If we encounter a large folio, only split it if it= is not > > > + * fully mapped within the range we are operating on.= Otherwise > > > + * leave it as is so that it can be marked as lazyfre= e. If we > > > + * fail to split a folio, leave it in place and advan= ce to the > > > + * next pte in the range. > > > */ > > > if (folio_test_large(folio)) { > > > - int err; > > > + bool any_young, any_dirty; > > > > > > - if (folio_likely_mapped_shared(folio)) > > > - break; > > > - if (!folio_trylock(folio)) > > > - break; > > > - folio_get(folio); > > > - arch_leave_lazy_mmu_mode(); > > > - pte_unmap_unlock(start_pte, ptl); > > > - start_pte =3D NULL; > > > - err =3D split_folio(folio); > > > - folio_unlock(folio); > > > - folio_put(folio); > > > - if (err) > > > - break; > > > - start_pte =3D pte =3D > > > - pte_offset_map_lock(mm, pmd, addr, &p= tl); > > > - if (!start_pte) > > > - break; > > > - arch_enter_lazy_mmu_mode(); > > > - pte--; > > > - addr -=3D PAGE_SIZE; > > > - continue; > > > + nr =3D madvise_folio_pte_batch(addr, end, fol= io, pte, > > > + ptent, &any_youn= g, &any_dirty); > > > + > > > + if (nr < folio_nr_pages(folio)) { > > > + int err; > > > + > > > + if (folio_likely_mapped_shared(folio)= ) > > > + continue; > > > + if (!folio_trylock(folio)) > > > + continue; > > > + folio_get(folio); > > > + arch_leave_lazy_mmu_mode(); > > > + pte_unmap_unlock(start_pte, ptl); > > > + start_pte =3D NULL; > > > + err =3D split_folio(folio); > > > + folio_unlock(folio); > > > + folio_put(folio); > > > + pte =3D pte_offset_map_lock(mm, pmd, = addr, &ptl); > > > + start_pte =3D pte; > > > + if (!start_pte) > > > + break; > > > + arch_enter_lazy_mmu_mode(); > > > + if (!err) > > > + nr =3D 0; > > > + continue; > > > + } > > > + > > > + if (any_young) > > > + ptent =3D pte_mkyoung(ptent); > > > + if (any_dirty) > > > + ptent =3D pte_mkdirty(ptent); > > > } > > > > > > if (folio_test_swapcache(folio) || folio_test_dirty(f= olio)) { > > > if (!folio_trylock(folio)) > > > continue; > > > /* > > > - * If folio is shared with others, we mustn't= clear > > > - * the folio's dirty flag. > > > + * If we have a large folio at this point, we= know it is > > > + * fully mapped so if its mapcount is the sam= e as its > > > + * number of pages, it must be exclusive. > > > */ > > > - if (folio_mapcount(folio) !=3D 1) { > > > + if (folio_mapcount(folio) !=3D folio_nr_pages= (folio)) { > > > folio_unlock(folio); > > > continue; > > > } > > > @@ -750,19 +764,8 @@ static int madvise_free_pte_range(pmd_t *pmd, un= signed long addr, > > > } > > > > > > if (pte_young(ptent) || pte_dirty(ptent)) { > > > - /* > > > - * Some of architecture(ex, PPC) don't update= TLB > > > - * with set_pte_at and tlb_remove_tlb_entry s= o for > > > - * the portability, remap the pte with old|cl= ean > > > - * after pte clearing. > > > - */ > > > - ptent =3D ptep_get_and_clear_full(mm, addr, p= te, > > > - tlb->fullmm); > > > - > > > - ptent =3D pte_mkold(ptent); > > > - ptent =3D pte_mkclean(ptent); > > > - set_pte_at(mm, addr, pte, ptent); > > > - tlb_remove_tlb_entry(tlb, pte, addr); > > > + clear_young_dirty_ptes(vma, addr, pte, nr, cy= dp_flags); > > > + tlb_remove_tlb_entries(tlb, pte, nr, addr); > > > } > > > folio_mark_lazyfree(folio); > > > } > > > -- > > > 2.33.1 > > > Thanks Barry