| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <25fbdb6c-1e68-0cc2-88fd-88ba24e162c5@loongson.cn>
Date: Mon, 15 Jul 2024 14:03:29 +0800
From: maobibo <maobibo@...ngson.cn>
To: Xianglai Li <lixianglai@...ngson.cn>, linux-kernel@...r.kernel.org
Cc: Tianrui Zhao <zhaotianrui@...ngson.cn>,
Huacai Chen <chenhuacai@...nel.org>, kvm@...r.kernel.org,
loongarch@...ts.linux.dev, Min Zhou <zhoumin@...ngson.cn>,
Paolo Bonzini <pbonzini@...hat.com>, WANG Xuerui <kernel@...0n.name>
Subject: Re: [PATCH 08/11] LoongArch: KVM: Add PCHPIC device support
On 2024/7/5 上午10:38, Xianglai Li wrote:
> Added device model for PCHPIC interrupt controller,
> implemented basic create destroy interface,
> and registered device model to kvm device table.
>
> Signed-off-by: Tianrui Zhao <zhaotianrui@...ngson.cn>
> Signed-off-by: Xianglai Li <lixianglai@...ngson.cn>
> ---
> Cc: Bibo Mao <maobibo@...ngson.cn>
> Cc: Huacai Chen <chenhuacai@...nel.org>
> Cc: kvm@...r.kernel.org
> Cc: loongarch@...ts.linux.dev
> Cc: Min Zhou <zhoumin@...ngson.cn>
> Cc: Paolo Bonzini <pbonzini@...hat.com>
> Cc: Tianrui Zhao <zhaotianrui@...ngson.cn>
> Cc: WANG Xuerui <kernel@...0n.name>
> Cc: Xianglai li <lixianglai@...ngson.cn>
>
> arch/loongarch/include/asm/kvm_host.h | 2 +
> arch/loongarch/include/asm/kvm_pch_pic.h | 30 +++++++
> arch/loongarch/kvm/Makefile | 1 +
> arch/loongarch/kvm/intc/pch_pic.c | 100 +++++++++++++++++++++++
> arch/loongarch/kvm/main.c | 6 ++
> include/uapi/linux/kvm.h | 2 +
> 6 files changed, 141 insertions(+)
> create mode 100644 arch/loongarch/include/asm/kvm_pch_pic.h
> create mode 100644 arch/loongarch/kvm/intc/pch_pic.c
>
> diff --git a/arch/loongarch/include/asm/kvm_host.h b/arch/loongarch/include/asm/kvm_host.h
> index 5c2adebd16b2..31891f884cee 100644
> --- a/arch/loongarch/include/asm/kvm_host.h
> +++ b/arch/loongarch/include/asm/kvm_host.h
> @@ -21,6 +21,7 @@
> #include <asm/loongarch.h>
> #include <asm/kvm_ipi.h>
> #include <asm/kvm_extioi.h>
> +#include <asm/kvm_pch_pic.h>
>
> /* Loongarch KVM register ids */
> #define KVM_GET_IOC_CSR_IDX(id) ((id & KVM_CSR_IDX_MASK) >> LOONGARCH_REG_SHIFT)
> @@ -115,6 +116,7 @@ struct kvm_arch {
> struct kvm_context __percpu *vmcs;
> struct loongarch_ipi *ipi;
> struct loongarch_extioi *extioi;
> + struct loongarch_pch_pic *pch_pic;
> };
>
> #define CSR_MAX_NUMS 0x800
> diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/include/asm/kvm_pch_pic.h
> new file mode 100644
> index 000000000000..5aef0e4e3863
> --- /dev/null
> +++ b/arch/loongarch/include/asm/kvm_pch_pic.h
> @@ -0,0 +1,30 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2024 Loongson Technology Corporation Limited
> + */
> +
> +#ifndef LOONGARCH_PCH_PIC_H
> +#define LOONGARCH_PCH_PIC_H
> +
> +#include <kvm/iodev.h>
> +
> +struct loongarch_pch_pic {
> + spinlock_t lock;
> + struct kvm *kvm;
> + struct kvm_io_device device;
> + uint64_t mask; /* 1:disable irq, 0:enable irq */
> + uint64_t htmsi_en; /* 1:msi */
> + uint64_t edge; /* 1:edge triggered, 0:level triggered */
> + uint64_t auto_ctrl0; /* only use default value 00b */
> + uint64_t auto_ctrl1; /* only use default value 00b */
> + uint64_t last_intirr; /* edge detection */
> + uint64_t irr; /* interrupt request register */
> + uint64_t isr; /* interrupt service register */
> + uint64_t polarity; /* 0: high level trigger, 1: low level trigger */
> + uint8_t route_entry[64]; /* default value 0, route to int0: extioi */
> + uint8_t htmsi_vector[64]; /* irq route table for routing to extioi */
> + uint64_t pch_pic_base;
> +};
> +
> +int kvm_loongarch_register_pch_pic_device(void);
> +#endif /* LOONGARCH_PCH_PIC_H */
> diff --git a/arch/loongarch/kvm/Makefile b/arch/loongarch/kvm/Makefile
> index a481952e3855..165ecb4d408f 100644
> --- a/arch/loongarch/kvm/Makefile
> +++ b/arch/loongarch/kvm/Makefile
> @@ -20,5 +20,6 @@ kvm-y += vcpu.o
> kvm-y += vm.o
> kvm-y += intc/ipi.o
> kvm-y += intc/extioi.o
> +kvm-y += intc/pch_pic.o
>
> CFLAGS_exit.o += $(call cc-option,-Wno-override-init,)
> diff --git a/arch/loongarch/kvm/intc/pch_pic.c b/arch/loongarch/kvm/intc/pch_pic.c
> new file mode 100644
> index 000000000000..4097c00e8294
> --- /dev/null
> +++ b/arch/loongarch/kvm/intc/pch_pic.c
> @@ -0,0 +1,100 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2024 Loongson Technology Corporation Limited
> + */
> +
> +#include <asm/kvm_extioi.h>
> +#include <asm/kvm_pch_pic.h>
> +#include <asm/kvm_vcpu.h>
> +#include <linux/count_zeros.h>
> +
> +static int kvm_loongarch_pch_pic_write(struct kvm_vcpu *vcpu,
> + struct kvm_io_device *dev,
> + gpa_t addr, int len, const void *val)
> +{
> + return 0;
> +}
> +
> +static int kvm_loongarch_pch_pic_read(struct kvm_vcpu *vcpu,
> + struct kvm_io_device *dev,
> + gpa_t addr, int len, void *val)
> +{
> + return 0;
> +}
> +
> +static const struct kvm_io_device_ops kvm_loongarch_pch_pic_ops = {
> + .read = kvm_loongarch_pch_pic_read,
> + .write = kvm_loongarch_pch_pic_write,
> +};
> +
> +static int kvm_loongarch_pch_pic_get_attr(struct kvm_device *dev,
> + struct kvm_device_attr *attr)
> +{
> + return 0;
> +}
> +
> +static int kvm_loongarch_pch_pic_set_attr(struct kvm_device *dev,
> + struct kvm_device_attr *attr)
> +{
> + return 0;
> +}
> +
> +static void kvm_loongarch_pch_pic_destroy(struct kvm_device *dev)
> +{
> + struct kvm *kvm;
> + struct loongarch_pch_pic *s;
> + struct kvm_io_device *device;
> +
> + if (!dev)
> + return;
> +
> + kvm = dev->kvm;
> + if (!kvm)
> + return;
> +
> + s = kvm->arch.pch_pic;
> + if (!s)
> + return;
How about something like this?
if (!dev || !dev->kvm || ! dev->kvm->arch.pch_pic)
return;
> +
> + device = &s->device;
> + /* unregister pch pic device and free it's memory */
> + kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, device);
> + kfree(s);
> +}
> +
> +static int kvm_loongarch_pch_pic_create(struct kvm_device *dev, u32 type)
> +{
> + struct loongarch_pch_pic *s;
> + struct kvm *kvm = dev->kvm;
> +
> + /* pch pic should not has been created */
> + if (kvm->arch.pch_pic)
> + return -EINVAL;
> +
> + s = kzalloc(sizeof(struct loongarch_pch_pic), GFP_KERNEL);
> + if (!s)
> + return -ENOMEM;
> +
> + spin_lock_init(&s->lock);
> + s->kvm = kvm;
> +
> +
The above two blank lines are unnecessary.
> + kvm->arch.pch_pic = s;
> +
> + kvm_info("create pch pic device successfully\n");
kvm_info is unnecessary here.
Regards
Bibo Mao
> + return 0;
> +}
> +
> +static struct kvm_device_ops kvm_loongarch_pch_pic_dev_ops = {
> + .name = "kvm-loongarch-pch-pic",
> + .create = kvm_loongarch_pch_pic_create,
> + .destroy = kvm_loongarch_pch_pic_destroy,
> + .set_attr = kvm_loongarch_pch_pic_set_attr,
> + .get_attr = kvm_loongarch_pch_pic_get_attr,
> +};
> +
> +int kvm_loongarch_register_pch_pic_device(void)
> +{
> + return kvm_register_device_ops(&kvm_loongarch_pch_pic_dev_ops,
> + KVM_DEV_TYPE_LA_IOAPIC);
> +}
> diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c
> index b5da4341006a..285bd4126e54 100644
> --- a/arch/loongarch/kvm/main.c
> +++ b/arch/loongarch/kvm/main.c
> @@ -10,6 +10,7 @@
> #include <asm/cpufeature.h>
> #include <asm/kvm_csr.h>
> #include <asm/kvm_extioi.h>
> +#include <asm/kvm_pch_pic.h>
> #include "trace.h"
>
> unsigned long vpid_mask;
> @@ -375,6 +376,11 @@ static int kvm_loongarch_env_init(void)
>
> /* Register loongarch extioi interrupt controller interface. */
> ret = kvm_loongarch_register_extioi_device();
> + if (ret)
> + return ret;
> +
> + /* Register loongarch pch pic interrupt controller interface. */
> + ret = kvm_loongarch_register_pch_pic_device();
>
> return ret;
> }
> diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
> index 607895ea450f..35560522a252 100644
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@ -1142,6 +1142,8 @@ enum kvm_device_type {
> #define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME
> KVM_DEV_TYPE_RISCV_AIA,
> #define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA
> + KVM_DEV_TYPE_LA_IOAPIC,
> +#define KVM_DEV_TYPE_LA_IOAPIC KVM_DEV_TYPE_LA_IOAPIC
> KVM_DEV_TYPE_LA_IPI,
> #define KVM_DEV_TYPE_LA_IPI KVM_DEV_TYPE_LA_IPI
> KVM_DEV_TYPE_LA_EXTIOI,
>
Powered by blists - more mailing lists