linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>, <mike.kravetz@oracle.com>,
	<songmuchun@bytedance.com>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<linmiaohe@huawei.com>
Subject: [PATCH 05/10] hugetlb: Use helper {huge_pte|pmd}_lock()
Date: Fri, 26 Aug 2022 17:24:17 +0800	[thread overview]
Message-ID: <20220826092422.39591-6-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220826092422.39591-1-linmiaohe@huawei.com>

Use helper huge_pte_lock and pmd_lock to simplify the code. No functional
change intended.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/hugetlb.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 06293da96112..6ea9f73aea84 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6094,8 +6094,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 		page_in_pagecache = true;
 	}
 
-	ptl = huge_pte_lockptr(h, dst_mm, dst_pte);
-	spin_lock(ptl);
+	ptl = huge_pte_lock(h, dst_mm, dst_pte);
 
 	/*
 	 * We allow to overwrite a pte marker: consider when both MISSING|WP
@@ -7176,8 +7175,7 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address,
 		return NULL;
 
 retry:
-	ptl = pmd_lockptr(mm, pmd);
-	spin_lock(ptl);
+	ptl = pmd_lock(mm, pmd);
 	/*
 	 * make sure that the address range covered by this pmd is not
 	 * unmapped from other threads.
-- 
2.23.0



  parent reply	other threads:[~2022-08-26  9:25 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-26  9:24 [PATCH 00/10] A few cleanup patches for hugetlb Miaohe Lin
2022-08-26  9:24 ` [PATCH 01/10] hugetlb: make hugetlb_cma_check() static Miaohe Lin
2022-08-27  1:40   ` Muchun Song
2022-08-26  9:24 ` [PATCH 02/10] hugetlb: Use helper macro SZ_1K Miaohe Lin
2022-08-27  1:40   ` Muchun Song
2022-08-26  9:24 ` [PATCH 03/10] hugetlb: Use LIST_HEAD() to define a list head Miaohe Lin
2022-08-27  1:47   ` Muchun Song
2022-08-27  2:27     ` Miaohe Lin
2022-08-27  2:48       ` Muchun Song
2022-08-27  6:38         ` Miaohe Lin
2022-08-26  9:24 ` [PATCH 04/10] hugetlb: Use sizeof() to get the array size Miaohe Lin
2022-08-27  1:43   ` Muchun Song
2022-08-26  9:24 ` Miaohe Lin [this message]
2022-08-27  1:48   ` [PATCH 05/10] hugetlb: Use helper {huge_pte|pmd}_lock() Muchun Song
2022-08-26  9:24 ` [PATCH 06/10] hugetlb: pass NULL to kobj_to_hstate() if nid is unused Miaohe Lin
2022-08-27  1:49   ` Muchun Song
2022-08-26  9:24 ` [PATCH 07/10] hugetlb: kill hugetlbfs_pagecache_page() Miaohe Lin
2022-08-27  1:52   ` Muchun Song
2022-08-26  9:24 ` [PATCH 08/10] hugetlb: remove unneeded SetHPageVmemmapOptimized() Miaohe Lin
2022-08-27  1:35   ` Muchun Song
2022-08-27  2:18     ` Miaohe Lin
2022-08-27  2:56       ` Muchun Song
2022-08-26  9:24 ` [PATCH 09/10] hugetlb: remove meaningless BUG_ON(huge_pte_none()) Miaohe Lin
2022-08-27  2:03   ` Muchun Song
2022-08-26  9:24 ` [PATCH 10/10] hugetlb: make hugetlb selects SYSFS if !SYSCTL Miaohe Lin
2022-08-27  1:59   ` Muchun Song
2022-08-27  2:34     ` 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=20220826092422.39591-6-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mike.kravetz@oracle.com \
    --cc=songmuchun@bytedance.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