From: Yuan Yao <yuan.yao@linux.intel.com>
To: isaku.yamahata@intel.com
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>,
isaku.yamahata@gmail.com, Kai Huang <kai.huang@intel.com>,
Chao Gao <chao.gao@intel.com>,
Atish Patra <atishp@atishpatra.org>,
Shaokun Zhang <zhangshaokun@hisilicon.com>,
Qi Liu <liuqi115@huawei.com>, John Garry <john.garry@huawei.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Huang Ying <ying.huang@intel.com>,
Huacai Chen <chenhuacai@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Borislav Petkov <bp@alien8.de>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Anup Patel <anup@brainfault.org>,
Claudio Imbrenda <imbrenda@linux.ibm.com>
Subject: Re: [PATCH v3 04/22] Partially revert "KVM: Pass kvm_init()'s opaque param to additional arch funcs"
Date: Mon, 5 Sep 2022 13:48:04 +0800 [thread overview]
Message-ID: <20220905054804.5yvmkhp2jgg5br3w@yy-desk-7060> (raw)
In-Reply-To: <dc34f52f5177156e4755ae3feb78b661386b1677.1662084396.git.isaku.yamahata@intel.com>
On Thu, Sep 01, 2022 at 07:17:39PM -0700, isaku.yamahata@intel.com wrote:
> From: Chao Gao <chao.gao@intel.com>
>
> This partially reverts commit b99040853738 ("KVM: Pass kvm_init()'s opaque
> param to additional arch funcs") remove opaque from
> kvm_arch_check_processor_compat because no one uses this opaque now.
> Address conflicts for ARM (due to file movement) and manually handle RISC-V
> which comes after the commit.
>
> And changes about kvm_arch_hardware_setup() in original commit are still
> needed so they are not reverted.
>
> Signed-off-by: Chao Gao <chao.gao@intel.com>
> Reviewed-by: Sean Christopherson <seanjc@google.com>
> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> Acked-by: Anup Patel <anup@brainfault.org>
> Acked-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> Link: https://lore.kernel.org/r/20220216031528.92558-3-chao.gao@intel.com
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> Reviewed-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Yuan Yao <yuan.yao@intel.com>
> ---
> arch/arm64/kvm/arm.c | 2 +-
> arch/mips/kvm/mips.c | 2 +-
> arch/powerpc/kvm/powerpc.c | 2 +-
> arch/riscv/kvm/main.c | 2 +-
> arch/s390/kvm/kvm-s390.c | 2 +-
> arch/x86/kvm/x86.c | 2 +-
> include/linux/kvm_host.h | 2 +-
> virt/kvm/kvm_main.c | 16 +++-------------
> 8 files changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 2ff0ef62abad..3385fb57c11a 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -68,7 +68,7 @@ int kvm_arch_hardware_setup(void *opaque)
> return 0;
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> return 0;
> }
> diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
> index a25e0b73ee70..092d09fb6a7e 100644
> --- a/arch/mips/kvm/mips.c
> +++ b/arch/mips/kvm/mips.c
> @@ -140,7 +140,7 @@ int kvm_arch_hardware_setup(void *opaque)
> return 0;
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> return 0;
> }
> diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
> index fb1490761c87..7b56d6ccfdfb 100644
> --- a/arch/powerpc/kvm/powerpc.c
> +++ b/arch/powerpc/kvm/powerpc.c
> @@ -447,7 +447,7 @@ int kvm_arch_hardware_setup(void *opaque)
> return 0;
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> return kvmppc_core_check_processor_compat();
> }
> diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c
> index 1549205fe5fe..f8d6372d208f 100644
> --- a/arch/riscv/kvm/main.c
> +++ b/arch/riscv/kvm/main.c
> @@ -20,7 +20,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
> return -EINVAL;
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> return 0;
> }
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index edfd4bbd0cba..e26d4dd85668 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -254,7 +254,7 @@ int kvm_arch_hardware_enable(void)
> return 0;
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> return 0;
> }
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 5f12a7ed6f94..53c8ee677f16 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -11998,7 +11998,7 @@ void kvm_arch_hardware_unsetup(void)
> static_call(kvm_x86_hardware_unsetup)();
> }
>
> -int kvm_arch_check_processor_compat(void *opaque)
> +int kvm_arch_check_processor_compat(void)
> {
> struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
>
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index f4519d3689e1..eab352902de7 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -1438,7 +1438,7 @@ int kvm_arch_hardware_enable(void);
> void kvm_arch_hardware_disable(void);
> int kvm_arch_hardware_setup(void *opaque);
> void kvm_arch_hardware_unsetup(void);
> -int kvm_arch_check_processor_compat(void *opaque);
> +int kvm_arch_check_processor_compat(void);
> int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
> bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
> int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 584a5bab3af3..4243a9541543 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -5799,22 +5799,14 @@ void kvm_unregister_perf_callbacks(void)
> }
> #endif
>
> -struct kvm_cpu_compat_check {
> - void *opaque;
> - int *ret;
> -};
> -
> -static void check_processor_compat(void *data)
> +static void check_processor_compat(void *rtn)
> {
> - struct kvm_cpu_compat_check *c = data;
> -
> - *c->ret = kvm_arch_check_processor_compat(c->opaque);
> + *(int *)rtn = kvm_arch_check_processor_compat();
> }
>
> int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
> struct module *module)
> {
> - struct kvm_cpu_compat_check c;
> int r;
> int cpu;
>
> @@ -5842,10 +5834,8 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
> if (r < 0)
> goto out_free_1;
>
> - c.ret = &r;
> - c.opaque = opaque;
> for_each_online_cpu(cpu) {
> - smp_call_function_single(cpu, check_processor_compat, &c, 1);
> + smp_call_function_single(cpu, check_processor_compat, &r, 1);
> if (r < 0)
> goto out_free_2;
> }
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-09-05 5:48 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 2:17 [PATCH v3 00/22] KVM: hardware enable/disable reorganize isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 01/22] KVM: x86: Drop kvm_user_return_msr_cpu_online() isaku.yamahata
2022-09-05 1:59 ` Chao Gao
2022-09-05 5:30 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 02/22] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) isaku.yamahata
2022-09-05 5:35 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 03/22] KVM: x86: Move check_processor_compatibility from init ops to runtime ops isaku.yamahata
2022-09-05 5:42 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 04/22] Partially revert "KVM: Pass kvm_init()'s opaque param to additional arch funcs" isaku.yamahata
2022-09-05 5:48 ` Yuan Yao [this message]
2022-09-02 2:17 ` [PATCH v3 05/22] KVM: Provide more information in kernel log if hardware enabling fails isaku.yamahata
2022-09-05 5:56 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 06/22] KVM: arm64: Simplify the CPUHP logic isaku.yamahata
2022-09-05 7:05 ` Yuan Yao
2022-09-05 9:29 ` Marc Zyngier
2022-09-05 12:39 ` Marc Zyngier
2022-09-07 15:12 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 07/22] KVM: Rename and move CPUHP_AP_KVM_STARTING to ONLINE section isaku.yamahata
2022-09-05 7:49 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 08/22] KVM: Do compatibility checks on hotplugged CPUs isaku.yamahata
2022-09-06 1:25 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 09/22] KVM: Do processor compatibility check on resume isaku.yamahata
2022-09-05 8:40 ` Yuan Yao
2022-09-05 9:27 ` Yuan Yao
2022-09-08 18:21 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 10/22] KVM: Drop kvm_count_lock and instead protect kvm_usage_count with kvm_lock isaku.yamahata
2022-09-06 2:46 ` Yuan Yao
2022-09-06 6:32 ` Marc Zyngier
2022-09-06 21:44 ` Isaku Yamahata
2022-09-08 18:24 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 11/22] KVM: Add arch hooks for PM events with empty stub isaku.yamahata
2022-09-06 6:25 ` Yuan Yao
2022-09-08 19:11 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 12/22] KVM: x86: Move TSC fixup logic to KVM arch resume callback isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 13/22] KVM: Add arch hook when VM is added/deleted isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 14/22] KVM: Move out KVM arch PM hooks and hardware enable/disable logic isaku.yamahata
2022-09-06 7:43 ` Yuan Yao
2022-09-08 19:15 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 15/22] KVM: kvm_arch.c: Remove _nolock post fix isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 16/22] KVM: kvm_arch.c: Remove a global variable, hardware_enable_failed isaku.yamahata
2022-09-07 5:56 ` Yuan Yao
2022-09-08 22:51 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 17/22] KVM: x86: Duplicate arch callbacks related to pm events isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 18/22] KVM: Eliminate kvm_arch_post_init_vm() isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 19/22] KVM: x86: Delete kvm_arch_hardware_enable/disable() isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 20/22] KVM: Add config to not compile kvm_arch.c isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 21/22] RFC: KVM: x86: Remove cpus_hardware_enabled and related sanity check isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 22/22] RFC: KVM: " isaku.yamahata
2022-09-05 15:38 ` [PATCH v3 00/22] KVM: hardware enable/disable reorganize Marc Zyngier
2022-09-06 22:25 ` Isaku Yamahata
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=20220905054804.5yvmkhp2jgg5br3w@yy-desk-7060 \
--to=yuan.yao@linux.intel.com \
--cc=anup@brainfault.org \
--cc=atishp@atishpatra.org \
--cc=bp@alien8.de \
--cc=chao.gao@intel.com \
--cc=chenhuacai@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=dave.hansen@linux.intel.com \
--cc=imbrenda@linux.ibm.com \
--cc=isaku.yamahata@gmail.com \
--cc=isaku.yamahata@intel.com \
--cc=john.garry@huawei.com \
--cc=kai.huang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuqi115@huawei.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=ying.huang@intel.com \
--cc=zhangshaokun@hisilicon.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).