2024-01-27 05:17:15

by Jinghao Jia

[permalink] [raw]
Subject: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

Both INTs (INT n, INT1, INT3, INTO) and UDs (UD0, UD1, UD2) serve
special purposes in the kernel, e.g., INT3 is used by KGDB and UD2 is
involved in LLVM-KCFI instrumentation. At the same time, attaching
kprobes on these instructions (particularly UDs) will pollute the stack
trace dumped in the kernel ring buffer, since the exception is triggered
in the copy buffer rather than the original location.

Check for INTs and UDs in can_probe and reject any kprobes trying to
attach to these instructions.

Suggested-by: Masami Hiramatsu (Google) <[email protected]>
Signed-off-by: Jinghao Jia <[email protected]>
---
arch/x86/kernel/kprobes/core.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index e8babebad7b8..792b38d22126 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -252,6 +252,22 @@ unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long add
return __recover_probed_insn(buf, addr);
}

+static inline int is_exception_insn(struct insn *insn)
+{
+ if (insn->opcode.bytes[0] == 0x0f) {
+ /* UD0 / UD1 / UD2 */
+ return insn->opcode.bytes[1] == 0xff ||
+ insn->opcode.bytes[1] == 0xb9 ||
+ insn->opcode.bytes[1] == 0x0b;
+ } else {
+ /* INT3 / INT n / INTO / INT1 */
+ return insn->opcode.bytes[0] == 0xcc ||
+ insn->opcode.bytes[0] == 0xcd ||
+ insn->opcode.bytes[0] == 0xce ||
+ insn->opcode.bytes[0] == 0xf1;
+ }
+}
+
/* Check if paddr is at an instruction boundary */
static int can_probe(unsigned long paddr)
{
@@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
#endif
addr += insn.length;
}
+ __addr = recover_probed_instruction(buf, addr);
+ if (!__addr)
+ return 0;
+
+ if (insn_decode_kernel(&insn, (void *)__addr) < 0)
+ return 0;
+
+ if (is_exception_insn(&insn))
+ return 0;
+
if (IS_ENABLED(CONFIG_CFI_CLANG)) {
/*
* The compiler generates the following instruction sequence
@@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
* Also, these movl and addl are used for showing expected
* type. So those must not be touched.
*/
- __addr = recover_probed_instruction(buf, addr);
- if (!__addr)
- return 0;
-
- if (insn_decode_kernel(&insn, (void *)__addr) < 0)
- return 0;
-
if (insn.opcode.value == 0xBA)
offset = 12;
else if (insn.opcode.value == 0x3)
--
2.43.0



2024-01-27 19:48:19

by Xin Li (Intel)

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

On 1/26/2024 8:41 PM, Jinghao Jia wrote:
> Both INTs (INT n, INT1, INT3, INTO) and UDs (UD0, UD1, UD2) serve
> special purposes in the kernel, e.g., INT3 is used by KGDB and UD2 is
> involved in LLVM-KCFI instrumentation. At the same time, attaching
> kprobes on these instructions (particularly UDs) will pollute the stack
> trace dumped in the kernel ring buffer, since the exception is triggered
> in the copy buffer rather than the original location.
>
> Check for INTs and UDs in can_probe and reject any kprobes trying to
> attach to these instructions.
>
> Suggested-by: Masami Hiramatsu (Google) <[email protected]>
> Signed-off-by: Jinghao Jia <[email protected]>
> ---
> arch/x86/kernel/kprobes/core.c | 33 ++++++++++++++++++++++++++-------
> 1 file changed, 26 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
> index e8babebad7b8..792b38d22126 100644
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -252,6 +252,22 @@ unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long add
> return __recover_probed_insn(buf, addr);
> }
>
> +static inline int is_exception_insn(struct insn *insn)

s/int/bool

