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 C08E4C3ABB2 for ; Wed, 28 May 2025 12:32:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EFE06B008A; Wed, 28 May 2025 08:32:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A0586B008C; Wed, 28 May 2025 08:32:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 641166B0092; Wed, 28 May 2025 08:32:11 -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 46B886B008A for ; Wed, 28 May 2025 08:32:11 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8946C1409CA for ; Wed, 28 May 2025 12:32:10 +0000 (UTC) X-FDA: 83492254020.05.93F570A Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf13.hostedemail.com (Postfix) with ESMTP id 1399520009 for ; Wed, 28 May 2025 12:32:07 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=u2dicOkS; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 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=1748435529; 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=pFNh0IVheZ8qINWFs4u+FxqVL8vEpYnDU+CU4iwFCWw=; b=PmaiO1Hg087k0YxNUUzUQJO5CV4LmMzS2Z4ujNkos9eKaWMVzeOcbdEVAH2vZ0QXYFD7G3 piNDrFu2m4Ta55lnzSc6dQ9vihv4w+DEA25WWQMMJsMWdNlD+qqTZfZn1pXgLKZUhR7M3P Mfk8NnyVYLcPF/suhlvfXjDDTE8HWrg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=u2dicOkS; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 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=1748435529; a=rsa-sha256; cv=none; b=DXzF7dutkmnWXT36jayGxhlfQfUpYTSmja1kckGA6hr97sURu1MX33w+NjBJuEBIYjWBPS 0Q3EP47tWLyPBV58P3jODjw6yEvv/T0KZuezJFbK5kWP3JflNR2vTtY2LbLIfM8FNa0zgW Lfygk1cHyjwkDBEsqAmhDTIZRV3wZFw= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1748435524; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=pFNh0IVheZ8qINWFs4u+FxqVL8vEpYnDU+CU4iwFCWw=; b=u2dicOkSOMvGpBevBQ4GQz3jz7eVFO1H3PXqBeScoH0pMHZWtoCMYaa6znfaCT1pLfH0ajd1v/wvC2ElIVUs9jVCRbPL3NY8bxINLRkUg97AVl0ivu3ZDrsp3OOt+rTrDlOmCkJjj+vk9FvyoazeKR2A1yiamZC/WvNcDD9WoWY= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WcDRdVN_1748435522 cluster:ay36) by smtp.aliyun-inc.com; Wed, 28 May 2025 20:32:02 +0800 From: Baolin Wang To: npache@redhat.com Cc: Liam.Howlett@oracle.com, aarcange@redhat.com, akpm@linux-foundation.org, anshuman.khandual@arm.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, catalin.marinas@arm.com, cl@gentwo.org, corbet@lwn.net, dave.hansen@linux.intel.com, david@redhat.com, dev.jain@arm.com, hannes@cmpxchg.org, jack@suse.cz, jglisse@google.com, kirill.shutemov@linux.intel.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, lorenzo.stoakes@oracle.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, mhocko@suse.com, peterx@redhat.com, raquini@redhat.com, rdunlap@infradead.org, rientjes@google.com, rostedt@goodmis.org, ryan.roberts@arm.com, sunnanyong@huawei.com, surenb@google.com, thomas.hellstrom@linux.intel.com, tiwai@suse.de, usamaarif642@gmail.com, vishal.moola@gmail.com, wangkefeng.wang@huawei.com, will@kernel.org, willy@infradead.org, yang@os.amperecomputing.com, ziy@nvidia.com, zokeefe@google.com Subject: [PATCH 2/2] mm: khugepaged: kick khugepaged for enabling none-PMD-sized mTHPs Date: Wed, 28 May 2025 20:31:47 +0800 Message-ID: <5ced00b4f9e53138fac98125655a533730857e7b.1748435162.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1399520009 X-Stat-Signature: skp5cn38qaqgaeao7w1nho3cy4x7ec6s X-Rspam-User: X-HE-Tag: 1748435527-48597 X-HE-Meta: U2FsdGVkX1/D+kl3jlmxm04nG106vNTeu+X2lGGY1FfGSUoJo7WFnZG/LHp97NXWewO6ors/AtwkRZyc1wDmJOVoDOyKPWtb9i94OwwUnlNXIClubY5DM2kkChTA0z/P/eZ8FStgVq8SE6lTqBBmyFLdHyt8T6+7kiUD5hAuBw8Dk17mYZuFKMJY1Zc4vGNn0vyx7U+MkXURQ+c1NfNFFsoQGIpunwUHLx910HnsyIWsS8mmMOv87VkgkKnhX0LMavBTDtWWaqMSVByojQ8dc0ICZFtQBhl/NzpNSYM+wblSQ8YudcDMoeoLAxO0NotA36tHr9KdLBja9pg2UU7oC4PXOf1O5X4T83K7PJvrlnYdPF+nX5nxWHH1F3EFaYeEYkDNj4KdYEINZLNd/NERAjHtGLzwiBdM2umAyIarAvmkOcwv4CYQXiFQQlBdJEjVKtBRa+BZtdDN4e+GCC1AeZlb7fAHYFk0wk+4rOsQEpdSv6d4bmp83Vb439QSebBrBHNkjdoLcHkS0alN8qZ+ZNpYq1HKxw2T3RfwtQKf+TMm+b0TjQ76iDI0NcA9BH4AbDuf9qsDcEV0Fn8hatHW8fSdI7QbLUmf7/b4HVRFReRjU1sLppcIaUx+Bp+3EmjlSfKLNDwE9NAT1hOZeTJ8PBXaOQNUABd2DCOT6Y/4LH/YxZihO69UGWtXWjjWNeYJCjQ885ldfMzBlYDXqF+VD5+hDJ9DH4bHXAV+g5KG2czq0S0MvALC/Fhd68MnKIWDwCYb+mMEOY7JI01QrbbR7gHoXjmdjo/5lfQFZ6GiVlQtIEgAUtSXteQtibFlfy+I3lBT9p1q4CBl8RSz0N3o3dJtW9AtWE+Lreal5i921DrRjkCY6PBPqPqhZ/9IVvGzkozNeOReb988hoXJ7JQOt5dkBy4TE33zqSD0IxgJq875eukP7ohdgBjCt8iNMm2NFOmFqD9xxB9LGPO5gHN iZKD858u aEZa32k6pSZvLpvK8qyWez17pUsbVRZUWr9MpFaf3DUcQIFzJsst18zqFrV/5EHX4hLGwLralASkAqPsvpdcUIsvOsmVnhrLKnTw5rtoOpppnRcgqVgiFFoFRBwFA0cAG4VogNpYNq+0N5ELZYzp7PL0WQ/GLIJxvLJD6xH0bmai2UM3vuUSVD5002EOuM4yWR5R+kDihz8ovYaMs8vg4Yc+miIPkUbUWSNM9d5hrOfHygx1P0eM4BHMR5Tb3BOe9Pg51k321izsa3xmQ03A88IaZuNsVnv8HRoI4KOK1lFySry9wUjoBgvRo3wQ+JROCtJHZffsc4/qyoCs= 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 only non-PMD-sized mTHP is enabled (such as only 64K mTHP enabled), we should also allow kicking khugepaged to attempt scanning and collapsing 64K mTHP. Modify hugepage_pmd_enabled() to support mTHP collapse, and while we are at it, rename it to make the function name more clear. Signed-off-by: Baolin Wang --- mm/khugepaged.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 16542ecf02dc..155ef8d286e2 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -430,7 +430,7 @@ static inline int khugepaged_test_exit_or_disable(struct mm_struct *mm) test_bit(MMF_DISABLE_THP, &mm->flags); } -static bool hugepage_pmd_enabled(void) +static bool hugepage_enabled(void) { /* * We cover the anon, shmem and the file-backed case here; file-backed @@ -442,11 +442,11 @@ static bool hugepage_pmd_enabled(void) if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && hugepage_global_enabled()) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_always)) + if (READ_ONCE(huge_anon_orders_always)) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_madvise)) + if (READ_ONCE(huge_anon_orders_madvise)) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_inherit) && + if (READ_ONCE(huge_anon_orders_inherit) && hugepage_global_enabled()) return true; if (IS_ENABLED(CONFIG_SHMEM) && shmem_hpage_pmd_enabled()) @@ -490,7 +490,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, unsigned long vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - hugepage_pmd_enabled()) { + hugepage_enabled()) { unsigned long orders = vma_is_anonymous(vma) ? THP_ORDERS_ALL_ANON : BIT(PMD_ORDER); @@ -2711,7 +2711,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, static int khugepaged_has_work(void) { - return !list_empty(&khugepaged_scan.mm_head) && hugepage_pmd_enabled(); + return !list_empty(&khugepaged_scan.mm_head) && hugepage_enabled(); } static int khugepaged_wait_event(void) @@ -2784,7 +2784,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_pmd_enabled()) + if (hugepage_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2815,7 +2815,7 @@ static void set_recommended_min_free_kbytes(void) int nr_zones = 0; unsigned long recommended_min; - if (!hugepage_pmd_enabled()) { + if (!hugepage_enabled()) { calculate_min_free_kbytes(); goto update_wmarks; } @@ -2865,7 +2865,7 @@ int start_stop_khugepaged(void) int err = 0; mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled()) { + if (hugepage_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, "khugepaged"); @@ -2891,7 +2891,7 @@ int start_stop_khugepaged(void) void khugepaged_min_free_kbytes_update(void) { mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled() && khugepaged_thread) + if (hugepage_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); mutex_unlock(&khugepaged_mutex); } -- 2.43.5