- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] amba-pl011: Fix no irq issue due to no IRQ domain found
by Lin Yujun 12 Dec '23

12 Dec '23

From: Lin Ruizhe <linruizhe(a)huawei.com> hulk inclusion category: bugfix bugzilla: 176552 https://gitee.com/openeuler/kernel/issues/I4DDEL ------------------------------------------------- If pl011 interrupt is connected to MBIGEN interrupt controller, because the mbigen initialization is too late, which will lead to no IRQ due to no IRQ domain found, logs is shown below, "irq: no irq domain found for uart0 !" When dev->irq[0] is zero, try to get IRQ by of_irq_get() again, and return -EPROBE_DEFER if the IRQ domain is not yet created. Using deferred probing mechanism to fix the issue. Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Lin ruizhe <linruizhe(a)huawei.com> Signed-off-by: He Ying <heying24(a)huawei.com> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> conflicts: drivers/tty/serial/amba-pl011.c Signed-off-by: Lin Yujun <linyujun809(a)huawei.com> --- drivers/tty/serial/amba-pl011.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 3dc9b0fcab1c..648f99d4774c 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2815,10 +2815,20 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) uap->vendor = vendor; uap->fifosize = vendor->get_fifosize(dev); uap->port.iotype = vendor->access_32b ? UPIO_MEM32 : UPIO_MEM; - uap->port.irq = dev->irq[0]; uap->port.ops = &amba_pl011_pops; uap->port.rs485_config = pl011_rs485_config; uap->port.rs485_supported = pl011_rs485_supported; + + /* if no irq domain found, irq number is 0, try again */ + if (!dev->irq[0] && dev->dev.of_node) { + ret = of_irq_get(dev->dev.of_node, 0); + if (ret < 0) + return ret; + dev->irq[0] = ret; + } + + uap->port.irq = dev->irq[0]; + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); if (device_property_read_u32(&dev->dev, "reg-io-width", &val) == 0) { -- 2.34.1

3 2

[PATCH OLK-6.6] x86/ioapic: add an interface for driver to sync hardware data into memory
by Lin Yujun 12 Dec '23

12 Dec '23

From: Hongbo Yao <yaohongbo(a)huawei.com> hulk inclusion category: bugfix bugzilla: 20890, https://gitee.com/openeuler/kernel/issues/I5ZV1W -------------------------------- The default interrupt trigger mode of Pci driver is Level, however, some pci drivers want to change irq trigger mode to edge by writing hardware register directly. In current kernel, this kind of driver needs to sync entry data which has already been reservd in memory. This patch provides an interface for the driver to sync entry data in memory. Signed-off-by: Hongbo Yao <yaohongbo(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Reviewed-by: Zhang Jianhua <chris.zjh(a)huawei.com> Reviewed-by: Liao Chang <liaochang1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: Lin Yujun <linyujun809(a)huawei.com> --- arch/x86/include/asm/io_apic.h | 1 + arch/x86/kernel/apic/io_apic.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 51c782600e02..435ae723a238 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -174,6 +174,7 @@ extern void clear_IO_APIC(void); extern void restore_boot_irq_mode(void); extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin); extern void print_IO_APICs(void); +extern void ioapic_sync_hardware_data(int irq); #else /* !CONFIG_X86_IO_APIC */ #define IO_APIC_IRQ(x) 0 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 00da6cf6b07d..d256e0b57e94 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1202,6 +1202,31 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); +/* + * The function is only provided for Drivers to keep the data value in + * memory consistent with the value of the register, and these drivers + * must use it carefully. + * + * The correct step should be: + * Change register ---> ioapic_sync_hardware_data ---> request_irq + */ +void ioapic_sync_hardware_data(int irq) +{ + struct IO_APIC_route_entry entry; + struct mp_chip_data *data; + struct irq_pin_list *pin_list; + + data = irq_get_chip_data(irq); + for_each_irq_pin(pin_list, data->irq_2_pin) { + entry = ioapic_read_entry(pin_list->apic, pin_list->pin); + data->entry.trigger = entry.trigger; + data->entry.polarity = entry.polarity; + pr_debug("irq[%d] update trigger[%d] polarity[%d]\n", + irq, entry.trigger, entry.polarity); + } +} +EXPORT_SYMBOL(ioapic_sync_hardware_data); + static struct irq_chip ioapic_chip, ioapic_ir_chip; static void __init setup_IO_APIC_irqs(void) -- 2.34.1

2 1

[PATCH OLK-6.6 0/9] files cgroup featrue
by chenridong 12 Dec '23

12 Dec '23

Binder Makin (1): cgroups: Resource controller for open files Hou Tao (1): cgroup/files: use task_get_css() to get a valid css during dup_fd() Lu Jialin (3): enable CONFIG_CGROUP_FILES in openeuler_defconfig for x86 and arm64 fs: fix files.usage bug when move tasks fs/filescontrol.c: fix warning:large integer implicitly truncated to unsigned type Yang Yingliang (1): cgroup/files: support boot parameter to control if disable files cgroup Yu Kuai (1): fs/filescontrol: add a switch to enable / disable accounting of open fds Zhang Xiaoxu (2): files_cgroup: fix error pointer when kvm_vm_worker_thread files_cgroup: Fix soft lockup when refcnt overflow. .../admin-guide/kernel-parameters.txt | 7 +- arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/Makefile | 1 + fs/file.c | 63 +++- fs/filescontrol.c | 312 ++++++++++++++++++ include/linux/cgroup-defs.h | 8 +- include/linux/cgroup_subsys.h | 6 + include/linux/fdtable.h | 1 + include/linux/filescontrol.h | 40 +++ init/Kconfig | 10 + 11 files changed, 442 insertions(+), 8 deletions(-) create mode 100644 fs/filescontrol.c create mode 100644 include/linux/filescontrol.h -- 2.34.1

2 10

[PATCH OLK-6.6 0/9] files cgroup enble
by chenridong 11 Dec '23

11 Dec '23

Binder Makin (1): cgroups: Resource controller for open files Hou Tao (1): cgroup/files: use task_get_css() to get a valid css during dup_fd() Lu Jialin (3): enable CONFIG_CGROUP_FILES in openeuler_defconfig for x86 and arm64 fs: fix files.usage bug when move tasks fs/filescontrol.c: fix warning:large integer implicitly truncated to unsigned type Yang Yingliang (1): cgroup/files: support boot parameter to control if disable files cgroup Yu Kuai (1): fs/filescontrol: add a switch to enable / disable accounting of open fds Zhang Xiaoxu (2): files_cgroup: fix error pointer when kvm_vm_worker_thread files_cgroup: Fix soft lockup when refcnt overflow. .../admin-guide/kernel-parameters.txt | 7 +- arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/Makefile | 1 + fs/file.c | 63 +++- fs/filescontrol.c | 312 ++++++++++++++++++ include/linux/cgroup-defs.h | 8 +- include/linux/cgroup_subsys.h | 6 + include/linux/fdtable.h | 1 + include/linux/filescontrol.h | 40 +++ init/Kconfig | 10 + 11 files changed, 442 insertions(+), 8 deletions(-) create mode 100644 fs/filescontrol.c create mode 100644 include/linux/filescontrol.h -- 2.34.1

2 10

[PATCH openEuler-1.0-LTS] tun: avoid double free in tun_free_netdev
by Ziyang Xuan 11 Dec '23

11 Dec '23

