- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10 v2] net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()
by Dapeng Yu 06 Dec '23

06 Dec '23

From: YueHaibing <yuehaibing(a)huawei.com> mainline inclusion from mainline-v6.2-rc1 commit a068d33e542f5d5be2e5de3cf1122c4347d3e2af category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8LOJU Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- eeprom_ptrs should be freed before returned. Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Dapeng Yu <dapeng.yu(a)windriver.com> --- v2: * remove lines from commit message to pass format check drivers/net/ethernet/netswift/txgbe/txgbe_hw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c b/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c index 55f98a55f4b6..929f03c42132 100644 --- a/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c +++ b/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c @@ -6925,6 +6925,7 @@ s32 txgbe_calc_eeprom_checksum(struct txgbe_hw *hw) eeprom_ptrs); if (status) { DEBUGOUT("Failed to read EEPROM image\n"); + kvfree(eeprom_ptrs); return status; } local_buffer = eeprom_ptrs; -- 2.43.0

2 1

[PATCH OLK-6.6 01/17] mm: export symbol find_get_task_by_vpid
by Yuan Can 06 Dec '23

06 Dec '23

From: Jean-Philippe Brucker <jean-philippe.brucker(a)arm.com> maillist inclusion category: feature bugzilla: 51855 Reference: https://jpbrucker.net/git/linux/commit/?h=sva/2021-03-01&id=176b3454e53ffdd… --------------------------------------------- Userspace drivers implemented with VFIO might want to bind sub-processes to their devices. In a VFIO ioctl, they provide a pid that is used to find a task and its mm. Since VFIO can be built as a module, export the find_get_task_by_vpid symbol. Signed-off-by: Jean-Philippe Brucker <jean-philippe(a)linaro.org> Signed-off-by: Lijun Fang <fanglijun3(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/pid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/pid.c b/kernel/pid.c index 6500ef956f2f..383abde0c208 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -437,6 +437,7 @@ struct task_struct *find_get_task_by_vpid(pid_t nr) return task; } +EXPORT_SYMBOL_GPL(find_get_task_by_vpid); struct pid *get_task_pid(struct task_struct *task, enum pid_type type) { -- 2.17.1

3 19

[PATCH OLK-5.10] net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum()
by Dapeng Yu 06 Dec '23

06 Dec '23

From: YueHaibing <yuehaibing(a)huawei.com> mainline inclusion from mainline-v6.2 commit a068d33e542f5d5be2e5de3cf1122c4347d3e2af category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8LOJU CVE: NA backport: OLK-5.10, openEuler-22.03-LTS, openEuler-22.03-LTS-SP1, openEuler-22.03-LTS-SP2 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- eeprom_ptrs should be freed before returned. Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Dapeng Yu <dapeng.yu(a)windriver.com> --- drivers/net/ethernet/netswift/txgbe/txgbe_hw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c b/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c index 55f98a55f4b6..929f03c42132 100644 --- a/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c +++ b/drivers/net/ethernet/netswift/txgbe/txgbe_hw.c @@ -6925,6 +6925,7 @@ s32 txgbe_calc_eeprom_checksum(struct txgbe_hw *hw) eeprom_ptrs); if (status) { DEBUGOUT("Failed to read EEPROM image\n"); + kvfree(eeprom_ptrs); return status; } local_buffer = eeprom_ptrs; -- 2.43.0

2 1

[PATCH OLK-5.10 v2] hinic: ethtool: Allow userspace to set more aggregation params
by Xiongfeng Wang 06 Dec '23

