diff options
| author |   Kefeng Wang <wangkefeng.wang@huawei.com> | 2023-12-29 16:22:07 +0800 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2024-02-21 16:00:02 -0800 |
| commit | 21fff064a26dc93d7ff24e36f35197fec809beee (patch) | |
| tree | 2c89465cb41d3d6b6dc62c978b49e020e57b9938 /mm/memory.c | |
| parent | mm/mmap: simplify vma link and unlink (diff) | |
| download | wireguard-linux-21fff064a26dc93d7ff24e36f35197fec809beee.tar.xz wireguard-linux-21fff064a26dc93d7ff24e36f35197fec809beee.zip | |
mm: memory: use nth_page() in clear/copy_subpage()
The clear and copy of huge gigantic page has converted to use nth_page()
to handle the possible discontinuous struct page(SPARSEMEM without
VMEMMAP), but not change for the non-gigantic part, fix it too.
Link: https://lkml.kernel.org/r/20231229082207.60235-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Zi Yan <ziy@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index 0bfc8b007c01..a25bc8a370fd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -6163,7 +6163,7 @@ static int clear_subpage(unsigned long addr, int idx, void *arg) { struct page *page = arg; - clear_user_highpage(page + idx, addr); + clear_user_highpage(nth_page(page, idx), addr); return 0; } @@ -6213,10 +6213,11 @@ struct copy_subpage_arg { static int copy_subpage(unsigned long addr, int idx, void *arg) { struct copy_subpage_arg *copy_arg = arg; + struct page *dst = nth_page(copy_arg->dst, idx); + struct page *src = nth_page(copy_arg->src, idx); - if (copy_mc_user_highpage(copy_arg->dst + idx, copy_arg->src + idx, - addr, copy_arg->vma)) { - memory_failure_queue(page_to_pfn(copy_arg->src + idx), 0); + if (copy_mc_user_highpage(dst, src, addr, copy_arg->vma)) { + memory_failure_queue(page_to_pfn(src), 0); return -EHWPOISON; } return 0; |