| Message ID | 20250301052628.1011210-7-brian.cain@oss.qualcomm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hexagon system emu, part 1/3 | expand |
> -----Original Message----- > From: Brian Cain <brian.cain@oss.qualcomm.com> > Sent: Friday, February 28, 2025 11:26 PM > To: qemu-devel@nongnu.org > Cc: brian.cain@oss.qualcomm.com; richard.henderson@linaro.org; > philmd@linaro.org; quic_mathbern@quicinc.com; ale@rev.ng; anjo@rev.ng; > quic_mliebel@quicinc.com; ltaylorsimpson@gmail.com; > alex.bennee@linaro.org; quic_mburton@quicinc.com; > sidneym@quicinc.com; Brian Cain <bcain@quicinc.com> > Subject: [PATCH 06/38] target/hexagon: Add privilege check, use > tag_ignore() > > From: Brian Cain <bcain@quicinc.com> > > Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com> > --- > target/hexagon/cpu_bits.h | 2 ++ > target/hexagon/gen_tcg_funcs.py | 32 +++++++++++++++++++------------- > 2 files changed, 21 insertions(+), 13 deletions(-) > > diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h index > ff596e2a94..6582bb4f16 100644 > --- a/target/hexagon/cpu_bits.h > +++ b/target/hexagon/cpu_bits.h > @@ -37,6 +37,8 @@ enum hex_cause { > HEX_CAUSE_PC_NOT_ALIGNED = 0x01e, > HEX_CAUSE_PRIV_NO_UREAD = 0x024, > HEX_CAUSE_PRIV_NO_UWRITE = 0x025, > + HEX_CAUSE_PRIV_USER_NO_GINSN = 0x01a, > + HEX_CAUSE_PRIV_USER_NO_SINSN = 0x01b, > }; > > #define PACKET_WORDS_MAX 4 > diff --git a/target/hexagon/gen_tcg_funcs.py > b/target/hexagon/gen_tcg_funcs.py index c2ba91ddc0..65bfa046b8 100755 > --- a/target/hexagon/gen_tcg_funcs.py > +++ b/target/hexagon/gen_tcg_funcs.py > @@ -21,7 +21,7 @@ > import re > import string > import hex_common > - > +from textwrap import dedent > > ## > ## Generate the TCG code to call the helper @@ -50,6 +50,18 @@ def > gen_tcg_func(f, tag, regs, imms): > > f.write(" Insn *insn G_GNUC_UNUSED = ctx->insn;\n") > > + if "A_PRIV" in hex_common.attribdict[tag]: > + f.write(dedent("""\ > +#ifdef CONFIG_USER_ONLY > + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_SINSN); > #else Indent this? Are you worried the line will be too long for checkpatch? > +""")) > + if "A_GUEST" in hex_common.attribdict[tag]: > + f.write(dedent("""\ > +#ifdef CONFIG_USER_ONLY > + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_GINSN); > #else Ditto > +""")) > if hex_common.need_ea(tag): > f.write(" TCGv EA G_GNUC_UNUSED = tcg_temp_new();\n") > > @@ -97,6 +109,11 @@ def gen_tcg_func(f, tag, regs, imms): > if reg.is_written(): > reg.log_write(f, tag) > > + if ( > + "A_PRIV" in hex_common.attribdict[tag] > + or "A_GUEST" in hex_common.attribdict[tag] > + ): > + f.write("#endif /* CONFIG_USER_ONLY */\n") > f.write("}\n\n") Otherwise Reviewed-by: Taylor Simpson <ltaylorsimpson@gmail.com>
On 2/28/25 21:25, Brian Cain wrote: > From: Brian Cain <bcain@quicinc.com> > > Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com> > --- > target/hexagon/cpu_bits.h | 2 ++ > target/hexagon/gen_tcg_funcs.py | 32 +++++++++++++++++++------------- > 2 files changed, 21 insertions(+), 13 deletions(-) > > diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h > index ff596e2a94..6582bb4f16 100644 > --- a/target/hexagon/cpu_bits.h > +++ b/target/hexagon/cpu_bits.h > @@ -37,6 +37,8 @@ enum hex_cause { > HEX_CAUSE_PC_NOT_ALIGNED = 0x01e, > HEX_CAUSE_PRIV_NO_UREAD = 0x024, > HEX_CAUSE_PRIV_NO_UWRITE = 0x025, > + HEX_CAUSE_PRIV_USER_NO_GINSN = 0x01a, > + HEX_CAUSE_PRIV_USER_NO_SINSN = 0x01b, > }; > > #define PACKET_WORDS_MAX 4 > diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs.py > index c2ba91ddc0..65bfa046b8 100755 > --- a/target/hexagon/gen_tcg_funcs.py > +++ b/target/hexagon/gen_tcg_funcs.py > @@ -21,7 +21,7 @@ > import re > import string > import hex_common > - > +from textwrap import dedent > > ## > ## Generate the TCG code to call the helper > @@ -50,6 +50,18 @@ def gen_tcg_func(f, tag, regs, imms): > > f.write(" Insn *insn G_GNUC_UNUSED = ctx->insn;\n") > > + if "A_PRIV" in hex_common.attribdict[tag]: > + f.write(dedent("""\ > +#ifdef CONFIG_USER_ONLY > + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_SINSN); > +#else > +""")) > + if "A_GUEST" in hex_common.attribdict[tag]: > + f.write(dedent("""\ > +#ifdef CONFIG_USER_ONLY > + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_GINSN); > +#else > +""")) You add new exceptions, but do not handle them in cpu_loop. I suppose this is not actually a regression, because we already fail to handle illegal instruction exceptions in cpu_loop. But you'll want to fix both. :-) r~
diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h index ff596e2a94..6582bb4f16 100644 --- a/target/hexagon/cpu_bits.h +++ b/target/hexagon/cpu_bits.h @@ -37,6 +37,8 @@ enum hex_cause { HEX_CAUSE_PC_NOT_ALIGNED = 0x01e, HEX_CAUSE_PRIV_NO_UREAD = 0x024, HEX_CAUSE_PRIV_NO_UWRITE = 0x025, + HEX_CAUSE_PRIV_USER_NO_GINSN = 0x01a, + HEX_CAUSE_PRIV_USER_NO_SINSN = 0x01b, }; #define PACKET_WORDS_MAX 4 diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs.py index c2ba91ddc0..65bfa046b8 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -21,7 +21,7 @@ import re import string import hex_common - +from textwrap import dedent ## ## Generate the TCG code to call the helper @@ -50,6 +50,18 @@ def gen_tcg_func(f, tag, regs, imms): f.write(" Insn *insn G_GNUC_UNUSED = ctx->insn;\n") + if "A_PRIV" in hex_common.attribdict[tag]: + f.write(dedent("""\ +#ifdef CONFIG_USER_ONLY + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_SINSN); +#else +""")) + if "A_GUEST" in hex_common.attribdict[tag]: + f.write(dedent("""\ +#ifdef CONFIG_USER_ONLY + hex_gen_exception_end_tb(ctx, HEX_CAUSE_PRIV_USER_NO_GINSN); +#else +""")) if hex_common.need_ea(tag): f.write(" TCGv EA G_GNUC_UNUSED = tcg_temp_new();\n") @@ -97,6 +109,11 @@ def gen_tcg_func(f, tag, regs, imms): if reg.is_written(): reg.log_write(f, tag) + if ( + "A_PRIV" in hex_common.attribdict[tag] + or "A_GUEST" in hex_common.attribdict[tag] + ): + f.write("#endif /* CONFIG_USER_ONLY */\n") f.write("}\n\n") @@ -121,18 +138,7 @@ def main(): f.write('#include "idef-generated-emitter.h.inc"\n\n') for tag in hex_common.tags: - ## Skip the priv instructions - if "A_PRIV" in hex_common.attribdict[tag]: - continue - ## Skip the guest instructions - if "A_GUEST" in hex_common.attribdict[tag]: - continue - ## Skip the diag instructions - if tag == "Y6_diag": - continue - if tag == "Y6_diag0": - continue - if tag == "Y6_diag1": + if hex_common.tag_ignore(tag): continue gen_def_tcg_func(f, tag, tagregs, tagimms)