06 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8M4TP CVE: NA -------------------------------- Allow userspace to set the following interrupt aggregation params by ethtool: Adaptive RX:on/off rx/tx-usecs rx/tx-usecs-low/high rx/tx-frames rx/tx-frames-low/high Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> --- drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index 26d695684cfb..a271e38d8618 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -2412,6 +2412,9 @@ static const struct ethtool_ops hinic_ethtool_ops = { static const struct ethtool_ops hinicvf_ethtool_ops = { .supported_coalesce_params = ETHTOOL_COALESCE_USECS | + ETHTOOL_COALESCE_MAX_FRAMES | + ETHTOOL_COALESCE_USECS_LOW_HIGH | + ETHTOOL_COALESCE_MAX_FRAMES_LOW_HIGH | ETHTOOL_COALESCE_PKT_RATE_RX_USECS, .get_link_ksettings = hinic_get_link_ksettings, .get_drvinfo = hinic_get_drvinfo, -- 2.20.1

2 1

[PATCH OLK-5.10] hinic: ethtool: Allow userspace to set more aggregation params
by Xiongfeng Wang 06 Dec '23

06 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8M4TP CVE: NA -------------------------------- Allow userspace to set the following interrupt aggregation params by ethtool: Adaptive RX:on/off rx/tx-usecs rx/tx-usecs-low/high rx/tx-frames rx/tx-frames-low/high Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> --- drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index 26d695684cfb..b65683b0548e 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -2411,8 +2411,12 @@ static const struct ethtool_ops hinic_ethtool_ops = { }; static const struct ethtool_ops hinicvf_ethtool_ops = { - .supported_coalesce_params = ETHTOOL_COALESCE_USECS | - ETHTOOL_COALESCE_PKT_RATE_RX_USECS, + .supported_coalesce_params = ETHTOOL_COALESCE_USECS | + ETHTOOL_COALESCE_MAX_FRAMES | + ETHTOOL_COALESCE_USECS_LOW_HIGH | + ETHTOOL_COALESCE_MAX_FRAMES_LOW_HIGH | + ETHTOOL_COALESCE_PKT_RATE_RX_USECS, + .get_link_ksettings = hinic_get_link_ksettings, .get_drvinfo = hinic_get_drvinfo, .get_msglevel = hinic_get_msglevel, -- 2.20.1

2 1

[PATCH OLK-5.10] md/raid5: fix miscalculation of 'end_sector' in raid5_read_one_chunk()
by Li Nan 06 Dec '23

06 Dec '23

From: Yu Kuai <yukuai3(a)huawei.com> mainline inclusion from mainline-v6.4-rc5 commit 8557dc27126949c702bd3aafe8a7e0b7e4fcb44c category: bugfix bugzilla: 189405, https://gitee.com/openeuler/kernel/issues/I8LZMK Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- 'end_sector' is compared to 'rdev->recovery_offset', which is offset to rdev, however, commit e82ed3a4fbb5 ("md/raid6: refactor raid5_read_one_chunk") changes the calculation of 'end_sector' to offset to the array. Fix this miscalculation. Fixes: e82ed3a4fbb5 ("md/raid6: refactor raid5_read_one_chunk") Cc: stable(a)vger.kernel.org # v5.12+ Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Song Liu <song(a)kernel.org> Link: https://lore.kernel.org/r/20230524014118.3172781-1-yukuai1@huaweicloud.com Conflict: Commit 2c897e63a100 ("[Backport] md/raid6: refactor raid5_read_one_chunk") missed the space of the previous line. Signed-off-by: Li Nan <linan122(a)huawei.com> --- drivers/md/raid5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 5af25898baad..b4d004b623e7 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5408,8 +5408,8 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio) } sector = raid5_compute_sector(conf, raid_bio->bi_iter.bi_sector, 0, - &dd_idx, NULL); - end_sector = bio_end_sector(raid_bio); + &dd_idx, NULL); + end_sector = sector + bio_sectors(raid_bio); rcu_read_lock(); if (r5c_big_stripe_cached(conf, sector)) -- 2.39.2

2 1

[PATCH OLK-5.10 00/27] KVM/arm64: support vtimer/virt_dev irqbypass
by Dongxu Sun 06 Dec '23

06 Dec '23

Dongxu Sun (1): KVM: arm64: update arm64 openeuler_defconfig for CONFIG_VIRT_PLAT_DEV Haibin Wang (2): KVM: arm64: arch_timer: Probe vtimer irqbypass capability KVM: arm64: arch_timer: Rework vcpu init/reset logic Kunkun Jiang (6): mbigen: vtimer mbigen driver support irqchip/gic-v4.1: Detect ITS vtimer interrupt bypass capability irqchip/gic-v4.1: Extend VSGI command to support the new vPPI mbigen: vtimer: add support for MBIX1_CPPI_NEGEDGE_CLR_EN_SETR(CLRR) KVM: arm64: vgic-v3: Clearing pending status of vtimer on guest reset mbigen: Sets the regs related to vtimer irqbypass Zenghui Yu (4): KVM: arm64: GICv4.1: Add direct injection capability to PPI registers KVM: arm64: GICv4.1: Allow non-trapping WFI when using direct vtimer interrupt KVM: arm64: vtimer: Expose HW-based vtimer interrupt in debugfs KVM: arm64: arch_timer: Make vtimer_irqbypass a Distributor attr wanghaibin (14): irqchip/gic-v4.1: Rework get/set_irqchip_state callbacks of GICv4.1-sgi chip irqchip/gic-v4.1: Rework its_alloc_vcpu_sgis() to support vPPI allocation irqchip/gic-v4.1: Probe vtimer irqbypass capability at RD level KVM: arm64: GICv4.1: Inform the HiSilicon vtimer irqbypass capability KVM: arm64: vgic: Add helper for vtimer vppi info register KVM: arm64: GICv4.1: Enable vtimer vPPI irqbypass config KVM: arm64: GICv4.1: Add support for MBIGEN save/restore irqchip/gic-v3-its: Introduce the reserved device ID pools irqchip/gic-v3-its: Alloc/Free device id from pools for virtual devices irqchip/gic-v3-its: Add virt platform devices MSI support virt_plat_dev: Register the virt platform device driver KVM: arm64: Introduce shadow device KVM: arm64: kire: irq routing entry cached the relevant cache data KVM: arm64: sdev: Support virq bypass by INT/VSYNC command arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/kvm_emulate.h | 1 + arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arch_timer.c | 218 +++++++- arch/arm64/kvm/arm.c | 42 ++ arch/arm64/kvm/vgic/shadow_dev.c | 327 ++++++++++++ arch/arm64/kvm/vgic/vgic-debug.c | 2 +- arch/arm64/kvm/vgic/vgic-init.c | 6 + arch/arm64/kvm/vgic/vgic-irqfd.c | 39 ++ arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 +- arch/arm64/kvm/vgic/vgic-mmio.c | 24 +- arch/arm64/kvm/vgic/vgic-v3.c | 8 + arch/arm64/kvm/vgic/vgic-v4.c | 57 +++ arch/arm64/kvm/vgic/vgic.c | 24 + arch/arm64/kvm/vgic/vgic.h | 11 + drivers/irqchip/irq-gic-phytium-2500-its.c | 2 +- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 39 +- drivers/irqchip/irq-gic-v3-its.c | 277 +++++++++- drivers/irqchip/irq-gic-v3.c | 37 +- drivers/irqchip/irq-gic-v4.c | 23 +- drivers/irqchip/irq-mbigen.c | 472 ++++++++++++++++++ drivers/misc/Kconfig | 9 + drivers/misc/Makefile | 1 + drivers/misc/virt_plat_dev.c | 119 +++++ include/clocksource/arm_arch_timer.h | 15 + include/kvm/arm_arch_timer.h | 13 + include/kvm/arm_vgic.h | 62 +++ include/linux/irqchip/arm-gic-common.h | 3 + include/linux/irqchip/arm-gic-v3.h | 49 +- include/linux/irqchip/arm-gic-v4.h | 6 +- include/linux/kvm_host.h | 9 + include/linux/msi.h | 2 + include/uapi/linux/kvm.h | 9 + virt/kvm/eventfd.c | 8 + 34 files changed, 1869 insertions(+), 63 deletions(-) create mode 100644 arch/arm64/kvm/vgic/shadow_dev.c create mode 100644 drivers/misc/virt_plat_dev.c -- 2.33.0

1 27

[PATCH OLK-6.6 0/3] cgroupv1 enable writeback
by chenridong 05 Dec '23

05 Dec '23

Lu Jialin (3): cgroup: Add cgroup1_get_from_id() cgroup: support cgroup writeback on cgroupv1 openeuler_defconfig: enable CONFIG_CGROUP_V1_WRITEBACK in openeuler_defconfig for x86 and arm64 arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + block/blk-cgroup.c | 3 + block/blk-cgroup.h | 3 + include/linux/backing-dev.h | 29 +++++- include/linux/cgroup-defs.h | 2 + include/linux/cgroup.h | 3 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 46 +++++++++- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 289 insertions(+), 9 deletions(-) -- 2.34.1

2 5

[PATCH OLK-6.6 v5 0/2] ipvlan: Introduce l2e mode
by Zhengchao Shao 05 Dec '23

05 Dec '23

Inherited features of olk5.10 version. Keefe LIU (2): ipvlan: Introduce l2e mode ipvlan: Introduce local xmit queue for l2e mode drivers/net/Kconfig | 7 + drivers/net/ipvlan/ipvlan.h | 11 ++ drivers/net/ipvlan/ipvlan_core.c | 232 +++++++++++++++++++++++++++++++ drivers/net/ipvlan/ipvlan_main.c | 103 +++++++++++++- include/uapi/linux/if_link.h | 1 + 5 files changed, 352 insertions(+), 2 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6] block: fix inaccurate io_ticks by set 'precise_iostat'
by Li Lingfeng 05 Dec '23

05 Dec '23

From: Zhang Wensheng <zhangwensheng5(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8M01Q CVE: NA -------------------------------- After introducing commit 5b18b5a73760 ("block: delete part_round_stats and switch to less precise counting"), '%util' accounted by iostat will be over reality data. In fact, the device is quite idle, but iostat may show '%util' as a big number (e.g. 50%). It can produce by fio: fio --name=1 --direct=1 --bs=4k --rw=read --filename=/dev/sda \ --thinktime=4ms --runtime=180 We fix this by using a switch(precise_iostat=1) to control whether or not acconut ioticks precisely. fixes: 5b18b5a73760 ("block: delete part_round_stats and switch to less precise counting") Signed-off-by: Zhang Wensheng <zhangwensheng5(a)huawei.com> Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Conflicts: block/blk-core.c block/blk-merge.c block/genhd.c include/linux/blkdev.h Signed-off-by: Li Lingfeng <lilingfeng3(a)huawei.com> --- block/blk-core.c | 25 +++++++++++++++++++++++-- block/blk-merge.c | 2 ++ block/blk-mq.c | 4 ++++ block/genhd.c | 2 +- include/linux/blkdev.h | 2 ++ 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index fdf25b8d6e78..16d645532ce9 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -61,6 +61,22 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert); static DEFINE_IDA(blk_queue_ida); +bool precise_iostat; + +static int __init precise_iostat_setup(char *str) +{ + bool precise; + + if (!strtobool(str, &precise)) { + precise_iostat = precise; + pr_info("precise iostat %d\n", precise_iostat); + } + + return 1; +} +__setup("precise_iostat=", precise_iostat_setup); + + /* * For queue allocation */ @@ -940,9 +956,14 @@ void update_io_ticks(struct block_device *part, unsigned long now, bool end) unsigned long stamp; again: stamp = READ_ONCE(part->bd_stamp); - if (unlikely(time_after(now, stamp))) { - if (likely(try_cmpxchg(&part->bd_stamp, &stamp, now))) + if (unlikely(time_after(now, stamp)) && + likely(try_cmpxchg(&part->bd_stamp, &stamp, now))) { + if (precise_iostat) { + if (end || part_in_flight(part)) + __part_stat_add(part, io_ticks, now - stamp); + } else { __part_stat_add(part, io_ticks, end ? now - stamp : 1); + } } if (part->bd_partno) { part = bdev_whole(part); diff --git a/block/blk-merge.c b/block/blk-merge.c index 65e75efa9bd3..463611c7c944 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -783,6 +783,8 @@ static void blk_account_io_merge_request(struct request *req) if (blk_do_io_stat(req)) { part_stat_lock(); part_stat_inc(req->part, merges[op_stat_group(req_op(req))]); + if (precise_iostat) + part_stat_local_dec(req->part, in_flight[rq_data_dir(req)]); part_stat_unlock(); } } diff --git a/block/blk-mq.c b/block/blk-mq.c index 6ab7f360ff2a..387528a9f3df 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -994,6 +994,8 @@ static inline void blk_account_io_done(struct request *req, u64 now) update_io_ticks(req->part, jiffies, true); part_stat_inc(req->part, ios[sgrp]); part_stat_add(req->part, nsecs[sgrp], now - req->start_time_ns); + if (precise_iostat) + part_stat_local_dec(req->part, in_flight[rq_data_dir(req)]); part_stat_unlock(); } } @@ -1016,6 +1018,8 @@ static inline void blk_account_io_start(struct request *req) part_stat_lock(); update_io_ticks(req->part, jiffies, false); + if (precise_iostat) + part_stat_local_inc(req->part, in_flight[rq_data_dir(req)]); part_stat_unlock(); } } diff --git a/block/genhd.c b/block/genhd.c index cc32a0c704eb..8cf16dc7e195 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -118,7 +118,7 @@ static void part_stat_read_all(struct block_device *part, } } -static unsigned int part_in_flight(struct block_device *part) +unsigned int part_in_flight(struct block_device *part) { unsigned int inflight = 0; int cpu; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index eef450f25982..99c2e6aa5e10 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -25,6 +25,7 @@ #include <linux/uuid.h> #include <linux/xarray.h> +extern bool precise_iostat; struct module; struct request_queue; struct elevator_queue; @@ -832,6 +833,7 @@ dev_t part_devt(struct gendisk *disk, u8 partno); void inc_diskseq(struct gendisk *disk); void blk_request_module(dev_t devt); +extern unsigned int part_in_flight(struct block_device *part); extern int blk_register_queue(struct gendisk *disk); extern void blk_unregister_queue(struct gendisk *disk); void submit_bio_noacct(struct bio *bio); -- 2.31.1

2 1