- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6 1/5] KVM: arm64: Support a new HiSi CPU type
by lishusen 10 Jan '24

10 Jan '24

From: Quan Zhou <zhouquan65(a)huawei.com> virt inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8TN8N CVE: NA ---------------------------------------------------- Add a new entry ("HIP09") in oem_str[] to support detection of the new HiSi CPU type. Signed-off-by: Quan Zhou <zhouquan65(a)huawei.com> Reviewed-by: Zenghui Yu <yuzenghui(a)huawei.com> Reviewed-by: Nianyao Tang <tangnianyao(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: lishusen <lishusen2(a)huawei.com> --- arch/arm64/kvm/hisilicon/hisi_virt.c | 4 +++- arch/arm64/kvm/hisilicon/hisi_virt.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.c b/arch/arm64/kvm/hisilicon/hisi_virt.c index 9587f9508a79..90c363ed642e 100644 --- a/arch/arm64/kvm/hisilicon/hisi_virt.c +++ b/arch/arm64/kvm/hisilicon/hisi_virt.c @@ -15,6 +15,7 @@ static const char * const hisi_cpu_type_str[] = { "Hisi1612", "Hisi1616", "Hisi1620", + "HIP09", "Unknown" }; @@ -22,7 +23,8 @@ static const char * const hisi_cpu_type_str[] = { static const char * const oem_str[] = { "HIP06", /* Hisi 1612 */ "HIP07", /* Hisi 1616 */ - "HIP08" /* Hisi 1620 */ + "HIP08", /* Hisi 1620 */ + "HIP09" /* HIP09 */ }; /* diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.h b/arch/arm64/kvm/hisilicon/hisi_virt.h index ef8de6a2101e..ebc462bf2a9d 100644 --- a/arch/arm64/kvm/hisilicon/hisi_virt.h +++ b/arch/arm64/kvm/hisilicon/hisi_virt.h @@ -10,6 +10,7 @@ enum hisi_cpu_type { HI_1612, HI_1616, HI_1620, + HI_IP09, UNKNOWN_HI_TYPE }; -- 2.33.0

2 5

[PATCH OLK-5.10] net: bridge: multicast: fix UAF of net_bridge
by Ziyang Xuan 10 Jan '24

10 Jan '24

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8UZTK CVE: NA -------------------------------- Get a UAF problem as following: ======================================================== BUG: KASAN: use-after-free in expire_timers+0x100/0x260 ... Call Trace: <IRQ> dump_stack+0xbe/0xfd print_address_description.constprop.0+0x19/0x170 ? expire_timers+0x100/0x260 __kasan_report.cold+0x6c/0x84 ? ipv6_mc_netdev_event+0x51/0x80 ? expire_timers+0x100/0x260 kasan_report+0x3a/0x50 expire_timers+0x100/0x260 run_timer_softirq+0x22c/0x550 ? expire_timers+0x260/0x260 ? pvclock_clocksource_read+0xf6/0x1d0 ? kvm_sched_clock_read+0x14/0x30 ? sched_clock+0x5/0x10 ? sched_clock_cpu+0x18/0x130 __do_softirq+0x104/0x42f asm_call_irq_on_stack+0xf/0x20 ... Allocated by task 26715: kasan_save_stack+0x1b/0x40 __kasan_kmalloc.constprop.0+0xf0/0x130 kvmalloc_node+0xc5/0x170 alloc_netdev_mqs+0x99/0x6b0 rtnl_create_link+0x170/0x510 __rtnl_newlink+0xc8a/0x10f0 rtnl_newlink+0x5a/0x90 rtnetlink_rcv_msg+0x303/0x780 netlink_rcv_skb+0xfd/0x2c0 netlink_unicast+0x2c1/0x3f0 netlink_sendmsg+0x537/0x950 __sock_sendmsg+0x10d/0x120 ____sys_sendmsg+0x519/0x590 ___sys_sendmsg+0xe9/0x150 __sys_sendmsg+0xea/0x190 do_syscall_64+0x30/0x40 entry_SYSCALL_64_after_hwframe+0x62/0xc7 Freed by task 26715: kasan_save_stack+0x1b/0x40 kasan_set_track+0x1c/0x30 kasan_set_free_info+0x20/0x40 __kasan_slab_free.part.0+0x13f/0x1b0 kfree+0xce/0x860 kvfree+0x47/0x50 device_release+0x62/0x130 kobject_cleanup+0xb6/0x280 kobject_put+0xe0/0xf0 netdev_run_todo+0x440/0x6d0 rtnetlink_rcv_msg+0x313/0x780 netlink_rcv_skb+0xfd/0x2c0 netlink_unicast+0x2c1/0x3f0 netlink_sendmsg+0x537/0x950 __sock_sendmsg+0x10d/0x120 ____sys_sendmsg+0x519/0x590 ___sys_sendmsg+0xe9/0x150 __sys_sendmsg+0xea/0x190 do_syscall_64+0x30/0x40 entry_SYSCALL_64_after_hwframe+0x62/0xc7 Under closed state of bridge netdev, try to activate ip6_own_query.timer of bridge netdev by br_multicast_set_querier(), and delete bridge netdev immediately afterwards. Because the timer will not be deleted during bridge netdev deleting process. When the timer is not activated before bridge netdev is released, UAF will be triggered to access the timer in expire_timers(). Add br_multicast_stop() in br_multicast_dev_del() to delete the timer during bridge netdev deleting process as done in commit 613d61dbef8e ("net: bridge: vlan: add global and per-port multicast context"). Fixes: cc0fdd802859 ("bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 ones") Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> --- net/bridge/br_multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index e2b1bb3de4a1..f3886d5b7952 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -3357,6 +3357,7 @@ void br_multicast_dev_del(struct net_bridge *br) hlist_move_list(&br->mcast_gc_list, &deleted_head); spin_unlock_bh(&br->multicast_lock); + br_multicast_stop(br); br_multicast_gc(&deleted_head); cancel_work_sync(&br->mcast_gc_work); -- 2.25.1

2 1

[PATCH openEuler-1.0-LTS] net: bridge: multicast: fix UAF of net_bridge
by Ziyang Xuan 10 Jan '24

10 Jan '24

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8UZTK CVE: NA -------------------------------- Get a UAF problem as following: ======================================================== BUG: KASAN: use-after-free in run_timer_softirq+0x526/0x750 ... Call Trace: <IRQ> dump_stack+0x8b/0xbb print_address_description+0x6a/0x270 kasan_report+0x179/0x2c0 ? run_timer_softirq+0x526/0x750 run_timer_softirq+0x526/0x750 ? pvclock_clocksource_read+0xd1/0x180 ? init_timer_key+0xc0/0xc0 ? kvm_sched_clock_read+0xd/0x20 ? sched_clock+0x5/0x10 ? sched_clock_cpu+0x18/0x100 __do_softirq+0x119/0x3a2 irq_exit+0x153/0x160 smp_apic_timer_interrupt+0x92/0x1a0 apic_timer_interrupt+0xf/0x20 ... Allocated by task 11277: kasan_kmalloc+0xa0/0xd0 __kmalloc_node+0x190/0x2b0 kvmalloc_node+0x43/0x70 alloc_netdev_mqs+0x6a/0x660 rtnl_create_link+0x12a/0x420 rtnl_newlink+0x832/0xab0 rtnetlink_rcv_msg+0x424/0x500 netlink_rcv_skb+0xcd/0x200 netlink_unicast+0x2e9/0x3a0 netlink_sendmsg+0x4d7/0x670 sock_sendmsg+0x6d/0x80 ____sys_sendmsg+0x36a/0x3d0 ___sys_sendmsg+0x10a/0x190 __sys_sendmsg+0xd2/0x150 do_syscall_64+0x77/0x2c0 entry_SYSCALL_64_after_hwframe+0x5c/0xc1 Freed by task 11313: __kasan_slab_free+0x130/0x180 kfree+0x90/0x1a0 device_release+0x47/0xe0 kobject_release+0x98/0x200 netdev_run_todo+0x36d/0x490 rtnetlink_rcv_msg+0x42c/0x500 netlink_rcv_skb+0xcd/0x200 netlink_unicast+0x2e9/0x3a0 netlink_sendmsg+0x4d7/0x670 sock_sendmsg+0x6d/0x80 ____sys_sendmsg+0x36a/0x3d0 ___sys_sendmsg+0x10a/0x190 __sys_sendmsg+0xd2/0x150 do_syscall_64+0x77/0x2c0 entry_SYSCALL_64_after_hwframe+0x5c/0xc1 Under closed state of bridge netdev, try to activate ip6_own_query.timer of bridge netdev by br_multicast_set_querier(), and delete bridge netdev immediately afterwards. Because the timer will not be deleted during bridge netdev deleting process. When the timer is not activated before bridge netdev is released, UAF will be triggered to access the timer in run_timer_softirq(). Add br_multicast_stop() in br_multicast_dev_del() to delete the timer during bridge netdev deleting process as done in commit 613d61dbef8e ("net: bridge: vlan: add global and per-port multicast context"). Fixes: cc0fdd802859 ("bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 ones") Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> --- net/bridge/br_multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 1dc32cbd20bb..d84abee1d24c 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -2068,6 +2068,7 @@ void br_multicast_dev_del(struct net_bridge *br) out: spin_unlock_bh(&br->multicast_lock); + br_multicast_stop(br); } int br_multicast_set_router(struct net_bridge *br, unsigned long val) -- 2.25.1

2 1

openEuler Kernel SIG双周例会
by openEuler conference 10 Jan '24

10 Jan '24

您好！ Kernel SIG 邀请您参加 2024-01-12 14:00 召开的WeLink会议(自动录制) 会议主题：openEuler Kernel SIG双周例会会议内容： 1. 进展update 2. 议题征集中（新增议题可直接回复本邮件申报，也可填至会议看板）会议链接：https://bmeeting.huaweicloud.com:36443/#/j/983665981 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the WeLink conference(auto recording) will be held at 2024-01-12 14:00, The subject of the conference is openEuler Kernel SIG双周例会, Summary: 1. 进展update 2. 议题征集中（新增议题可直接回复本邮件申报，也可填至会议看板） You can join the meeting at https://bmeeting.huaweicloud.com:36443/#/j/983665981. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH OLK-6.6 0/4] Add L3T and LPDDRC pmu
by Chen Jun 10 Jan '24

10 Jan '24

Chen Jun (4): perf: hisi: Make irq shared perf: hisi: Fix read sccl_id and ccl_id error in some platform perf: hisi: Add support for HiSilicon SoC L3T PMU perf: hisi: Add support for HiSilicon SoC LPDDRC PMU arch/arm64/configs/openeuler_defconfig | 2 + drivers/perf/hisilicon/Kconfig | 18 + drivers/perf/hisilicon/Makefile | 2 + drivers/perf/hisilicon/hisi_uncore_l3t_pmu.c | 403 +++++++++++++++++ .../perf/hisilicon/hisi_uncore_lpddrc_pmu.c | 408 ++++++++++++++++++ drivers/perf/hisilicon/hisi_uncore_pmu.c | 46 +- drivers/perf/hisilicon/hisi_uncore_pmu.h | 2 + 7 files changed, 870 insertions(+), 11 deletions(-) create mode 100644 drivers/perf/hisilicon/hisi_uncore_l3t_pmu.c create mode 100644 drivers/perf/hisilicon/hisi_uncore_lpddrc_pmu.c -- 2.17.1

2 5

[PATCH OLK-6.6 1/3] KVM: arm64: Probe Hisi CPU TYPE from ACPI/DTB
by lishusen 10 Jan '24

10 Jan '24

From: Zenghui Yu <yuzenghui(a)huawei.com> virt inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8TN8N CVE: NA ---------------------------------------------------- Parse ACPI/DTB to get where the hypervisor is running. Signed-off-by: Zenghui Yu <yuzenghui(a)huawei.com> Signed-off-by: Yanan Wang <wangyanan55(a)huawei.com> Reviewed-by: Zenghui Yu <yuzenghui(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: lishusen <lishusen2(a)huawei.com> --- arch/arm64/include/asm/hisi_cpu_model.h | 19 ++++++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 6 ++ arch/arm64/kvm/hisi_cpu_model.c | 83 +++++++++++++++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 arch/arm64/include/asm/hisi_cpu_model.h create mode 100644 arch/arm64/kvm/hisi_cpu_model.c diff --git a/arch/arm64/include/asm/hisi_cpu_model.h b/arch/arm64/include/asm/hisi_cpu_model.h new file mode 100644 index 000000000000..f686a7591e8f --- /dev/null +++ b/arch/arm64/include/asm/hisi_cpu_model.h @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright(c) 2019 Huawei Technologies Co., Ltd + */ + +#ifndef __HISI_CPU_MODEL_H__ +#define __HISI_CPU_MODEL_H__ + +enum hisi_cpu_type { + HI_1612, + HI_1616, + HI_1620, + UNKNOWN_HI_TYPE +}; + +extern enum hisi_cpu_type hi_cpu_type; + +void probe_hisi_cpu_type(void); +#endif /* __HISI_CPU_MODEL_H__ */ diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index af06ccb7ee34..5154085849fa 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -27,6 +27,7 @@ #include <asm/fpsimd.h> #include <asm/kvm.h> #include <asm/kvm_asm.h> +#include <asm/hisi_cpu_model.h> #define __KVM_HAVE_ARCH_INTC_INITIALIZED diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index c0c050e53157..86c6ded87eeb 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -15,6 +15,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ guest.o debug.o reset.o sys_regs.o stacktrace.o \ vgic-sys-reg-v3.o fpsimd.o pkvm.o \ arch_timer.o trng.o vmid.o emulate-nested.o nested.o \ + hisi_cpu_model.o \ vgic/vgic.o vgic/vgic-init.o \ vgic/vgic-irqfd.o vgic/vgic-v2.o \ vgic/vgic-v3.o vgic/vgic-v4.o \ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 4866b3f7b4ea..9d57a57283b3 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -56,6 +56,9 @@ DECLARE_KVM_NVHE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); static bool vgic_present, kvm_arm_initialised; +/* Hisi cpu type enum */ +enum hisi_cpu_type hi_cpu_type = UNKNOWN_HI_TYPE; + static DEFINE_PER_CPU(unsigned char, kvm_hyp_initialized); DEFINE_STATIC_KEY_FALSE(userspace_irqchip_in_use); @@ -2415,6 +2418,9 @@ static __init int kvm_arm_init(void) return err; } + /* Probe the Hisi CPU type */ + probe_hisi_cpu_type(); + in_hyp_mode = is_kernel_in_hyp_mode(); if (cpus_have_final_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) || diff --git a/arch/arm64/kvm/hisi_cpu_model.c b/arch/arm64/kvm/hisi_cpu_model.c new file mode 100644 index 000000000000..4d5a099bc27a --- /dev/null +++ b/arch/arm64/kvm/hisi_cpu_model.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright(c) 2019 Huawei Technologies Co., Ltd + */ + +#include <linux/acpi.h> +#include <linux/of.h> +#include <linux/init.h> +#include <linux/kvm_host.h> + +#ifdef CONFIG_ACPI + +/* ACPI Hisi oem table id str */ +const char *oem_str[] = { + "HIP06", /* Hisi 1612 */ + "HIP07", /* Hisi 1616 */ + "HIP08" /* Hisi 1620 */ +}; + +/* + * Get Hisi oem table id. + */ +static void acpi_get_hw_cpu_type(void) +{ + struct acpi_table_header *table; + acpi_status status; + int i, str_size = ARRAY_SIZE(oem_str); + + /* Get oem table id from ACPI table header */ + status = acpi_get_table(ACPI_SIG_DSDT, 0, &table); + if (ACPI_FAILURE(status)) { + pr_err("Failed to get ACPI table: %s\n", + acpi_format_exception(status)); + return; + } + + for (i = 0; i < str_size; ++i) { + if (!strncmp(oem_str[i], table->oem_table_id, 5)) { + hi_cpu_type = i; + return; + } + } +} + +#else +static void acpi_get_hw_cpu_type(void) {} +#endif + +/* of Hisi cpu model str */ +const char *of_model_str[] = { + "Hi1612", + "Hi1616" +}; + +static void of_get_hw_cpu_type(void) +{ + const char *cpu_type; + int ret, i, str_size = ARRAY_SIZE(of_model_str); + + ret = of_property_read_string(of_root, "model", &cpu_type); + if (ret < 0) { + pr_err("Failed to get Hisi cpu model by OF.\n"); + return; + } + + for (i = 0; i < str_size; ++i) { + if (strstr(cpu_type, of_model_str[i])) { + hi_cpu_type = i; + return; + } + } +} + +void probe_hisi_cpu_type(void) +{ + if (!acpi_disabled) + acpi_get_hw_cpu_type(); + else + of_get_hw_cpu_type(); + + if (hi_cpu_type == UNKNOWN_HI_TYPE) + pr_warn("UNKNOWN Hisi cpu type.\n"); +} -- 2.33.0

2 3

[PATH OLK-6.6 0/3] sync vgic-its from 5.10 to 6.6
by jiaqingtong 10 Jan '24

10 Jan '24

sync vgic-its from 5.10 to 6.6 depent on GICv4,test on 6.6 mainline with NIC PCI passthrough Heyi Guo (1): KVM: arm64: vgic-its: Flush pending LPIs when nuking DT Xiangyou Xie (2): KVM: arm/arm64: vgic-its: Introduce multiple LPI translation caches KVM: arm/arm64: vgic-its: Do not execute invalidate MSI-LPI translation cache on movi command arch/arm64/kvm/vgic/vgic-init.c | 8 +- arch/arm64/kvm/vgic/vgic-its.c | 255 +++++++++++++++++++++----------- include/kvm/arm_vgic.h | 13 +- 3 files changed, 183 insertions(+), 93 deletions(-) base-commit: ade260241330687a9006159f604a00deac794776 -- 2.43.GIT

1 0

[PATCH OLK-6.6 v7 0/5] block: Add config to show info about opening a mounted device for write
by Li Lingfeng 10 Jan '24

10 Jan '24

v1->v2: 1) Replace BLK_DEV_DUMPINFO with BLK_DEV_WRITE_MOUNTED_QUIET, which is logically opposite; 2) Make BLK_DEV_WRITE_MOUNTED_QUIET dependent on BLK_DEV_WRITE_MOUNTED, and decide whether to set bd_writers by BLK_DEV_WRITE_MOUNTED_QUIET; 3) Move bdev_dump_info() into bdev_may_open(); 4) Add the cmdline interface to control whether to show info; 5) Pass the state of "writes blocked" to part0 when mounting a partition. v2->v3: Add restriction for modifying bd_writers. v3->v4: 1) Count bd_writers regardless of whether bdev_allow_write_mounted is set; 2) Expand the meaning of bdev_allow_write_mounted; 3) Add config option to detect writing to part0 while partitions mounted; 4) Add bd_mounters to record the number of times that part0 or partition is mounted; 5) Show info about opening a lower device for write while upper-layers mounted. v4->v5: Move introduction of bd_mounters to patch1. v5->v6: Delete redundant conflict judgment. v6->v7: 1) Replace BLK_DEV_WRITE_MOUNTED_QUIET with BLK_DEV_WRITE_MOUNTED_DUMP. 2) Remove restriction for setting bdev_allow_write_mounted by cmdline. Li Lingfeng (5): block: Count writers and mounters regardless of whether bdev_allow_write_mounted is set block: Expand the meaning of bdev_allow_write_mounted block: Add config option to detect writing to part0 while partitions mounted block: Add config option to show info about opening a mounted device for write block: Show info about opening a lower device for write while upper-layers mounted block/Kconfig | 17 +++++++ block/bdev.c | 95 ++++++++++++++++++++++++++++++++------- include/linux/blk_types.h | 1 + 3 files changed, 98 insertions(+), 15 deletions(-) -- 2.31.1

