x86emul: convert op_bytes/opc checks in SIMD emulation
PATCH 1/1 x86emul: convert op_bytes/opc checks in SIMD emulation
Delivering #UD for an internal shortcoming of the emulator isn't quite right. Similarly BUG() is bigger a hammer than needed.
Switch to using EXPECT() instead.
xen/arch/x86/x86_emulate/x86_emulate.c +3 -3
@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none ) { -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc); +if (evex_encoded () ) { opc[insn_bytes -EVEX_PFX_BYTES ] =0xc3 ;
Quoted 7 lines · Jan Beulich
Delivering #UD for an internal shortcoming of the emulator isn't quite right. Similarly
BUG()is bigger a hammer than needed.Switch to using
EXPECT()instead.Suggested-by Andrew Cooper <[email protected]>Signed-off-by Jan Beulich <[email protected]>
To confirm, this is ASSERT_UNREACHABLE() (which fuzzing will now notice as an error), and unhandleable in release builds (which ultimately ends up in #UD)?
I think it would be helpful to at least note the fuzzing aspect in the commit message.
Quoted 6 lines
xen/arch/x86/x86_emulate/x86_emulate.c +0
-0@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none )
xen/arch/x86/x86_emulate/x86_emulate.c x86_emulate( · line 8122
Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2
-3{ -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc);
This is the only BUG() in x86_emulate.c, and it's right to get rid of it IMO.
Therefore, we should have a hunk removing it from tools/tests/x86_emulator/x86-emulate.h too, which will prevent reintroduction.
Maybe even undef BUG somewhere in x86_emulate/private.h?
~Andrew
Quoted 4 lines · Andrew Cooper
Quoted 3 lines · Jan Beulich
Delivering #UD for an internal shortcoming of the emulator isn't quite right. Similarly
BUG()is bigger a hammer than needed.
Quoted 8 lines
Quoted 4 lines
Switch to using
EXPECT()instead.Suggested-by Andrew Cooper <[email protected]>Signed-off-by Jan Beulich <[email protected]>To confirm, this is
ASSERT_UNREACHABLE()(which fuzzing will now notice as an error), and unhandleable in release builds (which ultimately ends up in #UD)?
Yes, at least mostly. What exactly UNHANDLEABLE converts to depends on the use site, I think.
Quoted 2 lines
I think it would be helpful to at least note the fuzzing aspect in the commit message.
I've added "This way even for insns not covered by the test harness fuzzers will have a chance of noticing issues, should any still exist or new ones be introduced" to the 2nd paragraph.
Quoted 19 lines
Quoted 5 lines
xen/arch/x86/x86_emulate/x86_emulate.c +0
-0@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none )xen/arch/x86/x86_emulate/x86_emulate.c x86_emulate( · line 8122
Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2
-3{ -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc);This is the only
BUG()inx86_emulate.c, and it's right to get rid of it IMO.
Quoted 5 lines
Therefore, we should have a hunk removing it from
tools/tests/x86_emulator/x86-emulate.htoo, which will prevent reintroduction.Maybe even undef BUG somewhere in
x86_emulate/private.h?
Both of these actions can only be taken if the other BUG() in decode.c also goes away. But yes, what you suggest is probably the best course of action. I guess I'll do that in yet another patch, though.
Jan
Andrew Cooper
Acked-byQuoted 7 lines · Jan Beulich
Quoted 6 lines · Andrew Cooper
Quoted 5 lines · Jan Beulich
Delivering #UD for an internal shortcoming of the emulator isn't quite right. Similarly
BUG()is bigger a hammer than needed.Switch to using
EXPECT()instead.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Suggested-by Andrew Cooper <[email protected]>Signed-off-by Jan Beulich <[email protected]>To confirm, this is
ASSERT_UNREACHABLE()(which fuzzing will now notice as an error), and unhandleable in release builds (which ultimately ends up in #UD)?Yes, at least mostly. What exactly UNHANDLEABLE converts to depends on the use site, I think.
Sure, but it's a well defined non-fatal exit path.
Quoted 6 lines
Quoted 3 lines
I think it would be helpful to at least note the fuzzing aspect in the commit message.
I've added "This way even for insns not covered by the test harness fuzzers will have a chance of noticing issues, should any still exist or new ones be introduced" to the 2nd paragraph.
Quoted 19 lines
Quoted 19 lines
Quoted 6 lines
xen/arch/x86/x86_emulate/x86_emulate.c +0
-0@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none )xen/arch/x86/x86_emulate/x86_emulate.c x86_emulate( · line 8122
Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2
-3{ -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc);This is the only
BUG()inx86_emulate.c, and it's right to get rid of it IMO.
Quoted 8 lines
Quoted 5 lines
Therefore, we should have a hunk removing it from
tools/tests/x86_emulator/x86-emulate.htoo, which will prevent reintroduction.Maybe even undef BUG somewhere in
x86_emulate/private.h?Both of these actions can only be taken if the other
BUG()indecode.calso goes away. But yes, what you suggest is probably the best course of action. I guess I'll do that in yet another patch, though.
Is that BUG() local to your tree? I cant see it in staging.
Deferring this to a later patch is fine.
~Andrew
Quoted 9 lines · Andrew Cooper
Quoted 6 lines · Jan Beulich
Quoted 2 lines · Andrew Cooper
I think it would be helpful to at least note the fuzzing aspect in the commit message.
I've added "This way even for insns not covered by the test harness fuzzers will have a chance of noticing issues, should any still exist or new ones be introduced" to the 2nd paragraph.
Acked-by Andrew Cooper <[email protected]>
Thanks.
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 5 lines
xen/arch/x86/x86_emulate/x86_emulate.c +0
-0@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none )xen/arch/x86/x86_emulate/x86_emulate.c x86_emulate( · line 8122
Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2
-3{ -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc);This is the only
BUG()inx86_emulate.c, and it's right to get rid of it IMO.Therefore, we should have a hunk removing it from
tools/tests/x86_emulator/x86-emulate.htoo, which will prevent reintroduction.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Maybe even undef BUG somewhere in
x86_emulate/private.h?Both of these actions can only be taken if the other
BUG()indecode.calso goes away. But yes, what you suggest is probably the best course of action. I guess I'll do that in yet another patch, though.Is that
BUG()local to your tree? I cant see it in staging.
I first thought it would be when you mentioned you found only one, but it's been there for a long time[1], in VEX/EVEX prefix decoding. With a comment added by you[2].
Jan
[1] https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=11c35f84b53622c429071049b830bb9b7a880eff
[2] https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=933acddf74213f77a5adbb2c10ccd3f72634d456
Quoted 22 lines · Jan Beulich
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 5 lines
xen/arch/x86/x86_emulate/x86_emulate.c +0
-0@@ -8114,13 +8114,13 @@ x86_emulate( }else if ( state->simd_size != simd_none )xen/arch/x86/x86_emulate/x86_emulate.c x86_emulate( · line 8122
Quoted 10 lines
xen/arch/x86/x86_emulate/x86_emulate.c +2
-3{ -generate_exception_if (!op_bytes,X86_EXC_UD );generate_exception_if ((vex.opcx && (d & TwoOp) && (vex.reg !=0xf || (evex_encoded () && !evex.RX))),X86_EXC_UD ); -if ( !opc ) -BUG (); +EXPECT (op_bytes); +EXPECT (opc);This is the only
BUG()inx86_emulate.c, and it's right to get rid of it IMO.Therefore, we should have a hunk removing it from
tools/tests/x86_emulator/x86-emulate.htoo, which will prevent reintroduction.
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Maybe even undef BUG somewhere in
x86_emulate/private.h?Both of these actions can only be taken if the other
BUG()indecode.calso goes away. But yes, what you suggest is probably the best course of action. I guess I'll do that in yet another patch, though.Is that
BUG()local to your tree? I cant see it in staging.I first thought it would be when you mentioned you found only one, but it's been there for a long time[1], in VEX/EVEX prefix decoding. With a comment added by you[2].
Oh, I'm clearly blind.
But yes, that one wants to become EXPECT() too, I'd say.
~Andrew