Messages in this thread | | | Date | Mon, 28 Jun 2021 12:02:22 +0200 | From | Heiko Carstens <> | Subject | Re: [PATCH 7/9] s390: kprobes: Use is_kernel() helper |
| |
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@linux.ibm.com> > Cc: Vasily Gorbik <gor@linux.ibm.com> > Cc: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: linux-s390@vger.kernel.org > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > 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!
| |