> +{
> + if (insn->opcode.bytes[0] == 0x0f) {
> + /* UD0 / UD1 / UD2 */
> + return insn->opcode.bytes[1] == 0xff ||
> + insn->opcode.bytes[1] == 0xb9 ||
> + insn->opcode.bytes[1] == 0x0b;
> + } else {
> + /* INT3 / INT n / INTO / INT1 */
> + return insn->opcode.bytes[0] == 0xcc ||
> + insn->opcode.bytes[0] == 0xcd ||
> + insn->opcode.bytes[0] == 0xce ||
> + insn->opcode.bytes[0] == 0xf1;
> + }
> +}
> +
> /* Check if paddr is at an instruction boundary */
> static int can_probe(unsigned long paddr)
> {
> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
> #endif
> addr += insn.length;
> }
> + __addr = recover_probed_instruction(buf, addr);
> + if (!__addr)
> + return 0;
> +
> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> + return 0;
> +
> + if (is_exception_insn(&insn))
> + return 0;
> +
> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
> /*
> * The compiler generates the following instruction sequence
> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
> * Also, these movl and addl are used for showing expected
> * type. So those must not be touched.
> */
> - __addr = recover_probed_instruction(buf, addr);
> - if (!__addr)
> - return 0;
> -
> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> - return 0;
> -
> if (insn.opcode.value == 0xBA)
> offset = 12;
> else if (insn.opcode.value == 0x3)

--
Thanks!
Xin


2024-01-28 01:20:17

by Masami Hiramatsu

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

On Fri, 26 Jan 2024 22:41:23 -0600
Jinghao Jia <[email protected]> wrote:

> Both INTs (INT n, INT1, INT3, INTO) and UDs (UD0, UD1, UD2) serve
> special purposes in the kernel, e.g., INT3 is used by KGDB and UD2 is
> involved in LLVM-KCFI instrumentation. At the same time, attaching
> kprobes on these instructions (particularly UDs) will pollute the stack
> trace dumped in the kernel ring buffer, since the exception is triggered
> in the copy buffer rather than the original location.
>
> Check for INTs and UDs in can_probe and reject any kprobes trying to
> attach to these instructions.
>

Thanks for implement this check!


> Suggested-by: Masami Hiramatsu (Google) <[email protected]>
> Signed-off-by: Jinghao Jia <[email protected]>
> ---
> arch/x86/kernel/kprobes/core.c | 33 ++++++++++++++++++++++++++-------
> 1 file changed, 26 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
> index e8babebad7b8..792b38d22126 100644
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -252,6 +252,22 @@ unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long add
> return __recover_probed_insn(buf, addr);
> }
>
> +static inline int is_exception_insn(struct insn *insn)
> +{
> + if (insn->opcode.bytes[0] == 0x0f) {
> + /* UD0 / UD1 / UD2 */
> + return insn->opcode.bytes[1] == 0xff ||
> + insn->opcode.bytes[1] == 0xb9 ||
> + insn->opcode.bytes[1] == 0x0b;
> + } else {

If "else" block just return, you don't need this "else".

bool func()
{
if (cond)
return ...

return ...
}

Is preferrable because this puts "return val" always at the end of non-void
function.

> + /* INT3 / INT n / INTO / INT1 */
> + return insn->opcode.bytes[0] == 0xcc ||
> + insn->opcode.bytes[0] == 0xcd ||
> + insn->opcode.bytes[0] == 0xce ||
> + insn->opcode.bytes[0] == 0xf1;
> + }
> +}
> +
> /* Check if paddr is at an instruction boundary */
> static int can_probe(unsigned long paddr)
> {
> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
> #endif
> addr += insn.length;
> }
> + __addr = recover_probed_instruction(buf, addr);
> + if (!__addr)
> + return 0;
> +
> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> + return 0;
> +
> + if (is_exception_insn(&insn))
> + return 0;
> +

Please don't put this outside of decoding loop. You should put these in
the loop which decodes the instruction from the beginning of the function.
Since the x86 instrcution is variable length, can_probe() needs to check
whether that the address is instruction boundary and decodable.

Thank you,

> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
> /*
> * The compiler generates the following instruction sequence
> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
> * Also, these movl and addl are used for showing expected
> * type. So those must not be touched.
> */
> - __addr = recover_probed_instruction(buf, addr);
> - if (!__addr)
> - return 0;
> -
> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> - return 0;
> -
> if (insn.opcode.value == 0xBA)
> offset = 12;
> else if (insn.opcode.value == 0x3)
> --
> 2.43.0
>


--
Masami Hiramatsu (Google) <[email protected]>

2024-01-28 21:12:24

by Jinghao Jia

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD



On 1/27/24 13:47, Xin Li wrote:
> On 1/26/2024 8:41 PM, Jinghao Jia wrote:
>> Both INTs (INT n, INT1, INT3, INTO) and UDs (UD0, UD1, UD2) serve
>> special purposes in the kernel, e.g., INT3 is used by KGDB and UD2 is
>> involved in LLVM-KCFI instrumentation. At the same time, attaching
>> kprobes on these instructions (particularly UDs) will pollute the stack
>> trace dumped in the kernel ring buffer, since the exception is triggered
>> in the copy buffer rather than the original location.
>>
>> Check for INTs and UDs in can_probe and reject any kprobes trying to
>> attach to these instructions.
>>
>> Suggested-by: Masami Hiramatsu (Google) <[email protected]>
>> Signed-off-by: Jinghao Jia <[email protected]>
>> ---
>>   arch/x86/kernel/kprobes/core.c | 33 ++++++++++++++++++++++++++-------
>>   1 file changed, 26 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
>> index e8babebad7b8..792b38d22126 100644
>> --- a/arch/x86/kernel/kprobes/core.c
>> +++ b/arch/x86/kernel/kprobes/core.c
>> @@ -252,6 +252,22 @@ unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long add
>>       return __recover_probed_insn(buf, addr);
>>   }
>>   +static inline int is_exception_insn(struct insn *insn)
>
> s/int/bool
>

Oh yes, the return type should be bool. Thanks for pointing out!

--Jinghao

>> +{
>> +    if (insn->opcode.bytes[0] == 0x0f) {
>> +        /* UD0 / UD1 / UD2 */
>> +        return insn->opcode.bytes[1] == 0xff ||
>> +               insn->opcode.bytes[1] == 0xb9 ||
>> +               insn->opcode.bytes[1] == 0x0b;
>> +    } else {
>> +        /* INT3 / INT n / INTO / INT1 */
>> +        return insn->opcode.bytes[0] == 0xcc ||
>> +               insn->opcode.bytes[0] == 0xcd ||
>> +               insn->opcode.bytes[0] == 0xce ||
>> +               insn->opcode.bytes[0] == 0xf1;
>> +    }
>> +}
>> +
>>   /* Check if paddr is at an instruction boundary */
>>   static int can_probe(unsigned long paddr)
>>   {
>> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
>>   #endif
>>           addr += insn.length;
>>       }
>> +    __addr = recover_probed_instruction(buf, addr);
>> +    if (!__addr)
>> +        return 0;
>> +
>> +    if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>> +        return 0;
>> +
>> +    if (is_exception_insn(&insn))
>> +        return 0;
>> +
>>       if (IS_ENABLED(CONFIG_CFI_CLANG)) {
>>           /*
>>            * The compiler generates the following instruction sequence
>> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
>>            * Also, these movl and addl are used for showing expected
>>            * type. So those must not be touched.
>>            */
>> -        __addr = recover_probed_instruction(buf, addr);
>> -        if (!__addr)
>> -            return 0;
>> -
>> -        if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>> -            return 0;
>> -
>>           if (insn.opcode.value == 0xBA)
>>               offset = 12;
>>           else if (insn.opcode.value == 0x3)
>


Attachments:
OpenPGP_signature.asc (855.00 B)
OpenPGP digital signature

2024-01-28 21:26:53

by Jinghao Jia

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD



On 1/27/24 19:19, Masami Hiramatsu (Google) wrote:
> On Fri, 26 Jan 2024 22:41:23 -0600
> Jinghao Jia <[email protected]> wrote:
>
>> Both INTs (INT n, INT1, INT3, INTO) and UDs (UD0, UD1, UD2) serve
>> special purposes in the kernel, e.g., INT3 is used by KGDB and UD2 is
>> involved in LLVM-KCFI instrumentation. At the same time, attaching
>> kprobes on these instructions (particularly UDs) will pollute the stack
>> trace dumped in the kernel ring buffer, since the exception is triggered
>> in the copy buffer rather than the original location.
>>
>> Check for INTs and UDs in can_probe and reject any kprobes trying to
>> attach to these instructions.
>>
>
> Thanks for implement this check!
>

You are very welcome :)

