From: Zhao Liu <zhao1.liu@intel.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: qemu-devel@nongnu.org, "David Hildenbrand" <david@redhat.com>,
"Weiwei Li" <liweiwei@iscas.ac.cn>,
qemu-s390x@nongnu.org, "Ilya Leoshkevich" <iii@linux.ibm.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Cameron Esfahani" <dirty@apple.com>,
qemu-ppc@nongnu.org,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
qemu-riscv@nongnu.org, "Max Filippov" <jcmvbkbc@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Roman Bolshakov" <rbolshakov@ddn.com>,
"Nicholas Piggin" <npiggin@gmail.com>
Subject: Re: [PATCH 6/6] target/i386: Use env_archcpu() in simulate_[rdmsr/wrmsr]()
Date: Fri, 20 Oct 2023 17:14:26 +0800 [thread overview]
Message-ID: <ZTJE8kPBnCn3luEE@intel.com> (raw)
In-Reply-To: <20231009110239.66778-7-philmd@linaro.org>
On Mon, Oct 09, 2023 at 01:02:39PM +0200, Philippe Mathieu-Daudé wrote:
> Date: Mon, 9 Oct 2023 13:02:39 +0200
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH 6/6] target/i386: Use env_archcpu() in
> simulate_[rdmsr/wrmsr]()
> X-Mailer: git-send-email 2.41.0
>
> When CPUArchState* is available (here CPUX86State*), we can
> use the fast env_archcpu() macro to get ArchCPU* (here X86CPU*).
> The QOM cast X86_CPU() macro will be slower when building with
> --enable-qom-cast-debug.
>
> Pass CPUX86State* as argument to simulate_rdmsr / simulate_wrmsr
> instead of a CPUState* to avoid an extra cast.
>
> simulate_rdmsr/simulate_rdmsr(CPUX86State
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> RFC: Not even build-tested.
> ---
> target/i386/hvf/x86_emu.h | 4 ++--
> target/i386/hvf/hvf.c | 4 ++--
> target/i386/hvf/x86_emu.c | 21 ++++++++++-----------
> 3 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/target/i386/hvf/x86_emu.h b/target/i386/hvf/x86_emu.h
> index 640da90b30..4b846ba80e 100644
> --- a/target/i386/hvf/x86_emu.h
> +++ b/target/i386/hvf/x86_emu.h
> @@ -29,8 +29,8 @@ bool exec_instruction(CPUX86State *env, struct x86_decode *ins);
> void load_regs(struct CPUState *cpu);
> void store_regs(struct CPUState *cpu);
>
> -void simulate_rdmsr(struct CPUState *cpu);
> -void simulate_wrmsr(struct CPUState *cpu);
> +void simulate_rdmsr(CPUX86State *env);
> +void simulate_wrmsr(CPUX86State *env);
>
> target_ulong read_reg(CPUX86State *env, int reg, int size);
> void write_reg(CPUX86State *env, int reg, target_ulong val, int size);
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index cb2cd0b02f..20b9ca3ef5 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -591,9 +591,9 @@ int hvf_vcpu_exec(CPUState *cpu)
> {
> load_regs(cpu);
> if (exit_reason == EXIT_REASON_RDMSR) {
> - simulate_rdmsr(cpu);
> + simulate_rdmsr(env);
> } else {
> - simulate_wrmsr(cpu);
> + simulate_wrmsr(env);
> }
> env->eip += ins_len;
> store_regs(cpu);
> diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
> index af1f205ecf..b1f8a685d1 100644
> --- a/target/i386/hvf/x86_emu.c
> +++ b/target/i386/hvf/x86_emu.c
> @@ -663,11 +663,10 @@ static void exec_lods(CPUX86State *env, struct x86_decode *decode)
> env->eip += decode->len;
> }
>
> -void simulate_rdmsr(struct CPUState *cpu)
> +void simulate_rdmsr(CPUX86State *env)
> {
> - X86CPU *x86_cpu = X86_CPU(cpu);
> - CPUX86State *env = &x86_cpu->env;
> - CPUState *cs = env_cpu(env);
> + X86CPU *x86_cpu = env_archcpu(env);
> + CPUState *cpu = env_cpu(env);
I find these names are confusing since in other i386 file
(target/i386/cpu.c), the "X86CPU" is called "cpu", and the "CPUState" is
called "cs".
Regarding this naming, it may be worthy of cleanup to unify the naming
for i386. ;-)
> uint32_t msr = ECX(env);
> uint64_t val = 0;
>
> @@ -746,8 +745,8 @@ void simulate_rdmsr(struct CPUState *cpu)
> val = env->mtrr_deftype;
> break;
> case MSR_CORE_THREAD_COUNT:
> - val = cs->nr_threads * cs->nr_cores; /* thread count, bits 15..0 */
> - val |= ((uint32_t)cs->nr_cores << 16); /* core count, bits 31..16 */
> + val = cpu->nr_threads * cpu->nr_cores; /* thread count, bits 15..0 */
> + val |= ((uint32_t)cpu->nr_cores << 16); /* core count, bits 31..16 */
> break;
> default:
> /* fprintf(stderr, "%s: unknown msr 0x%x\n", __func__, msr); */
> @@ -761,14 +760,14 @@ void simulate_rdmsr(struct CPUState *cpu)
>
> static void exec_rdmsr(CPUX86State *env, struct x86_decode *decode)
> {
> - simulate_rdmsr(env_cpu(env));
> + simulate_rdmsr(env);
> env->eip += decode->len;
> }
>
> -void simulate_wrmsr(struct CPUState *cpu)
> +void simulate_wrmsr(CPUX86State *env)
> {
> - X86CPU *x86_cpu = X86_CPU(cpu);
> - CPUX86State *env = &x86_cpu->env;
> + X86CPU *x86_cpu = env_archcpu(env);
> + CPUState *cpu = env_cpu(env);
> uint32_t msr = ECX(env);
> uint64_t data = ((uint64_t)EDX(env) << 32) | EAX(env);
>
> @@ -856,7 +855,7 @@ void simulate_wrmsr(struct CPUState *cpu)
>
> static void exec_wrmsr(CPUX86State *env, struct x86_decode *decode)
> {
> - simulate_wrmsr(env_cpu(env));
> + simulate_wrmsr(env);
> env->eip += decode->len;
> }
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
-Zhao
>
> --
> 2.41.0
>
>
>
next prev parent reply other threads:[~2023-10-20 12:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 11:02 [PATCH 0/6] target: Use env_archcpu() instead of ARCH_CPU(env_cpu(env)) Philippe Mathieu-Daudé
2023-10-09 11:02 ` [PATCH 1/6] target/ppc: Use env_archcpu() in helper_book3s_msgsndp() Philippe Mathieu-Daudé
2023-10-09 11:45 ` Daniel Henrique Barboza
2023-10-11 1:20 ` Alistair Francis
2023-10-09 11:02 ` [PATCH 2/6] target/riscv: Use env_archcpu() in [check_]nanbox() Philippe Mathieu-Daudé
2023-10-09 11:45 ` Daniel Henrique Barboza
2023-10-09 12:42 ` LIU Zhiwei
2023-10-10 17:04 ` Richard Henderson
2023-10-11 3:25 ` LIU Zhiwei
2023-10-11 5:31 ` Philippe Mathieu-Daudé
2023-10-12 5:59 ` LIU Zhiwei
2023-10-12 16:06 ` Richard Henderson
2023-10-13 8:48 ` LIU Zhiwei
2023-10-09 12:53 ` Richard W.M. Jones
2023-10-11 1:11 ` Alistair Francis
2023-10-09 11:02 ` [PATCH 3/6] target/s390x: Use env_archcpu() in handle_diag_308() Philippe Mathieu-Daudé
2023-10-11 1:17 ` Alistair Francis
2023-10-09 11:02 ` [PATCH 4/6] target/xtensa: Use env_archcpu() in update_c[compare|count]() Philippe Mathieu-Daudé
2023-10-11 1:17 ` Alistair Francis
2023-10-09 11:02 ` [PATCH 5/6] target/i386/hvf: Use x86_cpu in simulate_[rdmsr|wrmsr]() Philippe Mathieu-Daudé
2023-10-09 22:11 ` Roman Bolshakov
2023-10-20 8:44 ` Zhao Liu
2023-10-09 11:02 ` [PATCH 6/6] target/i386: Use env_archcpu() in simulate_[rdmsr/wrmsr]() Philippe Mathieu-Daudé
2023-10-09 22:41 ` Roman Bolshakov
2023-10-20 9:14 ` Zhao Liu [this message]
2023-10-10 17:06 ` [PATCH 0/6] target: Use env_archcpu() instead of ARCH_CPU(env_cpu(env)) Richard Henderson
2023-10-20 11:12 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZTJE8kPBnCn3luEE@intel.com \
--to=zhao1.liu@intel.com \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=dirty@apple.com \
--cc=iii@linux.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=liweiwei@iscas.ac.cn \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rbolshakov@ddn.com \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.