Commit b063e374 authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Linus Torvalds

mm/memory.c: avoid unnecessary kernel/user pointer conversion

Annotating a pointer from __user to kernel and then back again might
confuse sparse.  In copy_huge_page_from_user() it can be avoided by
removing the intermediate variable since it is never used.

Link: https://lkml.kernel.org/r/20210914150820.19326-1-amit.kachhap@arm.comSigned-off-by: default avatarAmit Daniel Kachhap <amit.kachhap@arm.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Vincenzo Frascino <Vincenzo.Frascino@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f1dc0db2
...@@ -5421,7 +5421,6 @@ long copy_huge_page_from_user(struct page *dst_page, ...@@ -5421,7 +5421,6 @@ long copy_huge_page_from_user(struct page *dst_page,
unsigned int pages_per_huge_page, unsigned int pages_per_huge_page,
bool allow_pagefault) bool allow_pagefault)
{ {
void *src = (void *)usr_src;
void *page_kaddr; void *page_kaddr;
unsigned long i, rc = 0; unsigned long i, rc = 0;
unsigned long ret_val = pages_per_huge_page * PAGE_SIZE; unsigned long ret_val = pages_per_huge_page * PAGE_SIZE;
...@@ -5434,8 +5433,7 @@ long copy_huge_page_from_user(struct page *dst_page, ...@@ -5434,8 +5433,7 @@ long copy_huge_page_from_user(struct page *dst_page,
else else
page_kaddr = kmap_atomic(subpage); page_kaddr = kmap_atomic(subpage);
rc = copy_from_user(page_kaddr, rc = copy_from_user(page_kaddr,
(const void __user *)(src + i * PAGE_SIZE), usr_src + i * PAGE_SIZE, PAGE_SIZE);
PAGE_SIZE);
if (allow_pagefault) if (allow_pagefault)
kunmap(subpage); kunmap(subpage);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment