From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<akpm@linux-foundation.org>, <willy@infradead.org>,
<mike.kravetz@oracle.com>
Cc: <vishal.moola@gmail.com>, <muchun.song@linux.dev>,
<sidhartha.kumar@oracle.com>, <wangkefeng.wang@huawei.com>,
<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH v4 2/6] userfaultfd: use kmap_local_page() in copy_huge_page_from_user()
Date: Thu, 30 Mar 2023 21:40:41 +0800 [thread overview]
Message-ID: <20230330134045.375163-3-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230330134045.375163-1-zhangpeng362@huawei.com>
From: ZhangPeng <zhangpeng362@huawei.com>
kmap() and kmap_atomic() are being deprecated in favor of
kmap_local_page() which is appropriate for any thread local context.[1]
Let's replace the kmap() and kmap_atomic() with kmap_local_page() in
copy_huge_page_from_user(). When allow_pagefault is false, disable page
faults to prevent potential deadlock.[2]
[1] https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com/
[2] https://lkml.kernel.org/r/20221025220136.2366143-1-ira.weiny@intel.com
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
mm/memory.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index f77fccb5310c..c47b8991410a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5866,16 +5866,14 @@ long copy_huge_page_from_user(struct page *dst_page,
for (i = 0; i < pages_per_huge_page; i++) {
subpage = nth_page(dst_page, i);
- if (allow_pagefault)
- page_kaddr = kmap(subpage);
- else
- page_kaddr = kmap_atomic(subpage);
+ page_kaddr = kmap_local_page(subpage);
+ if (!allow_pagefault)
+ pagefault_disable();
rc = copy_from_user(page_kaddr,
usr_src + i * PAGE_SIZE, PAGE_SIZE);
- if (allow_pagefault)
- kunmap(subpage);
- else
- kunmap_atomic(page_kaddr);
+ if (!allow_pagefault)
+ pagefault_enable();
+ kunmap_local(page_kaddr);
ret_val -= (PAGE_SIZE - rc);
if (rc)
--
2.25.1
next prev parent reply other threads:[~2023-03-30 13:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 13:40 [PATCH v4 0/6] userfaultfd: convert userfaultfd functions to use folios Peng Zhang
2023-03-30 13:40 ` [PATCH v4 1/6] userfaultfd: convert mfill_atomic_pte_copy() to use a folio Peng Zhang
2023-03-30 17:02 ` Sidhartha Kumar
2023-03-30 18:02 ` Matthew Wilcox
2023-03-31 9:38 ` zhangpeng (AS)
2023-04-06 21:28 ` Mike Kravetz
2023-03-30 13:40 ` Peng Zhang [this message]
2023-03-30 13:40 ` [PATCH v4 3/6] userfaultfd: convert copy_huge_page_from_user() to copy_folio_from_user() Peng Zhang
2023-03-30 17:18 ` Sidhartha Kumar
2023-03-30 13:40 ` [PATCH v4 4/6] userfaultfd: convert mfill_atomic_hugetlb() to use a folio Peng Zhang
2023-03-30 17:29 ` Sidhartha Kumar
2023-03-30 13:40 ` [PATCH v4 5/6] mm: convert copy_user_huge_page() to copy_user_folio() Peng Zhang
2023-03-30 18:15 ` Matthew Wilcox
2023-03-31 9:38 ` zhangpeng (AS)
2023-03-30 13:40 ` [PATCH v4 6/6] userfaultfd: convert mfill_atomic() to use a folio Peng Zhang
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=20230330134045.375163-3-zhangpeng362@huawei.com \
--to=zhangpeng362@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=muchun.song@linux.dev \
--cc=sidhartha.kumar@oracle.com \
--cc=sunnanyong@huawei.com \
--cc=vishal.moola@gmail.com \
--cc=wangkefeng.wang@huawei.com \
--cc=willy@infradead.org \
/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