>
>> Suggested-by: Masami Hiramatsu (Google) <[email protected]>
>> Signed-off-by: Jinghao Jia <[email protected]>
>> ---
>> arch/x86/kernel/kprobes/core.c | 33 ++++++++++++++++++++++++++-------
>> 1 file changed, 26 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
>> index e8babebad7b8..792b38d22126 100644
>> --- a/arch/x86/kernel/kprobes/core.c
>> +++ b/arch/x86/kernel/kprobes/core.c
>> @@ -252,6 +252,22 @@ unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long add
>> return __recover_probed_insn(buf, addr);
>> }
>>
>> +static inline int is_exception_insn(struct insn *insn)
>> +{
>> + if (insn->opcode.bytes[0] == 0x0f) {
>> + /* UD0 / UD1 / UD2 */
>> + return insn->opcode.bytes[1] == 0xff ||
>> + insn->opcode.bytes[1] == 0xb9 ||
>> + insn->opcode.bytes[1] == 0x0b;
>> + } else {
>
> If "else" block just return, you don't need this "else".
>
> bool func()
> {
> if (cond)
> return ...
>
> return ...
> }
>
> Is preferrable because this puts "return val" always at the end of non-void
> function.
>

I will fix this in the v2.

>> + /* INT3 / INT n / INTO / INT1 */
>> + return insn->opcode.bytes[0] == 0xcc ||
>> + insn->opcode.bytes[0] == 0xcd ||
>> + insn->opcode.bytes[0] == 0xce ||
>> + insn->opcode.bytes[0] == 0xf1;
>> + }
>> +}
>> +
>> /* Check if paddr is at an instruction boundary */
>> static int can_probe(unsigned long paddr)
>> {
>> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
>> #endif
>> addr += insn.length;
>> }
>> + __addr = recover_probed_instruction(buf, addr);
>> + if (!__addr)
>> + return 0;
>> +
>> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>> + return 0;
>> +
>> + if (is_exception_insn(&insn))
>> + return 0;
>> +
>
> Please don't put this outside of decoding loop. You should put these in
> the loop which decodes the instruction from the beginning of the function.
> Since the x86 instrcution is variable length, can_probe() needs to check
> whether that the address is instruction boundary and decodable.
>
> Thank you,

If my understanding is correct then this is trying to decode the kprobe
target instruction, given that it is after the main decoding loop. Here I
hoisted the decoding logic out of the if(IS_ENABLED(CONFIG_CFI_CLANG))
block so that we do not need to decode the same instruction twice. I left
the main decoding loop unchanged so it is still decoding the function from
the start and should handle instruction boundaries. Are there any caveats
that I missed?

--Jinghao

>
>> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
>> /*
>> * The compiler generates the following instruction sequence
>> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
>> * Also, these movl and addl are used for showing expected
>> * type. So those must not be touched.
>> */
>> - __addr = recover_probed_instruction(buf, addr);
>> - if (!__addr)
>> - return 0;
>> -
>> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>> - return 0;
>> -
>> if (insn.opcode.value == 0xBA)
>> offset = 12;
>> else if (insn.opcode.value == 0x3)
>> --
>> 2.43.0
>>
>
>


Attachments:
OpenPGP_signature.asc (855.00 B)
OpenPGP digital signature

2024-01-30 01:47:53

by Masami Hiramatsu

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

On Sun, 28 Jan 2024 15:25:59 -0600
Jinghao Jia <[email protected]> wrote:

> >> /* Check if paddr is at an instruction boundary */
> >> static int can_probe(unsigned long paddr)
> >> {
> >> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
> >> #endif
> >> addr += insn.length;
> >> }
> >> + __addr = recover_probed_instruction(buf, addr);
> >> + if (!__addr)
> >> + return 0;
> >> +
> >> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> >> + return 0;
> >> +
> >> + if (is_exception_insn(&insn))
> >> + return 0;
> >> +
> >
> > Please don't put this outside of decoding loop. You should put these in
> > the loop which decodes the instruction from the beginning of the function.
> > Since the x86 instrcution is variable length, can_probe() needs to check
> > whether that the address is instruction boundary and decodable.
> >
> > Thank you,
>
> If my understanding is correct then this is trying to decode the kprobe
> target instruction, given that it is after the main decoding loop. Here I
> hoisted the decoding logic out of the if(IS_ENABLED(CONFIG_CFI_CLANG))
> block so that we do not need to decode the same instruction twice. I left
> the main decoding loop unchanged so it is still decoding the function from
> the start and should handle instruction boundaries. Are there any caveats
> that I missed?

Ah, sorry I misread the patch. You're correct!
This is a good place to do that.

But hmm, I think we should add another patch to check the addr == paddr
soon after the loop so that we will avoid decoding.

Thank you,

>
> --Jinghao
>
> >
> >> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
> >> /*
> >> * The compiler generates the following instruction sequence
> >> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
> >> * Also, these movl and addl are used for showing expected
> >> * type. So those must not be touched.
> >> */
> >> - __addr = recover_probed_instruction(buf, addr);
> >> - if (!__addr)
> >> - return 0;
> >> -
> >> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> >> - return 0;
> >> -
> >> if (insn.opcode.value == 0xBA)
> >> offset = 12;
> >> else if (insn.opcode.value == 0x3)
> >> --
> >> 2.43.0
> >>
> >
> >


--
Masami Hiramatsu (Google) <[email protected]>

2024-01-30 02:52:10

by Jinghao Jia

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

On 1/29/24 19:44, Masami Hiramatsu (Google) wrote:
> On Sun, 28 Jan 2024 15:25:59 -0600
> Jinghao Jia <[email protected]> wrote:
>
>>>> /* Check if paddr is at an instruction boundary */
>>>> static int can_probe(unsigned long paddr)
>>>> {
>>>> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
>>>> #endif
>>>> addr += insn.length;
>>>> }
>>>> + __addr = recover_probed_instruction(buf, addr);
>>>> + if (!__addr)
>>>> + return 0;
>>>> +
>>>> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>>>> + return 0;
>>>> +
>>>> + if (is_exception_insn(&insn))
>>>> + return 0;
>>>> +
>>>
>>> Please don't put this outside of decoding loop. You should put these in
>>> the loop which decodes the instruction from the beginning of the function.
>>> Since the x86 instrcution is variable length, can_probe() needs to check
>>> whether that the address is instruction boundary and decodable.
>>>
>>> Thank you,
>>
>> If my understanding is correct then this is trying to decode the kprobe
>> target instruction, given that it is after the main decoding loop. Here I
>> hoisted the decoding logic out of the if(IS_ENABLED(CONFIG_CFI_CLANG))
>> block so that we do not need to decode the same instruction twice. I left
>> the main decoding loop unchanged so it is still decoding the function from
>> the start and should handle instruction boundaries. Are there any caveats
>> that I missed?
>
> Ah, sorry I misread the patch. You're correct!
> This is a good place to do that.
>
> But hmm, I think we should add another patch to check the addr == paddr
> soon after the loop so that we will avoid decoding.
>
> Thank you,
>

Yes, that makes sense to me. At the same time, I'm also thinking about
changing the return type of can_probe() to bool, since we are just using
int as bool in this context.

--Jinghao

