On 2021/6/28 18:02, Heiko Carstens wrote:
On Sat, Jun 26, 2021 at 03:34:37PM +0800, Kefeng Wang wrote:
Use is_kernel() helper instead of is_kernel_addr().
Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Cc: linux-s390@xxxxxxxxxxxxxxx
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
---
arch/s390/kernel/kprobes.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
...
-static inline int is_kernel_addr(void *addr)
-{
- return addr < (void *)_end;
-}
-
static int s390_get_insn_slot(struct kprobe *p)
{
/*
@@ -105,7 +100,7 @@ static int s390_get_insn_slot(struct kprobe *p)
* field can be patched and executed within the insn slot.
*/
p->ainsn.insn = NULL;
- if (is_kernel_addr(p->addr))
+ if (is_kernel(p->addr))
p->ainsn.insn = get_s390_insn_slot();
else if (is_module_addr(p->addr))
p->ainsn.insn = get_insn_slot();
@@ -117,7 +112,7 @@ static void s390_free_insn_slot(struct kprobe *p)
{
if (!p->ainsn.insn)
return;
- if (is_kernel_addr(p->addr))
+ if (is_kernel(p->addr))
free_s390_insn_slot(p->ainsn.insn, 0);
else
free_insn_slot(p->ainsn.insn, 0);
Given that this makes sense its own, and I can't follow the discussion
of the patch series due to missing cc, I applied this to the s390 tree
- and also fixed up the missing unsigned long casts.
Thanks Heiko, I got some tips(someone says, not send all patches to all
the people who maybe not care
about the other patches), so I only send this one to you, but the
patches is cc to all the maillist,
and it could be check from
https://lore.kernel.org/linux-arch/20210626073439.150586-1-wangkefeng.wang@xxxxxxxxxx
Thanks!
.
