From: Linus Walleij <linus.walleij@linaro.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, Linus Walleij <linus.walleij@linaro.org>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
kasan-dev@googlegroups.com
Subject: [PATCH 3/5] mm: kfence: Pass a pointer to virt_to_page()
Date: Thu, 30 Jun 2022 10:41:22 +0200 [thread overview]
Message-ID: <20220630084124.691207-4-linus.walleij@linaro.org> (raw)
In-Reply-To: <20220630084124.691207-1-linus.walleij@linaro.org>
Functions that work on a pointer to virtual memory such as
virt_to_pfn() and users of that function such as
virt_to_page() are supposed to pass a pointer to virtual
memory, ideally a (void *) or other pointer. However since
many architectures implement virt_to_pfn() as a macro,
this function becomes polymorphic and accepts both a
(unsigned long) and a (void *).
If we instead implement a proper virt_to_pfn(void *addr)
function the following happens (occurred on arch/arm):
mm/kfence/core.c:558:30: warning: passing argument 1
of 'virt_to_pfn' makes pointer from integer without a
cast [-Wint-conversion]
In one case we can refer to __kfence_pool directly (and
that is a proper (char *) pointer) and in the other call
site we use an explicit cast.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Marco Elver <elver@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: kasan-dev@googlegroups.com
Cc: linux-mm@kvack.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
mm/kfence/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/kfence/core.c b/mm/kfence/core.c
index 4e7cd4c8e687..153cde62ad72 100644
--- a/mm/kfence/core.c
+++ b/mm/kfence/core.c
@@ -543,7 +543,7 @@ static unsigned long kfence_init_pool(void)
if (!arch_kfence_init_pool())
return addr;
- pages = virt_to_page(addr);
+ pages = virt_to_page(__kfence_pool);
/*
* Set up object pages: they must have PG_slab set, to avoid freeing
@@ -657,7 +657,7 @@ static bool kfence_init_pool_late(void)
/* Same as above. */
free_size = KFENCE_POOL_SIZE - (addr - (unsigned long)__kfence_pool);
#ifdef CONFIG_CONTIG_ALLOC
- free_contig_range(page_to_pfn(virt_to_page(addr)), free_size / PAGE_SIZE);
+ free_contig_range(page_to_pfn(virt_to_page((void *)addr)), free_size / PAGE_SIZE);
#else
free_pages_exact((void *)addr, free_size);
#endif
--
2.36.1
next prev parent reply other threads:[~2022-06-30 8:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 8:41 [PATCH 0/5] mm: Pass pointers to page accessors Linus Walleij
2022-06-30 8:41 ` [PATCH 1/5] lib/test_free_pages.c: Pass a pointer to virt_to_page() Linus Walleij
2022-06-30 8:41 ` [PATCH 2/5] mm/highmem: " Linus Walleij
2022-06-30 8:41 ` Linus Walleij [this message]
2022-06-30 9:23 ` [PATCH 3/5] mm: kfence: " Marco Elver
2022-06-30 8:41 ` [PATCH 4/5] mm: gup: " Linus Walleij
2022-07-01 0:29 ` Jason Gunthorpe
2022-07-01 9:11 ` Linus Walleij
2022-06-30 8:41 ` [PATCH 5/5] mm: nommu: " Linus Walleij
2022-07-01 23:00 ` [PATCH 0/5] mm: Pass pointers to page accessors Andrew Morton
2022-07-03 13:28 ` Linus Walleij
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=20220630084124.691207-4-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=akpm@linux-foundation.org \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-mm@kvack.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