>>
>> --Jinghao
>>
>>>
>>>> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
>>>> /*
>>>> * The compiler generates the following instruction sequence
>>>> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
>>>> * Also, these movl and addl are used for showing expected
>>>> * type. So those must not be touched.
>>>> */
>>>> - __addr = recover_probed_instruction(buf, addr);
>>>> - if (!__addr)
>>>> - return 0;
>>>> -
>>>> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
>>>> - return 0;
>>>> -
>>>> if (insn.opcode.value == 0xBA)
>>>> offset = 12;
>>>> else if (insn.opcode.value == 0x3)
>>>> --
>>>> 2.43.0
>>>>
>>>
>>>
>
>


Attachments:
OpenPGP_signature.asc (855.00 B)
OpenPGP digital signature

2024-01-30 11:36:18

by Masami Hiramatsu

[permalink] [raw]
Subject: Re: [RFC PATCH 1/2] x86/kprobes: Prohibit kprobing on INT and UD

On Mon, 29 Jan 2024 20:50:39 -0600
Jinghao Jia <[email protected]> wrote:

> On 1/29/24 19:44, Masami Hiramatsu (Google) wrote:
> > On Sun, 28 Jan 2024 15:25:59 -0600
> > Jinghao Jia <[email protected]> wrote:
> >
> >>>> /* Check if paddr is at an instruction boundary */
> >>>> static int can_probe(unsigned long paddr)
> >>>> {
> >>>> @@ -294,6 +310,16 @@ static int can_probe(unsigned long paddr)
> >>>> #endif
> >>>> addr += insn.length;
> >>>> }
> >>>> + __addr = recover_probed_instruction(buf, addr);
> >>>> + if (!__addr)
> >>>> + return 0;
> >>>> +
> >>>> + if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> >>>> + return 0;
> >>>> +
> >>>> + if (is_exception_insn(&insn))
> >>>> + return 0;
> >>>> +
> >>>
> >>> Please don't put this outside of decoding loop. You should put these in
> >>> the loop which decodes the instruction from the beginning of the function.
> >>> Since the x86 instrcution is variable length, can_probe() needs to check
> >>> whether that the address is instruction boundary and decodable.
> >>>
> >>> Thank you,
> >>
> >> If my understanding is correct then this is trying to decode the kprobe
> >> target instruction, given that it is after the main decoding loop. Here I
> >> hoisted the decoding logic out of the if(IS_ENABLED(CONFIG_CFI_CLANG))
> >> block so that we do not need to decode the same instruction twice. I left
> >> the main decoding loop unchanged so it is still decoding the function from
> >> the start and should handle instruction boundaries. Are there any caveats
> >> that I missed?
> >
> > Ah, sorry I misread the patch. You're correct!
> > This is a good place to do that.
> >
> > But hmm, I think we should add another patch to check the addr == paddr
> > soon after the loop so that we will avoid decoding.
> >
> > Thank you,
> >
>
> Yes, that makes sense to me. At the same time, I'm also thinking about
> changing the return type of can_probe() to bool, since we are just using
> int as bool in this context.

Yes, that is also a good change :)

Thank you,

>
> --Jinghao
>
> >>
> >> --Jinghao
> >>
> >>>
> >>>> if (IS_ENABLED(CONFIG_CFI_CLANG)) {
> >>>> /*
> >>>> * The compiler generates the following instruction sequence
> >>>> @@ -308,13 +334,6 @@ static int can_probe(unsigned long paddr)
> >>>> * Also, these movl and addl are used for showing expected
> >>>> * type. So those must not be touched.
> >>>> */
> >>>> - __addr = recover_probed_instruction(buf, addr);
> >>>> - if (!__addr)
> >>>> - return 0;
> >>>> -
> >>>> - if (insn_decode_kernel(&insn, (void *)__addr) < 0)
> >>>> - return 0;
> >>>> -
> >>>> if (insn.opcode.value == 0xBA)
> >>>> offset = 12;
> >>>> else if (insn.opcode.value == 0x3)
> >>>> --
> >>>> 2.43.0
> >>>>
> >>>
> >>>
> >
> >


--
Masami Hiramatsu (Google) <[email protected]>