linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <shy828301@gmail.com>, <zokeefe@google.com>,
	<aarcange@redhat.com>, <willy@infradead.org>, <vbabka@suse.cz>,
	<dhowells@redhat.com>, <neilb@suse.de>, <apopple@nvidia.com>,
	<david@redhat.com>, <surenb@google.com>, <peterx@redhat.com>,
	<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<linmiaohe@huawei.com>
Subject: [PATCH v2 1/7] mm/khugepaged: remove unneeded shmem_huge_enabled() check
Date: Sat, 25 Jun 2022 17:28:10 +0800	[thread overview]
Message-ID: <20220625092816.4856-2-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220625092816.4856-1-linmiaohe@huawei.com>

If we reach here, khugepaged_scan_mm_slot() has already made sure that
hugepage is enabled for shmem, via its call to hugepage_vma_check().
Remove this duplicated check.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Yang Shi <shy828301@gmail.com>
Reviewed-by: Zach O'Keefe <zokeefe@google.com>
---
 mm/khugepaged.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index d8ebb60aae36..8a103e0f8d2b 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -2119,8 +2119,6 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
 		if (khugepaged_scan.address < hstart)
 			khugepaged_scan.address = hstart;
 		VM_BUG_ON(khugepaged_scan.address & ~HPAGE_PMD_MASK);
-		if (shmem_file(vma->vm_file) && !shmem_huge_enabled(vma))
-			goto skip;
 
 		while (khugepaged_scan.address < hend) {
 			int ret;
-- 
2.23.0



  reply	other threads:[~2022-06-25  9:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-25  9:28 [PATCH v2 0/7] A few cleanup patches for khugepaged Miaohe Lin
2022-06-25  9:28 ` Miaohe Lin [this message]
2022-06-25  9:28 ` [PATCH v2 2/7] mm/khugepaged: stop swapping in page when VM_FAULT_RETRY occurs Miaohe Lin
2022-06-25  9:28 ` [PATCH v2 3/7] mm/khugepaged: trivial typo and codestyle cleanup Miaohe Lin
2022-06-25  9:28 ` [PATCH v2 4/7] mm/khugepaged: minor cleanup for collapse_file Miaohe Lin
2022-06-25  9:28 ` [PATCH v2 5/7] mm/khugepaged: use helper macro __ATTR_RW Miaohe Lin
2022-06-25  9:28 ` [PATCH v2 6/7] mm/khugepaged: remove unneeded return value of khugepaged_add_pte_mapped_thp() Miaohe Lin
2022-06-25  9:28 ` [PATCH v2 7/7] mm/khugepaged: try to free transhuge swapcache when possible Miaohe Lin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220625092816.4856-2-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=apopple@nvidia.com \
    --cc=david@redhat.com \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=neilb@suse.de \
    --cc=peterx@redhat.com \
    --cc=shy828301@gmail.com \
    --cc=surenb@google.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.org \
    --cc=zokeefe@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).