2 6

[PATCH OLK-6.6 0/2] cgroup: Support iocost for cgroup v1
by Li Nan 10 Jan '24

10 Jan '24

Li Nan (2): cgroup: Support iocost for cgroup v1 openeuler_defconfig: enable iocost in openeuler_defconfig for x86 and arm64 block/blk-iocost.c | 27 ++++++++++++++++++++++++++ arch/arm64/configs/openeuler_defconfig | 4 +++- arch/x86/configs/openeuler_defconfig | 4 +++- block/Kconfig | 10 ++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) -- 2.39.2

2 3

[PATCH OLK-6.6 1/3] KVM: arm64: Adjust entry/exit and trap related tracepoints
by lishusen 10 Jan '24

10 Jan '24

virt inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4IZPY CVE: NA ------------------------------------------------- Currently, we use trace_kvm_exit() to report exception type (e.g., "IRQ", "TRAP") and exception class (ESR_ELx's bit[31:26]) together. But hardware only saves the exit class to ESR_ELx on synchronous exceptions, not on asynchronous exceptions. When the guest exits due to external interrupts, we will get tracing output like: "kvm_exit: IRQ: HSR_EC: 0x0000 (UNKNOWN), PC: 0xffff87259e30" Obviously, "HSR_EC" here is meaningless. This patch splits "exit" and "trap" events by adding two tracepoints explicitly in handle_trap_exceptions(). Let trace_kvm_exit() report VM exit events, and trace_kvm_trap_exit() report VM trap events. These tracepoints are adjusted also in preparation for supporting 'perf kvm stat' on arm64. Signed-off-by: Zenghui Yu <yuzenghui(a)huawei.com> Reviewed-by: Hailiang Zhang <zhang.zhanghailiang(a)huawei.com> Signed-off-by: Zenghui Yu <yuzenghui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Link: https://lore.kernel.org/r/1560330526-15468-3-git-send-email-yuzenghui@huawe… Link: https://gitee.com/openeuler/kernel/commit/14b85d8d7d2d Reviewed-by: Yanan Wang <wangyanan55(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: lishusen <lishusen2(a)huawei.com> --- arch/arm64/kvm/arm.c | 4 ++-- arch/arm64/kvm/handle_exit.c | 3 +++ arch/arm64/kvm/trace_arm.h | 21 +++++++++--------- arch/arm64/kvm/trace_handle_exit.h | 35 ++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 70fc3d00f82c..db1ea653a471 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1029,7 +1029,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) /************************************************************** * Enter the guest */ - trace_kvm_entry(*vcpu_pc(vcpu)); + trace_kvm_entry(vcpu->vcpu_id, *vcpu_pc(vcpu)); guest_timing_enter_irqoff(); ret = kvm_arm_vcpu_enter_exit(vcpu); @@ -1086,7 +1086,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) local_irq_enable(); - trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu)); + trace_kvm_exit(vcpu->vcpu_id, ret, *vcpu_pc(vcpu)); /* Exit types that need handling before we can be preempted */ handle_exit_early(vcpu, ret); diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 617ae6dea5d5..a8e370435e54 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -309,7 +309,10 @@ static int handle_trap_exceptions(struct kvm_vcpu *vcpu) exit_handle_fn exit_handler; exit_handler = kvm_get_exit_handler(vcpu); + trace_kvm_trap_enter(vcpu->vcpu_id, + kvm_vcpu_trap_get_class(vcpu)); handled = exit_handler(vcpu); + trace_kvm_trap_exit(vcpu->vcpu_id); } return handled; diff --git a/arch/arm64/kvm/trace_arm.h b/arch/arm64/kvm/trace_arm.h index 8ad53104934d..4a87477e2261 100644 --- a/arch/arm64/kvm/trace_arm.h +++ b/arch/arm64/kvm/trace_arm.h @@ -13,40 +13,41 @@ * Tracepoints for entry/exit to guest */ TRACE_EVENT(kvm_entry, - TP_PROTO(unsigned long vcpu_pc), - TP_ARGS(vcpu_pc), + TP_PROTO(unsigned int vcpu_id, unsigned long vcpu_pc), + TP_ARGS(vcpu_id, vcpu_pc), TP_STRUCT__entry( + __field( unsigned int, vcpu_id ) __field( unsigned long, vcpu_pc ) ), TP_fast_assign( + __entry->vcpu_id = vcpu_id; __entry->vcpu_pc = vcpu_pc; ), - TP_printk("PC: 0x%016lx", __entry->vcpu_pc) + TP_printk("VCPU %u: PC=0x%016lx", __entry->vcpu_id, __entry->vcpu_pc) ); TRACE_EVENT(kvm_exit, - TP_PROTO(int ret, unsigned int esr_ec, unsigned long vcpu_pc), - TP_ARGS(ret, esr_ec, vcpu_pc), + TP_PROTO(unsigned int vcpu_id, int ret, unsigned long vcpu_pc), + TP_ARGS(vcpu_id, ret, vcpu_pc), TP_STRUCT__entry( + __field( unsigned int, vcpu_id ) __field( int, ret ) - __field( unsigned int, esr_ec ) __field( unsigned long, vcpu_pc ) ), TP_fast_assign( + __entry->vcpu_id = vcpu_id; __entry->ret = ARM_EXCEPTION_CODE(ret); - __entry->esr_ec = ARM_EXCEPTION_IS_TRAP(ret) ? esr_ec : 0; __entry->vcpu_pc = vcpu_pc; ), - TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%016lx", + TP_printk("VCPU %u: exit_type=%s, PC=0x%016lx", + __entry->vcpu_id, __print_symbolic(__entry->ret, kvm_arm_exception_type), - __entry->esr_ec, - __print_symbolic(__entry->esr_ec, kvm_arm_exception_class), __entry->vcpu_pc) ); diff --git a/arch/arm64/kvm/trace_handle_exit.h b/arch/arm64/kvm/trace_handle_exit.h index 064a58c19f48..cda43f243f7e 100644 --- a/arch/arm64/kvm/trace_handle_exit.h +++ b/arch/arm64/kvm/trace_handle_exit.h @@ -8,6 +8,41 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm +TRACE_EVENT(kvm_trap_enter, + TP_PROTO(unsigned int vcpu_id, unsigned int esr_ec), + TP_ARGS(vcpu_id, esr_ec), + + TP_STRUCT__entry( + __field(unsigned int, vcpu_id) + __field(unsigned int, esr_ec) + ), + + TP_fast_assign( + __entry->vcpu_id = vcpu_id; + __entry->esr_ec = esr_ec; + ), + + TP_printk("VCPU %u: HSR_EC=0x%04x (%s)", + __entry->vcpu_id, + __entry->esr_ec, + __print_symbolic(__entry->esr_ec, kvm_arm_exception_class)) +); + +TRACE_EVENT(kvm_trap_exit, + TP_PROTO(unsigned int vcpu_id), + TP_ARGS(vcpu_id), + + TP_STRUCT__entry( + __field(unsigned int, vcpu_id) + ), + + TP_fast_assign( + __entry->vcpu_id = vcpu_id; + ), + + TP_printk("VCPU %u", __entry->vcpu_id) +); + TRACE_EVENT(kvm_wfx_arm64, TP_PROTO(unsigned long vcpu_pc, bool is_wfe), TP_ARGS(vcpu_pc, is_wfe), -- 2.33.0

2 3

2024

2023

2022

2021

2020

2019

Kernel