From: George Kennedy <george.kennedy(a)oracle.com> mainline inclusion from mainline-v5.16-rc7 commit 158b515f703e75e7d68289bf4d98c664e1d632df category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8NHAP CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ------------------------------- Avoid double free in tun_free_netdev() by moving the dev->tstats and tun->security allocs to a new ndo_init routine (tun_net_init()) that will be called by register_netdevice(). ndo_init is paired with the desctructor (tun_free_netdev()), so if there's an error in register_netdevice() the destructor will handle the frees. BUG: KASAN: double-free or invalid-free in selinux_tun_dev_free_security+0x1a/0x20 security/selinux/hooks.c:5605 CPU: 0 PID: 25750 Comm: syz-executor416 Not tainted 5.16.0-rc2-syzk #1 Hardware name: Red Hat KVM, BIOS Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x89/0xb5 lib/dump_stack.c:106 print_address_description.constprop.9+0x28/0x160 mm/kasan/report.c:247 kasan_report_invalid_free+0x55/0x80 mm/kasan/report.c:372 ____kasan_slab_free mm/kasan/common.c:346 [inline] __kasan_slab_free+0x107/0x120 mm/kasan/common.c:374 kasan_slab_free include/linux/kasan.h:235 [inline] slab_free_hook mm/slub.c:1723 [inline] slab_free_freelist_hook mm/slub.c:1749 [inline] slab_free mm/slub.c:3513 [inline] kfree+0xac/0x2d0 mm/slub.c:4561 selinux_tun_dev_free_security+0x1a/0x20 security/selinux/hooks.c:5605 security_tun_dev_free_security+0x4f/0x90 security/security.c:2342 tun_free_netdev+0xe6/0x150 drivers/net/tun.c:2215 netdev_run_todo+0x4df/0x840 net/core/dev.c:10627 rtnl_unlock+0x13/0x20 net/core/rtnetlink.c:112 __tun_chr_ioctl+0x80c/0x2870 drivers/net/tun.c:3302 tun_chr_ioctl+0x2f/0x40 drivers/net/tun.c:3311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x19d/0x220 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3a/0x80 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae Reported-by: syzkaller <syzkaller(a)googlegroups.com> Signed-off-by: George Kennedy <george.kennedy(a)oracle.com> Suggested-by: Jakub Kicinski <kuba(a)kernel.org> Link: https://lore.kernel.org/r/1639679132-19884-1-git-send-email-george.kennedy@… Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Conflicts: drivers/net/tun.c Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> --- drivers/net/tun.c | 111 +++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a6b233a01f35..e9b8a68b350a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -248,6 +248,9 @@ struct tun_struct { struct tun_prog __rcu *steering_prog; struct tun_prog __rcu *filter_prog; struct ethtool_link_ksettings link_ksettings; + /* init args */ + struct file *file; + struct ifreq *ifr; }; struct veth { @@ -273,6 +276,9 @@ void *tun_ptr_to_xdp(void *ptr) } EXPORT_SYMBOL(tun_ptr_to_xdp); +static void tun_flow_init(struct tun_struct *tun); +static void tun_flow_uninit(struct tun_struct *tun); + static int tun_napi_receive(struct napi_struct *napi, int budget) { struct tun_file *tfile = container_of(napi, struct tun_file, napi); @@ -1030,6 +1036,49 @@ static int check_filter(struct tap_filter *filter, const struct sk_buff *skb) static const struct ethtool_ops tun_ethtool_ops; +static int tun_net_init(struct net_device *dev) +{ + struct tun_struct *tun = netdev_priv(dev); + struct ifreq *ifr = tun->ifr; + int err; + + tun->pcpu_stats = netdev_alloc_pcpu_stats(struct tun_pcpu_stats); + if (!tun->pcpu_stats) + return -ENOMEM; + + spin_lock_init(&tun->lock); + + err = security_tun_dev_alloc_security(&tun->security); + if (err < 0) { + free_percpu(tun->pcpu_stats); + return err; + } + + tun_flow_init(tun); + + dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | + TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX; + dev->features = dev->hw_features | NETIF_F_LLTX; + dev->vlan_features = dev->features & + ~(NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX); + + tun->flags = (tun->flags & ~TUN_FEATURES) | + (ifr->ifr_flags & TUN_FEATURES); + + INIT_LIST_HEAD(&tun->disabled); + err = tun_attach(tun, tun->file, false, ifr->ifr_flags & IFF_NAPI, + ifr->ifr_flags & IFF_NAPI_FRAGS, false); + if (err < 0) { + tun_flow_uninit(tun); + security_tun_dev_free_security(tun->security); + free_percpu(tun->pcpu_stats); + return err; + } + return 0; +} + /* Net device detach from fd. */ static void tun_net_uninit(struct net_device *dev) { @@ -1260,6 +1309,7 @@ static int tun_xdp(struct net_device *dev, struct netdev_bpf *xdp) } static const struct net_device_ops tun_netdev_ops = { + .ndo_init = tun_net_init, .ndo_uninit = tun_net_uninit, .ndo_open = tun_net_open, .ndo_stop = tun_net_close, @@ -1339,6 +1389,7 @@ static int tun_xdp_tx(struct net_device *dev, struct xdp_buff *xdp) } static const struct net_device_ops tap_netdev_ops = { + .ndo_init = tun_net_init, .ndo_uninit = tun_net_uninit, .ndo_open = tun_net_open, .ndo_stop = tun_net_close, @@ -1378,7 +1429,7 @@ static void tun_flow_uninit(struct tun_struct *tun) #define MAX_MTU 65535 /* Initialize net device. */ -static void tun_net_init(struct net_device *dev) +static void tun_net_initialize(struct net_device *dev) { struct tun_struct *tun = netdev_priv(dev); @@ -2633,9 +2684,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) if (!dev) return -ENOMEM; - err = dev_get_valid_name(net, dev, name); - if (err < 0) - goto err_free_dev; dev_net_set(dev, net); dev->rtnl_link_ops = &tun_link_ops; @@ -2654,42 +2702,17 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) tun->rx_batched = 0; RCU_INIT_POINTER(tun->steering_prog, NULL); - tun->pcpu_stats = netdev_alloc_pcpu_stats(struct tun_pcpu_stats); - if (!tun->pcpu_stats) { - err = -ENOMEM; - goto err_free_dev; - } - - spin_lock_init(&tun->lock); - - err = security_tun_dev_alloc_security(&tun->security); - if (err < 0) - goto err_free_stat; - - tun_net_init(dev); - tun_flow_init(tun); - - dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | - TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | - NETIF_F_HW_VLAN_STAG_TX; - dev->features = dev->hw_features | NETIF_F_LLTX; - dev->vlan_features = dev->features & - ~(NETIF_F_HW_VLAN_CTAG_TX | - NETIF_F_HW_VLAN_STAG_TX); + tun->ifr = ifr; + tun->file = file; - tun->flags = (tun->flags & ~TUN_FEATURES) | - (ifr->ifr_flags & TUN_FEATURES); - - INIT_LIST_HEAD(&tun->disabled); - err = tun_attach(tun, file, false, ifr->ifr_flags & IFF_NAPI, - ifr->ifr_flags & IFF_NAPI_FRAGS, false); - if (err < 0) - goto err_free_flow; + tun_net_initialize(dev); err = register_netdevice(tun->dev); - if (err < 0) - goto err_detach; - /* free_netdev() won't check refcnt, to aovid race + if (err < 0) { + free_netdev(dev); + return err; + } + /* free_netdev() won't check refcnt, to avoid race * with dev_put() we need publish tun after registration. */ rcu_assign_pointer(tfile->tun, tun); @@ -2707,20 +2730,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) strcpy(ifr->ifr_name, tun->dev->name); return 0; - -err_detach: - tun_detach_all(dev); - /* register_netdevice() already called tun_free_netdev() */ - goto err_free_dev; - -err_free_flow: - tun_flow_uninit(tun); - security_tun_dev_free_security(tun->security); -err_free_stat: - free_percpu(tun->pcpu_stats); -err_free_dev: - free_netdev(dev); - return err; } static void tun_get_iff(struct net *net, struct tun_struct *tun, -- 2.25.1

2 1

[PATCH OLK-5.10 v3] smart_grid: cpufreq: clear offline and isolated CPU in warm CPUs
by Yipeng Zou 11 Dec '23

11 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MFO6 CVE: NA ---------------------------------------- When there has some CPU has been offline or isolated, the warm zone CPUs will not clear these CPUs. Because of the warm zone were saluted by a complement of hot zone. So, we need to clear offline and isolated CPUs in every time's warm zone CPUs update. Fixes: 6a00891859d8 ("smart_grid: cpufreq: introduce smart_grid cpufreq control") Signed-off-by: Yipeng Zou <zouyipeng(a)huawei.com> Tested-by: jifa <jifa(a)huawei.com> --- kernel/sched/grid/qos.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/sched/grid/qos.c b/kernel/sched/grid/qos.c index f8c5deffd3ea..7ee3687347ce 100644 --- a/kernel/sched/grid/qos.c +++ b/kernel/sched/grid/qos.c @@ -179,6 +179,7 @@ int sched_grid_zone_update(bool is_locked) raw_spin_lock_irqsave(&sg_zone.lock, flags); cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_HOT]); + cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_WARM]); list_for_each(pos, &sg_zone.af_list_head) { af_pos = list_entry(pos, struct auto_affinity, af_list); @@ -190,10 +191,14 @@ int sched_grid_zone_update(bool is_locked) cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_HOT], &sg_zone.cpus[SMART_GRID_ZONE_HOT], af_pos->ad.domains[af_pos->ad.curr_level]); + /* Update warm zone CPUs to max level first */ + cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + af_pos->ad.domains[af_pos->ad.dcount - 1]); } - cpumask_complement(&sg_zone.cpus[SMART_GRID_ZONE_WARM], - &sg_zone.cpus[SMART_GRID_ZONE_HOT]); + /* Then reset warm zone CPUs without hot zone CPUs */ + cpumask_andnot(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + &sg_zone.cpus[SMART_GRID_ZONE_HOT]); if (!is_locked) raw_spin_unlock_irqrestore(&sg_zone.lock, flags); -- 2.34.1

2 1

[PATCH OLK-6.6 0/9] files cgroup enable
by chenridong 11 Dec '23

11 Dec '23

Binder Makin (1): cgroups: Resource controller for open files Hou Tao (1): cgroup/files: use task_get_css() to get a valid css during dup_fd() Lu Jialin (3): enable CONFIG_CGROUP_FILES in openeuler_defconfig for x86 and arm64 fs: fix files.usage bug when move tasks fs/filescontrol.c: fix warning:large integer implicitly truncated to unsigned type Yang Yingliang (1): cgroup/files: support boot parameter to control if disable files cgroup Yu Kuai (1): fs/filescontrol: add a switch to enable / disable accounting of open fds Zhang Xiaoxu (2): files_cgroup: fix error pointer when kvm_vm_worker_thread files_cgroup: Fix soft lockup when refcnt overflow. .../admin-guide/kernel-parameters.txt | 7 +- arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/Makefile | 1 + fs/file.c | 63 +++- fs/filescontrol.c | 312 ++++++++++++++++++ include/linux/cgroup-defs.h | 8 +- include/linux/cgroup_subsys.h | 6 + include/linux/fdtable.h | 1 + include/linux/filescontrol.h | 40 +++ init/Kconfig | 10 + 11 files changed, 442 insertions(+), 8 deletions(-) create mode 100644 fs/filescontrol.c create mode 100644 include/linux/filescontrol.h -- 2.34.1

2 10

[PATCH OLK-6.6 v4 0/7] Ascend features
by Yuan Can 11 Dec '23

11 Dec '23

Jian Zhang (1): memcontrol: Add oom recover for kmemcg when release buddy hugepage Navid Emamdoost (1): nbd_genl_status: null check for nla_nest_start Weilong Chen (2): ACPI / APEI: Notify all ras err to driver arm64/ascend: Add new enable_oom_killer interface for oom contrl Xu Qiang (2): irq-gic-v3: Add support to init ts core GICR irq-gic-v3-its: It can't be initialized when the GICR had been cut Yuan Can (1): ascend: export interfaces required by ascend drivers arch/arm64/configs/openeuler_defconfig | 1 + drivers/acpi/apei/Kconfig | 7 + drivers/acpi/apei/ghes.c | 8 +- drivers/block/nbd.c | 6 + drivers/irqchip/Kconfig | 10 + drivers/irqchip/irq-gic-v3-its.c | 254 ++++++++++++++++++++++++- drivers/irqchip/irq-gic-v3.c | 101 +++++++++- include/linux/irqchip/arm-gic-v3.h | 5 + include/linux/oom.h | 26 +++ kernel/power/autosleep.c | 1 + kernel/workqueue.c | 3 + mm/Kconfig | 10 + mm/memcontrol.c | 14 ++ mm/oom_kill.c | 58 ++++++ mm/util.c | 2 + mm/vmalloc.c | 2 + 16 files changed, 499 insertions(+), 9 deletions(-) -- 2.17.1

3 10

[PATCH OLK-6.6 0/4] backport nbd bugfix patch
by Li Nan 11 Dec '23

11 Dec '23

Li Nan (4): nbd: fold nbd config initialization into nbd_alloc_config() nbd: factor out a helper to get nbd_config without holding 'config_lock' nbd: fix null-ptr-dereference while accessing 'nbd->config' nbd: pass nbd_sock to nbd_read_reply() instead of index drivers/block/nbd.c | 117 ++++++++++++++++++++++++++++---------------- 1 file changed, 75 insertions(+), 42 deletions(-) -- 2.39.2

2 5

[PATCH OLK-6.6] cgroup: Support iocost for cgroup v1
by Li Nan 11 Dec '23

11 Dec '23

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8ND38 --------------------------- Since iocost can only be used in cgroup v2, add it to v1 now. Signed-off-by: Li Nan <linan122(a)huawei.com> --- block/blk-iocost.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 089fcb9cfce3..d0bdb286632f 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3490,6 +3490,28 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, return ret; } +static struct cftype ioc_legacy_files[] = { + { + .name = "cost.weight", + .flags = CFTYPE_NOT_ON_ROOT, + .seq_show = ioc_weight_show, + .write = ioc_weight_write, + }, + { + .name = "cost.qos", + .flags = CFTYPE_ONLY_ON_ROOT, + .seq_show = ioc_qos_show, + .write = ioc_qos_write, + }, + { + .name = "cost.model", + .flags = CFTYPE_ONLY_ON_ROOT, + .seq_show = ioc_cost_model_show, + .write = ioc_cost_model_write, + }, + {} +}; + static struct cftype ioc_files[] = { { .name = "weight", @@ -3514,6 +3536,7 @@ static struct cftype ioc_files[] = { static struct blkcg_policy blkcg_policy_iocost = { .dfl_cftypes = ioc_files, + .legacy_cftypes = ioc_legacy_files, .cpd_alloc_fn = ioc_cpd_alloc, .cpd_free_fn = ioc_cpd_free, .pd_alloc_fn = ioc_pd_alloc, -- 2.39.2

2 1

[PATCH OLK-6.6 v2 0/1] Add config isolation for random initialization optimization
by GUO Zihua 11 Dec '23

11 Dec '23

This patch adds config isolating random bootup initialization optimization as it is required for all home-developed patches. v2: Fixed commit message. GUO Zihua (1): random: Added config for random boot optimization arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + drivers/char/random.c | 4 ++++ init/Kconfig | 11 +++++++++++ 4 files changed, 17 insertions(+) -- 2.34.1

2 2

[PATCH OLK-6.6 0/3] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 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 4

[PATCH OLK-6.6 0/1] Add config isolation for random initialization optimization
by GUO Zihua 11 Dec '23

11 Dec '23

This patch adds config isolating random bootup initialization optimization as it is required for all home-developed patches. GUO Zihua (1): random: Added config for random boot optimization arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + drivers/char/random.c | 4 ++++ init/Kconfig | 11 +++++++++++ 4 files changed, 17 insertions(+) -- 2.34.1

2 2

[PATCH OLK-6.6 v3 0/7] support userswap feature
by Peng Zhang 11 Dec '23

11 Dec '23

From: ZhangPeng <zhangpeng362(a)huawei.com> This patch series support userswap feature including registration, unregistration, swap-out and swap-in. Userswap feature depends on CONFIG_USERSWAP and can be enabled by cmdline enable_userswap. We tested the concurrent scenario of multi-threaded page fault and multi-threaded swap-in in the uswap demo;and the remapping in the swap-out phase and the copy-free function in the swap-in phase were ok. During the test, related debugging functions including CONFIG_DEBUG_VM, lockdep, slub debug, kasan and kmemleak are enabled. ChangeLog: v2->v3: - update patch 7 commit v1->v2: - enable CONFIG_USERSWAP for openeuler_defconfig ZhangPeng (7): mm/userswap: add VM_USWAP and SWP_USERSWAP_ENTRY mm/userswap: add enable_userswap boot option mm/userswap: introduce MREMAP_USWAP_SET_PTE mm/userswap: support userswap via userfaultfd mm/userswap: introduce UFFDIO_COPY_MODE_DIRECT_MAP mm/userswap: provide cpu info in userfault msg mm/userswap: openeuler_defconfig: enable userswap arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/proc/task_mmu.c | 3 + fs/userfaultfd.c | 43 +- include/linux/mm.h | 8 + include/linux/swap.h | 14 +- include/linux/swapops.h | 16 + include/linux/userfaultfd_k.h | 5 + include/linux/userswap.h | 60 +++ include/trace/events/mmflags.h | 7 + include/uapi/linux/mman.h | 1 + include/uapi/linux/userfaultfd.h | 3 + mm/Kconfig | 10 + mm/Makefile | 1 + mm/memory.c | 8 + mm/mremap.c | 8 +- mm/userfaultfd.c | 12 + mm/userswap.c | 552 +++++++++++++++++++++++++ 18 files changed, 747 insertions(+), 6 deletions(-) create mode 100644 include/linux/userswap.h create mode 100644 mm/userswap.c -- 2.25.1

2 16

[PATCH OLK-6.6 v3 0/7] support userswap feature
by Peng Zhang 11 Dec '23

11 Dec '23

From: ZhangPeng <zhangpeng362(a)huawei.com> This patch series support userswap feature including registration, unregistration, swap-out and swap-in. Userswap feature depends on CONFIG_USERSWAP and can be enabled by cmdline enable_userswap. We tested the concurrent scenario of multi-threaded page fault and multi-threaded swap-in in the uswap demo;and the remapping in the swap-out phase and the copy-free function in the swap-in phase were ok. During the test, related debugging functions including CONFIG_DEBUG_VM, lockdep, slub debug, kasan and kmemleak are enabled. ChangeLog: v2->v3: - update patch 7 commit v1->v2: - enable CONFIG_USERSWAP for openeuler_defconfig ZhangPeng (7): mm/userswap: add VM_USWAP and SWP_USERSWAP_ENTRY mm/userswap: add enable_userswap boot option mm/userswap: introduce MREMAP_USWAP_SET_PTE mm/userswap: support userswap via userfaultfd mm/userswap: introduce UFFDIO_COPY_MODE_DIRECT_MAP mm/userswap: provide cpu info in userfault msg mm/userswap: openeuler_defconfig: enable userswap arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/proc/task_mmu.c | 3 + fs/userfaultfd.c | 43 +- include/linux/mm.h | 8 + include/linux/swap.h | 14 +- include/linux/swapops.h | 16 + include/linux/userfaultfd_k.h | 5 + include/linux/userswap.h | 60 +++ include/trace/events/mmflags.h | 7 + include/uapi/linux/mman.h | 1 + include/uapi/linux/userfaultfd.h | 3 + mm/Kconfig | 10 + mm/Makefile | 1 + mm/memory.c | 8 + mm/mremap.c | 8 +- mm/userfaultfd.c | 12 + mm/userswap.c | 552 +++++++++++++++++++++++++ 18 files changed, 747 insertions(+), 6 deletions(-) create mode 100644 include/linux/userswap.h create mode 100644 mm/userswap.c -- 2.25.1

2 9

[PATCH OLK-6.6 v2 0/7] support userswap feature
by Peng Zhang 11 Dec '23

11 Dec '23

From: ZhangPeng <zhangpeng362(a)huawei.com> This patch series support userswap feature including registration, unregistration, swap-out and swap-in. Userswap feature depends on CONFIG_USERSWAP and can be enabled by cmdline enable_userswap. We tested the concurrent scenario of multi-threaded page fault and multi-threaded swap-in in the uswap demo;and the remapping in the swap-out phase and the copy-free function in the swap-in phase were ok. During the test, related debugging functions including CONFIG_DEBUG_VM, lockdep, slub debug, kasan and kmemleak are enabled. ChangeLog: v1->v2: - enable CONFIG_USERSWAP for openeuler_defconfig ZhangPeng (7): mm/userswap: add VM_USWAP and SWP_USERSWAP_ENTRY mm/userswap: add enable_userswap boot option mm/userswap: introduce MREMAP_USWAP_SET_PTE mm/userswap: support userswap via userfaultfd mm/userswap: introduce UFFDIO_COPY_MODE_DIRECT_MAP mm/userswap: provide cpu info in userfault msg mm/userswap: openeuler_defconfig: enable userswap arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + fs/proc/task_mmu.c | 3 + fs/userfaultfd.c | 43 +- include/linux/mm.h | 8 + include/linux/swap.h | 14 +- include/linux/swapops.h | 16 + include/linux/userfaultfd_k.h | 5 + include/linux/userswap.h | 60 +++ include/trace/events/mmflags.h | 7 + include/uapi/linux/mman.h | 1 + include/uapi/linux/userfaultfd.h | 3 + mm/Kconfig | 10 + mm/Makefile | 1 + mm/memory.c | 8 + mm/mremap.c | 8 +- mm/userfaultfd.c | 12 + mm/userswap.c | 552 +++++++++++++++++++++++++ 18 files changed, 747 insertions(+), 6 deletions(-) create mode 100644 include/linux/userswap.h create mode 100644 mm/userswap.c -- 2.25.1

2 16

[PATCH OLK-6.6 0/3] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 Dec '23

Lu Jialin (3): cgroup: deaggregate __cgroup1_get_from_id for cgroup v1, cgroup_get_from_id for cgrp_dfl_root 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

2 4

[PATCH OLK-6.6 v3 0/8] memcg reclaim and cgroup kill
by Lu Jialin 11 Dec '23

11 Dec '23

Lu Jialin (8): cgroup: Export cgroup.kill from cgroupv2 to cgroupv1 memcg: Export memcg.{min/low} from cgroupv2 to cgroupv1 memcg: Export memcg.high from cgroupv2 to cgroupv1 memcg: Export memory.events{local} from cgroupv2 to cgroupv1 memcg: enable memcg async reclaim memcg: export high_async_ratio to userland memcg: introduce per-memcg reclaim interface config: enable CONFIG_MEMCG_V1_RECLAIM and CONFIG_CGROUP_V1_KILL arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/memcontrol.h | 24 +++- init/Kconfig | 10 ++ kernel/cgroup/cgroup-internal.h | 3 + kernel/cgroup/cgroup-v1.c | 7 + kernel/cgroup/cgroup.c | 4 +- mm/memcontrol.c | 184 ++++++++++++++++++++++++- 8 files changed, 229 insertions(+), 7 deletions(-) -- 2.34.1

2 9

[PATCH OLK-6.6 0/3] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 Dec '23

Lu Jialin (3): cgroup: deaggregate __cgroup1_get_from_id for cgroup v1, cgroup_get_from_id for cgrp_dfl_root 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

2 4

[PATCH v2 OLK-6.6 00/10] kabi: add kabi helper macros and tools
by Jialin Zhang 11 Dec '23

11 Dec '23

1. add kabi helper macros 2. add kabi tools: kabideps, kabisyms, check-kabi v1->v2: Move config entries of kabi to "General setup", and make CONFIG_KABI_SIZE_ALIGN_CHECKS depending on CONFIG_KABI_RESERVE. Li Lingfeng (1): kabi: deduplication friendly structs Xie XiuQi (5): kabi: add KABI_SIZE_ALIGN_CHECKS for more stringent kabi checks kabi: enables more stringent kabi checks kabi: add script tools to check kabi symbol kabi: add a tool to generate the kabi reference relationship kabi: add kABI reference checking tool Zheng Zengkai (4): kabi: add kabi helper macros KABI: Add CONFIG_KABI_RESERVE to control KABI padding reserve openeuler_defconfig: Enable CONFIG_KABI_RESERVE for x86 and arm64 kabi: Generalize naming of kabi helper macros arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/kabi.h | 509 +++++++++++++++++++++++++ init/Kconfig | 16 + scripts/check-kabi | 147 +++++++ scripts/kabideps | 161 ++++++++ scripts/kabisyms | 141 +++++++ 7 files changed, 978 insertions(+) create mode 100644 include/linux/kabi.h create mode 100755 scripts/check-kabi create mode 100755 scripts/kabideps create mode 100755 scripts/kabisyms -- 2.25.1

2 11

[PATHC OLK-6.6 v3 0/8] memcg reclaim and cgroup kill
by Lu Jialin 11 Dec '23

11 Dec '23

Lu Jialin (8): cgroup: Export cgroup.kill from cgroupv2 to cgroupv1 memcg: Export memcg.{min/low} from cgroupv2 to cgroupv1 memcg: Export memcg.high from cgroupv2 to cgroupv1 memcg: Export memory.events{local} from cgroupv2 to cgroupv1 memcg: enable memcg async reclaim memcg: export high_async_ratio to userland memcg: introduce per-memcg reclaim interface config: enable CONFIG_MEMCG_V1_RECLAIM and CONFIG_CGROUP_V1_KILL arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/memcontrol.h | 24 +++- init/Kconfig | 10 ++ kernel/cgroup/cgroup-internal.h | 3 + kernel/cgroup/cgroup-v1.c | 7 + kernel/cgroup/cgroup.c | 4 +- mm/memcontrol.c | 184 ++++++++++++++++++++++++- 8 files changed, 229 insertions(+), 7 deletions(-) -- 2.34.1

1 8

[PATCH v6 OLK-6.6 0/5] Support Qos Scheduler
by Wenyu Huang 11 Dec '23

11 Dec '23

Zhang Qiao (5): sched: Introduce qos scheduler for co-location sched: Throttle qos cfs_rq when current cpu is running online task sched: Support kill boost for offline task sched: Introduce handle priority reversion mechanism sched: Enable qos scheduler config arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + include/linux/cgroup.h | 4 + include/linux/resume_user_mode.h | 5 + include/linux/sched.h | 11 + init/Kconfig | 12 + kernel/cgroup/cgroup.c | 22 ++ kernel/sched/core.c | 155 ++++++++++ kernel/sched/fair.c | 378 ++++++++++++++++++++++++- kernel/sched/sched.h | 12 + kernel/signal.c | 3 + 11 files changed, 603 insertions(+), 1 deletion(-) -- 2.34.1

2 6

[PATCH v2 OLK-5.10] iommu/arm-smmu-v3: Add a SYNC command to avoid broken page table prefetch
by Zhang Zekun 11 Dec '23

11 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8MVBZ CVE: NA ----------------------------------------------- On Hisilicon LINXICORE9100 cores, SMMU pagetable prefetch features may prefetch and use a invalid PTE even the PTE is valid at that time. This will cause the device trigger fake pagefaults. If the SMMU works in terminate mode, transactions which occur fake pagefaults will be aborted, and could result in unexpected errors. To fix this problem, we need to add a SYNC command after smmu has map a iova, then smmu will always try to get the newest PTE. Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- v2: - add a config to explictly set erratum config, no code logic change Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 13 +++++++++++++ arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/cpucaps.h | 1 + arch/arm64/kernel/cpu_errata.c | 14 ++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 20 ++++++++++++++++++++ 6 files changed, 51 insertions(+) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index a9441bfebb0d..1f06e18a1859 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -156,6 +156,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | LINXICORE9100 | #162100125 | HISILICON_ERRATUM_162100125 | +----------------+-----------------+-----------------+-----------------------------+ +| Hisilicon | LINXICORE9100 | #162100602 | HISILICON_ERRATUM_162100602 | ++----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | HIP09 | #162102203 | HISILICON_ERRATUM_162102203 | +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c5eca65c27fc..851d24a35e4e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -836,6 +836,19 @@ config HISILICON_ERRATUM_162102203 If unsure, say N. +config HISILICON_ERRATUM_162100602 + bool "Hisilicon erratum 162100602" + depends on ARM_SMMU_V3 + default y + help + On Hisilicon LINXICORE9100 cores, SMMU pagetable prefetch features may + prefetch and use a invalid PTE even the PTE is valid at that time. This + will cause the device trigger fake pagefaults. If the SMMU works in + terminate mode, transactions which occur fake pagefaults will be aborted, + and could result in unexpected errors. + + If unsure, say Y. + config QCOM_FALKOR_ERRATUM_1003 bool "Falkor E1003: Incorrect translation due to ASID change" default y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index edcb7911b3ce..261023a908a8 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -404,6 +404,7 @@ CONFIG_HISILICON_ERRATUM_1980005=y CONFIG_HISILICON_ERRATUM_162100801=y CONFIG_HISILICON_ERRATUM_162100125=y CONFIG_HISILICON_ERRATUM_162102203=y +CONFIG_HISILICON_ERRATUM_162100602=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index ce9fbf260a3c..0220f10cddd7 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -81,6 +81,7 @@ #define ARM64_HAS_PBHA_STAGE2 73 #define ARM64_SME 74 #define ARM64_SME_FA64 75 +#define ARM64_WORKAROUND_HISILICON_ERRATUM_162100602 76 #define ARM64_NCAPS 80 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 7f175b3aac15..6a3e948d5c2c 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -331,6 +331,13 @@ static const struct midr_range hisilicon_erratum_162100125_cpus[] = { }; #endif +#ifdef CONFIG_HISILICON_ERRATUM_162100602 +static const struct midr_range hisilicon_erratum_162100602_cpus[] = { + MIDR_REV(MIDR_HISI_LINXICORE9100, 0, 0), + {}, +}; +#endif + #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003 static const struct arm64_cpu_capabilities qcom_erratum_1003_list[] = { { @@ -533,6 +540,13 @@ const struct arm64_cpu_capabilities arm64_errata[] = { ERRATA_MIDR_RANGE_LIST(hisilicon_erratum_162100125_cpus), }, #endif +#ifdef CONFIG_HISILICON_ERRATUM_162100602 + { + .desc = "Hisilicon erratum 162100602", + .capability = ARM64_WORKAROUND_HISILICON_ERRATUM_162100602, + ERRATA_MIDR_RANGE_LIST(hisilicon_erratum_162100602_cpus), + }, +#endif #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003 { .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003", diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index a55c2dab72f8..458151b7fab2 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2941,6 +2941,23 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain, gather->pgsize, true, smmu_domain); } +#ifdef CONFIG_HISILICON_ERRATUM_162100602 +static void arm_smmu_iotlb_sync_map(struct iommu_domain *domain, + unsigned long iova, size_t size) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + size_t granule_size; + + if (!cpus_have_const_cap(ARM64_WORKAROUND_HISILICON_ERRATUM_162100602)) + return; + + granule_size = 1 << __ffs(smmu_domain->domain.pgsize_bitmap); + + /* Add a SYNC command to sync io-pgtale to avoid errors in pgtable prefetch*/ + arm_smmu_tlb_inv_range_domain(iova, granule_size, granule_size, true, smmu_domain); +} +#endif + static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { @@ -3970,6 +3987,9 @@ static struct iommu_ops arm_smmu_ops = { .unmap = arm_smmu_unmap, .flush_iotlb_all = arm_smmu_flush_iotlb_all, .iotlb_sync = arm_smmu_iotlb_sync, +#ifdef CONFIG_HISILICON_ERRATUM_162100602 + .iotlb_sync_map = arm_smmu_iotlb_sync_map, +#endif .iova_to_phys = arm_smmu_iova_to_phys, .probe_device = arm_smmu_probe_device, .release_device = arm_smmu_release_device, -- 2.17.1

2 1

[PATCH OLK-6.6 0/2] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 Dec '23

Lu Jialin (2): 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 v3] config: Open CONFIG_AARCH32_EL0 and keep CONFIG_ARM64_ILP32 closed
by Jinjie Ruan 11 Dec '23

11 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3 CVE: NA ------------------------------------------------------------------------- No one currently uses IPL32, keep it closed to simplify the code logic of TASK_SIZE_MAX, thereby improving benchmark performance. For example, all test items of libMicro can be improved by 4.89% on average. Since commit dbece8b041f3 ("arm64: rename COMPAT to AARCH32_EL0"), CONFIG_COMPAT has been renamed to CONFIG_AARCH32_EL0, so open CONFIG_AARCH32_EL0 as what CONFIG_COMPAT used to be. And as commit 880fd21c0a46 ("arm64: set 32-bit compatible TASK_SIZE_MAX to fix U32 libc_write_01 error") said, not set CONFIG_COMPAT_TASK_SIZE by default. Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Reviewed-by: Liu Chao (CR) <liuchao173(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: Jinjie Ruan <ruanjinjie(a)huawei.com> --- v3: - Update the commit subject and message to make it clear. v2: - Do not touch the makeconfig.sh. --- arch/arm64/configs/openeuler_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 9d2f717c1f7c..ce5a7aeaeeca 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -449,9 +449,10 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y -CONFIG_COMPAT=y +CONFIG_AARCH32_EL0=y # CONFIG_KUSER_HELPERS is not set # CONFIG_COMPAT_ALIGNMENT_FIXUPS is not set +# CONFIG_COMPAT_TASK_SIZE is not set CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -526,6 +527,8 @@ CONFIG_EFI=y CONFIG_DMI=y # end of Boot options +CONFIG_COMPAT=y + # # Power management options # -- 2.34.1

2 1

[PATCH OLK-6.6 0/2] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 Dec '23

Lu Jialin (2): 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 0/2] cgroup v1 writeback enable
by chenridong 11 Dec '23

11 Dec '23

Lu Jialin (2): 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 0/5] LoongArch: add cpufreq and ls2k500 bmc support
by Hongchen Zhang 11 Dec '23

11 Dec '23

Chong Qiao (4): fbdev: add ls2k500sfb driver for ls2k500 bmc. ipmi: add ls2k500 bmc ipmi support. LoongArch: defconfig: enable CONFIG_FB_LS2K500=m. LoongArch: fix ls2k500 bmc not work when installing iso liuyun (1): cpufreq: Add cpufreq driver for LoongArch arch/loongarch/Kconfig | 1 + arch/loongarch/configs/loongson3_defconfig | 5 + arch/loongarch/include/asm/fpu.h | 13 +- drivers/char/ipmi/Makefile | 4 + drivers/char/ipmi/btlock.h | 92 ++ drivers/char/ipmi/ipmi_si.h | 11 + drivers/char/ipmi/ipmi_si_intf.c | 4 + drivers/char/ipmi/ipmi_si_ls2k500.c | 173 +++ drivers/char/ipmi/kcs_bmc_ls2k500.h | 67 + drivers/cpufreq/Kconfig | 11 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/loongson3-acpi-cpufreq.c | 1527 ++++++++++++++++++++ drivers/gpu/drm/loongson/loongson_module.c | 15 + drivers/video/fbdev/Kconfig | 13 + drivers/video/fbdev/Makefile | 1 + drivers/video/fbdev/ls2k500sfb.c | 792 ++++++++++ 16 files changed, 2729 insertions(+), 1 deletion(-) create mode 100644 drivers/char/ipmi/btlock.h create mode 100644 drivers/char/ipmi/ipmi_si_ls2k500.c create mode 100644 drivers/char/ipmi/kcs_bmc_ls2k500.h create mode 100644 drivers/cpufreq/loongson3-acpi-cpufreq.c create mode 100644 drivers/video/fbdev/ls2k500sfb.c -- 2.33.0

2 6

[PATCH 0/5] LoongArch: add cpufreq and ls2k500 bmc support
by Hongchen Zhang 11 Dec '23

11 Dec '23

Chong Qiao (4): fbdev: add ls2k500sfb driver for ls2k500 bmc. ipmi: add ls2k500 bmc ipmi support. LoongArch: defconfig: enable CONFIG_FB_LS2K500=m. LoongArch: fix ls2k500 bmc not work when installing iso liuyun (1): cpufreq: Add cpufreq driver for LoongArch arch/loongarch/Kconfig | 1 + arch/loongarch/configs/loongson3_defconfig | 5 + arch/loongarch/include/asm/fpu.h | 13 +- drivers/char/ipmi/Makefile | 4 + drivers/char/ipmi/btlock.h | 92 ++ drivers/char/ipmi/ipmi_si.h | 11 + drivers/char/ipmi/ipmi_si_intf.c | 4 + drivers/char/ipmi/ipmi_si_ls2k500.c | 173 +++ drivers/char/ipmi/kcs_bmc_ls2k500.h | 67 + drivers/cpufreq/Kconfig | 11 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/loongson3-acpi-cpufreq.c | 1527 ++++++++++++++++++++ drivers/gpu/drm/loongson/loongson_module.c | 15 + drivers/video/fbdev/Kconfig | 13 + drivers/video/fbdev/Makefile | 1 + drivers/video/fbdev/ls2k500sfb.c | 792 ++++++++++ 16 files changed, 2729 insertions(+), 1 deletion(-) create mode 100644 drivers/char/ipmi/btlock.h create mode 100644 drivers/char/ipmi/ipmi_si_ls2k500.c create mode 100644 drivers/char/ipmi/kcs_bmc_ls2k500.h create mode 100644 drivers/cpufreq/loongson3-acpi-cpufreq.c create mode 100644 drivers/video/fbdev/ls2k500sfb.c -- 2.33.0

1 5

[PATCH OLK-5.10] smart_grid: cpufreq: clear offline and isolated CPU in warm CPUs
by Yipeng Zou 11 Dec '23

11 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MFO6 CVE: NA ---------------------------------------- When there has some CPU has been offline or isolated, the warm zone CPUs will not clear these CPUs. Because of the warm zone were saluted by a complement of hot zone. So, we need to clear offline and isolated CPUs in every time's warm zone CPUs update. Fixes: 6a00891859d8 ("smart_grid: cpufreq: introduce smart_grid cpufreq control") Signed-off-by: Yipeng Zou <zouyipeng(a)huawei.com> --- kernel/sched/grid/qos.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/sched/grid/qos.c b/kernel/sched/grid/qos.c index f8c5deffd3ea..7ee3687347ce 100644 --- a/kernel/sched/grid/qos.c +++ b/kernel/sched/grid/qos.c @@ -179,6 +179,7 @@ int sched_grid_zone_update(bool is_locked) raw_spin_lock_irqsave(&sg_zone.lock, flags); cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_HOT]); + cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_WARM]); list_for_each(pos, &sg_zone.af_list_head) { af_pos = list_entry(pos, struct auto_affinity, af_list); @@ -190,10 +191,14 @@ int sched_grid_zone_update(bool is_locked) cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_HOT], &sg_zone.cpus[SMART_GRID_ZONE_HOT], af_pos->ad.domains[af_pos->ad.curr_level]); + /* Update warm zone CPUs to max level first */ + cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + af_pos->ad.domains[af_pos->ad.dcount - 1]); } - cpumask_complement(&sg_zone.cpus[SMART_GRID_ZONE_WARM], - &sg_zone.cpus[SMART_GRID_ZONE_HOT]); + /* Then reset warm zone CPUs without hot zone CPUs */ + cpumask_andnot(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + &sg_zone.cpus[SMART_GRID_ZONE_HOT]); if (!is_locked) raw_spin_unlock_irqrestore(&sg_zone.lock, flags); -- 2.34.1

2 1

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

10 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 chenridong (1): drop cgroup1_get_from_id, unify cgroup_get_from_id 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 | 1 + include/linux/memcontrol.h | 5 ++ init/Kconfig | 5 ++ kernel/cgroup/cgroup.c | 28 ++++-- mm/backing-dev.c | 117 ++++++++++++++++++++++++- mm/memcontrol.c | 83 +++++++++++++++++- 12 files changed, 264 insertions(+), 14 deletions(-) -- 2.34.1

3 6

[PATCH V2 OLK-5.10 0/6] Make the rcache depot scale better
by Zhang Zekun 10 Dec '23

10 Dec '23

Recently we have meet a problem when running FIO test. In our kunpeng server with 320 cores, about 80% cpus comes to- 100% usage, and soft lockup appears in the kernel message, which shows it stuck in __alloc_and_insert_iova_range(). Both the call trace and high cpu occupy rate implys that the iova_rcache behaves poorly to alloc iovas. A similar problem has been addressed in early months this year, the solution is just to enlarge the MAX_GLOBAL_MAGS to 128, but it requires to growth with the cpu cores, and it is hard to set a accurate val for a specific machine. So, it is better to use solutions from the linux community, use a list to replace the array of iova_rcache->depot. It will push iova_magazine to depot list when the local cpu_rcache is full, and use schedul_delayed_work() to free it after 100ms. The minimum length of the depot list is the num of online_cpus(). The performance of this patch shows good. This patch set use a lot of timers to record the iova_magazine, and the delay of timers in system may increase when undering heavy work load, but it should not cause problem as timers itself allows a inaccurate delay for a range. v2: - change a comment in patch 5/6, no code change. We need to merge "iommu/iova: change IOVA_MAG_SIZE to 127 to save memory" first to resolve a compile error: error: static assertion failed: "!(sizeof(struct iova_magazine) & (sizeof(struct iova_magazine) - 1))" Feng Tang (1): iommu/iova: change IOVA_MAG_SIZE to 127 to save memory Zhang Zekun (5): Revert "iommu/iova: move IOVA_MAX_GLOBAL_MAGS outside of IOMMU_SUPPORT" Revert "config: enable set the max iova mag size to 128" Revert "iommu/iova: increase the iova_rcache depot max size to 128" iommu/iova: Make the rcache depot scale better iommu/iova: Manage the depot list size arch/arm64/configs/openeuler_defconfig | 1 - drivers/iommu/Kconfig | 10 ---- drivers/iommu/iova.c | 80 +++++++++++++++++++------- include/linux/iova.h | 7 ++- 4 files changed, 64 insertions(+), 34 deletions(-) -- 2.17.1

2 7

[PATCH OLK-5.10] iommu/arm-smmu-v3: Add a SYNC command to avoid broken page table prefetch
by Zhang Zekun 10 Dec '23

10 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8MVBZ CVE: NA ----------------------------------------------- On Hisilicon LINXICORE9100 cores, SMMU pagetable prefetch features may prefetch and use a invalid PTE even the PTE is valid at that time. This will cause the device trigger fake pagefaults. If the SMMU works in terminate mode, transactions which occur fake pagefaults will be aborted, and could result in unexpected errors. To fix this problem, we need to add a SYNC command after smmu has map a iova, then smmu will always try to get the newest PTE. Signed-off-by: Zhang Zekun <zhangzekun11(a)huawei.com> --- Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 13 +++++++++++++ arch/arm64/include/asm/cpucaps.h | 1 + arch/arm64/kernel/cpu_errata.c | 14 ++++++++++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 20 ++++++++++++++++++++ 5 files changed, 50 insertions(+) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index a9441bfebb0d..1f06e18a1859 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -156,6 +156,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | LINXICORE9100 | #162100125 | HISILICON_ERRATUM_162100125 | +----------------+-----------------+-----------------+-----------------------------+ +| Hisilicon | LINXICORE9100 | #162100602 | HISILICON_ERRATUM_162100602 | ++----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | HIP09 | #162102203 | HISILICON_ERRATUM_162102203 | +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c5eca65c27fc..851d24a35e4e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -836,6 +836,19 @@ config HISILICON_ERRATUM_162102203 If unsure, say N. +config HISILICON_ERRATUM_162100602 + bool "Hisilicon erratum 162100602" + depends on ARM_SMMU_V3 + default y + help + On Hisilicon LINXICORE9100 cores, SMMU pagetable prefetch features may + prefetch and use a invalid PTE even the PTE is valid at that time. This + will cause the device trigger fake pagefaults. If the SMMU works in + terminate mode, transactions which occur fake pagefaults will be aborted, + and could result in unexpected errors. + + If unsure, say Y. + config QCOM_FALKOR_ERRATUM_1003 bool "Falkor E1003: Incorrect translation due to ASID change" default y diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index ce9fbf260a3c..0220f10cddd7 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -81,6 +81,7 @@ #define ARM64_HAS_PBHA_STAGE2 73 #define ARM64_SME 74 #define ARM64_SME_FA64 75 +#define ARM64_WORKAROUND_HISILICON_ERRATUM_162100602 76 #define ARM64_NCAPS 80 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 7f175b3aac15..6a3e948d5c2c 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -331,6 +331,13 @@ static const struct midr_range hisilicon_erratum_162100125_cpus[] = { }; #endif +#ifdef CONFIG_HISILICON_ERRATUM_162100602 +static const struct midr_range hisilicon_erratum_162100602_cpus[] = { + MIDR_REV(MIDR_HISI_LINXICORE9100, 0, 0), + {}, +}; +#endif + #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003 static const struct arm64_cpu_capabilities qcom_erratum_1003_list[] = { { @@ -533,6 +540,13 @@ const struct arm64_cpu_capabilities arm64_errata[] = { ERRATA_MIDR_RANGE_LIST(hisilicon_erratum_162100125_cpus), }, #endif +#ifdef CONFIG_HISILICON_ERRATUM_162100602 + { + .desc = "Hisilicon erratum 162100602", + .capability = ARM64_WORKAROUND_HISILICON_ERRATUM_162100602, + ERRATA_MIDR_RANGE_LIST(hisilicon_erratum_162100602_cpus), + }, +#endif #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003 { .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003", diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index a55c2dab72f8..458151b7fab2 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2941,6 +2941,23 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain, gather->pgsize, true, smmu_domain); } +#ifdef CONFIG_HISILICON_ERRATUM_162100602 +static void arm_smmu_iotlb_sync_map(struct iommu_domain *domain, + unsigned long iova, size_t size) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + size_t granule_size; + + if (!cpus_have_const_cap(ARM64_WORKAROUND_HISILICON_ERRATUM_162100602)) + return; + + granule_size = 1 << __ffs(smmu_domain->domain.pgsize_bitmap); + + /* Add a SYNC command to sync io-pgtale to avoid errors in pgtable prefetch*/ + arm_smmu_tlb_inv_range_domain(iova, granule_size, granule_size, true, smmu_domain); +} +#endif + static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { @@ -3970,6 +3987,9 @@ static struct iommu_ops arm_smmu_ops = { .unmap = arm_smmu_unmap, .flush_iotlb_all = arm_smmu_flush_iotlb_all, .iotlb_sync = arm_smmu_iotlb_sync, +#ifdef CONFIG_HISILICON_ERRATUM_162100602 + .iotlb_sync_map = arm_smmu_iotlb_sync_map, +#endif .iova_to_phys = arm_smmu_iova_to_phys, .probe_device = arm_smmu_probe_device, .release_device = arm_smmu_release_device, -- 2.17.1

2 1

[PATCH OLK-6.6 0/6] support userswap feature
by Peng Zhang 10 Dec '23

10 Dec '23

From: ZhangPeng <zhangpeng362(a)huawei.com> This patch series support userswap feature including registration, unregistration, swap-out and swap-in. Userswap feature depends on CONFIG_USERSWAP and can be enabled by cmdline enable_userswap. We tested the concurrent scenario of multi-threaded page fault and multi-threaded swap-in in the uswap demo;and the remapping in the swap-out phase and the copy-free function in the swap-in phase were ok. During the test, related debugging functions including CONFIG_DEBUG_VM, lockdep, slub debug, kasan and kmemleak are enabled. ZhangPeng (6): mm/userswap: add VM_USWAP and SWP_USERSWAP_ENTRY mm/userswap: add enable_userswap boot option mm/userswap: introduce MREMAP_USWAP_SET_PTE mm/userswap: support userswap via userfaultfd mm/userswap: introduce UFFDIO_COPY_MODE_DIRECT_MAP mm/userswap: provide cpu info in userfault msg fs/proc/task_mmu.c | 3 + fs/userfaultfd.c | 43 ++- include/linux/mm.h | 8 + include/linux/swap.h | 14 +- include/linux/swapops.h | 16 + include/linux/userfaultfd_k.h | 5 + include/linux/userswap.h | 60 ++++ include/trace/events/mmflags.h | 7 + include/uapi/linux/mman.h | 1 + include/uapi/linux/userfaultfd.h | 3 + mm/Kconfig | 10 + mm/Makefile | 1 + mm/memory.c | 8 + mm/mremap.c | 8 +- mm/userfaultfd.c | 12 + mm/userswap.c | 552 +++++++++++++++++++++++++++++++ 16 files changed, 745 insertions(+), 6 deletions(-) create mode 100644 include/linux/userswap.h create mode 100644 mm/userswap.c -- 2.25.1

2 14

[PATCH OLK-6.6 0/6] support userswap feature
by Peng Zhang 10 Dec '23

10 Dec '23

From: ZhangPeng <zhangpeng362(a)huawei.com> This patch series support userswap feature including registration, unregistration, swap-out and swap-in. Userswap feature depends on CONFIG_USERSWAP and can be enabled by cmdline enable_userswap. We tested the concurrent scenario of multi-threaded page fault and multi-threaded swap-in in the uswap demo;and the remapping in the swap-out phase and the copy-free function in the swap-in phase were ok. During the test, related debugging functions including CONFIG_DEBUG_VM, lockdep, slub debug, kasan and kmemleak are enabled. ZhangPeng (6): mm/userswap: add VM_USWAP and SWP_USERSWAP_ENTRY mm/userswap: add enable_userswap boot option mm/userswap: introduce MREMAP_USWAP_SET_PTE mm/userswap: support userswap via userfaultfd mm/userswap: introduce UFFDIO_COPY_MODE_DIRECT_MAP mm/userswap: provide cpu info in userfault msg fs/proc/task_mmu.c | 3 + fs/userfaultfd.c | 43 ++- include/linux/mm.h | 8 + include/linux/swap.h | 14 +- include/linux/swapops.h | 16 + include/linux/userfaultfd_k.h | 5 + include/linux/userswap.h | 60 ++++ include/trace/events/mmflags.h | 7 + include/uapi/linux/mman.h | 1 + include/uapi/linux/userfaultfd.h | 3 + mm/Kconfig | 10 + mm/Makefile | 1 + mm/memory.c | 8 + mm/mremap.c | 8 +- mm/userfaultfd.c | 12 + mm/userswap.c | 552 +++++++++++++++++++++++++++++++ 16 files changed, 745 insertions(+), 6 deletions(-) create mode 100644 include/linux/userswap.h create mode 100644 mm/userswap.c -- 2.25.1

1 9

[PATCH OLK-6.6 v2 0/8] memcg reclaim and cgroup kill
by Lu Jialin 09 Dec '23

09 Dec '23

Chen Wandun (1): memcg: introduce per-memcg reclaim interface for cgroup v1 Lu Jialin (7): cgroup: Export cgroup.kill from cgroupv2 to cgroupv1 memcg: Export memcg.{min/low} from cgroupv2 to cgroupv1 memcg: Export memcg.high from cgroupv2 to cgroupv1 memcg: Export memory.events{local} from cgroupv2 to cgroupv1 memcg: enable memcg async reclaim memcg: export high_async_ratio to userland config: enable CONFIG_MEMCG_V1_RECLAIM and CONFIG_CGROUP_V1_KILL arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/memcontrol.h | 24 +- init/Kconfig | 10 + kernel/cgroup/cgroup-internal.h | 3 + kernel/cgroup/cgroup-v1.c | 7 + kernel/cgroup/cgroup.c | 4 +- mm/memcontrol.c | 471 +++++++++++++++++-------- 8 files changed, 369 insertions(+), 154 deletions(-) -- 2.34.1

2 9

[PATCH OLK-6.6 v2 0/8] memcg reclaim and cgroup kill
by Lu Jialin 09 Dec '23

09 Dec '23

Chen Wandun (1): memcg: introduce per-memcg reclaim interface for cgroup v1 Lu Jialin (7): cgroup: Export cgroup.kill from cgroupv2 to cgroupv1 memcg: Export memcg.{min/low} from cgroupv2 to cgroupv1 memcg: Export memcg.high from cgroupv2 to cgroupv1 memcg: Export memory.events and memory.events.local from cgroupv2 to cgroupv1 memcg: enable memcg async reclaim memcg: export high_async_ratio to userland config: enable CONFIG_MEMCG_V1_RECLAIM and CONFIG_CGROUP_V1_KILL arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + include/linux/memcontrol.h | 24 +- init/Kconfig | 10 + kernel/cgroup/cgroup-internal.h | 3 + kernel/cgroup/cgroup-v1.c | 7 + kernel/cgroup/cgroup.c | 4 +- mm/memcontrol.c | 471 +++++++++++++++++-------- 8 files changed, 369 insertions(+), 154 deletions(-) -- 2.34.1

2 9

[PATCH OLK-6.6 000/134] Backport 6.6.5 LTS Patches
by Zheng Zengkai 09 Dec '23

09 Dec '23

Backport linux-6.6.5 LTS patches from upstream. git cherry-pick v6.6.4..v6.6.5~1 -s No conflicts. Build and boot test passed. Abdul Halim, Mohd Syazwan (1): iommu/vt-d: Add MTL to quirk list to skip TE disabling Adrian Hunter (6): mmc: cqhci: Increase recovery halt timeout mmc: cqhci: Warn of halt or task clear failure mmc: cqhci: Fix task clearing in CQE error recovery mmc: block: Retry commands in CQE error recovery mmc: block: Do not lose cache flush during CQE error recovery mmc: block: Be sure to wait while busy in CQE error recovery Agustin Gutierrez (1): drm/amd/display: Remove power sequencing check Alex Sierra (1): drm/amdgpu: Force order between a read and write to the same address Alvin Lee (2): drm/amd/display: Include udelay when waiting for INBOX0 ACK drm/amd/display: Use DRAM speed from validation for dummy p-state Antonio Borneo (1): pinctrl: stm32: fix array read out of bound Ayush Jain (1): cpufreq/amd-pstate: Only print supported EPP values for performance governor Bragatheswaran Manickavel (1): btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod() Brett Creeley (2): vfio/pds: Fix mutex lock->magic != lock warning vfio/pds: Fix possible sleep while in atomic context Camille Cho (1): drm/amd/display: Simplify brightness initialization Candice Li (1): drm/amdgpu: Update EEPROM I2C address for smu v13_0_0 Chen Ni (1): pinctrl: stm32: Add check for devm_kcalloc Christian König (1): dma-buf: fix check in dma_resv_add_fence Christoph Niedermaier (1): cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily Claudiu Beznea (6): net: ravb: Check return value of reset_control_deassert() net: ravb: Use pm_runtime_resume_and_get() net: ravb: Make write access to CXR35 first before accessing other EMAC registers net: ravb: Start TX queues after HW initialization succeeded net: ravb: Stop DMA in case of failures on ravb_open() net: ravb: Keep reverse order of operations in ravb_remove() Damien Le Moal (2): scsi: Change SCSI device boolean fields to single bit flags scsi: sd: Fix system start for ATA devices Dan Carpenter (2): media: v4l2-subdev: Fix a 64bit bug wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta() Daniel Mentz (1): iommu: Fix printk arg in of_iommu_get_resv_regions() Dave Airlie (1): nouveau: find the smallest page allocation to cover a buffer alloc. Dave Ertman (1): ice: Fix VF Reset paths when interface in a failed over aggregate David Howells (2): cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved David Sterba (1): btrfs: fix 64bit compat send ioctl arguments not initializing version member Dinghao Liu (1): drm/amd/pm: fix a memleak in aldebaran_tables_init Dmitry Antipov (1): uapi: propagate __struct_group() attributes to the container union Elena Salomatkina (1): octeontx2-af: Fix possible buffer overflow Ewan D. Milne (1): nvme: check for valid nvme_identify_ns() before using it Filipe Manana (2): btrfs: fix off-by-one when checking chunk map includes logical address btrfs: make error messages more clear when getting a chunk map Furong Xu (1): net: stmmac: xgmac: Disable FPE MMC interrupts Gaurav Batra (1): powerpc/pseries/iommu: enable_ddw incorrectly returns direct mapping for SR-IOV device Gautham R. Shenoy (1): cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch() Geetha sowjanya (1): octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64 Greg Ungerer (2): net: dsa: mv88e6xxx: fix marvell 6350 switch probing net: dsa: mv88e6xxx: fix marvell 6350 probe crash Gustavo A. R. Silva (1): neighbour: Fix __randomize_layout crash in struct neighbour Hamza Mahfooz (1): drm/amd/display: fix ABM disablement Hans de Goede (1): ACPI: video: Use acpi_video_device for cooling-dev driver data Heiko Carstens (1): s390/cmma: fix handling of swapper_pg_dir and invalid_pg_dir Heiner Kallweit (2): r8169: fix deadlock on RTL8125 in jumbo mtu mode r8169: prevent potential deadlock in rtl8169_close Helge Deller (8): parisc: Mark ex_table entries 32-bit aligned in assembly.h parisc: Mark ex_table entries 32-bit aligned in uaccess.h parisc: Use natural CPU alignment for bug_table parisc: Mark lock_aligned variables 16-byte aligned on SMP parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes parisc: Mark jump_table naturally aligned parisc: Ensure 32-bit alignment on parisc unwind section parisc: Mark altinstructions read-only and 32-bit aligned Hou Tao (1): bpf: Add missed allocation hint for bpf_mem_cache_alloc_flags() Ian Chen (1): drm/amd/display: Refactor edp power control Ilya Bakoulin (1): drm/amd/display: Fix MPCC 1DLUT programming Ioana Ciornei (2): dpaa2-eth: increase the needed headroom to account for alignment dpaa2-eth: recycle the RX buffer only after all processing done Jakub Kicinski (1): ethtool: don't propagate EOPNOTSUPP from dumps Jann Horn (1): btrfs: send: ensure send_fd is writable Jens Axboe (6): io_uring: don't allow discontig pages for IORING_SETUP_NO_MMAP io_uring: free io_buffer_list entries via RCU io_uring: don't guard IORING_OFF_PBUF_RING with SETUP_NO_MMAP io_uring: enable io_mem_alloc/free to be used in other parts io_uring/kbuf: defer release of mapped buffer rings io_uring/kbuf: recycle freed mapped buffer ring entries Jiawen Wu (1): net: libwx: fix memory leak on msix entry Johannes Berg (1): wifi: cfg80211: fix CQM for non-range use John Fastabend (1): bpf, sockmap: af_unix stream sockets need to hold ref for pair sock Juergen Gross (1): x86/xen: fix percpu vcpu_info allocation Kailang Yang (2): ALSA: hda/realtek: Headset Mic VREF to 100% ALSA: hda/realtek: Add supported ALC257 for ChromeOS Kornel Dulęba (1): mmc: sdhci-pci-gli: Disable LPM during initialization Lu Baolu (4): iommu/vt-d: Fix incorrect cache invalidation for mm notification iommu/vt-d: Omit devTLB invalidation requests when TES=0 iommu/vt-d: Disable PCI ATS in legacy passthrough mode iommu/vt-d: Make context clearing consistent with context mapping Lukasz Luba (1): powercap: DTPM: Fix unneeded conversions to micro-Watts Maria Yu (1): pinctrl: avoid reload of p state in list iteration Mario Limonciello (1): drm/amd: Enable PCIe PME from D3 Markus Weippert (1): bcache: revert replacing IS_ERR_OR_NULL with IS_ERR Michael Roth (1): efi/unaccepted: Fix off-by-one when checking for overlapping ranges Mikulas Patocka (1): dm-verity: align struct dm_verity_fec_io properly Namjae Jeon (1): ksmbd: fix possible deadlock in smb2_open Nicholas Kazlauskas (2): drm/amd/display: Remove min_dst_y_next_start check for Z8 drm/amd/display: Update min Z8 residency time to 2100 for DCN314 Nicholas Piggin (1): KVM: PPC: Book3S HV: Fix KVM_RUN clobbering FP/VEC user registers Oldřich Jedlička (1): wifi: mac80211: do not pass AP_VLAN vif pointer to drivers during flush Paulo Alcantara (2): smb: client: fix missing mode bits for SMB symlinks smb: client: report correct st_size for SMB and NFS symlinks Peter Wang (1): scsi: ufs: core: Clear cmd if abort succeeds in MCQ mode Prike Liang (1): drm/amdgpu: correct the amdgpu runtime dereference usage count Qu Wenruo (2): btrfs: add dmesg output for first mount and last unmount of a filesystem btrfs: free the allocated memory if btrfs_alloc_page_array() fails Ritesh Harjani (IBM) (1): ext2: Fix ki_pos update for DIO buffered-io fallback case Robin Murphy (1): iommu: Avoid more races around device probe Sean Christopherson (1): vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart Sherry Wang (1): drm/amd/display: refactor ILR to make it work Stanislav Fomichev (1): netdevsim: Don't accept device bound programs Subbaraya Sundeep (1): octeontx2-pf: Restore TC ingress police rules when interface is up Swapnil Patel (1): drm/amd/display: Reduce default backlight min from 5 nits to 1 nits Takashi Iwai (2): leds: class: Don't expose color sysfs entry ALSA: hda: Disable power-save on KONTRON SinglePC Tim Huang (1): drm/amdgpu: fix memory overflow in the IB test Timothy Pearson (1): powerpc: Don't clobber f0/vs0 during fp|altivec register save Tvrtko Ursulin (1): drm/i915/gsc: Mark internal GSC engine with reserved uabi class Ville Syrjälä (1): drm/i915: Also check for VGA converter in eDP probe Wenchao Chen (1): mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled Willem de Bruijn (4): selftests/net: ipsec: fix constant out of range selftests/net: fix a char signedness issue selftests/net: unix: fix unused variable compiler warning selftests/net: mptcp: fix uninitialized variable warnings Wu Bo (2): dm verity: initialize fec io before freeing it dm verity: don't perform FEC for failed readahead IO Wyes Karny (1): cpufreq/amd-pstate: Fix scaling_min_freq and scaling_max_freq update Yang Yingliang (2): firewire: core: fix possible memory leak in create_units() drm/panel: nt36523: fix return value check in nt36523_probe() Yoshihiro Shimoda (4): net: rswitch: Fix type of ret in rswitch_start_xmit() net: rswitch: Fix return value in rswitch_start_xmit() net: rswitch: Fix missing dev_kfree_skb_any() in error path ravb: Fix races between ravb_tx_timeout_work() and net related ops Zhengchao Shao (1): ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet Zhongwei (1): drm/amd/display: force toggle rate wa for first link training for a retimer xiazhengqiao (1): drm/panel: starry-2081101qfh032011-53g: Fine tune the panel power sequence Documentation/ABI/testing/sysfs-class-led | 9 - arch/parisc/include/asm/alternative.h | 9 +- arch/parisc/include/asm/assembly.h | 1 + arch/parisc/include/asm/bug.h | 30 ++-- arch/parisc/include/asm/jump_label.h | 8 +- arch/parisc/include/asm/ldcw.h | 2 +- arch/parisc/include/asm/uaccess.h | 1 + arch/parisc/include/uapi/asm/errno.h | 2 - arch/parisc/kernel/vmlinux.lds.S | 1 + arch/powerpc/kernel/fpu.S | 13 ++ arch/powerpc/kernel/process.c | 6 +- arch/powerpc/kernel/vector.S | 2 + arch/powerpc/platforms/pseries/iommu.c | 8 +- arch/s390/mm/page-states.c | 6 + arch/x86/xen/enlighten.c | 6 +- arch/x86/xen/xen-ops.h | 2 +- drivers/acpi/acpi_video.c | 14 +- drivers/acpi/scan.c | 7 +- drivers/ata/libata-scsi.c | 9 +- drivers/cpufreq/amd-pstate.c | 71 ++++++-- drivers/cpufreq/imx6q-cpufreq.c | 2 +- drivers/dma-buf/dma-resv.c | 2 +- drivers/firewire/core-device.c | 11 +- drivers/firewire/sbp2.c | 6 +- drivers/firmware/efi/unaccepted_memory.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 6 + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 4 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 21 +++ drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - drivers/gpu/drm/amd/display/dc/dc_types.h | 4 - .../display/dc/dce110/dce110_hw_sequencer.c | 2 +- .../drm/amd/display/dc/dcn314/dcn314_hwseq.c | 3 +- .../amd/display/dc/dcn314/dcn314_resource.c | 2 +- .../drm/amd/display/dc/dcn32/dcn32_hwseq.c | 6 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 15 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 3 +- drivers/gpu/drm/amd/display/dc/inc/link.h | 1 + .../drm/amd/display/dc/link/link_detection.c | 8 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 11 +- .../drm/amd/display/dc/link/link_factory.c | 1 + .../dc/link/protocols/link_dp_capability.c | 14 +- .../display/dc/link/protocols/link_dp_phy.c | 3 +- .../link_dp_training_fixed_vs_pe_retimer.c | 6 +- .../link/protocols/link_edp_panel_control.c | 62 +++++-- .../link/protocols/link_edp_panel_control.h | 4 +- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 1 + .../include/asic_reg/gc/gc_11_0_0_offset.h | 2 + .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 5 +- drivers/gpu/drm/i915/display/intel_dp.c | 28 ++- drivers/gpu/drm/i915/gt/intel_engine_user.c | 39 ++-- drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 1 + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 4 +- drivers/iommu/intel/dmar.c | 18 ++ drivers/iommu/intel/iommu.c | 9 +- drivers/iommu/intel/svm.c | 26 +++ drivers/iommu/iommu.c | 20 +-- drivers/iommu/of_iommu.c | 14 +- drivers/leds/led-class.c | 14 -- drivers/md/bcache/btree.c | 2 +- drivers/md/dm-verity-fec.c | 3 +- drivers/md/dm-verity-target.c | 7 +- drivers/md/dm-verity.h | 6 - drivers/mmc/core/block.c | 2 + drivers/mmc/core/core.c | 9 +- drivers/mmc/host/cqhci-core.c | 44 ++--- drivers/mmc/host/sdhci-pci-gli.c | 54 +++--- drivers/mmc/host/sdhci-sprd.c | 25 +++ drivers/net/dsa/mv88e6xxx/chip.c | 26 ++- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 16 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.h | 2 +- drivers/net/ethernet/intel/ice/ice_lag.c | 122 +++++++------ drivers/net/ethernet/intel/ice/ice_lag.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 20 +++ drivers/net/ethernet/intel/ice/ice_virtchnl.c | 25 +++ .../ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- .../ethernet/marvell/octeontx2/nic/cn10k.c | 3 + .../marvell/octeontx2/nic/otx2_common.h | 2 + .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 9 +- .../ethernet/marvell/octeontx2/nic/otx2_tc.c | 120 ++++++++++--- drivers/net/ethernet/realtek/r8169_main.c | 9 +- drivers/net/ethernet/renesas/ravb_main.c | 69 ++++--- drivers/net/ethernet/renesas/rswitch.c | 22 ++- .../net/ethernet/stmicro/stmmac/mmc_core.c | 4 + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +- drivers/net/netdevsim/bpf.c | 4 +- .../net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +- drivers/nvme/host/core.c | 9 + drivers/pinctrl/core.c | 6 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 13 +- drivers/powercap/dtpm_cpu.c | 6 +- drivers/powercap/dtpm_devfreq.c | 11 +- drivers/scsi/sd.c | 9 +- drivers/ufs/core/ufshcd.c | 13 ++ drivers/vfio/pci/pds/pci_drv.c | 4 +- drivers/vfio/pci/pds/vfio_dev.c | 30 +++- drivers/vfio/pci/pds/vfio_dev.h | 2 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/extent_io.c | 11 +- fs/btrfs/ioctl.c | 1 + fs/btrfs/ref-verify.c | 2 + fs/btrfs/send.c | 2 +- fs/btrfs/super.c | 5 +- fs/btrfs/volumes.c | 9 +- fs/ext2/file.c | 1 - fs/smb/client/inode.c | 4 +- fs/smb/client/smb2ops.c | 13 +- fs/smb/server/smb2pdu.c | 47 +++-- fs/smb/server/smbacl.c | 7 +- fs/smb/server/smbacl.h | 2 +- fs/smb/server/vfs.c | 68 ++++--- fs/smb/server/vfs.h | 10 +- include/linux/amd-pstate.h | 4 + include/linux/dma-fence.h | 15 ++ include/linux/io_uring_types.h | 3 + include/linux/iommu.h | 1 + include/linux/skmsg.h | 1 + include/linux/vfio.h | 8 +- include/net/af_unix.h | 1 + include/net/neighbour.h | 2 +- include/scsi/scsi_device.h | 12 +- include/uapi/linux/stddef.h | 2 +- include/uapi/linux/v4l2-subdev.h | 2 +- io_uring/io_uring.c | 59 +++--- io_uring/io_uring.h | 3 + io_uring/kbuf.c | 169 +++++++++++++++--- io_uring/kbuf.h | 5 + kernel/bpf/memalloc.c | 2 + lib/errname.c | 6 - net/core/skmsg.c | 2 + net/ethtool/netlink.c | 1 + net/ipv4/igmp.c | 6 +- net/mac80211/driver-ops.h | 9 +- net/unix/af_unix.c | 2 - net/unix/unix_bpf.c | 5 + net/wireless/core.h | 1 + net/wireless/nl80211.c | 50 ++++-- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 12 ++ tools/arch/parisc/include/uapi/asm/errno.h | 2 - .../testing/selftests/net/af_unix/diag_uid.c | 1 - tools/testing/selftests/net/cmsg_sender.c | 2 +- tools/testing/selftests/net/ipsec.c | 4 +- .../selftests/net/mptcp/mptcp_connect.c | 11 +- tools/testing/selftests/net/mptcp/mptcp_inq.c | 11 +- 152 files changed, 1331 insertions(+), 622 deletions(-) -- 2.20.1

2 135

[PATCH OLK-6.6 000/112] Backport 6.6.4 LTS Patches
by Zheng Zengkai 09 Dec '23

09 Dec '23

Backport linux-6.6.4 LTS patches from upstream. git cherry-pick v6.6.3..v6.6.4~1 -s No conflicts. Build and boot test passed. Abel Wu (1): sched/eevdf: Fix vruntime adjustment on reweight Alex Elder (1): net: ipa: fix one GSI register field width Alexander Stein (1): usb: dwc3: Fix default mode initialization Andrzej Hajda (1): drm/i915: do not clean GT table on error path Ani Sinha (1): hv/hv_kvp_daemon: Some small fixes for handling NM keyfiles Arseniy Krasnov (1): vsock/test: fix SEQPACKET message bounds test Asuna Yang (1): USB: serial: option: add Luat Air72*U series products Badhri Jagan Sridharan (2): usb: typec: tcpm: Fix sink caps op current check usb: typec: tcpm: Skip hard reset when in error recovery Bjorn Andersson (1): drm/msm/dpu: Add missing safe_lut_tbl in sc8280xp catalog Charles Mirabile (1): io_uring/fs: consider link->flags when getting path for LINKAT Charles Yi (1): HID: fix HID device resource race between HID core and debugging support Chen Ni (1): ata: pata_isapnp: Add missing error check for devm_ioport_map() Christoph Hellwig (3): filemap: add a per-mapping stable writes flag block: update the stable_writes flag in bdev_add nvmet: nul-terminate the NQNs passed in the connect command Chuck Lever (3): NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() NFSD: Fix checksum mismatches in the duplicate reply cache libfs: getdents() should return 0 after reaching EOD Coly Li (2): bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() bcache: check return value from btree_node_alloc_replacement() Cong Yang (1): drm/panel: boe-tv101wum-nl6: Fine tune Himax83102-j02 panel HFP and HBP D. Wythe (1): net/smc: avoid data corruption caused by decline Daniel Borkmann (2): net, vrf: Move dstats structure to core net: Move {l,t,d}stats allocation to core and convert veth & vrf David Howells (6): rxrpc: Fix RTT determination to use any ACK as a source rxrpc: Defer the response to a PING ACK until we've parsed it afs: Fix afs_server_list to be cleaned up with RCU afs: Make error on cell lookup failure consistent with OpenAFS afs: Return ENOENT if no cell DNS record can be found afs: Fix file locking on R/O volumes to operate in local mode David Woodhouse (2): PM: tools: Fix sleepgraph syntax error ACPI: processor_idle: use raw_safe_halt() in acpi_idle_play_dead() Eric Dumazet (1): wireguard: use DEV_STATS_INC() Fang Xiang (1): irqchip/gic-v3-its: Flush ITS tables correctly in non-coherent GIC designs Florent Revest (1): mm: add a NO_INHERIT flag to the PR_SET_MDWE prctl Gerd Bayer (1): s390/ism: ism driver implies smc protocol Gil Fine (1): thunderbolt: Set lane bonding bit only for downstream port Haiyang Zhang (2): hv_netvsc: fix race of netvsc and VF register_netdevice hv_netvsc: Fix race of register_netdevice_notifier and VF register Hannes Reinecke (1): nvme: blank out authentication fabrics options if not configured Hans de Goede (3): ACPI: video: Use acpi_device_fix_up_power_children() ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA ACPI: PM: Add acpi_device_fix_up_power_children() function Harshit Mogalapalli (3): platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes() platform/x86: hp-bioscfg: move mutex_lock() down in hp_add_other_attributes() platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes() Helge Deller (1): prctl: Disable prctl(PR_SET_MDWE) on parisc Ivan Vecera (1): i40e: Fix adding unsupported cloud filters Jacek Lawrynowicz (1): accel/ivpu/37xx: Fix hangs related to MMIO reset Jan Höppner (1): s390/dasd: protect device queue against concurrent access Jann Horn (1): tls: fix NULL deref on tls_sw_splice_eof() with empty record Jiawen Wu (1): net: wangxun: fix kernel panic due to null pointer Johan Hovold (8): USB: dwc3: qcom: fix resource leaks on probe deferral USB: dwc3: qcom: fix ACPI platform device leak Revert "usb: phy: add usb phy notify port status API" Revert "phy: realtek: usb: Add driver for the Realtek SoC USB 3.0 PHY" Revert "phy: realtek: usb: Add driver for the Realtek SoC USB 2.0 PHY" USB: xhci-plat: fix legacy PHY double init USB: dwc3: qcom: fix software node leak on probe errors USB: dwc3: qcom: fix wakeup after probe deferral Jonas Karlman (1): drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full Jonathan Marek (1): drm/msm/dsi: use the correct VREG_CTRL_1 value for 4nm cphy Jose Ignacio Tornos Martinez (1): net: usb: ax88179_178a: fix failed operations during ax88179_reset Keisuke Nishimura (1): sched/fair: Fix the decision for load balance Keith Busch (2): swiotlb-xen: provide the "max_mapping_size" method io_uring: fix off-by one bvec index Kunwu Chan (1): ipv4: Correct/silence an endian warning in __ip_do_redirect Lech Perczak (1): USB: serial: option: don't claim interface 4 for ZTE MF290 Long Li (1): hv_netvsc: Mark VF as slave before exposing it to user-mode Lorenzo Bianconi (1): net: veth: fix ethtool stats reporting Marek Vasut (2): drm/panel: simple: Fix Innolux G101ICE-L01 bus flags drm/panel: simple: Fix Innolux G101ICE-L01 timings Mark Brown (1): kselftest/arm64: Fix output formatting for za-fork Mikhail Zaslonko (1): s390/ipl: add missing IPL_TYPE_ECKD_DUMP case to ipl_init() Mikulas Patocka (1): dm-delay: fix a race between delay_presuspend and delay_bio Ming Lei (1): blk-cgroup: avoid to warn !rcu_read_lock_held() in blkg_lookup() Mingzhe Zou (3): bcache: fixup multi-threaded bch_sectors_dirty_init() wake-up race bcache: fixup init dirty data errors bcache: fixup lock c->root error Niklas Neronin (1): usb: config: fix iteration issue in 'usb_get_bos_descriptor()' Oliver Neukum (1): USB: dwc2: write HCINT with INTMASK applied Pawel Laszczak (1): usb: cdnsp: Fix deadlock issue during using NCM gadget Peilin Ye (2): bpf: Fix dev's rx stats for bpf_redirect_peer traffic veth: Use tstats per-CPU traffic counters Peter Zijlstra (1): lockdep: Fix block chain corruption Puliang Lu (1): USB: serial: option: fix FM101R-GL defines Raju Rangoju (3): amd-xgbe: handle corner-case during sfp hotplug amd-xgbe: handle the corner-case during tx completion amd-xgbe: propagate the correct speed and duplex status Rand Deeb (1): bcache: prevent potential division by zero error Ricardo Ribalda (1): usb: dwc3: set the dma max_seg_size Samuel Holland (1): net: axienet: Fix check for partial TX checksum Shyam Prasad N (3): cifs: distribute channels across interfaces based on speed cifs: account for primary channel in the interface list cifs: fix leak of iface for primary channel Shyam Sundar S K (1): platform/x86/amd/pmc: adjust getting DRAM size behavior Song Liu (1): md: fix bi_status reporting in md_end_clone_io Stanislaw Gruszka (1): accel/ivpu: Do not initialize parameters on power up Stefan Berger (1): fs: Pass AT_GETATTR_NOSEC flag to getattr interface function Stefan Binding (1): ALSA: hda/realtek: Add quirks for ASUS 2024 Zenbooks Stefan Eichenberger (2): dt-bindings: usb: microchip,usb5744: Add second supply usb: misc: onboard-hub: add support for Microchip USB5744 Stefano Stabellini (1): arm/xen: fix xen_vcpu_info allocation alignment Stuart Hayhurst (1): platform/x86: ideapad-laptop: Set max_brightness before using it Suman Ghosh (2): octeontx2-pf: Fix memory leak during interface down octeontx2-pf: Fix ntuple rule creation to direct packet to VF with higher Rx queue than its PF Thomas Zimmermann (1): drm/ast: Disconnect BMC if physical connector is connected Victor Fragoso (1): USB: serial: option: add Fibocom L7xx modules Vitalii Torshyn (1): ALSA: hda: ASUS UM5302LA: Added quirks for cs35L41/10431A83 on i2c bus Will Deacon (1): arm64: mm: Fix "rodata=on" when CONFIG_RODATA_FULL_DEFAULT_ENABLED=y Xuxin Xiong (1): drm/panel: auo,b101uan08.3: Fine tune the panel power sequence .../bindings/usb/microchip,usb5744.yaml | 7 +- arch/arm/xen/enlighten.c | 3 +- arch/arm64/include/asm/setup.h | 17 +- arch/arm64/mm/pageattr.c | 7 +- arch/s390/kernel/ipl.c | 1 + block/bdev.c | 2 + block/blk-cgroup.h | 2 - drivers/accel/ivpu/ivpu_hw_37xx.c | 54 +- drivers/accel/ivpu/ivpu_hw_40xx.c | 8 +- drivers/acpi/acpi_video.c | 2 +- drivers/acpi/device_pm.c | 13 + drivers/acpi/processor_idle.c | 2 +- drivers/acpi/resource.c | 7 + drivers/ata/pata_isapnp.c | 3 + drivers/gpu/drm/ast/ast_drv.h | 13 +- drivers/gpu/drm/ast/ast_mode.c | 62 +- drivers/gpu/drm/i915/gt/intel_gt.c | 11 - drivers/gpu/drm/i915/i915_driver.c | 4 +- .../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 2 +- .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 9 +- drivers/gpu/drm/panel/panel-simple.c | 13 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +- drivers/hid/hid-core.c | 12 +- drivers/hid/hid-debug.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 16 +- drivers/md/bcache/btree.c | 4 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/bcache/writeback.c | 22 +- drivers/md/dm-delay.c | 17 +- drivers/md/md.c | 3 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 11 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 14 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 16 +- .../marvell/octeontx2/nic/otx2_flows.c | 20 +- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 8 +- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 4 +- .../net/ethernet/wangxun/txgbe/txgbe_main.c | 4 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 66 +- drivers/net/ipa/reg/gsi_reg-v5.0.c | 2 +- drivers/net/usb/ax88179_178a.c | 4 +- drivers/net/veth.c | 46 +- drivers/net/vrf.c | 38 +- drivers/net/wireguard/device.c | 4 +- drivers/net/wireguard/receive.c | 12 +- drivers/net/wireguard/send.c | 3 +- drivers/nvme/host/fabrics.c | 2 + drivers/nvme/target/fabrics-cmd.c | 4 + drivers/phy/Kconfig | 1 - drivers/phy/Makefile | 1 - drivers/phy/realtek/Kconfig | 32 - drivers/phy/realtek/Makefile | 3 - drivers/phy/realtek/phy-rtk-usb2.c | 1325 ----------------- drivers/phy/realtek/phy-rtk-usb3.c | 761 ---------- drivers/platform/x86/amd/pmc/pmc.c | 31 +- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 24 +- drivers/platform/x86/ideapad-laptop.c | 11 +- drivers/s390/block/dasd.c | 24 +- drivers/s390/net/Kconfig | 3 +- drivers/s390/net/ism_drv.c | 93 +- drivers/thunderbolt/switch.c | 2 +- drivers/usb/cdns3/cdnsp-ring.c | 3 + drivers/usb/core/config.c | 3 +- drivers/usb/core/hub.c | 23 - drivers/usb/dwc2/hcd_intr.c | 15 +- drivers/usb/dwc3/core.c | 2 + drivers/usb/dwc3/drd.c | 2 +- drivers/usb/dwc3/dwc3-qcom.c | 65 +- drivers/usb/host/xhci-plat.c | 50 +- drivers/usb/misc/onboard_usb_hub.c | 2 + drivers/usb/misc/onboard_usb_hub.h | 7 + drivers/usb/serial/option.c | 11 +- drivers/usb/typec/tcpm/tcpm.c | 12 +- drivers/xen/swiotlb-xen.c | 1 + fs/afs/dynroot.c | 4 +- fs/afs/internal.h | 1 + fs/afs/server_list.c | 2 +- fs/afs/super.c | 2 + fs/afs/vl_rotate.c | 10 + fs/ecryptfs/inode.c | 12 +- fs/inode.c | 2 + fs/libfs.c | 14 +- fs/nfsd/cache.h | 4 +- fs/nfsd/nfscache.c | 64 +- fs/nfsd/nfssvc.c | 14 +- fs/overlayfs/inode.c | 10 +- fs/overlayfs/overlayfs.h | 8 + fs/smb/client/cifs_debug.c | 16 + fs/smb/client/cifsglob.h | 2 + fs/smb/client/connect.c | 6 + fs/smb/client/sess.c | 112 +- fs/smb/client/smb2ops.c | 6 + fs/stat.c | 6 +- include/acpi/acpi_bus.h | 1 + include/linux/hid.h | 3 + include/linux/netdevice.h | 30 +- include/linux/pagemap.h | 17 + include/linux/sched/coredump.h | 10 + include/linux/usb/phy.h | 13 - include/trace/events/rxrpc.h | 2 +- include/uapi/linux/fcntl.h | 3 + include/uapi/linux/prctl.h | 1 + io_uring/fs.c | 2 +- io_uring/rsrc.c | 2 +- kernel/fork.c | 2 +- kernel/locking/lockdep.c | 3 +- kernel/sched/fair.c | 161 +- kernel/sys.c | 36 +- mm/page-writeback.c | 2 +- net/core/dev.c | 57 +- net/core/filter.c | 1 + net/ipv4/route.c | 2 +- net/rxrpc/input.c | 61 +- net/smc/af_smc.c | 8 +- net/tls/tls_sw.c | 3 + sound/pci/hda/patch_realtek.c | 10 + tools/hv/hv_kvp_daemon.c | 20 +- tools/hv/hv_set_ifconfig.sh | 4 +- tools/include/uapi/linux/prctl.h | 1 + tools/power/pm-graph/sleepgraph.py | 2 +- tools/testing/selftests/arm64/fp/za-fork.c | 2 +- tools/testing/vsock/vsock_test.c | 19 +- 125 files changed, 1207 insertions(+), 2685 deletions(-) delete mode 100644 drivers/phy/realtek/Kconfig delete mode 100644 drivers/phy/realtek/Makefile delete mode 100644 drivers/phy/realtek/phy-rtk-usb2.c delete mode 100644 drivers/phy/realtek/phy-rtk-usb3.c -- 2.20.1

2 113

[PATCH OLK-5.10] smart_grid: cpufreq: clear offline and isolated CPU in warm CPUs
by Yipeng Zou 09 Dec '23

09 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MFO6 CVE: NA ---------------------------------------- When there has some CPU has been offline or isolated, the warm zone CPUs will not clear these CPUs. Because of the warm zone were saluted by a complement of hot zone. So, we need to clear offline and isolated CPUs in every time's warm zone CPUs update. Fixes: 6a00891859d8 ("smart_grid: cpufreq: introduce smart_grid cpufreq control") Signed-off-by: Yipeng Zou <zouyipeng(a)huawei.com> --- drivers/cpufreq/cpufreq.c | 7 ++++++- kernel/sched/grid/qos.c | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 574c9584923f..a262eab3e771 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -29,6 +29,9 @@ #include <linux/syscore_ops.h> #include <linux/tick.h> #include <trace/events/power.h> +#ifdef CONFIG_QOS_SCHED_SMART_GRID +#include <linux/sched/isolation.h> +#endif static LIST_HEAD(cpufreq_policy_list); @@ -2827,7 +2830,9 @@ static void smart_grid_work_handler(struct work_struct *work) continue; for_each_cpu(cpu, sched_grid_zone_cpumask(gov_index)) { - if (cpu_is_offline(cpu)) + /* bypass offline and isolated CPU */ + if (housekeeping_test_cpu(cpu, HK_FLAG_DOMAIN) || + cpu_is_offline(cpu)) continue; policy = cpufreq_cpu_acquire(cpu); diff --git a/kernel/sched/grid/qos.c b/kernel/sched/grid/qos.c index f8c5deffd3ea..7ee3687347ce 100644 --- a/kernel/sched/grid/qos.c +++ b/kernel/sched/grid/qos.c @@ -179,6 +179,7 @@ int sched_grid_zone_update(bool is_locked) raw_spin_lock_irqsave(&sg_zone.lock, flags); cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_HOT]); + cpumask_clear(&sg_zone.cpus[SMART_GRID_ZONE_WARM]); list_for_each(pos, &sg_zone.af_list_head) { af_pos = list_entry(pos, struct auto_affinity, af_list); @@ -190,10 +191,14 @@ int sched_grid_zone_update(bool is_locked) cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_HOT], &sg_zone.cpus[SMART_GRID_ZONE_HOT], af_pos->ad.domains[af_pos->ad.curr_level]); + /* Update warm zone CPUs to max level first */ + cpumask_or(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + af_pos->ad.domains[af_pos->ad.dcount - 1]); } - cpumask_complement(&sg_zone.cpus[SMART_GRID_ZONE_WARM], - &sg_zone.cpus[SMART_GRID_ZONE_HOT]); + /* Then reset warm zone CPUs without hot zone CPUs */ + cpumask_andnot(&sg_zone.cpus[SMART_GRID_ZONE_WARM], &sg_zone.cpus[SMART_GRID_ZONE_WARM], + &sg_zone.cpus[SMART_GRID_ZONE_HOT]); if (!is_locked) raw_spin_unlock_irqrestore(&sg_zone.lock, flags); -- 2.34.1

2 1

[PATCH OLK-6.6 v2] kasan: fix the compilation error for memcpy_mcs()
by Tong Tiangen 09 Dec '23

09 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MWHA CVE: NA -------------------------------- check_memory_region() has been renamed kasan_check_range() in commit f00748bfa024 ("kasan: prefix global functions with kasan_"). Therefore, a compilation error occurs when check_memory_region() is called in memcpy_mcs() in file mm/kasan/shadow.c, this patch fix this issue. Fixes: 23ca830ebbef ("arm64: introduce copy_mc_to_kernel() implementation") Signed-off-by: Tong Tiangen <tongtiangen(a)huawei.com> --- mm/kasan/shadow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index ffaf2df1ed6e..9372f0c6f7ec 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -83,9 +83,9 @@ void *memcpy(void *dest, const void *src, size_t len) #undef memcpy_mcs int memcpy_mcs(void *dest, const void *src, size_t len) { - if (!check_memory_region((unsigned long)src, len, false, _RET_IP_) || - !check_memory_region((unsigned long)dest, len, true, _RET_IP_)) - return (unsigned long)len; + if (!kasan_check_range(src, len, false, _RET_IP_) || + !kasan_check_range(dest, len, true, _RET_IP_)) + return (int)len; return __memcpy_mcs(dest, src, len); } -- 2.25.1

2 1

[PATCH OLK-6.6] kasan: fix the compilation error for memcpy_mcs()
by Tong Tiangen 08 Dec '23

08 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MWHA CVE: NA -------------------------------- Fix the compilation error when CONFIG_KASAN=y: error: implicit declaration of function ‘check_memory_region’; Fixes: 23ca830ebbef ("arm64: introduce copy_mc_to_kernel() implementation") Signed-off-by: Tong Tiangen <tongtiangen(a)huawei.com> --- mm/kasan/shadow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index ffaf2df1ed6e..9372f0c6f7ec 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -83,9 +83,9 @@ void *memcpy(void *dest, const void *src, size_t len) #undef memcpy_mcs int memcpy_mcs(void *dest, const void *src, size_t len) { - if (!check_memory_region((unsigned long)src, len, false, _RET_IP_) || - !check_memory_region((unsigned long)dest, len, true, _RET_IP_)) - return (unsigned long)len; + if (!kasan_check_range(src, len, false, _RET_IP_) || + !kasan_check_range(dest, len, true, _RET_IP_)) + return (int)len; return __memcpy_mcs(dest, src, len); } -- 2.25.1

2 1

[PATCH OLK-6.6 v2] config: Open CONFIG_AARCH32_EL0 and close CONFIG_ARM64_ILP32
by Jinjie Ruan 08 Dec '23

08 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3 CVE: NA ------------------------------------------------------------------------- No one currently uses IPL32, close it to simplify the code logic of TASK_SIZE_MAX, thereby improving benchmark performance. For example, all test items of libMicro can be improved by 4.89% on average. Since commit 7f6675f0e994 ("arm64: rename COMPAT to AARCH32_EL0"), CONFIG_COMPAT has been renamed to CONFIG_AARCH32_EL0, so open CONFIG_AARCH32_EL0 as what CONFIG_COMPAT used to be. Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Reviewed-by: Liu Chao (CR) <liuchao173(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Signed-off-by: Jinjie Ruan <ruanjinjie(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 9d2f717c1f7c..ce5a7aeaeeca 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -449,9 +449,10 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y -CONFIG_COMPAT=y +CONFIG_AARCH32_EL0=y # CONFIG_KUSER_HELPERS is not set # CONFIG_COMPAT_ALIGNMENT_FIXUPS is not set +# CONFIG_COMPAT_TASK_SIZE is not set CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -526,6 +527,8 @@ CONFIG_EFI=y CONFIG_DMI=y # end of Boot options +CONFIG_COMPAT=y + # # Power management options # -- 2.34.1

2 1

[PATCH OLK-6.6 0/3] improve gettimeofday() performance in user space
by Yang Yingliang 08 Dec '23

08 Dec '23

Don't trap kernel to read the counter register, do this in userspace to improve performance. Yang Yingliang (3): arm64: arch_timer: Disable CNTVCT_EL0 trap if workaround is enabled vdso: do cntvct workaround in the VDSO arm64: arch_timer: disable CONFIG_ARM_ARCH_TIMER_WORKAROUND_IN_USERSPACE arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/vdso/gettimeofday.h | 32 ++++++++++++++++++++++ drivers/clocksource/Kconfig | 5 ++++ drivers/clocksource/arm_arch_timer.c | 27 ++++++++++++++++++ include/linux/clocksource.h | 4 +++ include/vdso/datapage.h | 8 +++++- kernel/time/vsyscall.c | 16 +++++++++++ 7 files changed, 92 insertions(+), 1 deletion(-) -- 2.25.1

2 4

[PATCH OLK-5.10] locking/osq_lock: Avoid false sharing in optimistic_spin_node
by Zeng Heng 08 Dec '23

08 Dec '23

hulk inclusion category: performance bugzilla: https://gitee.com/openeuler/kernel/issues/I8MV01 -------------------------------- In the prologue of osq_lock(), it set `cpu` member of percpu struct optimistic_spin_node with the local cpu id, after that the value is never changed any more. Consequently, we can regard the `cpu` member as a constant variable. In the meanwhile, other members like next, prev and locked are frequently modified by osq_lock() and osq_unlock() which come from rwsem, mutex and so on. So here we can place padding and locate them at different cache lines, so that avoid cache misses when access optimistic_spin_node.cpu field by other CPUs from the node list. Here provide the UnixBench full-core test result as below: Machine Intel(R) Xeon(R) Gold 6248 CPU, 40 cores, 80 threads Run the command of "./Run -c 80 -i 3" 10 times and take the average. System Benchmarks Index Values Without Patch With Patch Diff Dhrystone 2 using register variables 185876.43 185945.41 0.04% Double-Precision Whetstone 79637.27 79659.29 0.03% Execl Throughput 9909.61 10576.06 6.73% File Copy 1024 bufsize 2000 maxblocks 1723.01 2086.08 21.07% File Copy 256 bufsize 500 maxblocks 1150.24 1338.21 16.34% File Copy 4096 bufsize 8000 maxblocks 3719.19 4011.99 7.87% Pipe Throughput 66184.84 66025.25 -0.24% Pipe-based Context Switching 30606.18 31074.21 1.53% Process Creation 9442.48 9450.77 0.09% Shell Scripts (1 concurrent) 44526.52 46548.54 4.54% Shell Scripts (8 concurrent) 42903.96 45718.56 6.56% System Call Overhead 3645.20 3717.42 1.98% ======== System Benchmarks Index Score 15126.87 15931.29 5.32% Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- include/linux/osq_lock.h | 2 +- kernel/locking/osq_lock.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/osq_lock.h b/include/linux/osq_lock.h index 5581dbd3bd34..deb90ad5f560 100644 --- a/include/linux/osq_lock.h +++ b/include/linux/osq_lock.h @@ -9,7 +9,7 @@ struct optimistic_spin_node { struct optimistic_spin_node *next, *prev; int locked; /* 1 if lock acquired */ - int cpu; /* encoded CPU # + 1 value */ + int cpu ____cacheline_aligned; /* encoded CPU # + 1 value */ }; struct optimistic_spin_queue { diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c index 1de006ed3aa8..f7e7b76f6274 100644 --- a/kernel/locking/osq_lock.c +++ b/kernel/locking/osq_lock.c @@ -96,7 +96,8 @@ bool osq_lock(struct optimistic_spin_queue *lock) node->locked = 0; node->next = NULL; - node->cpu = curr; + if (!node->cpu) + node->cpu = curr; /* * We need both ACQUIRE (pairs with corresponding RELEASE in -- 2.25.1

2 1

[PATCH OLK-6.6 v3 00/19] Add sharepool support v3
by Wang Wensheng 08 Dec '23

08 Dec '23

This patch series migrates share pool features from OLK-5.10 to OLK-6.6. We don't want to do this work patch by patch since there are hundreds of patches in OLK-5.10 including bugfix and small features generation. Instead we just take the final version and split it into a few small patches, each of which contains one feature at the final version. The share pool features is a big feature, it is mainly used to share user virtual memory for different processes in the same group. It could be used by this steps: Process A create a new group which is owned by process A. Process A add process B to the group. Process A add process C to the same group. Process B alloc a new memory VA, and write something in it. The VA was send to the process C by IPC, then process C got it. The process C access the VA and got the data directly. The process A could add more processes in the group to share the memory. Fix the memory by use the free function or exit the group. The new features is enabled both by CONFIG_SHARE_POOL and the enable_ascend_share_pool bootarg, it would not affect anything if disabled. v1->v2: Delete some unused code. v2->v3: Rename several function. Wang Wensheng (19): mm/hugetlb: Introduce hugetlb_insert_hugepage_pte[_by_pa] mm/vmalloc: Extend vmalloc usage about hugepage mm: Extend mmap assocated functions to accept mm_struct mm/sharepool: Add base framework for share_pool mm/sharepool: Add sp_area management code mm/sharepool: Reserve the va space for share_pool mm/sharepool: Implement mg_sp_make_share_u2k() mm/sharepool: Implement mg_sp_unshare_kva mm/sharepool: Implement mg_sp_walk_page_range() mm/sharepool: Implement mg_sp_free() mm/sharepool: Implement mg_sp_alloc() mm/sharepool: Implement mg_sp_make_share_k2u() mm/sharepool: Implement mg_sp_group_add_task() mm/sharepool: Implement mg_sp_group_id_by_pid() mm/sharepool: Implement mg_sp_id_of_current() mm/sharepool: Implement mg_sp_config_dvpp_range() mm/sharepool: Add proc interfaces to show sp info mm/sharepool: support fork() and exit() to handle the mm mm/sharepool: Protect the va reserved for sharepool include/linux/hugetlb.h | 32 + include/linux/mempolicy.h | 11 + include/linux/mm.h | 17 + include/linux/mm_types.h | 6 + include/linux/share_pool.h | 267 +++ include/linux/vmalloc.h | 18 + kernel/fork.c | 3 + mm/Kconfig | 34 + mm/Makefile | 1 + mm/gup.c | 23 +- mm/hugetlb.c | 80 + mm/mempolicy.c | 12 +- mm/mmap.c | 50 +- mm/mremap.c | 4 + mm/share_pool.c | 3448 ++++++++++++++++++++++++++++++++++++ mm/util.c | 4 + mm/vmalloc.c | 205 ++- 17 files changed, 4194 insertions(+), 21 deletions(-) create mode 100644 include/linux/share_pool.h create mode 100644 mm/share_pool.c -- 2.17.1

2 20

[PATCH OLK-5.10] roh/core: Synchronously update the mac address of
by Ke Chen 08 Dec '23

08 Dec '23

driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MTN4 ----------------------------------------------------------------------- In ROH mode, when the IP address of a VLAN device changes, we need to change the MAC address of the VLAN device to maintain the mapping between the IP address, EID, and MAC address. In this way, the ARP fast response in ROH mode can take effect. Fixes:55901e4aae1e("roh/core: Add support for inetaddr notifier in roh/core") Signed-off-by: Ke Chen <chenke54(a)huawei.com> Reviewed-by: Gang Zhang <gang.zhang(a)huawei.com> --- drivers/roh/core/core.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/roh/core/core.c b/drivers/roh/core/core.c index 1b8041004be3..9b867f2cc2d5 100644 --- a/drivers/roh/core/core.c +++ b/drivers/roh/core/core.c @@ -3,6 +3,7 @@ #include <linux/pci.h> #include <linux/inetdevice.h> +#include <linux/if_vlan.h> #include "core_priv.h" #include "core.h" @@ -245,12 +246,26 @@ static int roh_ipv4_event(struct notifier_block *this, unsigned long event, void struct in_ifaddr *ifa = ptr; struct roh_device *device; struct net_device *ndev; + struct sockaddr s_addr; struct sockaddr_in in; int ret; + if (event != NETDEV_UP) + return NOTIFY_DONE; + device = container_of(this, struct roh_device, nb); ndev = ifa->ifa_dev->dev; - if (device->netdev != ndev || event != NETDEV_UP) + + if (is_vlan_dev(ndev)) { + if (vlan_dev_real_dev(ndev) == device->netdev) { + s_addr.sa_family = ndev->type; + u64_to_ether_addr(be32_to_cpu(ifa->ifa_address) & 0xffffff, s_addr.sa_data); + dev_set_mac_address(ndev, &s_addr, NULL); + } + return NOTIFY_DONE; + } + + if (device->netdev != ndev) return NOTIFY_DONE; in.sin_addr.s_addr = ifa->ifa_address; -- 2.30.0

2 1

[PATCH OLK-6.6 1/1] ARM: Add unwinding annotations to __loop.*delay functions
by Xu Kuohai 08 Dec '23

08 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MTBB CVE: NA -------------------------------- The unwind directives can't handle nested function entries, so only the outermost function __loop_udelay is annotated, and the inner nested entries share the same unwind info with __loop_udelay. Signed-off-by: Xu Kuohai <xukuohai(a)huawei.com> Reviewed-by: Yang Jihong <yangjihong1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- arch/arm/lib/delay-loop.S | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index 3ac05177d097..3ba37ce6dbb0 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -7,6 +7,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/delay.h> +#include <asm/unwind.h> #ifdef CONFIG_ARCH_RPC .arch armv4 @@ -25,6 +26,7 @@ */ ENTRY(__loop_udelay) +UNWIND(.fnstart) ldr r2, .LC1 mul r0, r2, r0 @ r0 = delay_us * UDELAY_MULT ENTRY(__loop_const_udelay) @ 0 <= r0 <= 0xfffffaf0 @@ -58,6 +60,7 @@ ENTRY(__loop_delay) #endif bhi __loop_delay ret lr -ENDPROC(__loop_udelay) -ENDPROC(__loop_const_udelay) ENDPROC(__loop_delay) +ENDPROC(__loop_const_udelay) +UNWIND(.fnend) +ENDPROC(__loop_udelay) -- 2.30.2

2 2

[PATCH OLK-6.6 1/1] ARM: Add unwinding annotations to __loop.*delay functions
by Xu Kuohai 08 Dec '23

08 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MTBB CVE: NA -------------------------------- The unwind directives can't handle nested function entries, so only the outermost function __loop_udelay is annotated, and the inner nested entries share the same unwind info with __loop_udelay. Signed-off-by: Xu Kuohai <xukuohai(a)huawei.com> Reviewed-by: Yang Jihong <yangjihong1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- arch/arm/lib/delay-loop.S | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index 3ac05177d097..3ba37ce6dbb0 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -7,6 +7,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/delay.h> +#include <asm/unwind.h> #ifdef CONFIG_ARCH_RPC .arch armv4 @@ -25,6 +26,7 @@ */ ENTRY(__loop_udelay) +UNWIND(.fnstart) ldr r2, .LC1 mul r0, r2, r0 @ r0 = delay_us * UDELAY_MULT ENTRY(__loop_const_udelay) @ 0 <= r0 <= 0xfffffaf0 @@ -58,6 +60,7 @@ ENTRY(__loop_delay) #endif bhi __loop_delay ret lr -ENDPROC(__loop_udelay) -ENDPROC(__loop_const_udelay) ENDPROC(__loop_delay) +ENDPROC(__loop_const_udelay) +UNWIND(.fnend) +ENDPROC(__loop_udelay) -- 2.30.2

2 1

[PATCH 0/5] LoongArch: add cpufreq and ls2k500 bmc support
by Hongchen Zhang 08 Dec '23

08 Dec '23

Chong Qiao (4): fbdev: add ls2k500sfb driver for ls2k500 bmc. ipmi: add ls2k500 bmc ipmi support. LoongArch: defconfig: enable CONFIG_FB_LS2K500=m. LoongArch: fix ls2k500 bmc not work when installing iso liuyun (1): cpufreq: Add cpufreq driver for LoongArch arch/loongarch/Kconfig | 1 + arch/loongarch/configs/loongson3_defconfig | 5 + arch/loongarch/include/asm/fpu.h | 13 +- drivers/char/ipmi/Makefile | 4 + drivers/char/ipmi/btlock.h | 92 ++ drivers/char/ipmi/ipmi_si.h | 11 + drivers/char/ipmi/ipmi_si_intf.c | 4 + drivers/char/ipmi/ipmi_si_ls2k500.c | 173 +++ drivers/char/ipmi/kcs_bmc_ls2k500.h | 67 + drivers/cpufreq/Kconfig | 11 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/loongson3-acpi-cpufreq.c | 1527 ++++++++++++++++++++ drivers/gpu/drm/loongson/loongson_module.c | 15 + drivers/video/fbdev/Kconfig | 13 + drivers/video/fbdev/Makefile | 1 + drivers/video/fbdev/ls2k500sfb.c | 792 ++++++++++ 16 files changed, 2729 insertions(+), 1 deletion(-) create mode 100644 drivers/char/ipmi/btlock.h create mode 100644 drivers/char/ipmi/ipmi_si_ls2k500.c create mode 100644 drivers/char/ipmi/kcs_bmc_ls2k500.h create mode 100644 drivers/cpufreq/loongson3-acpi-cpufreq.c create mode 100644 drivers/video/fbdev/ls2k500sfb.c -- 2.33.0

1 5