kprobes: drop the unnecessary unlikely()
PATCH 1/1 kprobes: drop the unnecessary unlikely()
From: "binglei.wang" <[email protected]>
!ap is likely when checking re-registering existing kprobe.
register_kprobe -> warn_kprobe_rereg -> __get_valid_kprobe
!ap is unlikely when checking whether the kprobe is valid on enable/disable ocassion.
__disable_kprobe/enable_kprobe -> __get_valid_kprobe
Considering these two cases, choose to drop the unlikely() here.
Signed-off-by binglei.wang <[email protected]>
--- kernel/kprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kprobes.c +1 -1
@@ -1504,7 +1504,7 @@ static struct kprobe *__get_valid_kprobe(struct kprobe *p)lockdep_assert_held (&kprobe_mutex); ap =get_kprobe (p->addr); -if (unlikely (!ap)) +if (!ap)return NULL ;if (p != ap) {
Signature · 1 line
2.27.0
Quoted 5 lines · On Mon, 13 Jun 2022 12:25:36 +0800 [email protected] wrote:
From: "binglei.wang" <[email protected]>
!ap is likely when checking re-registering existing kprobe.
register_kprobe -> warn_kprobe_rereg -> __get_valid_kprobe
Quoted 7 lines
!ap is unlikely when checking whether the kprobe is valid on enable/disable ocassion.
__disable_kprobe/enable_kprobe -> __get_valid_kprobeConsidering these two cases, choose to drop the
unlikely()here.Signed-off-by binglei.wang <[email protected]>
This looks good to me.
Thank you!
Quoted 20 lines
--- kernel/kprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/kprobes.c +1
-1@@ -1504,7 +1504,7 @@ static struct kprobe *__get_valid_kprobe(struct kprobe *p)lockdep_assert_held (&kprobe_mutex); ap =get_kprobe (p->addr); -if (unlikely (!ap)) +if (!ap)return NULL ;if (p != ap) {Signature · 1 line
2.27.0
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>