- Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS] RDMA/cma: Do not change route.addr.src_addr.ss_family
by tangbin 21 Jun '22

21 Jun '22

From: Jason Gunthorpe <jgg(a)nvidia.com> mainline inclusion from mainline-v5.15-rc4 commit bc0bdc5afaa740d782fbf936aaeebd65e5c2921d category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I59840 CVE: CVE-2021-4028 -------------------------------- Conflicts: The conditional statement to verify RDMA_CM_IDLE state is a little bit different from the upstream to 4.19. The commit 732d41c545bb (RDMA/cma: Make the locking for automatic state transition more clear) is missing from 4.19. So, the context has been modified. If the state is not idle then rdma_bind_addr() will immediately fail and no change to global state should happen. For instance if the state is already RDMA_CM_LISTEN then this will corrupt the src_addr and would cause the test in cma_cancel_operation(): if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev) To view a mangled src_addr, eg with a IPv6 loopback address but an IPv4 family, failing the test. This would manifest as this trace from syzkaller: BUG: KASAN: use-after-free in __list_add_valid+0x93/0xa0 lib/list_debug.c:26 Read of size 8 at addr ffff8881546491e0 by task syz-executor.1/32204 CPU: 1 PID: 32204 Comm: syz-executor.1 Not tainted 5.12.0-rc8-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:79 [inline] dump_stack+0x141/0x1d7 lib/dump_stack.c:120 print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:232 __kasan_report mm/kasan/report.c:399 [inline] kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416 __list_add_valid+0x93/0xa0 lib/list_debug.c:26 __list_add include/linux/list.h:67 [inline] list_add_tail include/linux/list.h:100 [inline] cma_listen_on_all drivers/infiniband/core/cma.c:2557 [inline] rdma_listen+0x787/0xe00 drivers/infiniband/core/cma.c:3751 ucma_listen+0x16a/0x210 drivers/infiniband/core/ucma.c:1102 ucma_write+0x259/0x350 drivers/infiniband/core/ucma.c:1732 vfs_write+0x28e/0xa30 fs/read_write.c:603 ksys_write+0x1ee/0x250 fs/read_write.c:658 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xae Which is indicating that an rdma_id_private was destroyed without doing cma_cancel_listens(). Instead of trying to re-use the src_addr memory to indirectly create an any address build one explicitly on the stack and bind to that as any other normal flow would do. Link: https://lore.kernel.org/r/0-v1-9fbb33f5e201+2a-cma_listen_jgg@nvidia.com Cc: stable(a)vger.kernel.org Fixes: 732d41c545bb ("RDMA/cma: Make the locking for automatic state transition more clear") Reported-by: syzbot+6bb0528b13611047209c(a)syzkaller.appspotmail.com Tested-by: Hao Sun <sunhao.th(a)gmail.com> Reviewed-by: Leon Romanovsky <leonro(a)nvidia.com> Signed-off-by: Jason Gunthorpe <jgg(a)nvidia.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> --- drivers/infiniband/core/cma.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 319bfef00a4a..7444df92e7cf 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -3375,8 +3375,13 @@ int rdma_listen(struct rdma_cm_id *id, int backlog) id_priv = container_of(id, struct rdma_id_private, id); if (id_priv->state == RDMA_CM_IDLE) { - id->route.addr.src_addr.ss_family = AF_INET; - ret = rdma_bind_addr(id, cma_src_addr(id_priv)); + struct sockaddr_in any_in = { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_ANY), + }; + + /* For a well behaved ULP state will be RDMA_CM_IDLE */ + ret = rdma_bind_addr(id, (struct sockaddr *)&any_in); if (ret) return ret; } -- 2.18.4

1 0

[PATCH openEuler-1.0-LTS] arm64: fix out-of-range error when adapting for ARM64_SPECTRE_BHB
by Yongqiang Liu 20 Jun '22

20 Jun '22

From: Chen Jiahao <chenjiahao16(a)huawei.com> hulk inclusion category: bugfix bugzilla: 186460, https://gitee.com/src-openeuler/kernel/issues/I53MHA CVE: CVE-2022-23960 -------------------------------- In cpufeature.c, when num is set to ARM64_SPECTRE_BHB, it should not be passed to cpu_hwcap_keys, otherwise the out-of-range error would happen as below: UBSAN: Undefined behaviour in arch/arm64/kernel/cpufeature.c:1742:3 index 40 is out of range for type 'static_key_false [39]' CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.90+ #1 Call trace: dump_backtrace+0x0/0x390 show_stack+0x24/0x30 dump_stack+0x130/0x188 ubsan_epilogue+0x14/0xa4 __ubsan_handle_out_of_bounds+0x144/0x184 __enable_cpu_capabilities+0x158/0x1d4 setup_cpu_features+0x34/0xc8 smp_cpus_done+0x44/0x13c smp_init+0x188/0x1a4 kernel_init_freeable+0x454/0x974 kernel_init+0x18/0x150 ret_from_fork+0x10/0x18 Because KABI cpu_hwcap_keys is consistent and defined with length ARM64_NCAPS, which is smaller than ARM64_SPECTRE_BHB. Fixes: 2df7cf898c5b ("arm64: fix extra cpucaps setup problem") Signed-off-by: Chen Jiahao <chenjiahao16(a)huawei.com> Reviewed-by: Liao Chang <liaochang1(a)huawei.com> Reviewed-by: Zhang Jianhua <chris.zjh(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- arch/arm64/kernel/cpufeature.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 996d3476f3c8..d7d8a4ab94b4 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1732,8 +1732,10 @@ __enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps, for (; caps->matches; caps++) { unsigned int num = caps->capability; - if (num == ARM64_SPECTRE_BHB) + if (num == ARM64_SPECTRE_BHB) { set_cap_spectre_bhb = true; + continue; + } if (!(caps->type & scope_mask) || !cpus_have_cap(num)) continue; -- 2.25.1

1 0

[Cancel] openEuler kernel SIG例会&技术分享
by openEuler conference 20 Jun '22

20 Jun '22

Sorry! The Zoom meeting will be held at 2022-06-24 14:00 scheduled by openEuler Kernel SIG has been cancelled.

1 0

openEuler kernel SIG例会&技术分享
by openEuler conference 20 Jun '22

20 Jun '22

您好！ Kernel SIG 邀请您参加 2022-06-24 14:00 召开的Zoom会议(自动录制) 会议主题：openEuler kernel SIG例会&技术分享会议内容： openEuler kernel 技术分享：执行实体创建与切换会议链接：https://us06web.zoom.us/j/83567640355?pwd=OHVRQ2VKcFNka0FhVjg2emQybG1Edz09 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the Zoom conference(auto recording) will be held at 2022-06-24 14:00, The subject of the conference is openEuler kernel SIG例会&技术分享, Summary: openEuler kernel 技术分享：执行实体创建与切换 You can join the meeting at https://us06web.zoom.us/j/83567640355?pwd=OHVRQ2VKcFNka0FhVjg2emQybG1Edz09. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

openEuler kernel SIG例会&技术分享
by openEuler conference 20 Jun '22

20 Jun '22

您好！ Kernel SIG 邀请您参加 2022-06-24 14:00 召开的Zoom会议(自动录制) 会议主题：openEuler kernel SIG例会&技术分享会议内容： openEuler kernel 技术分享：执行实体创建与切换会议链接：https://us06web.zoom.us/j/81671713618?pwd=eWIxeGowd1hvNTNZQUlRRmplNlZydz09 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the Zoom conference(auto recording) will be held at 2022-06-24 14:00, The subject of the conference is openEuler kernel SIG例会&技术分享, Summary: openEuler kernel 技术分享：执行实体创建与切换 You can join the meeting at https://us06web.zoom.us/j/81671713618?pwd=eWIxeGowd1hvNTNZQUlRRmplNlZydz09. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH openEuler-1.0-LTS 1/8] xfs: abort xattr scrub if fatal signals are pending
by Laibin Qiu 18 Jun '22

18 Jun '22

From: "Darrick J. Wong" <darrick.wong(a)oracle.com> mainline inclusion from mainline-v5.1-rc1 commit 3258cb208caba74258ffdd8bd59972bbda9bfee1 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5BDCU CVE: NA -------------------------------- The extended attribute scrubber should abort the "read all attrs" loop if there's a fatal signal pending on the process. Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Reviewed-by: Brian Foster <bfoster(a)redhat.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> Reviewed-by: Lihong Kou <koulihong(a)huawei.com> Reviewed-by: Xuenan Guo <guoxuenan(a)huawei.com> Signed-off-by: Laibin Qiu <qiulaibin(a)huawei.com> --- fs/xfs/scrub/attr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c index 81d5e90547a1..9960bc5b5d76 100644 --- a/fs/xfs/scrub/attr.c +++ b/fs/xfs/scrub/attr.c @@ -82,6 +82,11 @@ xchk_xattr_listent( sx = container_of(context, struct xchk_xattr, context); + if (xchk_should_terminate(sx->sc, &error)) { + context->seen_enough = 1; + return; + } + if (flags & XFS_ATTR_INCOMPLETE) { /* Incomplete attr key, just mark the inode for preening. */ xchk_ino_set_preen(sx->sc, context->dp->i_ino); -- 2.25.1

1 7

[PATCH openEuler-1.0-LTS 0/8] xfs: fix the xfstests problem
by tangbin 18 Jun '22

18 Jun '22

Hi all: These patches are used to resolve the xfs problem when perform xfstests. For details about how to fix the problem, we can see the link below: https://lore.kernel.org/linux-xfs/154697976479.2839.3584921201780682011.stg… https://lore.kernel.org/linux-xfs/157232182246.593721.4902116478429075171.s… Thanks --- Darrick J. Wong (8): xfs: abort xattr scrub if fatal signals are pending xfs: scrub should flag dir/attr offsets that aren't mappable with xfs_dablk_t xfs: check directory name validity xfs: check attribute name validity xfs: check attribute leaf block structure xfs: namecheck attribute names before listing them xfs: namecheck directory entry names before listing them xfs: replace -EIO with -EFSCORRUPTED for corrupt metadata fs/xfs/libxfs/xfs_attr.c | 17 +++++++++ fs/xfs/libxfs/xfs_attr.h | 2 +- fs/xfs/libxfs/xfs_attr_leaf.c | 68 +++++++++++++++++++++++++++++++++-- fs/xfs/libxfs/xfs_attr_leaf.h | 4 +-- fs/xfs/libxfs/xfs_bmap.c | 6 ++-- fs/xfs/libxfs/xfs_dir2.c | 17 +++++++++ fs/xfs/libxfs/xfs_dir2.h | 1 + fs/xfs/libxfs/xfs_types.c | 11 ++++++ fs/xfs/libxfs/xfs_types.h | 1 + fs/xfs/scrub/attr.c | 11 ++++++ fs/xfs/scrub/bmap.c | 27 ++++++++++++++ fs/xfs/scrub/dir.c | 6 ++++ fs/xfs/xfs_attr_inactive.c | 6 ++-- fs/xfs/xfs_attr_list.c | 60 ++++++++++++++++++++----------- fs/xfs/xfs_dir2_readdir.c | 27 +++++++++++--- fs/xfs/xfs_dquot.c | 2 +- 16 files changed, 228 insertions(+), 38 deletions(-) -- 2.18.4

2 9

[PATCH OLK_5.10] update via-cputemp driver
by LeoLiuoc 17 Jun '22

17 Jun '22

zhaoxin inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I52DS7 CVE: NA -------------------------------- Optimize driver code and add support for Zhaoxin CPU. Signed-off-by: LeoLiuoc <LeoLiu-oc(a)zhaoxin.com> --- drivers/hwmon/Makefile | 3 +- drivers/hwmon/via-cputemp.c | 69 ++++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index c22a5316bd91..115c0e002718 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -183,7 +183,8 @@ obj-$(CONFIG_SENSORS_TMP401) += tmp401.o obj-$(CONFIG_SENSORS_TMP421) += tmp421.o obj-$(CONFIG_SENSORS_TMP513) += tmp513.o obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress-hwmon.o -obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o +obj-$(CONFIG_SENSORS_VIA_CPUTEMP) += cputemp-hwmon.o +cputemp-hwmon-objs := via-cputemp.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o obj-$(CONFIG_SENSORS_VT1211) += vt1211.o obj-$(CONFIG_SENSORS_VT8231) += vt8231.o diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index e5d18dac8ee7..1599440cc451 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c @@ -26,7 +26,8 @@ #include <asm/processor.h> #include <asm/cpu_device_id.h> -#define DRVNAME "via_cputemp" +#define VIA_DRVNAME "via_cputemp" +#define ZHAOXIN_DRVNAME "zhaoxin_cputemp" enum { SHOW_TEMP, SHOW_LABEL, SHOW_NAME }; @@ -114,17 +115,17 @@ static int via_cputemp_probe(struct platform_device *pdev) int err; u32 eax, edx; - data = devm_kzalloc(&pdev->dev, sizeof(struct via_cputemp_data), - GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct via_cputemp_data), GFP_KERNEL); if (!data) return -ENOMEM; data->id = pdev->id; - data->name = "via_cputemp"; if (c->x86 == 7) { + data->name = ZHAOXIN_DRVNAME; data->msr_temp = 0x1423; } else { + data->name = VIA_DRVNAME; switch (c->x86_model) { case 0xA: /* C7 A */ @@ -145,8 +146,7 @@ static int via_cputemp_probe(struct platform_device *pdev) /* test if we can access the TEMPERATURE MSR */ err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx); if (err) { - dev_err(&pdev->dev, - "Unable to access TEMPERATURE MSR, giving up\n"); + dev_err(&pdev->dev, "Unable to access TEMPERATURE MSR, giving up\n"); return err; } @@ -165,11 +165,10 @@ static int via_cputemp_probe(struct platform_device *pdev) goto exit_remove; } - data->hwmon_dev = hwmon_device_register(&pdev->dev); + data->hwmon_dev = hwmon_device_register_with_info(&pdev->dev, data->name, NULL, NULL, NULL); if (IS_ERR(data->hwmon_dev)) { err = PTR_ERR(data->hwmon_dev); - dev_err(&pdev->dev, "Class registration failed (%d)\n", - err); + dev_err(&pdev->dev, "Class registration failed (%d)\n", err); goto exit_remove; } @@ -194,13 +193,12 @@ static int via_cputemp_remove(struct platform_device *pdev) } static struct platform_driver via_cputemp_driver = { - .driver = { - .name = DRVNAME, - }, .probe = via_cputemp_probe, .remove = via_cputemp_remove, }; +static struct platform_device_info cputemp_device_info; + struct pdev_entry { struct list_head list; struct platform_device *pdev; @@ -216,23 +214,20 @@ static int via_cputemp_online(unsigned int cpu) struct platform_device *pdev; struct pdev_entry *pdev_entry; - pdev = platform_device_alloc(DRVNAME, cpu); - if (!pdev) { - err = -ENOMEM; - pr_err("Device allocation failed\n"); + cputemp_device_info.id = cpu; + + pdev = platform_device_register_full(&cputemp_device_info); + if (IS_ERR(pdev)) { + err = PTR_ERR(pdev); + pr_err("Device registration failed (%d)\n", err); goto exit; } pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL); if (!pdev_entry) { err = -ENOMEM; - goto exit_device_put; - } - - err = platform_device_add(pdev); - if (err) { - pr_err("Device addition failed (%d)\n", err); - goto exit_device_free; + pr_err("Pdev_entry alloc failed (%d)\n", err); + goto exit_device_unregister; } pdev_entry->pdev = pdev; @@ -243,10 +238,8 @@ static int via_cputemp_online(unsigned int cpu) return 0; -exit_device_free: - kfree(pdev_entry); -exit_device_put: - platform_device_put(pdev); +exit_device_unregister: + platform_device_unregister(pdev); exit: return err; } @@ -270,10 +263,11 @@ static int via_cputemp_down_prep(unsigned int cpu) } static const struct x86_cpu_id __initconst cputemp_ids[] = { - X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_A, NULL), - X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_D, NULL), - X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_NANO, NULL), - X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_A, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_D, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_NANO, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY, NULL), + X86_MATCH_VENDOR_FAM_MODEL(ZHAOXIN, 7, X86_MODEL_ANY, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, cputemp_ids); @@ -283,15 +277,26 @@ static enum cpuhp_state via_temp_online; static int __init via_cputemp_init(void) { int err; + char *cpuhp_name; if (!x86_match_cpu(cputemp_ids)) return -ENODEV; + if (boot_cpu_data.x86 == 0x7) { + via_cputemp_driver.driver.name = ZHAOXIN_DRVNAME; + cputemp_device_info.name = ZHAOXIN_DRVNAME; + cpuhp_name = "hwmon/zhaoxin:online"; + } else { + via_cputemp_driver.driver.name = VIA_DRVNAME; + cputemp_device_info.name = VIA_DRVNAME; + cpuhp_name = "hwmon/via:online"; + } + err = platform_driver_register(&via_cputemp_driver); if (err) goto exit; - err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "hwmon/via:online", + err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, cpuhp_name, via_cputemp_online, via_cputemp_down_prep); if (err < 0) goto exit_driver_unreg; -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS 1/2] tcp: change source port randomizarion at connect() time
by Yongqiang Liu 17 Jun '22

17 Jun '22

From: Eric Dumazet <edumazet(a)google.com> stable inclusion from stable-v4.19.246 commit ddec440133913a6b8880e53b896d521a4b7ff24f category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5C3A9 CVE: CVE-2022-32296 -------------------------------- commit 190cc82489f46f9d88e73c81a47e14f80a791e1a upstream. RFC 6056 (Recommendations for Transport-Protocol Port Randomization) provides good summary of why source selection needs extra care. David Dworken reminded us that linux implements Algorithm 3 as described in RFC 6056 3.3.3 Quoting David : In the context of the web, this creates an interesting info leak where websites can count how many TCP connections a user's computer is establishing over time. For example, this allows a website to count exactly how many subresources a third party website loaded. This also allows: - Distinguishing between different users behind a VPN based on distinct source port ranges. - Tracking users over time across multiple networks. - Covert communication channels between different browsers/browser profiles running on the same computer - Tracking what applications are running on a computer based on the pattern of how fast source ports are getting incremented. Section 3.3.4 describes an enhancement, that reduces attackers ability to use the basic information currently stored into the shared 'u32 hint'. This change also decreases collision rate when multiple applications need to connect() to different destinations. Signed-off-by: Eric Dumazet <edumazet(a)google.com> Reported-by: David Dworken <ddworken(a)google.com> Cc: Willem de Bruijn <willemb(a)google.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [SG: Adjusted context] Signed-off-by: Stefan Ghinea <stefan.ghinea(a)windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/ipv4/inet_hashtables.c Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/ipv4/inet_hashtables.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index bd0108aaa45b..72b8b6f44add 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -666,6 +666,17 @@ void inet_unhash(struct sock *sk) } EXPORT_SYMBOL_GPL(inet_unhash); +/* RFC 6056 3.3.4. Algorithm 4: Double-Hash Port Selection Algorithm + * Note that we use 32bit integers (vs RFC 'short integers') + * because 2^16 is not a multiple of num_ephemeral and this + * property might be used by clever attacker. + * RFC claims using TABLE_LENGTH=10 buckets gives an improvement, + * we use 256 instead to really give more isolation and + * privacy, this only consumes 1 KB of kernel memory. + */ +#define INET_TABLE_PERTURB_SHIFT 8 +static u32 table_perturb[1 << INET_TABLE_PERTURB_SHIFT]; + int __inet_hash_connect(struct inet_timewait_death_row *death_row, struct sock *sk, u64 port_offset, int (*check_established)(struct inet_timewait_death_row *, @@ -679,8 +690,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, struct inet_bind_bucket *tb; u32 remaining, offset; int ret, i, low, high; - static u32 hint; int l3mdev; + u32 index; if (port) { head = &hinfo->bhash[inet_bhashfn(net, port, @@ -707,7 +718,10 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, if (likely(remaining > 1)) remaining &= ~1U; - offset = hint + port_offset; + net_get_random_once(table_perturb, sizeof(table_perturb)); + index = hash_32(port_offset, INET_TABLE_PERTURB_SHIFT); + + offset = READ_ONCE(table_perturb[index]) + port_offset; offset %= remaining; /* In first pass we try ports of @low parity. * inet_csk_get_port() does the opposite choice. @@ -762,7 +776,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, return -EADDRNOTAVAIL; ok: - hint += i + 2; + WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + i + 2); /* Head lock still held and bh's disabled */ inet_bind_hash(sk, tb, port); -- 2.25.1

1 1

[PATCH openEuler-1.0-LTS] arm64: fix extra cpucaps setup problem
by Yongqiang Liu 16 Jun '22

16 Jun '22

From: Chen Jiahao <chenjiahao16(a)huawei.com> hulk inclusion category: bugfix bugzilla: 186460, https://gitee.com/src-openeuler/kernel/issues/I53MHA CVE: CVE-2022-23960 -------------------------------- When introducing a new cpucaps macro ARM64_SPECTRE_BHB, ARM64_NCAPS was not able to modified easily due to KABI consistency. Here introduce a workaround to properly setup ARM64_SPECTRE_BHB beyond ARM64_NCAPS range. Fixes: def2df575d30 ("KVM: arm64: Add templates for BHB mitigation sequences") Signed-off-by: Chen Jiahao <chenjiahao16(a)huawei.com> Reviewed-by: Zhang Jianhua <chris.zjh(a)huawei.com> Reviewed-by: Liao Chang <liaochang1(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- arch/arm64/include/asm/cpufeature.h | 15 +++++++++++++++ arch/arm64/kernel/alternative.c | 5 +++++ arch/arm64/kernel/cpufeature.c | 3 +++ 3 files changed, 23 insertions(+) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index bfb699957880..ffb0a1ec0088 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -368,6 +368,8 @@ extern struct static_key_false arm64_const_caps_ready; #define ARM64_NPATCHABLE (ARM64_NCAPS + 1) extern DECLARE_BITMAP(boot_capabilities, ARM64_NPATCHABLE); +extern bool set_cap_spectre_bhb; + bool this_cpu_has_cap(unsigned int cap); static inline bool cpu_have_feature(unsigned int num) @@ -378,15 +380,23 @@ static inline bool cpu_have_feature(unsigned int num) /* System capability check for constant caps */ static __always_inline bool __cpus_have_const_cap(int num) { + if (num == ARM64_SPECTRE_BHB) + return set_cap_spectre_bhb; + if (num >= ARM64_NCAPS) return false; + return static_branch_unlikely(&cpu_hwcap_keys[num]); } static inline bool cpus_have_cap(unsigned int num) { + if (num == ARM64_SPECTRE_BHB) + return set_cap_spectre_bhb; + if (num >= ARM64_NCAPS) return false; + return test_bit(num, cpu_hwcaps); } @@ -400,6 +410,11 @@ static __always_inline bool cpus_have_const_cap(int num) static inline void cpus_set_cap(unsigned int num) { + if (num == ARM64_SPECTRE_BHB) { + set_cap_spectre_bhb = true; + return; + } + if (num >= ARM64_NCAPS) { pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n", num, ARM64_NCAPS); diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index 8511fc3b94bb..ce5a26080b46 100644 --- a/arch/arm64/kernel/alternative.c +++ b/arch/arm64/kernel/alternative.c @@ -41,8 +41,13 @@ struct alt_region { struct alt_instr *end; }; +bool set_cap_spectre_bhb; + bool alternative_is_applied(u16 cpufeature) { + if (cpufeature == ARM64_SPECTRE_BHB) + return set_cap_spectre_bhb; + if (WARN_ON(cpufeature >= ARM64_NCAPS)) return false; diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index aa9178e9acc6..996d3476f3c8 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1732,6 +1732,9 @@ __enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps, for (; caps->matches; caps++) { unsigned int num = caps->capability; + if (num == ARM64_SPECTRE_BHB) + set_cap_spectre_bhb = true; + if (!(caps->type & scope_mask) || !cpus_have_cap(num)) continue; -- 2.25.1

1 0

[Cancel] openEuler kernel SIG例会&技术分享
by openEuler conference 16 Jun '22

16 Jun '22

Sorry! The Zoom meeting will be held at 2022-06-17 14:00 scheduled by openEuler Kernel SIG has been cancelled.

1 0

[PATCH openEuler-1.0-LTS 1/3] powerpc/32: Fix overread/overwrite of thread_struct via ptrace
by Yongqiang Liu 15 Jun '22

15 Jun '22

From: Michael Ellerman <mpe(a)ellerman.id.au> mainline inclusion from mainline-v5.19-rc2 commit 8e1278444446fc97778a5e5c99bca1ce0bbc5ec9 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5C43D CVE: CVE-2022-32981 -------------------------------- The ptrace PEEKUSR/POKEUSR (aka PEEKUSER/POKEUSER) API allows a process to read/write registers of another process. To get/set a register, the API takes an index into an imaginary address space called the "USER area", where the registers of the process are laid out in some fashion. The kernel then maps that index to a particular register in its own data structures and gets/sets the value. The API only allows a single machine-word to be read/written at a time. So 4 bytes on 32-bit kernels and 8 bytes on 64-bit kernels. The way floating point registers (FPRs) are addressed is somewhat complicated, because double precision float values are 64-bit even on 32-bit CPUs. That means on 32-bit kernels each FPR occupies two word-sized locations in the USER area. On 64-bit kernels each FPR occupies one word-sized location in the USER area. Internally the kernel stores the FPRs in an array of u64s, or if VSX is enabled, an array of pairs of u64s where one half of each pair stores the FPR. Which half of the pair stores the FPR depends on the kernel's endianness. To handle the different layouts of the FPRs depending on VSX/no-VSX and big/little endian, the TS_FPR() macro was introduced. Unfortunately the TS_FPR() macro does not take into account the fact that the addressing of each FPR differs between 32-bit and 64-bit kernels. It just takes the index into the "USER area" passed from userspace and indexes into the fp_state.fpr array. On 32-bit there are 64 indexes that address FPRs, but only 32 entries in the fp_state.fpr array, meaning the user can read/write 256 bytes past the end of the array. Because the fp_state sits in the middle of the thread_struct there are various fields than can be overwritten, including some pointers. As such it may be exploitable. It has also been observed to cause systems to hang or otherwise misbehave when using gdbserver, and is probably the root cause of this report which could not be easily reproduced: https://lore.kernel.org/linuxppc-dev/dc38afe9-6b78-f3f5-666b-986939e40fc6@k… Rather than trying to make the TS_FPR() macro even more complicated to fix the bug, or add more macros, instead add a special-case for 32-bit kernels. This is more obvious and hopefully avoids a similar bug happening again in future. Note that because 32-bit kernels never have VSX enabled the code doesn't need to consider TS_FPRWIDTH/OFFSET at all. Add a BUILD_BUG_ON() to ensure that 32-bit && VSX is never enabled. Fixes: 87fec0514f61 ("powerpc: PTRACE_PEEKUSR/PTRACE_POKEUSER of FPR registers in little endian builds") Cc: stable(a)vger.kernel.org # v3.13+ Reported-by: Ariel Miculas <ariel.miculas(a)belden.com> Tested-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> Link: https://lore.kernel.org/r/20220609133245.573565-1-mpe@ellerman.id.au Conflicts: arch/powerpc/kernel/ptrace/ptrace-fpu.c arch/powerpc/kernel/ptrace/ptrace.c Signed-off-by: Yipeng Zou <zouyipeng(a)huawei.com> Reviewed-by: Zhang Jianhua <chris.zjh(a)huawei.com> Reviewed-by: Liao Chang <liaochang1(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- arch/powerpc/kernel/ptrace.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index e08b32ccf1d9..d245f0af412a 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -2980,6 +2980,9 @@ long arch_ptrace(struct task_struct *child, long request, void __user *datavp = (void __user *) data; unsigned long __user *datalp = datavp; + // ptrace_get/put_fpr() rely on PPC32 and VSX being incompatible + BUILD_BUG_ON(IS_ENABLED(CONFIG_PPC32) && IS_ENABLED(CONFIG_VSX)); + switch (request) { /* read the word at location addr in the USER area. */ case PTRACE_PEEKUSR: { @@ -3006,10 +3009,13 @@ long arch_ptrace(struct task_struct *child, long request, unsigned int fpidx = index - PT_FPR0; flush_fp_to_thread(child); - if (fpidx < (PT_FPSCR - PT_FPR0)) - memcpy(&tmp, &child->thread.TS_FPR(fpidx), - sizeof(long)); - else + if (fpidx < (PT_FPSCR - PT_FPR0)) { + if (IS_ENABLED(CONFIG_PPC32)) + // On 32-bit the index we are passed refers to 32-bit words + tmp = ((u32 *)child->thread.fp_state.fpr)[fpidx]; + else + memcpy(&tmp, &child->thread.TS_FPR(fpidx), sizeof(long)); + } else tmp = child->thread.fp_state.fpscr; } ret = put_user(tmp, datalp); @@ -3039,10 +3045,13 @@ long arch_ptrace(struct task_struct *child, long request, unsigned int fpidx = index - PT_FPR0; flush_fp_to_thread(child); - if (fpidx < (PT_FPSCR - PT_FPR0)) - memcpy(&child->thread.TS_FPR(fpidx), &data, - sizeof(long)); - else + if (fpidx < (PT_FPSCR - PT_FPR0)) { + if (IS_ENABLED(CONFIG_PPC32)) + // On 32-bit the index we are passed refers to 32-bit words + ((u32 *)child->thread.fp_state.fpr)[fpidx] = data; + else + memcpy(&child->thread.TS_FPR(fpidx), &data, sizeof(long)); + } else child->thread.fp_state.fpscr = data; ret = 0; } -- 2.25.1

1 2

[PATCH openEuler-1.0-LTS] sctp: use call_rcu to free endpoint
by Yongqiang Liu 14 Jun '22

14 Jun '22

From: Xin Long <lucien.xin(a)gmail.com> stable inclusion from stable-v4.19.224 commit af6e6e58f7ebf86b4e7201694b1e4f3a62cbc3ec category: bugfix bugzilla: 186701, https://gitee.com/src-openeuler/kernel/issues/I5CAM2 CVE: CVE-2022-20154 -------------------------------- [ Upstream commit 5ec7d18d1813a5bead0b495045606c93873aecbb ] This patch is to delay the endpoint free by calling call_rcu() to fix another use-after-free issue in sctp_sock_dump(): BUG: KASAN: use-after-free in __lock_acquire+0x36d9/0x4c20 Call Trace: __lock_acquire+0x36d9/0x4c20 kernel/locking/lockdep.c:3218 lock_acquire+0x1ed/0x520 kernel/locking/lockdep.c:3844 __raw_spin_lock_bh include/linux/spinlock_api_smp.h:135 [inline] _raw_spin_lock_bh+0x31/0x40 kernel/locking/spinlock.c:168 spin_lock_bh include/linux/spinlock.h:334 [inline] __lock_sock+0x203/0x350 net/core/sock.c:2253 lock_sock_nested+0xfe/0x120 net/core/sock.c:2774 lock_sock include/net/sock.h:1492 [inline] sctp_sock_dump+0x122/0xb20 net/sctp/diag.c:324 sctp_for_each_transport+0x2b5/0x370 net/sctp/socket.c:5091 sctp_diag_dump+0x3ac/0x660 net/sctp/diag.c:527 __inet_diag_dump+0xa8/0x140 net/ipv4/inet_diag.c:1049 inet_diag_dump+0x9b/0x110 net/ipv4/inet_diag.c:1065 netlink_dump+0x606/0x1080 net/netlink/af_netlink.c:2244 __netlink_dump_start+0x59a/0x7c0 net/netlink/af_netlink.c:2352 netlink_dump_start include/linux/netlink.h:216 [inline] inet_diag_handler_cmd+0x2ce/0x3f0 net/ipv4/inet_diag.c:1170 __sock_diag_cmd net/core/sock_diag.c:232 [inline] sock_diag_rcv_msg+0x31d/0x410 net/core/sock_diag.c:263 netlink_rcv_skb+0x172/0x440 net/netlink/af_netlink.c:2477 sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:274 This issue occurs when asoc is peeled off and the old sk is freed after getting it by asoc->base.sk and before calling lock_sock(sk). To prevent the sk free, as a holder of the sk, ep should be alive when calling lock_sock(). This patch uses call_rcu() and moves sock_put and ep free into sctp_endpoint_destroy_rcu(), so that it's safe to try to hold the ep under rcu_read_lock in sctp_transport_traverse_process(). If sctp_endpoint_hold() returns true, it means this ep is still alive and we have held it and can continue to dump it; If it returns false, it means this ep is dead and can be freed after rcu_read_unlock, and we should skip it. In sctp_sock_dump(), after locking the sk, if this ep is different from tsp->asoc->ep, it means during this dumping, this asoc was peeled off before calling lock_sock(), and the sk should be skipped; If this ep is the same with tsp->asoc->ep, it means no peeloff happens on this asoc, and due to lock_sock, no peeloff will happen either until release_sock. Note that delaying endpoint free won't delay the port release, as the port release happens in sctp_endpoint_destroy() before calling call_rcu(). Also, freeing endpoint by call_rcu() makes it safe to access the sk by asoc->base.sk in sctp_assocs_seq_show() and sctp_rcv(). Thanks Jones to bring this issue up. v1->v2: - improve the changelog. - add kfree(ep) into sctp_endpoint_destroy_rcu(), as Jakub noticed. Reported-by: syzbot+9276d76e83e3bcde6c99(a)syzkaller.appspotmail.com Reported-by: Lee Jones <lee.jones(a)linaro.org> Fixes: d25adbeb0cdb ("sctp: fix an use-after-free issue in sctp_sock_dump") Signed-off-by: Xin Long <lucien.xin(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Huang Guobin <huangguobin4(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- include/net/sctp/sctp.h | 6 +++--- include/net/sctp/structs.h | 3 ++- net/sctp/diag.c | 12 ++++++------ net/sctp/endpointola.c | 23 +++++++++++++++-------- net/sctp/socket.c | 23 +++++++++++++++-------- 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index fef8c3372aee..6d201c6700be 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -118,6 +118,7 @@ extern struct percpu_counter sctp_sockets_allocated; int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *); struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *); +typedef int (*sctp_callback_t)(struct sctp_endpoint *, struct sctp_transport *, void *); void sctp_transport_walk_start(struct rhashtable_iter *iter); void sctp_transport_walk_stop(struct rhashtable_iter *iter); struct sctp_transport *sctp_transport_get_next(struct net *net, @@ -128,9 +129,8 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *), struct net *net, const union sctp_addr *laddr, const union sctp_addr *paddr, void *p); -int sctp_for_each_transport(int (*cb)(struct sctp_transport *, void *), - int (*cb_done)(struct sctp_transport *, void *), - struct net *net, int *pos, void *p); +int sctp_transport_traverse_process(sctp_callback_t cb, sctp_callback_t cb_done, + struct net *net, int *pos, void *p); int sctp_for_each_endpoint(int (*cb)(struct sctp_endpoint *, void *), void *p); int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, struct sctp_info *info); diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 2882bc7a5b4b..18f9924aa250 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -1348,6 +1348,7 @@ struct sctp_endpoint { u32 secid; u32 peer_secid; + struct rcu_head rcu; }; /* Recover the outter endpoint structure. */ @@ -1363,7 +1364,7 @@ static inline struct sctp_endpoint *sctp_ep(struct sctp_ep_common *base) struct sctp_endpoint *sctp_endpoint_new(struct sock *, gfp_t); void sctp_endpoint_free(struct sctp_endpoint *); void sctp_endpoint_put(struct sctp_endpoint *); -void sctp_endpoint_hold(struct sctp_endpoint *); +int sctp_endpoint_hold(struct sctp_endpoint *ep); void sctp_endpoint_add_asoc(struct sctp_endpoint *, struct sctp_association *); struct sctp_association *sctp_endpoint_lookup_assoc( const struct sctp_endpoint *ep, diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 8767405de9fa..0a9db0a7f423 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -307,9 +307,8 @@ static int sctp_tsp_dump_one(struct sctp_transport *tsp, void *p) return err; } -static int sctp_sock_dump(struct sctp_transport *tsp, void *p) +static int sctp_sock_dump(struct sctp_endpoint *ep, struct sctp_transport *tsp, void *p) { - struct sctp_endpoint *ep = tsp->asoc->ep; struct sctp_comm_param *commp = p; struct sock *sk = ep->base.sk; struct sk_buff *skb = commp->skb; @@ -319,6 +318,8 @@ static int sctp_sock_dump(struct sctp_transport *tsp, void *p) int err = 0; lock_sock(sk); + if (ep != tsp->asoc->ep) + goto release; list_for_each_entry(assoc, &ep->asocs, asocs) { if (cb->args[4] < cb->args[1]) goto next; @@ -361,9 +362,8 @@ static int sctp_sock_dump(struct sctp_transport *tsp, void *p) return err; } -static int sctp_sock_filter(struct sctp_transport *tsp, void *p) +static int sctp_sock_filter(struct sctp_endpoint *ep, struct sctp_transport *tsp, void *p) { - struct sctp_endpoint *ep = tsp->asoc->ep; struct sctp_comm_param *commp = p; struct sock *sk = ep->base.sk; const struct inet_diag_req_v2 *r = commp->r; @@ -521,8 +521,8 @@ static void sctp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, if (!(idiag_states & ~(TCPF_LISTEN | TCPF_CLOSE))) goto done; - sctp_for_each_transport(sctp_sock_filter, sctp_sock_dump, - net, &pos, &commp); + sctp_transport_traverse_process(sctp_sock_filter, sctp_sock_dump, + net, &pos, &commp); cb->args[2] = pos; done: diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 8640dedcf64f..c4068451b9c7 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -242,6 +242,18 @@ void sctp_endpoint_free(struct sctp_endpoint *ep) } /* Final destructor for endpoint. */ +static void sctp_endpoint_destroy_rcu(struct rcu_head *head) +{ + struct sctp_endpoint *ep = container_of(head, struct sctp_endpoint, rcu); + struct sock *sk = ep->base.sk; + + sctp_sk(sk)->ep = NULL; + sock_put(sk); + + kfree(ep); + SCTP_DBG_OBJCNT_DEC(ep); +} + static void sctp_endpoint_destroy(struct sctp_endpoint *ep) { struct sock *sk; @@ -275,18 +287,13 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep) if (sctp_sk(sk)->bind_hash) sctp_put_port(sk); - sctp_sk(sk)->ep = NULL; - /* Give up our hold on the sock */ - sock_put(sk); - - kfree(ep); - SCTP_DBG_OBJCNT_DEC(ep); + call_rcu(&ep->rcu, sctp_endpoint_destroy_rcu); } /* Hold a reference to an endpoint. */ -void sctp_endpoint_hold(struct sctp_endpoint *ep) +int sctp_endpoint_hold(struct sctp_endpoint *ep) { - refcount_inc(&ep->base.refcnt); + return refcount_inc_not_zero(&ep->base.refcnt); } /* Release a reference to an endpoint and clean up if there are diff --git a/net/sctp/socket.c b/net/sctp/socket.c index cfa54e56add9..0e979a273dcd 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -5059,11 +5059,12 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *), } EXPORT_SYMBOL_GPL(sctp_transport_lookup_process); -int sctp_for_each_transport(int (*cb)(struct sctp_transport *, void *), - int (*cb_done)(struct sctp_transport *, void *), - struct net *net, int *pos, void *p) { +int sctp_transport_traverse_process(sctp_callback_t cb, sctp_callback_t cb_done, + struct net *net, int *pos, void *p) +{ struct rhashtable_iter hti; struct sctp_transport *tsp; + struct sctp_endpoint *ep; int ret; again: @@ -5072,26 +5073,32 @@ int sctp_for_each_transport(int (*cb)(struct sctp_transport *, void *), tsp = sctp_transport_get_idx(net, &hti, *pos + 1); for (; !IS_ERR_OR_NULL(tsp); tsp = sctp_transport_get_next(net, &hti)) { - ret = cb(tsp, p); - if (ret) - break; + ep = tsp->asoc->ep; + if (sctp_endpoint_hold(ep)) { /* asoc can be peeled off */ + ret = cb(ep, tsp, p); + if (ret) + break; + sctp_endpoint_put(ep); + } (*pos)++; sctp_transport_put(tsp); } sctp_transport_walk_stop(&hti); if (ret) { - if (cb_done && !cb_done(tsp, p)) { + if (cb_done && !cb_done(ep, tsp, p)) { (*pos)++; + sctp_endpoint_put(ep); sctp_transport_put(tsp); goto again; } + sctp_endpoint_put(ep); sctp_transport_put(tsp); } return ret; } -EXPORT_SYMBOL_GPL(sctp_for_each_transport); +EXPORT_SYMBOL_GPL(sctp_transport_traverse_process); /* 7.2.1 Association Status (SCTP_STATUS) -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] ext4: convert from atomic_t to refcount_t on ext4_io_end->count
by Yongqiang Liu 14 Jun '22

14 Jun '22

From: Xiyu Yang <xiyuyang19(a)fudan.edu.cn> hulk inclusion category: bugfix bugzilla: 186971, https://gitee.com/openeuler/kernel/issues/I5C8IW CVE: NA -------------------------------- refcount_t type and corresponding API can protect refcounters from accidental underflow and overflow and further use-after-free situations. Signed-off-by: Xiyu Yang <xiyuyang19(a)fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf(a)gmail.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/1626674355-55795-1-git-send-email-xiyuyang19@fuda… Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Signed-off-by: Li Nan <linan122(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- fs/ext4/ext4.h | 3 ++- fs/ext4/page-io.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 16e2b719d47c..6efc710b07bf 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -17,6 +17,7 @@ #ifndef _EXT4_H #define _EXT4_H +#include <linux/refcount.h> #include <linux/types.h> #include <linux/blkdev.h> #include <linux/magic.h> @@ -231,7 +232,7 @@ typedef struct ext4_io_end { struct bio *bio; /* Linked list of completed * bios covering the extent */ unsigned int flag; /* unwritten or not */ - atomic_t count; /* reference counter */ + refcount_t count; /* reference counter */ loff_t offset; /* offset in the file */ ssize_t size; /* size of the extent */ } ext4_io_end_t; diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 3de933354a08..decae80aeb98 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -256,14 +256,14 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags) if (io) { io->inode = inode; INIT_LIST_HEAD(&io->list); - atomic_set(&io->count, 1); + refcount_set(&io->count, 1); } return io; } void ext4_put_io_end_defer(ext4_io_end_t *io_end) { - if (atomic_dec_and_test(&io_end->count)) { + if (refcount_dec_and_test(&io_end->count)) { if (!(io_end->flag & EXT4_IO_END_UNWRITTEN) || !io_end->size) { ext4_release_io_end(io_end); return; @@ -276,7 +276,7 @@ int ext4_put_io_end(ext4_io_end_t *io_end) { int err = 0; - if (atomic_dec_and_test(&io_end->count)) { + if (refcount_dec_and_test(&io_end->count)) { if (io_end->flag & EXT4_IO_END_UNWRITTEN) { err = ext4_convert_unwritten_extents(io_end->handle, io_end->inode, io_end->offset, @@ -291,7 +291,7 @@ int ext4_put_io_end(ext4_io_end_t *io_end) ext4_io_end_t *ext4_get_io_end(ext4_io_end_t *io_end) { - atomic_inc(&io_end->count); + refcount_inc(&io_end->count); return io_end; } -- 2.25.1

1 0

[PATCH openEuler-5.10 01/49] io_uring: always use original task when preparing req identity
by Zheng Zengkai 14 Jun '22

14 Jun '22

From: Jens Axboe <axboe(a)kernel.dk> stable inclusion from stable-v5.10.116 commit 29f077d070519a88a793fbc70f1e6484dc6d9e35 category: bugfix bugzilla: 186865,https://gitee.com/src-openeuler/kernel/issues/I593SI CVE: CVE-2022-1786 -------------------------------- If the ring is setup with IORING_SETUP_IOPOLL and we have more than one task doing submissions on a ring, we can up in a situation where we assign the context from the current task rather than the request originator. Always use req->task rather than assume it's the same as current. No upstream patch exists for this issue, as only older kernels with the non-native workers have this problem. Reported-by: Kyle Zeng <zengyhkyle(a)gmail.com> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Guo Xuenan <guoxuenan(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 2ed0da75000e..cadd491edc6f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1156,7 +1156,7 @@ static inline void __io_req_init_async(struct io_kiocb *req) */ static inline void io_req_init_async(struct io_kiocb *req) { - struct io_uring_task *tctx = current->io_uring; + struct io_uring_task *tctx = req->task->io_uring; if (req->flags & REQ_F_WORK_INITIALIZED) return; -- 2.20.1

1 48

[openEuler-5.10 00/19] Backport 5.10.107 LTS
by Zheng Zengkai 14 Jun '22

14 Jun '22

Backport 5.10.107 LTS patches from upstream kselftest/vm: fix tests build with old libc sfc: extend the locking on mcdi->seqno tcp: make tcp_read_sock() more robust nl80211: Update bss channel on channel switch for P2P_CLIENT drm/vrr: Set VRR capable prop only if it is attached to connector iwlwifi: don't advertise TWT support atm: firestream: check the return value of ioremap() in fs_init() can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE MIPS: smp: fill in sibling and core maps earlier mac80211: refuse aggregations sessions before authorized ARM: dts: rockchip: fix a typo on rk3288 crypto-controller ARM: dts: rockchip: reorder rk322x hmdi clocks arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" arm64: dts: rockchip: reorder rk3399 hdmi clocks arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity xfrm: Fix xfrm migrate issues when address family changes xfrm: Check if_id in xfrm_migrate Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Already merged(3) arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable io_uring: return back safer resurrect sctp: fix the processing for INIT chunk Total patches: 22 - 3 = 19 Alexander Lobakin (1): MIPS: smp: fill in sibling and core maps earlier Chengming Zhou (1): kselftest/vm: fix tests build with old libc Corentin Labbe (1): ARM: dts: rockchip: fix a typo on rk3288 crypto-controller Dinh Nguyen (1): arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" Eric Dumazet (1): tcp: make tcp_read_sock() more robust Golan Ben Ami (1): iwlwifi: don't advertise TWT support Jakob Unterwurzacher (1): arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity Jia-Ju Bai (1): atm: firestream: check the return value of ioremap() in fs_init() Johannes Berg (1): mac80211: refuse aggregations sessions before authorized Julian Braha (1): ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE Kai Lueke (1): Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Lad Prabhakar (1): can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready Manasi Navare (1): drm/vrr: Set VRR capable prop only if it is attached to connector Niels Dossche (1): sfc: extend the locking on mcdi->seqno Sascha Hauer (2): arm64: dts: rockchip: reorder rk3399 hdmi clocks ARM: dts: rockchip: reorder rk322x hmdi clocks Sreeramya Soratkal (1): nl80211: Update bss channel on channel switch for P2P_CLIENT Yan Yan (2): xfrm: Check if_id in xfrm_migrate xfrm: Fix xfrm migrate issues when address family changes arch/arm/boot/dts/rk322x.dtsi | 4 +-- arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +-- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 6 +++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++--- arch/mips/kernel/smp.c | 6 ++--- drivers/atm/firestream.c | 2 ++ drivers/gpu/drm/drm_connector.c | 3 +++ drivers/net/can/rcar/rcar_canfd.c | 6 ++--- drivers/net/ethernet/sfc/mcdi.c | 2 +- .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +-- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 - include/net/xfrm.h | 5 ++-- lib/Kconfig | 1 - net/ipv4/tcp.c | 10 ++++--- net/key/af_key.c | 2 +- net/mac80211/agg-tx.c | 10 ++++++- net/wireless/nl80211.c | 3 ++- net/xfrm/xfrm_policy.c | 14 +++++----- net/xfrm/xfrm_state.c | 15 ++++++++--- net/xfrm/xfrm_user.c | 27 ++++++------------- tools/testing/selftests/vm/userfaultfd.c | 1 + 22 files changed, 76 insertions(+), 57 deletions(-) -- 2.20.1

1 19

[PATCH openEuler-1.0-LTS 1/9] HID: add hid_is_usb() function to make it simpler for USB detection
by Yongqiang Liu 14 Jun '22

14 Jun '22

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> stable inclusion from linux-4.19.221 commit b1efa723b986a84f84a95b6907cffe3a357338c9 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5BTIG CVE: CVE-2022-20132 -------------------------------- commit f83baa0cb6cfc92ebaf7f9d3a99d7e34f2e77a8a upstream. A number of HID drivers already call hid_is_using_ll_driver() but only for the detection of if this is a USB device or not. Make this more obvious by creating hid_is_usb() and calling the function that way. Also converts the existing hid_is_using_ll_driver() functions to use the new call. Cc: Jiri Kosina <jikos(a)kernel.org> Cc: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Cc: linux-input(a)vger.kernel.org Cc: stable(a)vger.kernel.org Tested-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Link: https://lore.kernel.org/r/20211201183503.2373082-1-gregkh@linuxfoundation.o… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Rui Xiang <rui.xiang(a)huawei.com> Reviewed-by: Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/hid/hid-asus.c | 2 +- drivers/hid/wacom_sys.c | 2 +- include/linux/hid.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 88a5672f42cd..800b2364e29e 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -622,7 +622,7 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) if (drvdata->quirks & QUIRK_IS_MULTITOUCH) drvdata->tp = &asus_i2c_tp; - if (drvdata->quirks & QUIRK_T100_KEYBOARD) { + if ((drvdata->quirks & QUIRK_T100_KEYBOARD) && hid_is_usb(hdev)) { struct usb_interface *intf = to_usb_interface(hdev->dev.parent); if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) { diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 3038c975e417..101b5ae2c3a7 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -2154,7 +2154,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) if ((features->type == HID_GENERIC) && !strcmp("Wacom HID", features->name)) { char *product_name = wacom->hdev->name; - if (hid_is_using_ll_driver(wacom->hdev, &usb_hid_driver)) { + if (hid_is_usb(wacom->hdev)) { struct usb_interface *intf = to_usb_interface(wacom->hdev->dev.parent); struct usb_device *dev = interface_to_usbdev(intf); product_name = dev->product; diff --git a/include/linux/hid.h b/include/linux/hid.h index bbbe6c0e0e26..7f321909ec58 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -832,6 +832,11 @@ static inline bool hid_is_using_ll_driver(struct hid_device *hdev, return hdev->ll_driver == driver; } +static inline bool hid_is_usb(struct hid_device *hdev) +{ + return hid_is_using_ll_driver(hdev, &usb_hid_driver); +} + #define PM_HINT_FULLON 1<<5 #define PM_HINT_NORMAL 1<<1 -- 2.25.1

1 8

[PATCH openEuler-5.10-LTS 01/42] netfilter: nf_tables: sanitize nft_set_desc_concat_parse()
by Zheng Zengkai 14 Jun '22

14 Jun '22

From: Pablo Neira Ayuso <pablo(a)netfilter.org> stable inclusion from stable-v5.10.120 commit c0aff1faf66b6b7a19103f83e6a5d0fdc64b9048 category: bugfix bugzilla: 186913 https://gitee.com/src-openeuler/kernel/issues/I5B69E CVE: CVE-2022-1972 -------------------------------- commit fecf31ee395b0295f2d7260aa29946b7605f7c85 upstream. Add several sanity checks for nft_set_desc_concat_parse(): - validate desc->field_count not larger than desc->field_len array. - field length cannot be larger than desc->field_len (ie. U8_MAX) - total length of the concatenation cannot be larger than register array. Joint work with Florian Westphal. Fixes: f3a2181e16f1 ("netfilter: nf_tables: Support for sets with multiple ranged fields") Reported-by: <zhangziming.zzm(a)antgroup.com> Reviewed-by: Stefano Brivio <sbrivio(a)redhat.com> Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Zhengchao Shao <shaozhengchao(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/netfilter/nf_tables_api.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index fdd1da9ecea9..164b686bb4c9 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4047,6 +4047,9 @@ static int nft_set_desc_concat_parse(const struct nlattr *attr, u32 len; int err; + if (desc->field_count >= ARRAY_SIZE(desc->field_len)) + return -E2BIG; + err = nla_parse_nested_deprecated(tb, NFTA_SET_FIELD_MAX, attr, nft_concat_policy, NULL); if (err < 0) @@ -4056,9 +4059,8 @@ static int nft_set_desc_concat_parse(const struct nlattr *attr, return -EINVAL; len = ntohl(nla_get_be32(tb[NFTA_SET_FIELD_LEN])); - - if (len * BITS_PER_BYTE / 32 > NFT_REG32_COUNT) - return -E2BIG; + if (!len || len > U8_MAX) + return -EINVAL; desc->field_len[desc->field_count++] = len; @@ -4069,7 +4071,8 @@ static int nft_set_desc_concat(struct nft_set_desc *desc, const struct nlattr *nla) { struct nlattr *attr; - int rem, err; + u32 num_regs = 0; + int rem, err, i; nla_for_each_nested(attr, nla, rem) { if (nla_type(attr) != NFTA_LIST_ELEM) @@ -4080,6 +4083,12 @@ static int nft_set_desc_concat(struct nft_set_desc *desc, return err; } + for (i = 0; i < desc->field_count; i++) + num_regs += DIV_ROUND_UP(desc->field_len[i], sizeof(u32)); + + if (num_regs > NFT_REG32_COUNT) + return -E2BIG; + return 0; } -- 2.20.1

1 41

[PATCH openEuler-5.10 00/19] Backport 5.10.107 LTS
by Zheng Zengkai 14 Jun '22

14 Jun '22

Backport 5.10.107 LTS patches from upstream kselftest/vm: fix tests build with old libc sfc: extend the locking on mcdi->seqno tcp: make tcp_read_sock() more robust nl80211: Update bss channel on channel switch for P2P_CLIENT drm/vrr: Set VRR capable prop only if it is attached to connector iwlwifi: don't advertise TWT support atm: firestream: check the return value of ioremap() in fs_init() can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE MIPS: smp: fill in sibling and core maps earlier mac80211: refuse aggregations sessions before authorized ARM: dts: rockchip: fix a typo on rk3288 crypto-controller ARM: dts: rockchip: reorder rk322x hmdi clocks arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" arm64: dts: rockchip: reorder rk3399 hdmi clocks arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity xfrm: Fix xfrm migrate issues when address family changes xfrm: Check if_id in xfrm_migrate Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Already merged(3) arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable io_uring: return back safer resurrect sctp: fix the processing for INIT chunk Total patches: 22 - 3 = 19 Alexander Lobakin (1): MIPS: smp: fill in sibling and core maps earlier Chengming Zhou (1): kselftest/vm: fix tests build with old libc Corentin Labbe (1): ARM: dts: rockchip: fix a typo on rk3288 crypto-controller Dinh Nguyen (1): arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" Eric Dumazet (1): tcp: make tcp_read_sock() more robust Golan Ben Ami (1): iwlwifi: don't advertise TWT support Jakob Unterwurzacher (1): arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity Jia-Ju Bai (1): atm: firestream: check the return value of ioremap() in fs_init() Johannes Berg (1): mac80211: refuse aggregations sessions before authorized Julian Braha (1): ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE Kai Lueke (1): Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Lad Prabhakar (1): can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready Manasi Navare (1): drm/vrr: Set VRR capable prop only if it is attached to connector Niels Dossche (1): sfc: extend the locking on mcdi->seqno Sascha Hauer (2): arm64: dts: rockchip: reorder rk3399 hdmi clocks ARM: dts: rockchip: reorder rk322x hmdi clocks Sreeramya Soratkal (1): nl80211: Update bss channel on channel switch for P2P_CLIENT Yan Yan (2): xfrm: Check if_id in xfrm_migrate xfrm: Fix xfrm migrate issues when address family changes arch/arm/boot/dts/rk322x.dtsi | 4 +-- arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +-- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 6 +++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++--- arch/mips/kernel/smp.c | 6 ++--- drivers/atm/firestream.c | 2 ++ drivers/gpu/drm/drm_connector.c | 3 +++ drivers/net/can/rcar/rcar_canfd.c | 6 ++--- drivers/net/ethernet/sfc/mcdi.c | 2 +- .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +-- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 - include/net/xfrm.h | 5 ++-- lib/Kconfig | 1 - net/ipv4/tcp.c | 10 ++++--- net/key/af_key.c | 2 +- net/mac80211/agg-tx.c | 10 ++++++- net/wireless/nl80211.c | 3 ++- net/xfrm/xfrm_policy.c | 14 +++++----- net/xfrm/xfrm_state.c | 15 ++++++++--- net/xfrm/xfrm_user.c | 27 ++++++------------- tools/testing/selftests/vm/userfaultfd.c | 1 + 22 files changed, 76 insertions(+), 57 deletions(-) -- 2.20.1

1 19

[PATCH openEuler-1.0-LTS] netfilter: nf_tables: disallow non-stateful expression in sets earlier
by Yongqiang Liu 14 Jun '22

14 Jun '22

From: Pablo Neira Ayuso <pablo(a)netfilter.org> mainline inclusion from mainline-v5.19-rc1 commit 520778042ccca019f3ffa136dd0ca565c486cedd category: bugfix bugzilla: 186905, https://gitee.com/src-openeuler/kernel/issues/I5B3QZ CVE: CVE-2022-1966 -------------------------------- Since 3e135cd499bf ("netfilter: nft_dynset: dynamic stateful expression instantiation"), it is possible to attach stateful expressions to set elements. cd5125d8f518 ("netfilter: nf_tables: split set destruction in deactivate and destroy phase") introduces conditional destruction on the object to accomodate transaction semantics. nft_expr_init() calls expr->ops->init() first, then check for NFT_STATEFUL_EXPR, this stills allows to initialize a non-stateful lookup expressions which points to a set, which might lead to UAF since the set is not properly detached from the set->binding for this case. Anyway, this combination is non-sense from nf_tables perspective. This patch fixes this problem by checking for NFT_STATEFUL_EXPR before expr->ops->init() is called. The reporter provides a KASAN splat and a poc reproducer (similar to those autogenerated by syzbot to report use-after-free errors). It is unknown to me if they are using syzbot or if they use similar automated tool to locate the bug that they are reporting. For the record, this is the KASAN splat. [ 85.431824] ================================================================== [ 85.432901] BUG: KASAN: use-after-free in nf_tables_bind_set+0x81b/0xa20 [ 85.433825] Write of size 8 at addr ffff8880286f0e98 by task poc/776 [ 85.434756] [ 85.434999] CPU: 1 PID: 776 Comm: poc Tainted: G W 5.18.0+ #2 [ 85.436023] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 Fixes: 0b2d8a7b638b ("netfilter: nf_tables: add helper functions for expression handling") Reported-and-tested-by: Aaron Adams <edg-e(a)nccgroup.com> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> conflict: net/netfilter/nf_tables_api.c net/netfilter/nft_dynset.c Signed-off-by: Lu Wei <luwei32(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/netfilter/nf_tables_api.c | 16 ++++++++++------ net/netfilter/nft_dynset.c | 3 --- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 9cc8e92f4b00..ab68076d2cba 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2167,27 +2167,31 @@ struct nft_expr *nft_expr_init(const struct nft_ctx *ctx, err = nf_tables_expr_parse(ctx, nla, &info); if (err < 0) - goto err1; + goto err_expr_parse; + + err = -EOPNOTSUPP; + if (!(info.ops->type->flags & NFT_EXPR_STATEFUL)) + goto err_expr_stateful; err = -ENOMEM; expr = kzalloc(info.ops->size, GFP_KERNEL); if (expr == NULL) - goto err2; + goto err_expr_stateful; err = nf_tables_newexpr(ctx, &info, expr); if (err < 0) - goto err3; + goto err_expr_new; return expr; -err3: +err_expr_new: kfree(expr); -err2: +err_expr_stateful: owner = info.ops->type->owner; if (info.ops->type->release_ops) info.ops->type->release_ops(info.ops); module_put(owner); -err1: +err_expr_parse: return ERR_PTR(err); } diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c index 4e544044fc2d..cc076d535e14 100644 --- a/net/netfilter/nft_dynset.c +++ b/net/netfilter/nft_dynset.c @@ -193,9 +193,6 @@ static int nft_dynset_init(const struct nft_ctx *ctx, return PTR_ERR(priv->expr); err = -EOPNOTSUPP; - if (!(priv->expr->ops->type->flags & NFT_EXPR_STATEFUL)) - goto err1; - if (priv->expr->ops->type->flags & NFT_EXPR_GC) { if (set->flags & NFT_SET_TIMEOUT) goto err1; -- 2.25.1

1 0

[PATCH OLK-5.10 v2] eulerfs: fix potential sbi->persisters free error
by gouhao＠uniontech.com 14 Jun '22

14 Jun '22

From: Gou Hao <gouhao(a)uniontech.com> uniontech inclusion category: bugfix bugzilla: NA CVE: NA ------------------- After alloc the sbi->persisters memory, dep_init will call dep_fini when error happened.Because sbi->persisters is not set to 0, -> dep_fini() can be called with sbi->persisters[] uninitialized, thus kthread_stop() can be called with random value. Signed-off-by: Gou Hao <gouhao(a)uniontech.com> --- fs/eulerfs/dep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eulerfs/dep.c b/fs/eulerfs/dep.c index ec014bbf3700..a41471c5f2ec 100644 --- a/fs/eulerfs/dep.c +++ b/fs/eulerfs/dep.c @@ -718,7 +718,7 @@ int dep_init(struct super_block *sb) for_each_possible_cpu(cpu) init_llist_head(per_cpu_ptr(sbi->persistee_list, cpu)); - sbi->persisters = kmalloc(sizeof(struct task_struct *) * + sbi->persisters = kzalloc(sizeof(struct task_struct *) * persisters_per_socket * num_sockets, GFP_KERNEL); if (!sbi->persisters) { -- 2.25.1

2 1

[PATCH openEuler-1.0-LTS 1/2] Revert "NFSv4: Handle the special Linux file open access mode"
by Yongqiang Liu 14 Jun '22

14 Jun '22

From: ChenXiaoSong <chenxiaosong2(a)huawei.com> mainline inclusion from mainline-v5.18-rc2 commit ab0fc21bc7105b54bafd85bd8b82742f9e68898a category: bugfix bugzilla: 186890, https://gitee.com/openeuler/kernel/issues/I5BZTX CVE: NA -------------------------------- This reverts commit 44942b4e457beda00981f616402a1a791e8c616e. After secondly opening a file with O_ACCMODE|O_DIRECT flags, nfs4_valid_open_stateid() will dereference NULL nfs4_state when lseek(). Reproducer: 1. mount -t nfs -o vers=4.2 $server_ip:/ /mnt/ 2. fd = open("/mnt/file", O_ACCMODE|O_DIRECT|O_CREAT) 3. close(fd) 4. fd = open("/mnt/file", O_ACCMODE|O_DIRECT) 5. lseek(fd) Reported-by: Lyu Tao <tao.lyu(a)epfl.ch> Signed-off-by: ChenXiaoSong <chenxiaosong2(a)huawei.com> Signed-off-by: Trond Myklebust <trond.myklebust(a)hammerspace.com> Signed-off-by: ChenXiaoSong <chenxiaosong2(a)huawei.com> Reviewed-by: Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- fs/nfs/inode.c | 1 - fs/nfs/nfs4file.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index db52430dfbd7..053e78d777f1 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1103,7 +1103,6 @@ int nfs_open(struct inode *inode, struct file *filp) nfs_fscache_open_file(inode, filp); return 0; } -EXPORT_SYMBOL_GPL(nfs_open); /* * This function is called whenever some part of NFS notices that diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index e053a883d08d..09d65a654c2b 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -49,7 +49,7 @@ nfs4_file_open(struct inode *inode, struct file *filp) return err; if ((openflags & O_ACCMODE) == 3) - return nfs_open(inode, filp); + openflags--; /* We can't create new files here */ openflags &= ~(O_CREAT|O_EXCL); -- 2.25.1

1 1

openEuler kernel SIG例会&技术分享
by openEuler conference 14 Jun '22

14 Jun '22

您好！ Kernel SIG 邀请您参加 2022-06-17 14:00 召开的Zoom会议(自动录制) 会议主题：openEuler kernel SIG例会&技术分享会议内容： openEuler kernel 技术分享：执行实体创建与切换会议链接：https://us06web.zoom.us/j/82875828076?pwd=cWVmcGtITlJlM0RxcXYzcDlXZjVJUT09 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the Zoom conference(auto recording) will be held at 2022-06-17 14:00, The subject of the conference is openEuler kernel SIG例会&技术分享, Summary: openEuler kernel 技术分享：执行实体创建与切换 You can join the meeting at https://us06web.zoom.us/j/82875828076?pwd=cWVmcGtITlJlM0RxcXYzcDlXZjVJUT09. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH openEuler-1.0-LTS] nvme: Assign subsys instance from first ctrl
by Chen Taotao 09 Jun '22

09 Jun '22

mainline inclusion from mainline-5.3.0-rc3 commit 733e4b69d508d03c20adfdcf4bd27abc60fae9cc category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5986O CVE: NA -------------------------------- The namespace disk names must be unique for the lifetime of the subsystem. This was accomplished by using their parent subsystems' instances which were allocated independently from the controllers connected to that subsystem. This allowed name prefixes assigned to namespaces to match a controller from an unrelated subsystem, and has created confusion among users examining device nodes. Ensure a namespace's subsystem instance never clashes with a controller instance of another subsystem by transferring the instance ownership to the parent subsystem from the first controller discovered in that subsystem. Reviewed-by: Logan Gunthorpe <logang(a)deltatee.com> Signed-off-by: Keith Busch <kbusch(a)kernel.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Minwoo Im <minwoo.im(a)samsung.com> Reviewed-by: Hannes Reinecke <hare(a)suse.com> Reviewed-off-by: Sagi Grimberg <sagi(a)grimberg.me> Signed-off-by: Sagi Grimberg <sagi(a)grimberg.me> Signed-off-by: Chen Taotao <chentt10(a)chinatelecom.cn> Signed-off-by: Ctyun Kernel <ctyuncommiter01(a)chinatelecom.cn> --- drivers/nvme/host/core.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 164ec45da..0b47c8fd8 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -89,7 +89,6 @@ EXPORT_SYMBOL_GPL(nvme_reset_wq); struct workqueue_struct *nvme_delete_wq; EXPORT_SYMBOL_GPL(nvme_delete_wq); -static DEFINE_IDA(nvme_subsystems_ida); static LIST_HEAD(nvme_subsystems); static DEFINE_MUTEX(nvme_subsystems_lock); @@ -2350,7 +2349,8 @@ static void nvme_release_subsystem(struct device *dev) struct nvme_subsystem *subsys = container_of(dev, struct nvme_subsystem, dev); - ida_simple_remove(&nvme_subsystems_ida, subsys->instance); + if (subsys->instance >= 0) + ida_simple_remove(&nvme_instance_ida, subsys->instance); kfree(subsys); } @@ -2461,12 +2461,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys = kzalloc(sizeof(*subsys), GFP_KERNEL); if (!subsys) return -ENOMEM; - ret = ida_simple_get(&nvme_subsystems_ida, 0, 0, GFP_KERNEL); - if (ret < 0) { - kfree(subsys); - return ret; - } - subsys->instance = ret; + + subsys->instance = -1; mutex_init(&subsys->lock); kref_init(&subsys->ref); INIT_LIST_HEAD(&subsys->ctrls); @@ -2481,7 +2477,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys->dev.class = nvme_subsys_class; subsys->dev.release = nvme_release_subsystem; subsys->dev.groups = nvme_subsys_attrs_groups; - dev_set_name(&subsys->dev, "nvme-subsys%d", subsys->instance); + dev_set_name(&subsys->dev, "nvme-subsys%d", ctrl->instance); device_initialize(&subsys->dev); mutex_lock(&nvme_subsystems_lock); @@ -2514,6 +2510,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) list_add_tail(&subsys->entry, &nvme_subsystems); } + if (!found) + subsys->instance = ctrl->instance; ctrl->subsys = subsys; mutex_unlock(&nvme_subsystems_lock); @@ -3840,7 +3838,9 @@ static void nvme_free_ctrl(struct device *dev) container_of(dev, struct nvme_ctrl, ctrl_device); struct nvme_subsystem *subsys = ctrl->subsys; - ida_simple_remove(&nvme_instance_ida, ctrl->instance); + if (subsys && ctrl->instance != subsys->instance) + ida_simple_remove(&nvme_instance_ida, ctrl->instance); + kfree(ctrl->effects); nvme_mpath_uninit(ctrl); __free_page(ctrl->discard_page); @@ -4102,7 +4102,6 @@ int __init nvme_core_init(void) void nvme_core_exit(void) { - ida_destroy(&nvme_subsystems_ida); class_destroy(nvme_subsys_class); class_destroy(nvme_class); unregister_chrdev_region(nvme_chr_devt, NVME_MINORS); -- 2.27.0

1 0

[openEuler-5.10-LTS 01/11] xhci: Fix a logic issue when display Zhaoxin XHCI root hub speed
by Zheng Zengkai 07 Jun '22

07 Jun '22

From: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I40QDN CVE: NA ---------------------------------------------------------------- Fix a logic issue when display Zhaoxin XHCI root hub speed. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> --- drivers/usb/host/xhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ba2b2b5afdd1..0984bd31e0e9 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -5271,10 +5271,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) if (XHCI_EXT_PORT_PSIV(xhci->port_caps[j].psi[i]) >= 5) minor_rev = 1; } - if (minor_rev != 1) { - hcd->speed = HCD_USB3; - hcd->self.root_hub->speed = USB_SPEED_SUPER; - } + } + if (minor_rev != 1) { + hcd->speed = HCD_USB3; + hcd->self.root_hub->speed = USB_SPEED_SUPER; } } -- 2.20.1

1 10

[PATCH openEuler-5.10-LTS 00/67] Backport 5.10.106 LTS
by Zheng Zengkai 07 Jun '22

07 Jun '22

Backport 5.10.106 LTS patches from upstream watch_queue: Fix filter limit check ext4: add check to prevent attempting to resize an fs with sparse_super2 x86/traps: Mark do_int3() NOKPROBE_SYMBOL x86/boot: Add setup_indirect support in early_memremap_is_setup_data() x86/boot: Fix memremap of setup_indirect structures watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix to release page in ->release() watch_queue, pipe: Free watchqueue state after clearing pipe ring virtio: acknowledge all features before access virtio: unexport virtio_finalize_features arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 riscv: Fix auipc+jalr relocation range checks mmc: meson: Fix usage of meson_mmc_post_req() net: macb: Fix lost RX packet wakeup race in NAPI receive staging: gdm724x: fix use after free in gdm_lte_rx() staging: rtl8723bs: Fix access-point mode deadlock selftests/memfd: clean up mapping in mfd_fail_write selftest/vm: fix map_fixed_noreplace test failure tracing: Ensure trace buffer is at least 4096 bytes large ipv6: prevent a possible race condition with lifetimes Revert "xen-netback: Check for hotplug-status existence before watching" Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" gpio: Return EPROBE_DEFER if gc->to_irq is NULL hwmon: (pmbus) Clear pmbus fault/warning bits after read net-sysfs: add check for netdevice being present to speed_show spi: rockchip: terminate dma transmission when slave abort spi: rockchip: Fix error in getting num-cs property selftests/bpf: Add test for bpf_timer overwriting crash net: bcmgenet: Don't claim WOL when its not available sctp: fix kernel-infoleak for SCTP sockets net: phy: DP83822: clear MISR2 register to disable interrupts gianfar: ethtool: Fix refcount leak in gfar_get_ts_info gpio: ts4900: Do not set DAT and OE together selftests: pmtu.sh: Kill tcpdump processes launched by subshell. NFC: port100: fix use-after-free in port100_send_complete net/mlx5e: Lag, Only handle events from highest priority multipath entry net/mlx5: Fix a race on command flush flow net/mlx5: Fix size field in bufferx_reg struct net: ethernet: lpc_eth: Handle error for clk_enable net: ethernet: ti: cpts: Handle error for clk_enable tipc: fix incorrect order of state message data sanity check ethernet: Fix error handling in xemaclite_of_probe ice: Fix curr_link_speed advertised speed ice: Rename a couple of variables ice: Remove unnecessary checker loop ice: Align macro names to the specification ice: stop disabling VFs due to PF error responses i40e: stop disabling VFs due to PF error responses ARM: dts: aspeed: Fix AST2600 quad spi group net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() drm/sun4i: mixer: Fix P010 and P210 format numbers qed: return status of qed_iov_get_link esp: Fix BEET mode inter address family tunneling on GSO net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero mISDN: Fix memory leak in dsp_pipeline_build() mISDN: Remove obsolete PIPELINE_DEBUG debugging information tipc: fix kernel panic when enabling bearer arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias HID: vivaldi: fix sysfs attributes leak clk: qcom: gdsc: Add support to update GDSC transition delay ARM: boot: dts: bcm2711: Fix HVS register range Already merged: ax25: Fix NULL pointer dereference in ax25_kill_by_device ARM: Spectre-BHB: provide empty stub for non-config fuse: fix pipe buffer lifetime for direct_io ARM: fix Thumb2 regression with Spectre BHB Total patches: 71 - 4 = 67 Alexey Khoroshilov (1): mISDN: Fix memory leak in dsp_pipeline_build() Aneesh Kumar K.V (1): selftest/vm: fix map_fixed_noreplace test failure Anirudh Venkataramanan (3): ice: Align macro names to the specification ice: Remove unnecessary checker loop ice: Rename a couple of variables Clément Léger (1): net: phy: DP83822: clear MISR2 register to disable interrupts Dan Carpenter (1): staging: gdm724x: fix use after free in gdm_lte_rx() David Howells (8): watch_queue, pipe: Free watchqueue state after clearing pipe ring watch_queue: Fix to release page in ->release() watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix filter limit check Dmitry Torokhov (1): HID: vivaldi: fix sysfs attributes leak Emil Renner Berthing (1): riscv: Fix auipc+jalr relocation range checks Eric Dumazet (1): sctp: fix kernel-infoleak for SCTP sockets Guillaume Nault (1): selftests: pmtu.sh: Kill tcpdump processes launched by subshell. Hans de Goede (1): staging: rtl8723bs: Fix access-point mode deadlock Jacob Keller (2): i40e: stop disabling VFs due to PF error responses ice: stop disabling VFs due to PF error responses Jedrzej Jagielski (1): ice: Fix curr_link_speed advertised speed Jeremy Linton (1): net: bcmgenet: Don't claim WOL when its not available Jernej Skrabec (1): drm/sun4i: mixer: Fix P010 and P210 format numbers Jia-Ju Bai (2): isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() Jiasheng Jiang (2): net: ethernet: ti: cpts: Handle error for clk_enable net: ethernet: lpc_eth: Handle error for clk_enable Joel Stanley (1): ARM: dts: aspeed: Fix AST2600 quad spi group Jon Lin (2): spi: rockchip: Fix error in getting num-cs property spi: rockchip: terminate dma transmission when slave abort Josh Triplett (1): ext4: add check to prevent attempting to resize an fs with sparse_super2 Kumar Kartikeya Dwivedi (1): selftests/bpf: Add test for bpf_timer overwriting crash Li Huafei (1): x86/traps: Mark do_int3() NOKPROBE_SYMBOL Marek Marczykowski-Górecki (2): Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" Revert "xen-netback: Check for hotplug-status existence before watching" Mark Featherston (1): gpio: ts4900: Do not set DAT and OE together Maxime Ripard (1): ARM: boot: dts: bcm2711: Fix HVS register range Miaoqian Lin (2): ethernet: Fix error handling in xemaclite_of_probe gianfar: ethtool: Fix refcount leak in gfar_get_ts_info Michael S. Tsirkin (2): virtio: unexport virtio_finalize_features virtio: acknowledge all features before access Mike Kravetz (1): selftests/memfd: clean up mapping in mfd_fail_write Mohammad Kabat (1): net/mlx5: Fix size field in bufferx_reg struct Moshe Shemesh (1): net/mlx5: Fix a race on command flush flow Niels Dossche (1): ipv6: prevent a possible race condition with lifetimes Pali Rohár (2): arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 Pavel Skripkin (1): NFC: port100: fix use-after-free in port100_send_complete Robert Hancock (1): net: macb: Fix lost RX packet wakeup race in NAPI receive Roi Dayan (1): net/mlx5e: Lag, Only handle events from highest priority multipath entry Rong Chen (1): mmc: meson: Fix usage of meson_mmc_post_req() Ross Philipson (2): x86/boot: Fix memremap of setup_indirect structures x86/boot: Add setup_indirect support in early_memremap_is_setup_data() Russell King (Oracle) (1): net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() Shreeya Patel (1): gpio: Return EPROBE_DEFER if gc->to_irq is NULL Steffen Klassert (1): esp: Fix BEET mode inter address family tunneling on GSO Sven Schnelle (1): tracing: Ensure trace buffer is at least 4096 bytes large Taniya Das (1): clk: qcom: gdsc: Add support to update GDSC transition delay Tom Rix (1): qed: return status of qed_iov_get_link Tung Nguyen (2): tipc: fix kernel panic when enabling bearer tipc: fix incorrect order of state message data sanity check Vikash Chandola (1): hwmon: (pmbus) Clear pmbus fault/warning bits after read Xie Yongji (1): virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero Zhen Lei (1): mISDN: Remove obsolete PIPELINE_DEBUG debugging information suresh kumar (1): net-sysfs: add check for netdevice being present to speed_show arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 2 +- arch/arm/boot/dts/bcm2711.dtsi | 1 + .../dts/marvell/armada-3720-turris-mox.dts | 8 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- arch/riscv/kernel/module.c | 21 +++-- arch/x86/kernel/e820.c | 41 +++++++--- arch/x86/kernel/kdebugfs.c | 37 ++++++--- arch/x86/kernel/ksysfs.c | 77 +++++++++++++++---- arch/x86/kernel/setup.c | 34 ++++++-- arch/x86/kernel/traps.c | 1 + arch/x86/mm/ioremap.c | 57 ++++++++++++-- drivers/block/virtio_blk.c | 10 ++- drivers/clk/qcom/gdsc.c | 26 +++++-- drivers/clk/qcom/gdsc.h | 8 +- drivers/gpio/gpio-ts4900.c | 24 ++++-- drivers/gpio/gpiolib.c | 10 +++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 8 +- drivers/hid/hid-vivaldi.c | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 5 ++ drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- drivers/isdn/mISDN/dsp_pipeline.c | 52 ++----------- drivers/mmc/host/meson-gx-mmc.c | 15 ++-- drivers/net/dsa/mt7530.c | 2 +- .../ethernet/broadcom/genet/bcmgenet_wol.c | 7 ++ drivers/net/ethernet/cadence/macb_main.c | 25 +++++- .../net/ethernet/freescale/gianfar_ethtool.c | 1 + .../net/ethernet/intel/i40e/i40e_debugfs.c | 6 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 57 ++------------ .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 -- .../net/ethernet/intel/ice/ice_adminq_cmd.h | 10 +-- drivers/net/ethernet/intel/ice/ice_common.c | 13 ++-- drivers/net/ethernet/intel/ice/ice_ethtool.c | 70 ++++++++--------- drivers/net/ethernet/intel/ice/ice_main.c | 12 +-- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 18 ----- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 3 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 15 ++-- .../net/ethernet/mellanox/mlx5/core/lag_mp.c | 11 ++- drivers/net/ethernet/nxp/lpc_eth.c | 5 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++-- drivers/net/ethernet/qlogic/qed/qed_vf.c | 7 ++ drivers/net/ethernet/ti/cpts.c | 4 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- drivers/net/phy/dp83822.c | 2 +- drivers/net/xen-netback/xenbus.c | 14 ++-- drivers/nfc/port100.c | 2 + drivers/spi/spi-rockchip.c | 13 +++- drivers/staging/gdm724x/gdm_lte.c | 5 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 ++- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 22 +++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 ++-- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 + drivers/virtio/virtio.c | 40 +++++----- fs/ext4/resize.c | 5 ++ fs/pipe.c | 11 ++- include/linux/mlx5/mlx5_ifc.h | 4 +- include/linux/virtio.h | 1 - include/linux/virtio_config.h | 3 +- include/linux/watch_queue.h | 3 +- kernel/trace/trace.c | 10 ++- kernel/watch_queue.c | 15 ++-- net/core/net-sysfs.c | 2 +- net/ipv4/esp4_offload.c | 3 + net/ipv6/addrconf.c | 2 + net/ipv6/esp6_offload.c | 3 + net/sctp/diag.c | 9 +-- net/tipc/bearer.c | 12 +-- net/tipc/link.c | 9 ++- .../selftests/bpf/prog_tests/timer_crash.c | 32 ++++++++ .../testing/selftests/bpf/progs/timer_crash.c | 54 +++++++++++++ tools/testing/selftests/memfd/memfd_test.c | 1 + tools/testing/selftests/net/pmtu.sh | 7 +- .../selftests/vm/map_fixed_noreplace.c | 49 +++++++++--- 73 files changed, 714 insertions(+), 394 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_crash.c create mode 100644 tools/testing/selftests/bpf/progs/timer_crash.c -- 2.20.1

1 67

[PATCH openEuler-5.10 01/16] xhci: Fix a logic issue when display Zhaoxin XHCI root hub speed
by Zheng Zengkai 07 Jun '22

07 Jun '22

From: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I40QDN CVE: NA ---------------------------------------------------------------- Fix a logic issue when display Zhaoxin XHCI root hub speed. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> --- drivers/usb/host/xhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ba2b2b5afdd1..0984bd31e0e9 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -5271,10 +5271,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) if (XHCI_EXT_PORT_PSIV(xhci->port_caps[j].psi[i]) >= 5) minor_rev = 1; } - if (minor_rev != 1) { - hcd->speed = HCD_USB3; - hcd->self.root_hub->speed = USB_SPEED_SUPER; - } + } + if (minor_rev != 1) { + hcd->speed = HCD_USB3; + hcd->self.root_hub->speed = USB_SPEED_SUPER; } } -- 2.20.1

1 15

[PATCH openEuler-5.10 00/90] Backport SW64 enhancement and bugfix
by Zheng Zengkai 07 Jun '22

07 Jun '22

Backport SW64 enhancement and bugfix patches from hardware vendor. Cui Mingrui (2): sw64: optimize ip checksum calculation sw64: fix ip checksum calculation Du Yilong (3): sw64: kvm: fix bug when open file with the O_DIRECT flag sw64: add set time support for hypervisor based rtc sw64: kvm: remap pages of guest by vm_insert_page() Gu Zitao (7): config: add initial openeuler_defconfig for sw64 sw64: fix coding style problems sw64: fix the VDSO symbol generation for nm sw64: fix SPDX license identifier in uapi headers sw64: add SO_RCVTIMEO/ SO_SNDTIMEO socket options sw64: remove unnecessary include headers sw64: fix some compile errors He Chuyue (2): sw64: add regs and stack access APIs to support kprobe events sw64: remove unnecessary parameter in REG_OFFSET_NAME He Sheng (20): sw64: clean up useless #if 0 and #if 1 sw64: switch GUP to the generic get_user_pages_fast() implementation sw64: remove unused a.out.h sw64: fix ex_table entries from misalignment handlers sw64: define NR_SYSCALLS as generated __NR_syscalls sw64: clean up a.out and ECOFF binary related headers sw64: ptrace: clean up debug codes sw64: add kbuild defconfig rule sw64: clean up out-of-date selected options sw64: Kconfig: remove dependence on !PREEMPT sw64: Kconfig: remove dependence on ARCH_SUPPORTS_ACPI sw64: add missing global __constant_c_memset sw64: do some cleanups for rt_sigframe sw64: fix setup_rt_frame for non SA_SIGINFO sw64: fix compile error for DISCONTIGMEM=y sw64: force signal and fault for traps and debugging sw64: push and pop kernel stack with ldi instruction sw64: signal: save/restore fpregs with copy user sw64: fix the number of aux entries in ARCH_DLINFO sw64: fix sendfile system call Lu Feifei (6): sw64: fix printk method for guest os sw64: unify access to LONGTIME for guest and emulator sw64: kvm: handle ldl_u and stl_u when exit mmio sw64: kvm: simplify the code sw64: pci: align the address of mmio resource to PAGE_SIZE sw64: unify 32-bit MEMIO address of host and guest Mao Minkai (29): sw64: vdso: add automatic syscall fallback sw64: vdso: change vdso version sw64: vdso: fix time calculation sw64: mm: reorder memblock_init process sw64: mm: warn overlapped memmap and DMA region sw64: mm: use memblock to find the end of memory sw64: print correct initrd address sw64: remove redundant Kconfig source sw64: modify tc_sched_clock debugfs file sw64: simplify cpumask_of_node sw64: remove CONFIG_USE_PERCPU_NUMA_NODE_ID=n code sw64: fix all compile warnings sw64: numa: switch to arch node_distance sw64: mm: mark pci and memmap region as nomap sw64: use jump label for running modes sw64: remove MAX_ASN sw64: kvm: remove MAX_VPN sw64: fix coding style problems sw64: rename kvm_mem variables sw64: reformat syscall.tbl sw64: add missing pkey syscall numbers sw64: add clone3 syscall support sw64: add required include headers to ptrace.h sw64: switch to old-style semctl/shmctl syscalls sw64: increase position index in c_next for cpuinfo sw64: add old sigprocmask back for compatibility sw64: vdso: fix backtrace of vrt_sigreturn sw64: vdso: fix CFI directives for fpregs in vrt_sigreturn sw64: optimize simd version of memcpy and memset Min Fanlei (4): sw64: fix the value of QEMU_PRINTF_BUFF_BASE sw64: add support for emulator running mode sw64: enable more than 32 CPUs for guest sw64: kvm: fix bad page state setting outside of kvm memory pool Tang Jinyang (2): sw64: add dynamic frequency scaling support sw64: add dynamic turning on/off cores support Wang Yingying (3): hwmon: add voltage sensor support for sw64 sw64: add pvt device to chip3.dts hwmon: add support for sw64 temperature sensor Xu Chenjiao (2): sw64: radeon: add a force flush to delay work when radeon uvd suspend sw64: pcie: enable PME and AER support Zhao Yihan (1): sw64: remap PA with |= in early_ioremap Zheng Chongzhen (3): sw64: re-implement sw64_dma_direct_ops according upstream sw64: iommu: fix 32-bit devices dma ops sw64: fix compile error for CONFIG_PCI=n Zhou Xuemei (5): sw64: pci: remove some useless code sw64: switch to generic pcibios_set_master and pci_common_swizzle sw64: clean up some useless codes sw64: dts: rename spi flash partition to fix warning sw64: add ARCH_HAS_PTE_SPECIAL support Zhu Donghong (1): ipmi: add ipmi driver support arch/sw_64/Kconfig | 325 +- arch/sw_64/Makefile | 1 + arch/sw_64/boot/dts/chip3.dts | 41 +- arch/sw_64/chip/chip3/chip.c | 130 +- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +- arch/sw_64/chip/chip3/i2c-lib.c | 4 - arch/sw_64/chip/chip3/irq_chip.c | 13 +- arch/sw_64/chip/chip3/msi.c | 7 +- arch/sw_64/chip/chip3/pci-quirks.c | 7 +- arch/sw_64/chip/chip3/vt_msi.c | 6 - arch/sw_64/configs/openeuler_defconfig | 4312 +++++++++++++++++++++ arch/sw_64/defconfig | 73 - arch/sw_64/include/asm/Kbuild | 1 + arch/sw_64/include/asm/a.out-core.h | 80 - arch/sw_64/include/asm/a.out.h | 16 - arch/sw_64/include/asm/checksum.h | 58 +- arch/sw_64/include/asm/chip3_io.h | 4 +- arch/sw_64/include/asm/clock.h | 56 + arch/sw_64/include/asm/cputime.h | 4 +- arch/sw_64/include/asm/early_ioremap.h | 2 +- arch/sw_64/include/asm/hw_init.h | 29 +- arch/sw_64/include/asm/kvm_host.h | 3 +- arch/sw_64/include/asm/mmu_context.h | 3 +- arch/sw_64/include/asm/numa.h | 1 + arch/sw_64/include/asm/pci.h | 24 +- arch/sw_64/include/asm/pgtable.h | 26 +- arch/sw_64/include/asm/ptrace.h | 8 +- arch/sw_64/include/asm/topology.h | 29 +- arch/sw_64/include/asm/unistd.h | 3 +- arch/sw_64/include/asm/user.h | 53 - arch/sw_64/include/asm/vdso.h | 4 +- arch/sw_64/include/asm/vga.h | 18 +- arch/sw_64/include/uapi/asm/a.out.h | 88 - arch/sw_64/include/uapi/asm/auxvec.h | 25 +- arch/sw_64/include/uapi/asm/bitsperlong.h | 2 +- arch/sw_64/include/uapi/asm/byteorder.h | 2 +- arch/sw_64/include/uapi/asm/compiler.h | 2 +- arch/sw_64/include/uapi/asm/console.h | 2 +- arch/sw_64/include/uapi/asm/errno.h | 2 +- arch/sw_64/include/uapi/asm/fcntl.h | 2 +- arch/sw_64/include/uapi/asm/fpu.h | 2 +- arch/sw_64/include/uapi/asm/gentrap.h | 2 +- arch/sw_64/include/uapi/asm/hmcall.h | 2 +- arch/sw_64/include/uapi/asm/ioctl.h | 2 +- arch/sw_64/include/uapi/asm/ioctls.h | 48 +- arch/sw_64/include/uapi/asm/ipcbuf.h | 2 +- arch/sw_64/include/uapi/asm/kvm.h | 14 +- arch/sw_64/include/uapi/asm/kvm_para.h | 2 +- arch/sw_64/include/uapi/asm/mman.h | 2 +- arch/sw_64/include/uapi/asm/msgbuf.h | 2 +- arch/sw_64/include/uapi/asm/param.h | 2 +- arch/sw_64/include/uapi/asm/poll.h | 2 +- arch/sw_64/include/uapi/asm/posix_types.h | 2 +- arch/sw_64/include/uapi/asm/ptrace.h | 2 +- arch/sw_64/include/uapi/asm/reg.h | 2 +- arch/sw_64/include/uapi/asm/regdef.h | 2 +- arch/sw_64/include/uapi/asm/resource.h | 2 +- arch/sw_64/include/uapi/asm/sembuf.h | 2 +- arch/sw_64/include/uapi/asm/setup.h | 2 +- arch/sw_64/include/uapi/asm/shmbuf.h | 2 +- arch/sw_64/include/uapi/asm/sigcontext.h | 2 +- arch/sw_64/include/uapi/asm/siginfo.h | 2 +- arch/sw_64/include/uapi/asm/signal.h | 2 +- arch/sw_64/include/uapi/asm/socket.h | 34 +- arch/sw_64/include/uapi/asm/sockios.h | 2 +- arch/sw_64/include/uapi/asm/stat.h | 2 +- arch/sw_64/include/uapi/asm/statfs.h | 2 +- arch/sw_64/include/uapi/asm/swab.h | 2 +- arch/sw_64/include/uapi/asm/sysinfo.h | 2 +- arch/sw_64/include/uapi/asm/termbits.h | 2 +- arch/sw_64/include/uapi/asm/termios.h | 2 +- arch/sw_64/include/uapi/asm/types.h | 2 +- arch/sw_64/include/uapi/asm/unistd.h | 7 +- arch/sw_64/kernel/Makefile | 5 +- arch/sw_64/kernel/acpi.c | 19 +- arch/sw_64/kernel/asm-offsets.c | 7 +- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +- arch/sw_64/kernel/clock.c | 184 + arch/sw_64/kernel/core.c | 41 +- arch/sw_64/kernel/cpuautoplug.c | 496 +++ arch/sw_64/kernel/crash_dump.c | 2 - arch/sw_64/kernel/dup_print.c | 10 +- arch/sw_64/kernel/early_printk.c | 4 +- arch/sw_64/kernel/entry.S | 5 +- arch/sw_64/kernel/ftrace.c | 5 - arch/sw_64/kernel/insn.c | 13 - arch/sw_64/kernel/irq.c | 15 - arch/sw_64/kernel/irq_sw64.c | 9 +- arch/sw_64/kernel/jump_label.c | 3 +- arch/sw_64/kernel/kgdb.c | 9 +- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +- arch/sw_64/kernel/kprobes/kprobes.c | 4 - arch/sw_64/kernel/kvm_cma.c | 4 - arch/sw_64/kernel/machine_kexec.c | 7 +- arch/sw_64/kernel/module.c | 9 - arch/sw_64/kernel/msi.c | 25 - arch/sw_64/kernel/pci-noop.c | 8 - arch/sw_64/kernel/pci-sysfs.c | 3 - arch/sw_64/kernel/pci.c | 102 +- arch/sw_64/kernel/pci_common.c | 285 +- arch/sw_64/kernel/pci_impl.h | 49 - arch/sw_64/kernel/perf_event.c | 12 - arch/sw_64/kernel/perf_regs.c | 4 - arch/sw_64/kernel/platform.c | 20 + arch/sw_64/kernel/process.c | 26 - arch/sw_64/kernel/ptrace.c | 132 +- arch/sw_64/kernel/relocate.c | 13 +- arch/sw_64/kernel/segvdbg.c | 4 +- arch/sw_64/kernel/setup.c | 124 +- arch/sw_64/kernel/signal.c | 74 +- arch/sw_64/kernel/smp.c | 25 +- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 22 +- arch/sw_64/kernel/syscalls/syscall.tbl | 28 +- arch/sw_64/kernel/tc.c | 3 - arch/sw_64/kernel/time.c | 31 +- arch/sw_64/kernel/timer.c | 21 +- arch/sw_64/kernel/topology.c | 19 - arch/sw_64/kernel/traps.c | 95 +- arch/sw_64/kernel/unaligned.c | 3 - arch/sw_64/kernel/uprobes.c | 5 - arch/sw_64/kernel/vdso.c | 9 - arch/sw_64/kernel/vdso/so2s.sh | 3 +- arch/sw_64/kernel/vdso/vdso.S | 2 - arch/sw_64/kernel/vdso/vdso.lds.S | 2 +- arch/sw_64/kernel/vdso/vgettimeofday.c | 33 +- arch/sw_64/kernel/vdso/vrt_sigreturn.S | 40 + arch/sw_64/kvm/emulate.c | 2 + arch/sw_64/kvm/kvm-sw64.c | 39 +- arch/sw_64/kvm/vmem.c | 37 +- arch/sw_64/lib/checksum.c | 136 +- arch/sw_64/lib/csum_partial_copy.c | 310 +- arch/sw_64/lib/deep-memcpy.S | 449 ++- arch/sw_64/lib/deep-memset.S | 27 +- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +- arch/sw_64/lib/udelay.c | 5 - arch/sw_64/math-emu/math.c | 10 +- arch/sw_64/mm/fault.c | 21 +- arch/sw_64/mm/hugetlbpage.c | 7 +- arch/sw_64/mm/init.c | 48 +- arch/sw_64/mm/numa.c | 30 +- arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 - drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sw64_cpufreq.c | 186 + drivers/gpu/drm/radeon/radeon_uvd.c | 5 + drivers/hwmon/Kconfig | 10 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sw64_pvt.c | 223 ++ drivers/iommu/sw64/sunway_iommu.c | 58 +- drivers/iommu/sw64/sunway_iommu.h | 2 +- drivers/rtc/rtc-sw64-virt.c | 24 +- 154 files changed, 7028 insertions(+), 2337 deletions(-) create mode 100644 arch/sw_64/configs/openeuler_defconfig delete mode 100644 arch/sw_64/defconfig delete mode 100644 arch/sw_64/include/asm/a.out-core.h delete mode 100644 arch/sw_64/include/asm/a.out.h create mode 100644 arch/sw_64/include/asm/clock.h delete mode 100644 arch/sw_64/include/asm/user.h delete mode 100644 arch/sw_64/include/uapi/asm/a.out.h create mode 100644 arch/sw_64/kernel/clock.c create mode 100644 arch/sw_64/kernel/cpuautoplug.c create mode 100644 arch/sw_64/kernel/platform.c create mode 100644 drivers/cpufreq/sw64_cpufreq.c create mode 100644 drivers/hwmon/sw64_pvt.c -- 2.20.1

1 90

[PATCH openEuler-5.10 00/67] Backport 5.10.106 LTS
by Zheng Zengkai 07 Jun '22

07 Jun '22

Backport 5.10.106 LTS patches from upstream watch_queue: Fix filter limit check ext4: add check to prevent attempting to resize an fs with sparse_super2 x86/traps: Mark do_int3() NOKPROBE_SYMBOL x86/boot: Add setup_indirect support in early_memremap_is_setup_data() x86/boot: Fix memremap of setup_indirect structures watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix to release page in ->release() watch_queue, pipe: Free watchqueue state after clearing pipe ring virtio: acknowledge all features before access virtio: unexport virtio_finalize_features arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 riscv: Fix auipc+jalr relocation range checks mmc: meson: Fix usage of meson_mmc_post_req() net: macb: Fix lost RX packet wakeup race in NAPI receive staging: gdm724x: fix use after free in gdm_lte_rx() staging: rtl8723bs: Fix access-point mode deadlock selftests/memfd: clean up mapping in mfd_fail_write selftest/vm: fix map_fixed_noreplace test failure tracing: Ensure trace buffer is at least 4096 bytes large ipv6: prevent a possible race condition with lifetimes Revert "xen-netback: Check for hotplug-status existence before watching" Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" gpio: Return EPROBE_DEFER if gc->to_irq is NULL hwmon: (pmbus) Clear pmbus fault/warning bits after read net-sysfs: add check for netdevice being present to speed_show spi: rockchip: terminate dma transmission when slave abort spi: rockchip: Fix error in getting num-cs property selftests/bpf: Add test for bpf_timer overwriting crash net: bcmgenet: Don't claim WOL when its not available sctp: fix kernel-infoleak for SCTP sockets net: phy: DP83822: clear MISR2 register to disable interrupts gianfar: ethtool: Fix refcount leak in gfar_get_ts_info gpio: ts4900: Do not set DAT and OE together selftests: pmtu.sh: Kill tcpdump processes launched by subshell. NFC: port100: fix use-after-free in port100_send_complete net/mlx5e: Lag, Only handle events from highest priority multipath entry net/mlx5: Fix a race on command flush flow net/mlx5: Fix size field in bufferx_reg struct net: ethernet: lpc_eth: Handle error for clk_enable net: ethernet: ti: cpts: Handle error for clk_enable tipc: fix incorrect order of state message data sanity check ethernet: Fix error handling in xemaclite_of_probe ice: Fix curr_link_speed advertised speed ice: Rename a couple of variables ice: Remove unnecessary checker loop ice: Align macro names to the specification ice: stop disabling VFs due to PF error responses i40e: stop disabling VFs due to PF error responses ARM: dts: aspeed: Fix AST2600 quad spi group net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() drm/sun4i: mixer: Fix P010 and P210 format numbers qed: return status of qed_iov_get_link esp: Fix BEET mode inter address family tunneling on GSO net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero mISDN: Fix memory leak in dsp_pipeline_build() mISDN: Remove obsolete PIPELINE_DEBUG debugging information tipc: fix kernel panic when enabling bearer arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias HID: vivaldi: fix sysfs attributes leak clk: qcom: gdsc: Add support to update GDSC transition delay ARM: boot: dts: bcm2711: Fix HVS register range Already merged: ax25: Fix NULL pointer dereference in ax25_kill_by_device ARM: Spectre-BHB: provide empty stub for non-config fuse: fix pipe buffer lifetime for direct_io ARM: fix Thumb2 regression with Spectre BHB Total patches: 71 - 4 = 67 Alexey Khoroshilov (1): mISDN: Fix memory leak in dsp_pipeline_build() Aneesh Kumar K.V (1): selftest/vm: fix map_fixed_noreplace test failure Anirudh Venkataramanan (3): ice: Align macro names to the specification ice: Remove unnecessary checker loop ice: Rename a couple of variables Clément Léger (1): net: phy: DP83822: clear MISR2 register to disable interrupts Dan Carpenter (1): staging: gdm724x: fix use after free in gdm_lte_rx() David Howells (8): watch_queue, pipe: Free watchqueue state after clearing pipe ring watch_queue: Fix to release page in ->release() watch_queue: Fix to always request a pow-of-2 pipe ring size watch_queue: Fix the alloc bitmap size to reflect notes allocated watch_queue: Free the alloc bitmap when the watch_queue is torn down watch_queue: Fix lack of barrier/sync/lock between post and read watch_queue: Make comment about setting ->defunct more accurate watch_queue: Fix filter limit check Dmitry Torokhov (1): HID: vivaldi: fix sysfs attributes leak Emil Renner Berthing (1): riscv: Fix auipc+jalr relocation range checks Eric Dumazet (1): sctp: fix kernel-infoleak for SCTP sockets Guillaume Nault (1): selftests: pmtu.sh: Kill tcpdump processes launched by subshell. Hans de Goede (1): staging: rtl8723bs: Fix access-point mode deadlock Jacob Keller (2): i40e: stop disabling VFs due to PF error responses ice: stop disabling VFs due to PF error responses Jedrzej Jagielski (1): ice: Fix curr_link_speed advertised speed Jeremy Linton (1): net: bcmgenet: Don't claim WOL when its not available Jernej Skrabec (1): drm/sun4i: mixer: Fix P010 and P210 format numbers Jia-Ju Bai (2): isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() Jiasheng Jiang (2): net: ethernet: ti: cpts: Handle error for clk_enable net: ethernet: lpc_eth: Handle error for clk_enable Joel Stanley (1): ARM: dts: aspeed: Fix AST2600 quad spi group Jon Lin (2): spi: rockchip: Fix error in getting num-cs property spi: rockchip: terminate dma transmission when slave abort Josh Triplett (1): ext4: add check to prevent attempting to resize an fs with sparse_super2 Kumar Kartikeya Dwivedi (1): selftests/bpf: Add test for bpf_timer overwriting crash Li Huafei (1): x86/traps: Mark do_int3() NOKPROBE_SYMBOL Marek Marczykowski-Górecki (2): Revert "xen-netback: remove 'hotplug-status' once it has served its purpose" Revert "xen-netback: Check for hotplug-status existence before watching" Mark Featherston (1): gpio: ts4900: Do not set DAT and OE together Maxime Ripard (1): ARM: boot: dts: bcm2711: Fix HVS register range Miaoqian Lin (2): ethernet: Fix error handling in xemaclite_of_probe gianfar: ethtool: Fix refcount leak in gfar_get_ts_info Michael S. Tsirkin (2): virtio: unexport virtio_finalize_features virtio: acknowledge all features before access Mike Kravetz (1): selftests/memfd: clean up mapping in mfd_fail_write Mohammad Kabat (1): net/mlx5: Fix size field in bufferx_reg struct Moshe Shemesh (1): net/mlx5: Fix a race on command flush flow Niels Dossche (1): ipv6: prevent a possible race condition with lifetimes Pali Rohár (2): arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 Pavel Skripkin (1): NFC: port100: fix use-after-free in port100_send_complete Robert Hancock (1): net: macb: Fix lost RX packet wakeup race in NAPI receive Roi Dayan (1): net/mlx5e: Lag, Only handle events from highest priority multipath entry Rong Chen (1): mmc: meson: Fix usage of meson_mmc_post_req() Ross Philipson (2): x86/boot: Fix memremap of setup_indirect structures x86/boot: Add setup_indirect support in early_memremap_is_setup_data() Russell King (Oracle) (1): net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() Shreeya Patel (1): gpio: Return EPROBE_DEFER if gc->to_irq is NULL Steffen Klassert (1): esp: Fix BEET mode inter address family tunneling on GSO Sven Schnelle (1): tracing: Ensure trace buffer is at least 4096 bytes large Taniya Das (1): clk: qcom: gdsc: Add support to update GDSC transition delay Tom Rix (1): qed: return status of qed_iov_get_link Tung Nguyen (2): tipc: fix kernel panic when enabling bearer tipc: fix incorrect order of state message data sanity check Vikash Chandola (1): hwmon: (pmbus) Clear pmbus fault/warning bits after read Xie Yongji (1): virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero Zhen Lei (1): mISDN: Remove obsolete PIPELINE_DEBUG debugging information suresh kumar (1): net-sysfs: add check for netdevice being present to speed_show arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 2 +- arch/arm/boot/dts/bcm2711.dtsi | 1 + .../dts/marvell/armada-3720-turris-mox.dts | 8 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- arch/riscv/kernel/module.c | 21 +++-- arch/x86/kernel/e820.c | 41 +++++++--- arch/x86/kernel/kdebugfs.c | 37 ++++++--- arch/x86/kernel/ksysfs.c | 77 +++++++++++++++---- arch/x86/kernel/setup.c | 34 ++++++-- arch/x86/kernel/traps.c | 1 + arch/x86/mm/ioremap.c | 57 ++++++++++++-- drivers/block/virtio_blk.c | 10 ++- drivers/clk/qcom/gdsc.c | 26 +++++-- drivers/clk/qcom/gdsc.h | 8 +- drivers/gpio/gpio-ts4900.c | 24 ++++-- drivers/gpio/gpiolib.c | 10 +++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 8 +- drivers/hid/hid-vivaldi.c | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 5 ++ drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- drivers/isdn/mISDN/dsp_pipeline.c | 52 ++----------- drivers/mmc/host/meson-gx-mmc.c | 15 ++-- drivers/net/dsa/mt7530.c | 2 +- .../ethernet/broadcom/genet/bcmgenet_wol.c | 7 ++ drivers/net/ethernet/cadence/macb_main.c | 25 +++++- .../net/ethernet/freescale/gianfar_ethtool.c | 1 + .../net/ethernet/intel/i40e/i40e_debugfs.c | 6 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 57 ++------------ .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 -- .../net/ethernet/intel/ice/ice_adminq_cmd.h | 10 +-- drivers/net/ethernet/intel/ice/ice_common.c | 13 ++-- drivers/net/ethernet/intel/ice/ice_ethtool.c | 70 ++++++++--------- drivers/net/ethernet/intel/ice/ice_main.c | 12 +-- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 18 ----- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 3 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 15 ++-- .../net/ethernet/mellanox/mlx5/core/lag_mp.c | 11 ++- drivers/net/ethernet/nxp/lpc_eth.c | 5 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++-- drivers/net/ethernet/qlogic/qed/qed_vf.c | 7 ++ drivers/net/ethernet/ti/cpts.c | 4 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- drivers/net/phy/dp83822.c | 2 +- drivers/net/xen-netback/xenbus.c | 14 ++-- drivers/nfc/port100.c | 2 + drivers/spi/spi-rockchip.c | 13 +++- drivers/staging/gdm724x/gdm_lte.c | 5 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 ++- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 22 +++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 ++-- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 + drivers/virtio/virtio.c | 40 +++++----- fs/ext4/resize.c | 5 ++ fs/pipe.c | 11 ++- include/linux/mlx5/mlx5_ifc.h | 4 +- include/linux/virtio.h | 1 - include/linux/virtio_config.h | 3 +- include/linux/watch_queue.h | 3 +- kernel/trace/trace.c | 10 ++- kernel/watch_queue.c | 15 ++-- net/core/net-sysfs.c | 2 +- net/ipv4/esp4_offload.c | 3 + net/ipv6/addrconf.c | 2 + net/ipv6/esp6_offload.c | 3 + net/sctp/diag.c | 9 +-- net/tipc/bearer.c | 12 +-- net/tipc/link.c | 9 ++- .../selftests/bpf/prog_tests/timer_crash.c | 32 ++++++++ .../testing/selftests/bpf/progs/timer_crash.c | 54 +++++++++++++ tools/testing/selftests/memfd/memfd_test.c | 1 + tools/testing/selftests/net/pmtu.sh | 7 +- .../selftests/vm/map_fixed_noreplace.c | 49 +++++++++--- 73 files changed, 714 insertions(+), 394 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_crash.c create mode 100644 tools/testing/selftests/bpf/progs/timer_crash.c -- 2.20.1

1 67

[PATCH] nvme: Assign subsys instance from first ctrl upstream 733e4b69
by Chen Taotao 06 Jun '22

06 Jun '22

The namespace disk names must be unique for the lifetime of the subsystem. This was accomplished by using their parent subsystems' instances which were allocated independently from the controllers connected to that subsystem. This allowed name prefixes assigned to namespaces to match a controller from an unrelated subsystem, and has created confusion among users examining device nodes. Ensure a namespace's subsystem instance never clashes with a controller instance of another subsystem by transferring the instance ownership to the parent subsystem from the first controller discovered in that subsystem. Reviewed-by: Logan Gunthorpe <logang(a)deltatee.com> Signed-off-by: Keith Busch <kbusch(a)kernel.org> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Minwoo Im <minwoo.im(a)samsung.com> Reviewed-by: Hannes Reinecke <hare(a)suse.com> Reviewed-off-by: Sagi Grimberg <sagi(a)grimberg.me> Signed-off-by: Sagi Grimberg <sagi(a)grimberg.me> --- drivers/nvme/host/core.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8c760493354f..576da5820a57 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -88,7 +88,6 @@ EXPORT_SYMBOL_GPL(nvme_reset_wq); struct workqueue_struct *nvme_delete_wq; EXPORT_SYMBOL_GPL(nvme_delete_wq); -static DEFINE_IDA(nvme_subsystems_ida); static LIST_HEAD(nvme_subsystems); static DEFINE_MUTEX(nvme_subsystems_lock); @@ -2308,7 +2307,8 @@ static void nvme_release_subsystem(struct device *dev) struct nvme_subsystem *subsys = container_of(dev, struct nvme_subsystem, dev); - ida_simple_remove(&nvme_subsystems_ida, subsys->instance); + if (subsys->instance >= 0) + ida_simple_remove(&nvme_instance_ida, subsys->instance); kfree(subsys); } @@ -2419,12 +2419,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys = kzalloc(sizeof(*subsys), GFP_KERNEL); if (!subsys) return -ENOMEM; - ret = ida_simple_get(&nvme_subsystems_ida, 0, 0, GFP_KERNEL); - if (ret < 0) { - kfree(subsys); - return ret; - } - subsys->instance = ret; + + subsys->instance = -1; mutex_init(&subsys->lock); kref_init(&subsys->ref); INIT_LIST_HEAD(&subsys->ctrls); @@ -2439,7 +2435,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) subsys->dev.class = nvme_subsys_class; subsys->dev.release = nvme_release_subsystem; subsys->dev.groups = nvme_subsys_attrs_groups; - dev_set_name(&subsys->dev, "nvme-subsys%d", subsys->instance); + dev_set_name(&subsys->dev, "nvme-subsys%d", ctrl->instance); device_initialize(&subsys->dev); mutex_lock(&nvme_subsystems_lock); @@ -2472,6 +2468,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) list_add_tail(&subsys->entry, &nvme_subsystems); } + if (!found) + subsys->instance = ctrl->instance; ctrl->subsys = subsys; mutex_unlock(&nvme_subsystems_lock); @@ -3749,7 +3747,9 @@ static void nvme_free_ctrl(struct device *dev) container_of(dev, struct nvme_ctrl, ctrl_device); struct nvme_subsystem *subsys = ctrl->subsys; - ida_simple_remove(&nvme_instance_ida, ctrl->instance); + if (subsys && ctrl->instance != subsys->instance) + ida_simple_remove(&nvme_instance_ida, ctrl->instance); + kfree(ctrl->effects); nvme_mpath_uninit(ctrl); __free_page(ctrl->discard_page); @@ -4009,7 +4009,6 @@ int __init nvme_core_init(void) void nvme_core_exit(void) { - ida_destroy(&nvme_subsystems_ida); class_destroy(nvme_subsys_class); class_destroy(nvme_class); unregister_chrdev_region(nvme_chr_devt, NVME_MINORS); -- 2.27.0

1 0

Re: [PATCH OLK-5.10 1/4] eulerfs: add socket_num to eufs_sb_info
by Yu Kuai 06 Jun '22

06 Jun '22

在 2022/06/02 19:24, Gou Hao 写道: > > 在 2022/6/2 17:10, Yu Kuai 写道: >> 在 2022/06/02 10:50, Gou Hao 写道: >>> uniontech inclusion >>> category: bugfix >>> bugzilla: NA >>> CVE: NA >>> >>> ---------------------- >>> >>> We should not get the socket num in init_eufs_fs, becuse >>> system usually supports cpu hotplug,so we should get socket >>> num in dep_int. >> Hi, >> >> What if cpu is offline during mount, and online afterwards? >> > Well, in this case, we have to add a monitoring mechanism to > > dynamically adjust the number of threads according to the > > online status of the CPU. > > Or there are other better ways ... I prefer to keep the current implementation for now. Thanks, Kuai >> Thanks, >> Kuai >>> >>> Socket num is not necessarily the same when file system >>> mount,so it shoule be eufs_sb_info's member. >>> >>> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >>> --- >>> fs/eulerfs/dep.c | 28 ++++++++++++++++++++++------ >>> fs/eulerfs/euler.h | 2 -- >>> fs/eulerfs/euler_def.h | 1 + >>> fs/eulerfs/super.c | 15 +-------------- >>> 4 files changed, 24 insertions(+), 22 deletions(-) >>

2 1

[openEuler-22.09 00/34] bcache backport for openEuler-22.09 (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[openEuler-22.03-LTS 00/34] bcache backport for openEuler-22.03-LTS (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[OLK-5.10 PATCH 00/34] bcache backport for OLK-5.10 (up to Linux v5.19-rc1)
by Coly Li 04 Jun '22

04 Jun '22

This series is bcache backport up to Linux v5.19. The referenced bug is, https://gitee.com/openeuler/kernel/issues/I59A5L#note_10515416 All the patches are tested on Intel x86-64 platform, but not tested on ARM64 plantform yet. Coly Li --- Arnd Bergmann (1): md: bcache: avoid -Wempty-body warnings Bhaskar Chowdhury (1): md: bcache: Trivial typo fixes in the file journal.c Chao Yu (1): bcache: fix error info in register_bcache() Christoph Hellwig (1): bcache: remove PTR_CACHE Coly Li (10): bcache: fix a regression of code compiling failure in debug.c bcache: remove bcache device self-defined readahead bcache: avoid oversized read request in cache missing code path bcache: move uapi header bcache.h to bcache code directory bcache: improve multithreaded bch_btree_check() bcache: improve multithreaded bch_sectors_dirty_init() bcache: remove incremental dirty sector counting for bch_sectors_dirty_init() bcache: avoid journal no-space deadlock by reserving 1 journal bucket bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() bcache: avoid unnecessary soft lockup in kworker update_writeback_rate() Ding Senjie (1): md: bcache: Fix spelling of 'acquire' Dongsheng Yang (1): bcache: fix race between setting bdev state to none and new write request direct to backing Greg Kroah-Hartman (1): bcache: use default_groups in kobj_type Gustavo A. R. Silva (1): bcache: Use 64-bit arithmetic instead of 32-bit Jia-Ju Bai (1): md: bcache: check the return value of kzalloc() in detached_dev_do_request() Joe Perches (1): bcache: Avoid comma separated statements Kai Krakow (1): bcache: Fix register_device_aync typo Lin Feng (2): bcache: move calc_cached_dev_sectors to proper place on backing device detach bcache: fix NULL pointer reference in cached_dev_detach_finish Ming Lei (1): bcache: don't pass BIOSET_NEED_BVECS for the 'bio_set' embedded in 'cache_set' Mingzhe Zou (2): bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing bcache: fixup multiple threads crash Qing Wang (1): bcache: replace snprintf in show functions with sysfs_emit Yang Li (1): bcache: use NULL instead of using plain integer as pointer Yi Li (2): bcache:remove a superfluous check in register_bcache bcache: set pdev_set_uuid before scond loop iteration YueHaibing (1): lib: crc64: fix kernel-doc warning Zheng Yongjun (1): md/bcache: convert comma to semicolon Zhiqiang Liu (1): bcache: reduce redundant code in bch_cached_dev_run() dongdong tao (1): bcache: consider the fragmentation when update the writeback rate drivers/md/bcache/alloc.c | 5 +- drivers/md/bcache/bcache.h | 25 ++- .../md/bcache/bcache_ondisk.h | 0 drivers/md/bcache/bset.c | 12 +- drivers/md/bcache/bset.h | 2 +- drivers/md/bcache/btree.c | 67 +++--- drivers/md/bcache/btree.h | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/extents.c | 4 +- drivers/md/bcache/features.c | 4 +- drivers/md/bcache/features.h | 3 +- drivers/md/bcache/io.c | 4 +- drivers/md/bcache/journal.c | 37 +++- drivers/md/bcache/journal.h | 2 + drivers/md/bcache/request.c | 25 +-- drivers/md/bcache/stats.c | 17 +- drivers/md/bcache/stats.h | 1 - drivers/md/bcache/super.c | 63 +++--- drivers/md/bcache/sysfs.c | 50 +++-- drivers/md/bcache/sysfs.h | 20 +- drivers/md/bcache/util.h | 19 +- drivers/md/bcache/writeback.c | 198 +++++++++++------- drivers/md/bcache/writeback.h | 6 +- lib/crc64.c | 2 +- 24 files changed, 324 insertions(+), 246 deletions(-) rename include/uapi/linux/bcache.h => drivers/md/bcache/bcache_ondisk.h (100%) -- 2.35.3

1 34

[PATCH openEuler-1.0-LTS] xfs: show the proper user quota options
by tangbin 02 Jun '22

02 Jun '22

From: Kaixu Xia <kaixuxia(a)tencent.com> mainline inclusion from mainline-v5.11-rc6 commit 237d7887ae723af7d978e8b9a385fdff416f357b category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5AG18 CVE: NA -------------------------------- The quota option 'usrquota' should be shown if both the XFS_UQUOTA_ACCT and XFS_UQUOTA_ENFD flags are set. The option 'uqnoenforce' should be shown when only the XFS_UQUOTA_ACCT flag is set. The current code logic seems wrong, Fix it and show proper options. Signed-off-by: Kaixu Xia <kaixuxia(a)tencent.com> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> --- fs/xfs/xfs_super.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e126bc6cdeb8..5d8e3a4d2671 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -505,10 +505,12 @@ xfs_showargs( seq_printf(m, ",swidth=%d", (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); - if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) - seq_puts(m, ",usrquota"); - else if (mp->m_qflags & XFS_UQUOTA_ACCT) - seq_puts(m, ",uqnoenforce"); + if (mp->m_qflags & XFS_UQUOTA_ACCT) { + if (mp->m_qflags & XFS_UQUOTA_ENFD) + seq_puts(m, ",usrquota"); + else + seq_puts(m, ",uqnoenforce"); + } if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_PQUOTA_ENFD) -- 2.18.4

1 0

[PATCH] xfs: show the proper user quota options
by tangbin 02 Jun '22

02 Jun '22

From: Kaixu Xia <kaixuxia(a)tencent.com> mainline inclusion from mainline-v5.11-rc6 commit 237d7887ae723af7d978e8b9a385fdff416f357b category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5AG18 CVE: NA -------------------------------- The quota option 'usrquota' should be shown if both the XFS_UQUOTA_ACCT and XFS_UQUOTA_ENFD flags are set. The option 'uqnoenforce' should be shown when only the XFS_UQUOTA_ACCT flag is set. The current code logic seems wrong, Fix it and show proper options. Signed-off-by: Kaixu Xia <kaixuxia(a)tencent.com> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: tangbin <tangbin(a)cmss.chinamobile.com> --- fs/xfs/xfs_super.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e126bc6cdeb8..5d8e3a4d2671 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -505,10 +505,12 @@ xfs_showargs( seq_printf(m, ",swidth=%d", (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); - if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) - seq_puts(m, ",usrquota"); - else if (mp->m_qflags & XFS_UQUOTA_ACCT) - seq_puts(m, ",uqnoenforce"); + if (mp->m_qflags & XFS_UQUOTA_ACCT) { + if (mp->m_qflags & XFS_UQUOTA_ENFD) + seq_puts(m, ",usrquota"); + else + seq_puts(m, ",uqnoenforce"); + } if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_PQUOTA_ENFD) -- 2.18.4

1 0

Re: [PATCH OLK-5.10 1/4] eulerfs: add socket_num to eufs_sb_info
by Gou Hao 02 Jun '22

02 Jun '22

在 2022/6/2 17:10, Yu Kuai 写道: > 在 2022/06/02 10:50, Gou Hao 写道: >> uniontech inclusion >> category: bugfix >> bugzilla: NA >> CVE: NA >> >> ---------------------- >> >> We should not get the socket num in init_eufs_fs, becuse >> system usually supports cpu hotplug,so we should get socket >> num in dep_int. > Hi, > > What if cpu is offline during mount, and online afterwards? > Well, in this case, we have to add a monitoring mechanism to dynamically adjust the number of threads according to the online status of the CPU. Or there are other better ways ... > Thanks, > Kuai >> >> Socket num is not necessarily the same when file system >> mount,so it shoule be eufs_sb_info's member. >> >> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >> --- >> fs/eulerfs/dep.c | 28 ++++++++++++++++++++++------ >> fs/eulerfs/euler.h | 2 -- >> fs/eulerfs/euler_def.h | 1 + >> fs/eulerfs/super.c | 15 +-------------- >> 4 files changed, 24 insertions(+), 22 deletions(-) > -- thanks, Gou Hao

1 0

Re: [PATCH OLK-5.10 4/4] eulerfs: fix potential sbi->persisters free error
by Gou Hao 02 Jun '22

02 Jun '22

在 2022/6/2 17:15, Yu Kuai 写道: > 在 2022/06/02 10:51, Gou Hao 写道: >> uniontech inclusion >> category: bugfix >> bugzilla: NA >> CVE: NA >> >> ------------------- >> >> After alloc the sbi->persisters memory, dep_init >> will call dep_fini when error happened.Because >> sbi->persisters is not set to 0, kthread_stop >> may happened error. > > Looks good to me, just one language fixup: > > sbi->persisters is not set to 0 > -> dep_fini() can be called with sbi->persisters[] uninitialized, thus > kthread_stop() can be called with random value. > ok, thank you : ) > Thanks, > Kuai >> >> Signed-off-by: Gou Hao <gouhao(a)uniontech.com> >> --- >> fs/eulerfs/dep.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/eulerfs/dep.c b/fs/eulerfs/dep.c >> index da826a18fa31..62fd1376f980 100644 >> --- a/fs/eulerfs/dep.c >> +++ b/fs/eulerfs/dep.c >> @@ -728,8 +728,8 @@ int dep_init(struct super_block *sb) >> node_num++; >> sbi->persister_num = node_num * persisters_per_socket; >> - >> - sbi->persisters = kmalloc(sizeof(struct task_struct *) * >> + >> + sbi->persisters = kzalloc(sizeof(struct task_struct *) * >> sbi->persister_num, GFP_KERNEL); >> if (!sbi->persisters) { >> err = -ENOMEM; >> > -- thanks, Gou Hao

1 0

[PATCH OLK-5.10 0/4] eulerfs: improve the creation of persister
by Gou Hao 02 Jun '22

02 Jun '22

Patch series "improve the creation of persister". The main modification is to create a persistent thread only when a NUMA node has an online CPU at least, instead of on all NUMA nodes. In the current code, the number of NUMA nodes is obtained when the module is loaded, and the same number of persistent threads are created when the file system is mounted. However, we should ignore NUMA nodes that do not have an online CPU. So we should decide how many threads to create according to the online CPU condition when initializing persist. Patch4 is a bugfix about dep_init(). Gou Hao (4): eulerfs: add socket_num to eufs_sb_info eulerfs: create persister on node when it has online cpu eulerfs: record persister num eulerfs: fix potential sbi->persisters free error fs/eulerfs/dep.c | 48 +++++++++++++++++++++++++++--------------- fs/eulerfs/euler.h | 2 -- fs/eulerfs/euler_def.h | 1 + fs/eulerfs/super.c | 21 ++++-------------- 4 files changed, 36 insertions(+), 36 deletions(-) -- 2.20.1

1 4

[PATCH openEuler-5.10-LTS 01/31] inet: fully convert sk->sk_rx_dst to RCU rules
by Zheng Zengkai 31 May '22

31 May '22

From: Eric Dumazet <edumazet(a)google.com> mainline inclusion from mainline-v5.16-rc7 commit 8f905c0e7354ef261360fb7535ea079b1082c105 category: bugfix bugzilla: 186714 https://gitee.com/src-openeuler/kernel/issues/I57QUK -------------------------------- syzbot reported various issues around early demux, one being included in this changelog [1] sk->sk_rx_dst is using RCU protection without clearly documenting it. And following sequences in tcp_v4_do_rcv()/tcp_v6_do_rcv() are not following standard RCU rules. [a] dst_release(dst); [b] sk->sk_rx_dst = NULL; They look wrong because a delete operation of RCU protected pointer is supposed to clear the pointer before the call_rcu()/synchronize_rcu() guarding actual memory freeing. In some cases indeed, dst could be freed before [b] is done. We could cheat by clearing sk_rx_dst before calling dst_release(), but this seems the right time to stick to standard RCU annotations and debugging facilities. [1] BUG: KASAN: use-after-free in dst_check include/net/dst.h:470 [inline] BUG: KASAN: use-after-free in tcp_v4_early_demux+0x95b/0x960 net/ipv4/tcp_ipv4.c:1792 Read of size 2 at addr ffff88807f1cb73a by task syz-executor.5/9204 CPU: 0 PID: 9204 Comm: syz-executor.5 Not tainted 5.16.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 print_address_description.constprop.0.cold+0x8d/0x320 mm/kasan/report.c:247 __kasan_report mm/kasan/report.c:433 [inline] kasan_report.cold+0x83/0xdf mm/kasan/report.c:450 dst_check include/net/dst.h:470 [inline] tcp_v4_early_demux+0x95b/0x960 net/ipv4/tcp_ipv4.c:1792 ip_rcv_finish_core.constprop.0+0x15de/0x1e80 net/ipv4/ip_input.c:340 ip_list_rcv_finish.constprop.0+0x1b2/0x6e0 net/ipv4/ip_input.c:583 ip_sublist_rcv net/ipv4/ip_input.c:609 [inline] ip_list_rcv+0x34e/0x490 net/ipv4/ip_input.c:644 __netif_receive_skb_list_ptype net/core/dev.c:5508 [inline] __netif_receive_skb_list_core+0x549/0x8e0 net/core/dev.c:5556 __netif_receive_skb_list net/core/dev.c:5608 [inline] netif_receive_skb_list_internal+0x75e/0xd80 net/core/dev.c:5699 gro_normal_list net/core/dev.c:5853 [inline] gro_normal_list net/core/dev.c:5849 [inline] napi_complete_done+0x1f1/0x880 net/core/dev.c:6590 virtqueue_napi_complete drivers/net/virtio_net.c:339 [inline] virtnet_poll+0xca2/0x11b0 drivers/net/virtio_net.c:1557 __napi_poll+0xaf/0x440 net/core/dev.c:7023 napi_poll net/core/dev.c:7090 [inline] net_rx_action+0x801/0xb40 net/core/dev.c:7177 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 invoke_softirq kernel/softirq.c:432 [inline] __irq_exit_rcu+0x123/0x180 kernel/softirq.c:637 irq_exit_rcu+0x5/0x20 kernel/softirq.c:649 common_interrupt+0x52/0xc0 arch/x86/kernel/irq.c:240 asm_common_interrupt+0x1e/0x40 arch/x86/include/asm/idtentry.h:629 RIP: 0033:0x7f5e972bfd57 Code: 39 d1 73 14 0f 1f 80 00 00 00 00 48 8b 50 f8 48 83 e8 08 48 39 ca 77 f3 48 39 c3 73 3e 48 89 13 48 8b 50 f8 48 89 38 49 8b 0e <48> 8b 3e 48 83 c3 08 48 83 c6 08 eb bc 48 39 d1 72 9e 48 39 d0 73 RSP: 002b:00007fff8a413210 EFLAGS: 00000283 RAX: 00007f5e97108990 RBX: 00007f5e97108338 RCX: ffffffff81d3aa45 RDX: ffffffff81d3aa45 RSI: 00007f5e97108340 RDI: ffffffff81d3aa45 RBP: 00007f5e97107eb8 R08: 00007f5e97108d88 R09: 0000000093c2e8d9 R10: 0000000000000000 R11: 0000000000000000 R12: 00007f5e97107eb0 R13: 00007f5e97108338 R14: 00007f5e97107ea8 R15: 0000000000000019 </TASK> Allocated by task 13: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 kasan_set_track mm/kasan/common.c:46 [inline] set_alloc_info mm/kasan/common.c:434 [inline] __kasan_slab_alloc+0x90/0xc0 mm/kasan/common.c:467 kasan_slab_alloc include/linux/kasan.h:259 [inline] slab_post_alloc_hook mm/slab.h:519 [inline] slab_alloc_node mm/slub.c:3234 [inline] slab_alloc mm/slub.c:3242 [inline] kmem_cache_alloc+0x202/0x3a0 mm/slub.c:3247 dst_alloc+0x146/0x1f0 net/core/dst.c:92 rt_dst_alloc+0x73/0x430 net/ipv4/route.c:1613 ip_route_input_slow+0x1817/0x3a20 net/ipv4/route.c:2340 ip_route_input_rcu net/ipv4/route.c:2470 [inline] ip_route_input_noref+0x116/0x2a0 net/ipv4/route.c:2415 ip_rcv_finish_core.constprop.0+0x288/0x1e80 net/ipv4/ip_input.c:354 ip_list_rcv_finish.constprop.0+0x1b2/0x6e0 net/ipv4/ip_input.c:583 ip_sublist_rcv net/ipv4/ip_input.c:609 [inline] ip_list_rcv+0x34e/0x490 net/ipv4/ip_input.c:644 __netif_receive_skb_list_ptype net/core/dev.c:5508 [inline] __netif_receive_skb_list_core+0x549/0x8e0 net/core/dev.c:5556 __netif_receive_skb_list net/core/dev.c:5608 [inline] netif_receive_skb_list_internal+0x75e/0xd80 net/core/dev.c:5699 gro_normal_list net/core/dev.c:5853 [inline] gro_normal_list net/core/dev.c:5849 [inline] napi_complete_done+0x1f1/0x880 net/core/dev.c:6590 virtqueue_napi_complete drivers/net/virtio_net.c:339 [inline] virtnet_poll+0xca2/0x11b0 drivers/net/virtio_net.c:1557 __napi_poll+0xaf/0x440 net/core/dev.c:7023 napi_poll net/core/dev.c:7090 [inline] net_rx_action+0x801/0xb40 net/core/dev.c:7177 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 Freed by task 13: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 kasan_set_track+0x21/0x30 mm/kasan/common.c:46 kasan_set_free_info+0x20/0x30 mm/kasan/generic.c:370 ____kasan_slab_free mm/kasan/common.c:366 [inline] ____kasan_slab_free mm/kasan/common.c:328 [inline] __kasan_slab_free+0xff/0x130 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+0x8b/0x1c0 mm/slub.c:1749 slab_free mm/slub.c:3513 [inline] kmem_cache_free+0xbd/0x5d0 mm/slub.c:3530 dst_destroy+0x2d6/0x3f0 net/core/dst.c:127 rcu_do_batch kernel/rcu/tree.c:2506 [inline] rcu_core+0x7ab/0x1470 kernel/rcu/tree.c:2741 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 Last potentially related work creation: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 __kasan_record_aux_stack+0xf5/0x120 mm/kasan/generic.c:348 __call_rcu kernel/rcu/tree.c:2985 [inline] call_rcu+0xb1/0x740 kernel/rcu/tree.c:3065 dst_release net/core/dst.c:177 [inline] dst_release+0x79/0xe0 net/core/dst.c:167 tcp_v4_do_rcv+0x612/0x8d0 net/ipv4/tcp_ipv4.c:1712 sk_backlog_rcv include/net/sock.h:1030 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2768 release_sock+0x54/0x1b0 net/core/sock.c:3300 tcp_sendmsg+0x36/0x40 net/ipv4/tcp.c:1441 inet_sendmsg+0x99/0xe0 net/ipv4/af_inet.c:819 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:724 sock_write_iter+0x289/0x3c0 net/socket.c:1057 call_write_iter include/linux/fs.h:2162 [inline] new_sync_write+0x429/0x660 fs/read_write.c:503 vfs_write+0x7cd/0xae0 fs/read_write.c:590 ksys_write+0x1ee/0x250 fs/read_write.c:643 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae The buggy address belongs to the object at ffff88807f1cb700 which belongs to the cache ip_dst_cache of size 176 The buggy address is located 58 bytes inside of 176-byte region [ffff88807f1cb700, ffff88807f1cb7b0) The buggy address belongs to the page: page:ffffea0001fc72c0 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x7f1cb flags: 0xfff00000000200(slab|node=0|zone=1|lastcpupid=0x7ff) raw: 00fff00000000200 dead000000000100 dead000000000122 ffff8881413bb780 raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 0, migratetype Unmovable, gfp_mask 0x112a20(GFP_ATOMIC|__GFP_NOWARN|__GFP_NORETRY|__GFP_HARDWALL), pid 5, ts 108466983062, free_ts 108048976062 prep_new_page mm/page_alloc.c:2418 [inline] get_page_from_freelist+0xa72/0x2f50 mm/page_alloc.c:4149 __alloc_pages+0x1b2/0x500 mm/page_alloc.c:5369 alloc_pages+0x1a7/0x300 mm/mempolicy.c:2191 alloc_slab_page mm/slub.c:1793 [inline] allocate_slab mm/slub.c:1930 [inline] new_slab+0x32d/0x4a0 mm/slub.c:1993 ___slab_alloc+0x918/0xfe0 mm/slub.c:3022 __slab_alloc.constprop.0+0x4d/0xa0 mm/slub.c:3109 slab_alloc_node mm/slub.c:3200 [inline] slab_alloc mm/slub.c:3242 [inline] kmem_cache_alloc+0x35c/0x3a0 mm/slub.c:3247 dst_alloc+0x146/0x1f0 net/core/dst.c:92 rt_dst_alloc+0x73/0x430 net/ipv4/route.c:1613 __mkroute_output net/ipv4/route.c:2564 [inline] ip_route_output_key_hash_rcu+0x921/0x2d00 net/ipv4/route.c:2791 ip_route_output_key_hash+0x18b/0x300 net/ipv4/route.c:2619 __ip_route_output_key include/net/route.h:126 [inline] ip_route_output_flow+0x23/0x150 net/ipv4/route.c:2850 ip_route_output_key include/net/route.h:142 [inline] geneve_get_v4_rt+0x3a6/0x830 drivers/net/geneve.c:809 geneve_xmit_skb drivers/net/geneve.c:899 [inline] geneve_xmit+0xc4a/0x3540 drivers/net/geneve.c:1082 __netdev_start_xmit include/linux/netdevice.h:4994 [inline] netdev_start_xmit include/linux/netdevice.h:5008 [inline] xmit_one net/core/dev.c:3590 [inline] dev_hard_start_xmit+0x1eb/0x920 net/core/dev.c:3606 __dev_queue_xmit+0x299a/0x3650 net/core/dev.c:4229 page last free stack trace: reset_page_owner include/linux/page_owner.h:24 [inline] free_pages_prepare mm/page_alloc.c:1338 [inline] free_pcp_prepare+0x374/0x870 mm/page_alloc.c:1389 free_unref_page_prepare mm/page_alloc.c:3309 [inline] free_unref_page+0x19/0x690 mm/page_alloc.c:3388 qlink_free mm/kasan/quarantine.c:146 [inline] qlist_free_all+0x5a/0xc0 mm/kasan/quarantine.c:165 kasan_quarantine_reduce+0x180/0x200 mm/kasan/quarantine.c:272 __kasan_slab_alloc+0xa2/0xc0 mm/kasan/common.c:444 kasan_slab_alloc include/linux/kasan.h:259 [inline] slab_post_alloc_hook mm/slab.h:519 [inline] slab_alloc_node mm/slub.c:3234 [inline] kmem_cache_alloc_node+0x255/0x3f0 mm/slub.c:3270 __alloc_skb+0x215/0x340 net/core/skbuff.c:414 alloc_skb include/linux/skbuff.h:1126 [inline] alloc_skb_with_frags+0x93/0x620 net/core/skbuff.c:6078 sock_alloc_send_pskb+0x783/0x910 net/core/sock.c:2575 mld_newpack+0x1df/0x770 net/ipv6/mcast.c:1754 add_grhead+0x265/0x330 net/ipv6/mcast.c:1857 add_grec+0x1053/0x14e0 net/ipv6/mcast.c:1995 mld_send_initial_cr.part.0+0xf6/0x230 net/ipv6/mcast.c:2242 mld_send_initial_cr net/ipv6/mcast.c:1232 [inline] mld_dad_work+0x1d3/0x690 net/ipv6/mcast.c:2268 process_one_work+0x9b2/0x1690 kernel/workqueue.c:2298 worker_thread+0x658/0x11f0 kernel/workqueue.c:2445 Memory state around the buggy address: ffff88807f1cb600: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88807f1cb680: fb fb fb fb fb fb fc fc fc fc fc fc fc fc fc fc >ffff88807f1cb700: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff88807f1cb780: fb fb fb fb fb fb fc fc fc fc fc fc fc fc fc fc ffff88807f1cb800: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb Fixes: 41063e9dd119 ("ipv4: Early TCP socket demux.") Signed-off-by: Eric Dumazet <edumazet(a)google.com> Link: https://lore.kernel.org/r/20211220143330.680945-1-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Zhengchao Shao <shaozhengchao(a)huawei.com> Conflict: include/net/sock.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c net/ipv6/udp.c Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/net/sock.h | 2 +- net/ipv4/af_inet.c | 2 +- net/ipv4/tcp.c | 3 +-- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 11 +++++++---- net/ipv4/udp.c | 6 +++--- net/ipv6/tcp_ipv6.c | 11 +++++++---- net/ipv6/udp.c | 4 ++-- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index c958be11d172..bd34faf53b1f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -428,7 +428,7 @@ struct sock { #ifdef CONFIG_XFRM struct xfrm_policy __rcu *sk_policy[2]; #endif - struct dst_entry *sk_rx_dst; + struct dst_entry __rcu *sk_rx_dst; struct dst_entry __rcu *sk_dst_cache; atomic_t sk_omem_alloc; int sk_sndbuf; diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 8bf43ca7139a..911ad595dbb9 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -158,7 +158,7 @@ void inet_sock_destruct(struct sock *sk) kfree(rcu_dereference_protected(inet->inet_opt, 1)); dst_release(rcu_dereference_protected(sk->sk_dst_cache, 1)); - dst_release(sk->sk_rx_dst); + dst_release(rcu_dereference_protected(sk->sk_rx_dst, 1)); sk_refcnt_debug_dec(sk); } EXPORT_SYMBOL(inet_sock_destruct); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index fcd792816756..c19428e97876 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2814,8 +2814,7 @@ int tcp_disconnect(struct sock *sk, int flags) icsk->icsk_ack.rcv_mss = TCP_MIN_MSS; memset(&tp->rx_opt, 0, sizeof(tp->rx_opt)); __sk_dst_reset(sk); - dst_release(sk->sk_rx_dst); - sk->sk_rx_dst = NULL; + dst_release(xchg((__force struct dst_entry **)&sk->sk_rx_dst, NULL)); tcp_saved_syn_free(tp); tp->compressed_ack = 0; tp->segs_in = 0; diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 11f3f8e23a8a..6f4ac0f10f57 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5744,7 +5744,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) trace_tcp_probe(sk, skb); tcp_mstamp_refresh(tp); - if (unlikely(!sk->sk_rx_dst)) + if (unlikely(!rcu_access_pointer(sk->sk_rx_dst))) inet_csk(sk)->icsk_af_ops->sk_rx_dst_set(sk, skb); /* * Header prediction. diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ebfeeeadd47c..078f3a5d65b3 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1670,15 +1670,18 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) struct sock *rsk; if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst = sk->sk_rx_dst; + struct dst_entry *dst; + + dst = rcu_dereference_protected(sk->sk_rx_dst, + lockdep_sock_is_held(sk)); sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || !dst->ops->check(dst, 0)) { + RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); - sk->sk_rx_dst = NULL; } } tcp_rcv_established(sk, skb); @@ -1753,7 +1756,7 @@ int tcp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); + struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0); @@ -2160,7 +2163,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) struct dst_entry *dst = skb_dst(skb); if (dst && dst_hold_safe(dst)) { - sk->sk_rx_dst = dst; + rcu_assign_pointer(sk->sk_rx_dst, dst); inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; } } diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 8cca8bda0612..121c08d4255c 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2186,7 +2186,7 @@ bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst) struct dst_entry *old; if (dst_hold_safe(dst)) { - old = xchg(&sk->sk_rx_dst, dst); + old = xchg((__force struct dst_entry **)&sk->sk_rx_dst, dst); dst_release(old); return old != dst; } @@ -2376,7 +2376,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(sk->sk_rx_dst != dst)) + if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) udp_sk_rx_dst_set(sk, dst); ret = udp_unicast_rcv_skb(sk, skb, uh); @@ -2535,7 +2535,7 @@ int udp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = READ_ONCE(sk->sk_rx_dst); + dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index df33145b876c..b87b04526e65 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -107,7 +107,7 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) if (dst && dst_hold_safe(dst)) { const struct rt6_info *rt = (const struct rt6_info *)dst; - sk->sk_rx_dst = dst; + rcu_assign_pointer(sk->sk_rx_dst, dst); inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; tcp_inet6_sk(sk)->rx_dst_cookie = rt6_get_cookie(rt); } @@ -1482,15 +1482,18 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) opt_skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC)); if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst = sk->sk_rx_dst; + struct dst_entry *dst; + + dst = rcu_dereference_protected(sk->sk_rx_dst, + lockdep_sock_is_held(sk)); sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || dst->ops->check(dst, np->rx_dst_cookie) == NULL) { + RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); - sk->sk_rx_dst = NULL; } } @@ -1842,7 +1845,7 @@ INDIRECT_CALLABLE_SCOPE void tcp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); + struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, tcp_inet6_sk(sk)->rx_dst_cookie); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 503706397839..7022dcbb5a11 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -940,7 +940,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(sk->sk_rx_dst != dst)) + if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) udp6_sk_rx_dst_set(sk, dst); if (!uh->check && !udp_sk(sk)->no_check6_rx) { @@ -1054,7 +1054,7 @@ INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = READ_ONCE(sk->sk_rx_dst); + dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); -- 2.20.1

1 30

[PATCH openEuler-5.10-LTS 0/7] Backport 5.10.105 LTS
by Zheng Zengkai 31 May '22

31 May '22

Backport 5.10.105 LTS patches from upstream Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" arm64: cpufeature: add HWCAP for FEAT_RPRES arm64: cpufeature: add HWCAP for FEAT_AFP arm64: Add Cortex-A510 CPU part definition arm64: Add Cortex-X2 CPU part definition arm64: Add Neoverse-N2, Cortex-A710 CPU part definition arm64: cputype: Add CPU implementor & types for the Apple M1 cores Conflicts: arm64: cpufeature: add HWCAP for FEAT_RPRES arm64: cpufeature: add HWCAP for FEAT_AFP arm64: Add Cortex-A510 CPU part definition arm64: Add Neoverse-N2, Cortex-A710 CPU part definition arm64: cputype: Add CPU implementor & types for the Apple M1 cores Already merged(51): xen/netfront: react properly to failing gnttab_end_foreign_access_ref() xen/gnttab: fix gnttab_end_foreign_access() without page specified xen/pvcalls: use alloc/free_pages_exact() xen/9p: use alloc/free_pages_exact() xen: remove gnttab_query_foreign_access() xen/gntalloc: don't use gnttab_query_foreign_access() xen/scsifront: don't use gnttab_query_foreign_access() for mapped status xen/netfront: don't use gnttab_query_foreign_access() for mapped status xen/blkfront: don't use gnttab_query_foreign_access() for mapped status xen/grant-table: add gnttab_try_end_foreign_access() xen/xenbus: don't let xenbus_grant_ring() remove grants in error case ARM: Do not use NOCROSSREFS directive with ld.lld arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting arm64: Use the clearbhb instruction in mitigations KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated arm64: Mitigate spectre style branch history side channels KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 arm64: Add percpu vectors for EL1 arm64: entry: Add macro for reading symbol addresses from the trampoline arm64: entry: Add vectors that have the bhb mitigation sequences arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations arm64: entry: Allow the trampoline text to occupy multiple pages arm64: entry: Make the kpti trampoline's kpti sequence optional arm64: entry: Move trampoline macros out of ifdef'd section arm64: entry: Don't assume tramp_vectors is the start of the vectors arm64: entry: Allow tramp_alias to access symbols after the 4K boundary arm64: entry: Move the trampoline data page before the text page arm64: entry: Free up another register on kpti's tramp_exit path arm64: entry: Make the trampoline cleanup optional arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit arm64: entry.S: Add ventry overflow sanity checks arm64: add ID_AA64ISAR2_EL1 sys register arm64: Add HWCAP for self-synchronising virtual counter ARM: include unprivileged BPF status in Spectre V2 reporting ARM: Spectre-BHB workaround ARM: use LOADADDR() to get load address of sections ARM: early traps initialisation ARM: report Spectre v2 status through sysfs x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT x86/speculation: Warn about Spectre v2 LFENCE mitigation x86/speculation: Update link to AMD speculation whitepaper x86/speculation: Use generic retpoline by default on AMD x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Documentation/hw-vuln: Update spectre doc x86/speculation: Add eIBRS + Retpoline options x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE x86,bugs: Unconditionally allow spectre_v2=retpoline,amd ARM: fix build error when BPF_SYSCALL is disabled ARM: fix co-processor register typo ARM: fix build warning in proc-v7-bugs.c Total patches: 58 - 51 = 7 Anshuman Khandual (2): arm64: Add Cortex-X2 CPU part definition arm64: Add Cortex-A510 CPU part definition Greg Kroah-Hartman (1): Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" Hector Martin (1): arm64: cputype: Add CPU implementor & types for the Apple M1 cores Joey Gouly (2): arm64: cpufeature: add HWCAP for FEAT_AFP arm64: cpufeature: add HWCAP for FEAT_RPRES Suzuki K Poulose (1): arm64: Add Neoverse-N2, Cortex-A710 CPU part definition Documentation/arm64/cpu-feature-registers.rst | 17 +++++++++++++++++ Documentation/arm64/elf_hwcaps.rst | 8 ++++++++ arch/arm64/include/asm/cputype.h | 14 ++++++++++++++ arch/arm64/include/asm/hwcap.h | 2 ++ arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/include/uapi/asm/hwcap.h | 2 ++ arch/arm64/kernel/cpufeature.c | 4 ++++ arch/arm64/kernel/cpuinfo.c | 2 ++ drivers/acpi/ec.c | 10 ---------- drivers/acpi/sleep.c | 14 ++++++++++---- 10 files changed, 60 insertions(+), 14 deletions(-) -- 2.20.1

1 7

[PATCH openEuler-5.10 01/50] inet: fully convert sk->sk_rx_dst to RCU rules
by Zheng Zengkai 31 May '22

31 May '22

From: Eric Dumazet <edumazet(a)google.com> mainline inclusion from mainline-v5.16-rc7 commit 8f905c0e7354ef261360fb7535ea079b1082c105 category: bugfix bugzilla: 186714 https://gitee.com/src-openeuler/kernel/issues/I57QUK -------------------------------- syzbot reported various issues around early demux, one being included in this changelog [1] sk->sk_rx_dst is using RCU protection without clearly documenting it. And following sequences in tcp_v4_do_rcv()/tcp_v6_do_rcv() are not following standard RCU rules. [a] dst_release(dst); [b] sk->sk_rx_dst = NULL; They look wrong because a delete operation of RCU protected pointer is supposed to clear the pointer before the call_rcu()/synchronize_rcu() guarding actual memory freeing. In some cases indeed, dst could be freed before [b] is done. We could cheat by clearing sk_rx_dst before calling dst_release(), but this seems the right time to stick to standard RCU annotations and debugging facilities. [1] BUG: KASAN: use-after-free in dst_check include/net/dst.h:470 [inline] BUG: KASAN: use-after-free in tcp_v4_early_demux+0x95b/0x960 net/ipv4/tcp_ipv4.c:1792 Read of size 2 at addr ffff88807f1cb73a by task syz-executor.5/9204 CPU: 0 PID: 9204 Comm: syz-executor.5 Not tainted 5.16.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 print_address_description.constprop.0.cold+0x8d/0x320 mm/kasan/report.c:247 __kasan_report mm/kasan/report.c:433 [inline] kasan_report.cold+0x83/0xdf mm/kasan/report.c:450 dst_check include/net/dst.h:470 [inline] tcp_v4_early_demux+0x95b/0x960 net/ipv4/tcp_ipv4.c:1792 ip_rcv_finish_core.constprop.0+0x15de/0x1e80 net/ipv4/ip_input.c:340 ip_list_rcv_finish.constprop.0+0x1b2/0x6e0 net/ipv4/ip_input.c:583 ip_sublist_rcv net/ipv4/ip_input.c:609 [inline] ip_list_rcv+0x34e/0x490 net/ipv4/ip_input.c:644 __netif_receive_skb_list_ptype net/core/dev.c:5508 [inline] __netif_receive_skb_list_core+0x549/0x8e0 net/core/dev.c:5556 __netif_receive_skb_list net/core/dev.c:5608 [inline] netif_receive_skb_list_internal+0x75e/0xd80 net/core/dev.c:5699 gro_normal_list net/core/dev.c:5853 [inline] gro_normal_list net/core/dev.c:5849 [inline] napi_complete_done+0x1f1/0x880 net/core/dev.c:6590 virtqueue_napi_complete drivers/net/virtio_net.c:339 [inline] virtnet_poll+0xca2/0x11b0 drivers/net/virtio_net.c:1557 __napi_poll+0xaf/0x440 net/core/dev.c:7023 napi_poll net/core/dev.c:7090 [inline] net_rx_action+0x801/0xb40 net/core/dev.c:7177 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 invoke_softirq kernel/softirq.c:432 [inline] __irq_exit_rcu+0x123/0x180 kernel/softirq.c:637 irq_exit_rcu+0x5/0x20 kernel/softirq.c:649 common_interrupt+0x52/0xc0 arch/x86/kernel/irq.c:240 asm_common_interrupt+0x1e/0x40 arch/x86/include/asm/idtentry.h:629 RIP: 0033:0x7f5e972bfd57 Code: 39 d1 73 14 0f 1f 80 00 00 00 00 48 8b 50 f8 48 83 e8 08 48 39 ca 77 f3 48 39 c3 73 3e 48 89 13 48 8b 50 f8 48 89 38 49 8b 0e <48> 8b 3e 48 83 c3 08 48 83 c6 08 eb bc 48 39 d1 72 9e 48 39 d0 73 RSP: 002b:00007fff8a413210 EFLAGS: 00000283 RAX: 00007f5e97108990 RBX: 00007f5e97108338 RCX: ffffffff81d3aa45 RDX: ffffffff81d3aa45 RSI: 00007f5e97108340 RDI: ffffffff81d3aa45 RBP: 00007f5e97107eb8 R08: 00007f5e97108d88 R09: 0000000093c2e8d9 R10: 0000000000000000 R11: 0000000000000000 R12: 00007f5e97107eb0 R13: 00007f5e97108338 R14: 00007f5e97107ea8 R15: 0000000000000019 </TASK> Allocated by task 13: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 kasan_set_track mm/kasan/common.c:46 [inline] set_alloc_info mm/kasan/common.c:434 [inline] __kasan_slab_alloc+0x90/0xc0 mm/kasan/common.c:467 kasan_slab_alloc include/linux/kasan.h:259 [inline] slab_post_alloc_hook mm/slab.h:519 [inline] slab_alloc_node mm/slub.c:3234 [inline] slab_alloc mm/slub.c:3242 [inline] kmem_cache_alloc+0x202/0x3a0 mm/slub.c:3247 dst_alloc+0x146/0x1f0 net/core/dst.c:92 rt_dst_alloc+0x73/0x430 net/ipv4/route.c:1613 ip_route_input_slow+0x1817/0x3a20 net/ipv4/route.c:2340 ip_route_input_rcu net/ipv4/route.c:2470 [inline] ip_route_input_noref+0x116/0x2a0 net/ipv4/route.c:2415 ip_rcv_finish_core.constprop.0+0x288/0x1e80 net/ipv4/ip_input.c:354 ip_list_rcv_finish.constprop.0+0x1b2/0x6e0 net/ipv4/ip_input.c:583 ip_sublist_rcv net/ipv4/ip_input.c:609 [inline] ip_list_rcv+0x34e/0x490 net/ipv4/ip_input.c:644 __netif_receive_skb_list_ptype net/core/dev.c:5508 [inline] __netif_receive_skb_list_core+0x549/0x8e0 net/core/dev.c:5556 __netif_receive_skb_list net/core/dev.c:5608 [inline] netif_receive_skb_list_internal+0x75e/0xd80 net/core/dev.c:5699 gro_normal_list net/core/dev.c:5853 [inline] gro_normal_list net/core/dev.c:5849 [inline] napi_complete_done+0x1f1/0x880 net/core/dev.c:6590 virtqueue_napi_complete drivers/net/virtio_net.c:339 [inline] virtnet_poll+0xca2/0x11b0 drivers/net/virtio_net.c:1557 __napi_poll+0xaf/0x440 net/core/dev.c:7023 napi_poll net/core/dev.c:7090 [inline] net_rx_action+0x801/0xb40 net/core/dev.c:7177 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 Freed by task 13: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 kasan_set_track+0x21/0x30 mm/kasan/common.c:46 kasan_set_free_info+0x20/0x30 mm/kasan/generic.c:370 ____kasan_slab_free mm/kasan/common.c:366 [inline] ____kasan_slab_free mm/kasan/common.c:328 [inline] __kasan_slab_free+0xff/0x130 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+0x8b/0x1c0 mm/slub.c:1749 slab_free mm/slub.c:3513 [inline] kmem_cache_free+0xbd/0x5d0 mm/slub.c:3530 dst_destroy+0x2d6/0x3f0 net/core/dst.c:127 rcu_do_batch kernel/rcu/tree.c:2506 [inline] rcu_core+0x7ab/0x1470 kernel/rcu/tree.c:2741 __do_softirq+0x29b/0x9c2 kernel/softirq.c:558 Last potentially related work creation: kasan_save_stack+0x1e/0x50 mm/kasan/common.c:38 __kasan_record_aux_stack+0xf5/0x120 mm/kasan/generic.c:348 __call_rcu kernel/rcu/tree.c:2985 [inline] call_rcu+0xb1/0x740 kernel/rcu/tree.c:3065 dst_release net/core/dst.c:177 [inline] dst_release+0x79/0xe0 net/core/dst.c:167 tcp_v4_do_rcv+0x612/0x8d0 net/ipv4/tcp_ipv4.c:1712 sk_backlog_rcv include/net/sock.h:1030 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2768 release_sock+0x54/0x1b0 net/core/sock.c:3300 tcp_sendmsg+0x36/0x40 net/ipv4/tcp.c:1441 inet_sendmsg+0x99/0xe0 net/ipv4/af_inet.c:819 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:724 sock_write_iter+0x289/0x3c0 net/socket.c:1057 call_write_iter include/linux/fs.h:2162 [inline] new_sync_write+0x429/0x660 fs/read_write.c:503 vfs_write+0x7cd/0xae0 fs/read_write.c:590 ksys_write+0x1ee/0x250 fs/read_write.c:643 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae The buggy address belongs to the object at ffff88807f1cb700 which belongs to the cache ip_dst_cache of size 176 The buggy address is located 58 bytes inside of 176-byte region [ffff88807f1cb700, ffff88807f1cb7b0) The buggy address belongs to the page: page:ffffea0001fc72c0 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x7f1cb flags: 0xfff00000000200(slab|node=0|zone=1|lastcpupid=0x7ff) raw: 00fff00000000200 dead000000000100 dead000000000122 ffff8881413bb780 raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 0, migratetype Unmovable, gfp_mask 0x112a20(GFP_ATOMIC|__GFP_NOWARN|__GFP_NORETRY|__GFP_HARDWALL), pid 5, ts 108466983062, free_ts 108048976062 prep_new_page mm/page_alloc.c:2418 [inline] get_page_from_freelist+0xa72/0x2f50 mm/page_alloc.c:4149 __alloc_pages+0x1b2/0x500 mm/page_alloc.c:5369 alloc_pages+0x1a7/0x300 mm/mempolicy.c:2191 alloc_slab_page mm/slub.c:1793 [inline] allocate_slab mm/slub.c:1930 [inline] new_slab+0x32d/0x4a0 mm/slub.c:1993 ___slab_alloc+0x918/0xfe0 mm/slub.c:3022 __slab_alloc.constprop.0+0x4d/0xa0 mm/slub.c:3109 slab_alloc_node mm/slub.c:3200 [inline] slab_alloc mm/slub.c:3242 [inline] kmem_cache_alloc+0x35c/0x3a0 mm/slub.c:3247 dst_alloc+0x146/0x1f0 net/core/dst.c:92 rt_dst_alloc+0x73/0x430 net/ipv4/route.c:1613 __mkroute_output net/ipv4/route.c:2564 [inline] ip_route_output_key_hash_rcu+0x921/0x2d00 net/ipv4/route.c:2791 ip_route_output_key_hash+0x18b/0x300 net/ipv4/route.c:2619 __ip_route_output_key include/net/route.h:126 [inline] ip_route_output_flow+0x23/0x150 net/ipv4/route.c:2850 ip_route_output_key include/net/route.h:142 [inline] geneve_get_v4_rt+0x3a6/0x830 drivers/net/geneve.c:809 geneve_xmit_skb drivers/net/geneve.c:899 [inline] geneve_xmit+0xc4a/0x3540 drivers/net/geneve.c:1082 __netdev_start_xmit include/linux/netdevice.h:4994 [inline] netdev_start_xmit include/linux/netdevice.h:5008 [inline] xmit_one net/core/dev.c:3590 [inline] dev_hard_start_xmit+0x1eb/0x920 net/core/dev.c:3606 __dev_queue_xmit+0x299a/0x3650 net/core/dev.c:4229 page last free stack trace: reset_page_owner include/linux/page_owner.h:24 [inline] free_pages_prepare mm/page_alloc.c:1338 [inline] free_pcp_prepare+0x374/0x870 mm/page_alloc.c:1389 free_unref_page_prepare mm/page_alloc.c:3309 [inline] free_unref_page+0x19/0x690 mm/page_alloc.c:3388 qlink_free mm/kasan/quarantine.c:146 [inline] qlist_free_all+0x5a/0xc0 mm/kasan/quarantine.c:165 kasan_quarantine_reduce+0x180/0x200 mm/kasan/quarantine.c:272 __kasan_slab_alloc+0xa2/0xc0 mm/kasan/common.c:444 kasan_slab_alloc include/linux/kasan.h:259 [inline] slab_post_alloc_hook mm/slab.h:519 [inline] slab_alloc_node mm/slub.c:3234 [inline] kmem_cache_alloc_node+0x255/0x3f0 mm/slub.c:3270 __alloc_skb+0x215/0x340 net/core/skbuff.c:414 alloc_skb include/linux/skbuff.h:1126 [inline] alloc_skb_with_frags+0x93/0x620 net/core/skbuff.c:6078 sock_alloc_send_pskb+0x783/0x910 net/core/sock.c:2575 mld_newpack+0x1df/0x770 net/ipv6/mcast.c:1754 add_grhead+0x265/0x330 net/ipv6/mcast.c:1857 add_grec+0x1053/0x14e0 net/ipv6/mcast.c:1995 mld_send_initial_cr.part.0+0xf6/0x230 net/ipv6/mcast.c:2242 mld_send_initial_cr net/ipv6/mcast.c:1232 [inline] mld_dad_work+0x1d3/0x690 net/ipv6/mcast.c:2268 process_one_work+0x9b2/0x1690 kernel/workqueue.c:2298 worker_thread+0x658/0x11f0 kernel/workqueue.c:2445 Memory state around the buggy address: ffff88807f1cb600: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88807f1cb680: fb fb fb fb fb fb fc fc fc fc fc fc fc fc fc fc >ffff88807f1cb700: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff88807f1cb780: fb fb fb fb fb fb fc fc fc fc fc fc fc fc fc fc ffff88807f1cb800: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb Fixes: 41063e9dd119 ("ipv4: Early TCP socket demux.") Signed-off-by: Eric Dumazet <edumazet(a)google.com> Link: https://lore.kernel.org/r/20211220143330.680945-1-eric.dumazet@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Zhengchao Shao <shaozhengchao(a)huawei.com> Conflict: include/net/sock.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c net/ipv6/udp.c Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/net/sock.h | 2 +- net/ipv4/af_inet.c | 2 +- net/ipv4/tcp.c | 3 +-- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 11 +++++++---- net/ipv4/udp.c | 6 +++--- net/ipv6/tcp_ipv6.c | 11 +++++++---- net/ipv6/udp.c | 4 ++-- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index af73dda0285b..7d068cf871a3 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -429,7 +429,7 @@ struct sock { #ifdef CONFIG_XFRM struct xfrm_policy __rcu *sk_policy[2]; #endif - struct dst_entry *sk_rx_dst; + struct dst_entry __rcu *sk_rx_dst; struct dst_entry __rcu *sk_dst_cache; atomic_t sk_omem_alloc; int sk_sndbuf; diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 8bf43ca7139a..911ad595dbb9 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -158,7 +158,7 @@ void inet_sock_destruct(struct sock *sk) kfree(rcu_dereference_protected(inet->inet_opt, 1)); dst_release(rcu_dereference_protected(sk->sk_dst_cache, 1)); - dst_release(sk->sk_rx_dst); + dst_release(rcu_dereference_protected(sk->sk_rx_dst, 1)); sk_refcnt_debug_dec(sk); } EXPORT_SYMBOL(inet_sock_destruct); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index fcd792816756..c19428e97876 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2814,8 +2814,7 @@ int tcp_disconnect(struct sock *sk, int flags) icsk->icsk_ack.rcv_mss = TCP_MIN_MSS; memset(&tp->rx_opt, 0, sizeof(tp->rx_opt)); __sk_dst_reset(sk); - dst_release(sk->sk_rx_dst); - sk->sk_rx_dst = NULL; + dst_release(xchg((__force struct dst_entry **)&sk->sk_rx_dst, NULL)); tcp_saved_syn_free(tp); tp->compressed_ack = 0; tp->segs_in = 0; diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 11f3f8e23a8a..6f4ac0f10f57 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5744,7 +5744,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) trace_tcp_probe(sk, skb); tcp_mstamp_refresh(tp); - if (unlikely(!sk->sk_rx_dst)) + if (unlikely(!rcu_access_pointer(sk->sk_rx_dst))) inet_csk(sk)->icsk_af_ops->sk_rx_dst_set(sk, skb); /* * Header prediction. diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index ebfeeeadd47c..078f3a5d65b3 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1670,15 +1670,18 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) struct sock *rsk; if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst = sk->sk_rx_dst; + struct dst_entry *dst; + + dst = rcu_dereference_protected(sk->sk_rx_dst, + lockdep_sock_is_held(sk)); sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || !dst->ops->check(dst, 0)) { + RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); - sk->sk_rx_dst = NULL; } } tcp_rcv_established(sk, skb); @@ -1753,7 +1756,7 @@ int tcp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); + struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0); @@ -2160,7 +2163,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) struct dst_entry *dst = skb_dst(skb); if (dst && dst_hold_safe(dst)) { - sk->sk_rx_dst = dst; + rcu_assign_pointer(sk->sk_rx_dst, dst); inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; } } diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 8cca8bda0612..121c08d4255c 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2186,7 +2186,7 @@ bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst) struct dst_entry *old; if (dst_hold_safe(dst)) { - old = xchg(&sk->sk_rx_dst, dst); + old = xchg((__force struct dst_entry **)&sk->sk_rx_dst, dst); dst_release(old); return old != dst; } @@ -2376,7 +2376,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(sk->sk_rx_dst != dst)) + if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) udp_sk_rx_dst_set(sk, dst); ret = udp_unicast_rcv_skb(sk, skb, uh); @@ -2535,7 +2535,7 @@ int udp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = READ_ONCE(sk->sk_rx_dst); + dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index df33145b876c..b87b04526e65 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -107,7 +107,7 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) if (dst && dst_hold_safe(dst)) { const struct rt6_info *rt = (const struct rt6_info *)dst; - sk->sk_rx_dst = dst; + rcu_assign_pointer(sk->sk_rx_dst, dst); inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; tcp_inet6_sk(sk)->rx_dst_cookie = rt6_get_cookie(rt); } @@ -1482,15 +1482,18 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) opt_skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC)); if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst = sk->sk_rx_dst; + struct dst_entry *dst; + + dst = rcu_dereference_protected(sk->sk_rx_dst, + lockdep_sock_is_held(sk)); sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || dst->ops->check(dst, np->rx_dst_cookie) == NULL) { + RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); - sk->sk_rx_dst = NULL; } } @@ -1842,7 +1845,7 @@ INDIRECT_CALLABLE_SCOPE void tcp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); + struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, tcp_inet6_sk(sk)->rx_dst_cookie); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 503706397839..7022dcbb5a11 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -940,7 +940,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(sk->sk_rx_dst != dst)) + if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) udp6_sk_rx_dst_set(sk, dst); if (!uh->check && !udp_sk(sk)->no_check6_rx) { @@ -1054,7 +1054,7 @@ INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = READ_ONCE(sk->sk_rx_dst); + dst = rcu_dereference(sk->sk_rx_dst); if (dst) dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); -- 2.20.1

1 49

[PATCH openEuler-5.10 0/7] Backport 5.10.105 LTS
by Zheng Zengkai 31 May '22

31 May '22

Backport 5.10.105 LTS patches from upstream Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" arm64: cpufeature: add HWCAP for FEAT_RPRES arm64: cpufeature: add HWCAP for FEAT_AFP arm64: Add Cortex-A510 CPU part definition arm64: Add Cortex-X2 CPU part definition arm64: Add Neoverse-N2, Cortex-A710 CPU part definition arm64: cputype: Add CPU implementor & types for the Apple M1 cores Conflicts: Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" arm64: Add Cortex-X2 CPU part definition Anshuman Khandual (2): arm64: Add Cortex-X2 CPU part definition arm64: Add Cortex-A510 CPU part definition Greg Kroah-Hartman (1): Revert "ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE" Hector Martin (1): arm64: cputype: Add CPU implementor & types for the Apple M1 cores Joey Gouly (2): arm64: cpufeature: add HWCAP for FEAT_AFP arm64: cpufeature: add HWCAP for FEAT_RPRES Suzuki K Poulose (1): arm64: Add Neoverse-N2, Cortex-A710 CPU part definition Documentation/arm64/cpu-feature-registers.rst | 17 +++++++++++++++++ Documentation/arm64/elf_hwcaps.rst | 8 ++++++++ arch/arm64/include/asm/cputype.h | 14 ++++++++++++++ arch/arm64/include/asm/hwcap.h | 2 ++ arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/include/uapi/asm/hwcap.h | 2 ++ arch/arm64/kernel/cpufeature.c | 4 ++++ arch/arm64/kernel/cpuinfo.c | 2 ++ drivers/acpi/ec.c | 10 ---------- drivers/acpi/sleep.c | 14 ++++++++++---- 10 files changed, 60 insertions(+), 14 deletions(-) -- 2.20.1

1 7

Re:[PATCH OLK-5.10] config: change CONFIG_DMATEST from y to m
by 焦芬芳 30 May '22

30 May '22

hi, all      Reviewed-by, "jiaofenfang"<jiaofenfang(a)uniontech.com>     ------------------ Original ------------------ From:  "Chao Liu"<liuchao173(a)huawei.com>; Date:  Sat, May 28, 2022 03:47 PM To:  "kernel"<kernel(a)openeuler.org>; Cc:  "hewenliang4"<hewenliang4(a)huawei.com>; "fangchuangchuang"<fangchuangchuang(a)huawei.com>; "xiexiuqi"<xiexiuqi(a)huawei.com>; "zhengzengkai"<zhengzengkai(a)huawei.com>; "kai.liu"<kai.liu(a)suse.com>; "jiaofenfang"<jiaofenfang(a)uniontech.com>; "yinxiujiang"<yinxiujiang(a)kylinos.cn>; Subject:  [PATCH OLK-5.10] config: change CONFIG_DMATEST from y to m   euler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I59Q07 CVE: NA -------------------------------- Simple DMA test client. Say N unless you're debugging a DMA Device driver. It doesn't need to be compiled into the vmlinux, change it to m. Signed-off-by: Chao Liu <liuchao173(a)huawei.com> ---  arch/x86/configs/openeuler_defconfig | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 61c4be815462..f9c94b618ad4 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -6370,7 +6370,7 @@ CONFIG_HSU_DMA=y  # DMA Clients  #  CONFIG_ASYNC_TX_DMA=y -CONFIG_DMATEST=y +CONFIG_DMATEST=m  CONFIG_DMA_ENGINE_RAID=y    # -- 2.23.0

1 0

[PATCH OLK-5.10] config: change CONFIG_DMATEST from y to m
by Chao Liu 30 May '22

30 May '22

euler inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I59Q07 CVE: NA -------------------------------- Simple DMA test client. Say N unless you're debugging a DMA Device driver. It doesn't need to be compiled into the vmlinux, change it to m. Signed-off-by: Chao Liu <liuchao173(a)huawei.com> --- arch/x86/configs/openeuler_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 61c4be815462..f9c94b618ad4 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -6370,7 +6370,7 @@ CONFIG_HSU_DMA=y # DMA Clients # CONFIG_ASYNC_TX_DMA=y -CONFIG_DMATEST=y +CONFIG_DMATEST=m CONFIG_DMA_ENGINE_RAID=y # -- 2.23.0

3 2

[PATCH openEuler-5.10 1/8] Revert "audit: bugfix for infinite loop when flush the hold queue"
by Zheng Zengkai 28 May '22

28 May '22

From: Cui GaoSheng <cuigaosheng1(a)huawei.com> hulk inclusion category: bugfix bugzilla: 186383 https://gitee.com/openeuler/kernel/issues/I4X1AI?from=project-issue CVE: NA backport: openEuler-22.03-LTS -------------------------------- This reverts commit fcfdde9cfc503cfd191b7286f9c48077fb5bf420. Signed-off-by: Cui GaoSheng <cuigaosheng1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/audit.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 21be62bc8205..2a38cbaf3ddb 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -732,8 +732,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, if (!sk) { if (err_hook) (*err_hook)(skb); - if (queue == &audit_hold_queue) - goto out; continue; } @@ -750,8 +748,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, (*err_hook)(skb); if (rc == -EAGAIN) rc = 0; - if (queue == &audit_hold_queue) - goto out; /* continue to drain the queue */ continue; } else @@ -763,7 +759,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, } } -out: return (rc >= 0 ? 0 : rc); } -- 2.20.1

1 7

[PATCH openEuler-5.10 00/99] Backport 5.10.104 LTS
by Zheng Zengkai 28 May '22

28 May '22

Backport 5.10.104 LTS patches from upstream hamradio: fix macro redefine warning Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6" btrfs: add missing run of delayed items after unlink during log replay btrfs: qgroup: fix deadlock between rescan worker and remove qgroup btrfs: fix lost prealloc extents beyond eof after full fsync tracing: Fix return value of setup handlers tracing/histogram: Fix sorting on old "cpu" value HID: add mapping for KEY_ALL_APPLICATIONS HID: add mapping for KEY_DICTATE Input: samsung-keypad - properly state IOMEM dependency Input: elan_i2c - fix regulator enable count imbalance after suspend/resume Input: elan_i2c - move regulator[en|dis]able() out of elan[en|dis]able_power() net: dcb: disable softirqs in dcbnl_flush_dev() drm/amdgpu: fix suspend/resume hang regression nl80211: Handle nla_memdup failures in handle_nan_filter iavf: Refactor iavf state machine tracking net: chelsio: cxgb3: check the return value of pci_find_capability() ibmvnic: complete init_done on transport events ARM: tegra: Move panels to AUX bus soc: fsl: qe: Check of ioremap return value soc: fsl: guts: Add a missing memory allocation failure check soc: fsl: guts: Revert commit 3c0d64e867ed ARM: dts: Use 32KiHz oscillator on devkit8000 ARM: dts: switch timer config to common devkit8000 devicetree s390/extable: fix exception table sorting memfd: fix F_SEAL_WRITE after shmem huge page allocated ibmvnic: free reset-work-item when flushing igc: igc_write_phy_reg_gpy: drop premature return pinctrl: sunxi: Use unique lockdep classes for IRQs selftests: mlxsw: tc_police_scale: Make test more robust ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions ARM: Fix kgdb breakpoint for Thumb2 igc: igc_read_phy_reg_gpy: drop premature return arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output can: gs_usb: change active_channels's type from atomic_t to u8 ASoC: cs4265: Fix the duplicated control name firmware: arm_scmi: Remove space in MODULE_ALIAS name efivars: Respect "block" flag in efivar_entry_set_safe() ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc() net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe() ibmvnic: register netdev after init of adapter net: sxgbe: fix return value of __setup handler iavf: Fix missing check for running netdev mac80211: treat some SAE auth steps as final net: stmmac: fix return value of __setup handler mac80211: fix forwarded mesh frames AC & queue selection ice: fix concurrent reset and removal of VFs ice: Fix race conditions between virtchnl handling and VF ndo ops net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client net/smc: fix connection leak net: dcb: flush lingering app table entries for unregistered devices net: ipv6: ensure we call ipv6_mc_down() at most once batman-adv: Don't expect inter-netns unique iflink indices batman-adv: Request iflink once in batadv_get_real_netdevice batman-adv: Request iflink once in batadv-on-batadv check netfilter: nf_queue: handle socket prefetch netfilter: nf_queue: fix possible use-after-free netfilter: nf_queue: don't assume sk is full socket net: fix up skbs delta_truesize in UDP GRO frag_list e1000e: Correct NVM checksum verification flow xfrm: enforce validity of offload input flags xfrm: fix the if_id check in changelink bpf, sockmap: Do not ignore orig_len parameter netfilter: fix use-after-free in __nf_register_net_hook() xfrm: fix MTU regression mm: Consider __GFP_NOWARN flag for oversized kvmalloc() calls ntb: intel: fix port config status offset for SPR thermal: core: Fix TZ_GET_TRIP NULL pointer dereference xen/netfront: destroy queues before real_num_tx_queues is zeroed drm/i915: s/JSP2/ICP2/ PCH iommu/amd: Recover from event log overflow ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min riscv: Fix config KASAN && DEBUG_VIRTUAL riscv: Fix config KASAN && SPARSEMEM && !SPARSE_VMEMMAP riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value ALSA: intel_hdmi: Fix reference to PCM buffer address tracing: Add ustring operation to filtering string pointers drm/amdgpu: check vm ready by amdgpu_vm->evicting flag ata: pata_hpt37x: fix PCI clock detection serial: stm32: prevent TDR register overwrite when sending x_char tracing: Add test for user space strings when filtering on string pointers exfat: fix i_blocks for files truncated over 4 GiB exfat: reuse exfat_inode_info variable instead of calling EXFAT_I() net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990 i2c: qup: allow COMPILE_TEST i2c: cadence: allow COMPILE_TEST dmaengine: shdma: Fix runtime PM imbalance on error selftests/seccomp: Fix seccomp failure by adding missing headers cifs: fix double free race when mount fails in cifs_get_root() tipc: fix a bit overflow in tipc_crypto_key_rcv() KVM: arm64: vgic: Read HW interrupt pending state from the HW Input: clear BTN_RIGHT/MIDDLE on buttonpads regulator: core: fix false positive in regulator_late_cleanup() ASoC: rt5682: do not block workqueue if card is unbound ASoC: rt5668: do not block workqueue if card is unbound i2c: bcm2835: Avoid clock stretching timeouts mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work mac80211_hwsim: report NOACK frames in tx_status already merged: usb: gadget: don't release an existing dev->buf usb: gadget: clear related members when goto fail rcu/nocb: Fix missed nocb_timer requeue sched/topology: Make sched_init_numa() use a set for the deduplicating sort sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa() ia64: ensure proper NUMA distance and possible map initialization Total patches: 105 - 6 = 99 Alexandre Ghiti (2): riscv: Fix config KASAN && SPARSEMEM && !SPARSE_VMEMMAP riscv: Fix config KASAN && DEBUG_VIRTUAL Alyssa Ross (1): firmware: arm_scmi: Remove space in MODULE_ALIAS name Amit Cohen (1): selftests: mlxsw: tc_police_scale: Make test more robust Anthoine Bourgeois (2): ARM: dts: switch timer config to common devkit8000 devicetree ARM: dts: Use 32KiHz oscillator on devkit8000 Antony Antony (1): xfrm: fix the if_id check in changelink Benjamin Beichler (1): mac80211_hwsim: report NOACK frames in tx_status Brett Creeley (1): ice: Fix race conditions between virtchnl handling and VF ndo ops Brian Norris (1): arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output Christophe JAILLET (2): soc: fsl: guts: Revert commit 3c0d64e867ed soc: fsl: guts: Add a missing memory allocation failure check Christophe Vu-Brugier (2): exfat: reuse exfat_inode_info variable instead of calling EXFAT_I() exfat: fix i_blocks for files truncated over 4 GiB Corinna Vinschen (1): igc: igc_read_phy_reg_gpy: drop premature return D. Wythe (3): net/smc: fix connection leak net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server Daniel Borkmann (1): mm: Consider __GFP_NOWARN flag for oversized kvmalloc() calls Daniele Palmas (1): net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990 Dave Jiang (1): ntb: intel: fix port config status offset for SPR David Gow (1): Input: samsung-keypad - properly state IOMEM dependency Eric Anholt (1): i2c: bcm2835: Avoid clock stretching timeouts Eric Dumazet (2): netfilter: fix use-after-free in __nf_register_net_hook() bpf, sockmap: Do not ignore orig_len parameter Fabio Estevam (1): ASoC: cs4265: Fix the duplicated control name Filipe Manana (2): btrfs: fix lost prealloc extents beyond eof after full fsync btrfs: add missing run of delayed items after unlink during log replay Florian Westphal (3): netfilter: nf_queue: don't assume sk is full socket netfilter: nf_queue: fix possible use-after-free netfilter: nf_queue: handle socket prefetch Hangyu Hua (1): tipc: fix a bit overflow in tipc_crypto_key_rcv() Hans de Goede (2): Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power() Input: elan_i2c - fix regulator enable count imbalance after suspend/resume Heiko Carstens (1): s390/extable: fix exception table sorting Huang Pei (1): hamradio: fix macro redefine warning Hugh Dickins (1): memfd: fix F_SEAL_WRITE after shmem huge page allocated Jacob Keller (1): ice: fix concurrent reset and removal of VFs JaeMan Park (1): mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work Jann Horn (1): efivars: Respect "block" flag in efivar_entry_set_safe() Jia-Ju Bai (1): net: chelsio: cxgb3: check the return value of pci_find_capability() Jiasheng Jiang (2): soc: fsl: qe: Check of ioremap return value nl80211: Handle nla_memdup failures in handle_nan_filter Jiri Bohac (2): xfrm: fix MTU regression Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6" Johannes Berg (1): mac80211: treat some SAE auth steps as final José Expósito (1): Input: clear BTN_RIGHT/MIDDLE on buttonpads Kai Vehmanen (2): ASoC: rt5668: do not block workqueue if card is unbound ASoC: rt5682: do not block workqueue if card is unbound Lennert Buytenhek (1): iommu/amd: Recover from event log overflow Leon Romanovsky (1): xfrm: enforce validity of offload input flags Maciej Fijalkowski (1): ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc() Marc Zyngier (1): KVM: arm64: vgic: Read HW interrupt pending state from the HW Marek Marczykowski-Górecki (1): xen/netfront: destroy queues before real_num_tx_queues is zeroed Marek Vasut (1): ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min Mateusz Palczewski (1): iavf: Refactor iavf state machine tracking Nicolas Cavallari (1): thermal: core: Fix TZ_GET_TRIP NULL pointer dereference Nicolas Escande (1): mac80211: fix forwarded mesh frames AC & queue selection Oliver Barta (1): regulator: core: fix false positive in regulator_late_cleanup() Qiang Yu (2): drm/amdgpu: check vm ready by amdgpu_vm->evicting flag drm/amdgpu: fix suspend/resume hang regression Randy Dunlap (4): net: stmmac: fix return value of __setup handler net: sxgbe: fix return value of __setup handler ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions tracing: Fix return value of __setup handlers Ronnie Sahlberg (1): cifs: fix double free race when mount fails in cifs_get_root() Russell King (Oracle) (1): ARM: Fix kgdb breakpoint for Thumb2 Samuel Holland (1): pinctrl: sunxi: Use unique lockdep classes for IRQs Sasha Neftin (2): e1000e: Correct NVM checksum verification flow igc: igc_write_phy_reg_gpy: drop premature return Sergey Shtylyov (1): ata: pata_hpt37x: fix PCI clock detection Sherry Yang (1): selftests/seccomp: Fix seccomp failure by adding missing headers Sidong Yang (1): btrfs: qgroup: fix deadlock between rescan worker and remove qgroup Slawomir Laba (1): iavf: Fix missing check for running netdev Steven Rostedt (2): tracing: Add test for user space strings when filtering on string pointers tracing: Add ustring operation to filtering string pointers Steven Rostedt (Google) (1): tracing/histogram: Fix sorting on old "cpu" value Sukadev Bhattiprolu (3): ibmvnic: register netdev after init of adapter ibmvnic: free reset-work-item when flushing ibmvnic: complete init_done on transport events Sunil V L (1): riscv/efi_stub: Fix get_boot_hartid_from_fdt() return value Sven Eckelmann (3): batman-adv: Request iflink once in batadv-on-batadv check batman-adv: Request iflink once in batadv_get_real_netdevice batman-adv: Don't expect inter-netns unique iflink indices Thierry Reding (1): ARM: tegra: Move panels to AUX bus Valentin Caron (1): serial: stm32: prevent TDR register overwrite when sending x_char Ville Syrjälä (1): drm/i915: s/JSP2/ICP2/ PCH Vincent Mailhol (1): can: gs_usb: change active_channels's type from atomic_t to u8 Vladimir Oltean (2): net: dcb: flush lingering app table entries for unregistered devices net: dcb: disable softirqs in dcbnl_flush_dev() William Mahon (2): HID: add mapping for KEY_DICTATE HID: add mapping for KEY_ALL_APPLICATIONS Wolfram Sang (2): i2c: cadence: allow COMPILE_TEST i2c: qup: allow COMPILE_TEST Yongzhi Liu (1): dmaengine: shdma: Fix runtime PM imbalance on error Zhen Ni (1): ALSA: intel_hdmi: Fix reference to PCM buffer address Zheyu Ma (1): net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe() j.nixdorf(a)avm.de (1): net: ipv6: ensure we call ipv6_mc_down() at most once lena wang (1): net: fix up skbs delta_truesize in UDP GRO frag_list Documentation/trace/events.rst | 19 ++++ .../arm/boot/dts/omap3-devkit8000-common.dtsi | 18 +++ arch/arm/boot/dts/omap3-devkit8000.dts | 33 ------ arch/arm/boot/dts/tegra124-nyan-big.dts | 15 ++- arch/arm/boot/dts/tegra124-nyan-blaze.dts | 15 ++- arch/arm/boot/dts/tegra124-venice2.dts | 14 +-- arch/arm/kernel/kgdb.c | 36 ++++-- arch/arm/mm/mmu.c | 2 + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++- arch/arm64/kvm/vgic/vgic-mmio.c | 2 + arch/riscv/mm/Makefile | 3 + arch/riscv/mm/kasan_init.c | 3 +- arch/s390/include/asm/extable.h | 9 +- drivers/ata/pata_hpt37x.c | 4 +- drivers/clocksource/timer-ti-dm-systimer.c | 3 +- drivers/dma/sh/shdma-base.c | 4 +- drivers/firmware/arm_scmi/driver.c | 2 +- drivers/firmware/efi/libstub/riscv-stub.c | 17 +-- drivers/firmware/efi/vars.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +- drivers/gpu/drm/i915/intel_pch.c | 2 +- drivers/gpu/drm/i915/intel_pch.h | 2 +- drivers/hid/hid-debug.c | 5 +- drivers/hid/hid-input.c | 3 + drivers/i2c/busses/Kconfig | 4 +- drivers/i2c/busses/i2c-bcm2835.c | 11 ++ drivers/input/input.c | 6 + drivers/input/keyboard/Kconfig | 2 +- drivers/input/mouse/elan_i2c_core.c | 64 ++++------- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 1 + drivers/iommu/amd/init.c | 10 ++ drivers/iommu/amd/iommu.c | 10 +- drivers/net/arcnet/com20020-pci.c | 3 + drivers/net/can/usb/gs_usb.c | 10 +- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 + drivers/net/ethernet/ibm/ibmvnic.c | 21 +++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +- drivers/net/ethernet/intel/iavf/iavf.h | 10 ++ drivers/net/ethernet/intel/iavf/iavf_main.c | 44 +++---- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 2 + .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 58 ++++++++-- .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 5 + drivers/net/ethernet/intel/igc/igc_phy.c | 4 - drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 6 +- .../net/ethernet/samsung/sxgbe/sxgbe_main.c | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- drivers/net/hamradio/mkiss.c | 2 + drivers/net/usb/cdc_mbim.c | 5 + drivers/net/wireless/mac80211_hwsim.c | 13 +++ drivers/net/xen-netfront.c | 39 ++++--- drivers/ntb/hw/intel/ntb_hw_gen4.c | 17 ++- drivers/ntb/hw/intel/ntb_hw_gen4.h | 16 +++ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 9 ++ drivers/regulator/core.c | 13 +-- drivers/soc/fsl/guts.c | 14 ++- drivers/soc/fsl/qe/qe_io.c | 2 + drivers/thermal/thermal_netlink.c | 5 +- drivers/tty/serial/stm32-usart.c | 12 ++ fs/btrfs/qgroup.c | 9 +- fs/btrfs/tree-log.c | 61 ++++++++-- fs/cifs/cifsfs.c | 1 + fs/exfat/file.c | 18 +-- fs/exfat/inode.c | 13 +-- fs/exfat/namei.c | 6 +- fs/exfat/super.c | 10 +- include/net/netfilter/nf_queue.h | 2 +- include/net/xfrm.h | 1 - include/uapi/linux/input-event-codes.h | 4 +- include/uapi/linux/xfrm.h | 6 + kernel/trace/trace.c | 4 +- kernel/trace/trace_events_filter.c | 107 ++++++++++++++++-- kernel/trace/trace_events_hist.c | 6 +- kernel/trace/trace_kprobe.c | 2 +- mm/memfd.c | 40 +++++-- mm/util.c | 4 +- net/batman-adv/hard-interface.c | 29 +++-- net/core/skbuff.c | 2 +- net/core/skmsg.c | 2 +- net/dcb/dcbnl.c | 44 +++++++ net/ipv4/esp4.c | 2 +- net/ipv6/addrconf.c | 8 +- net/ipv6/esp6.c | 2 +- net/ipv6/ip6_output.c | 11 +- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/mlme.c | 16 ++- net/mac80211/rx.c | 4 +- net/netfilter/core.c | 5 +- net/netfilter/nf_queue.c | 36 +++++- net/netfilter/nfnetlink_queue.c | 12 +- net/smc/af_smc.c | 10 +- net/smc/smc_core.c | 5 +- net/tipc/crypto.c | 2 +- net/wireless/nl80211.c | 12 ++ net/xfrm/xfrm_device.c | 6 +- net/xfrm/xfrm_interface.c | 2 +- net/xfrm/xfrm_state.c | 14 +-- sound/soc/codecs/cs4265.c | 3 +- sound/soc/codecs/rt5668.c | 12 +- sound/soc/codecs/rt5682.c | 12 +- sound/soc/soc-ops.c | 4 +- sound/x86/intel_hdmi_audio.c | 2 +- .../drivers/net/mlxsw/tc_police_scale.sh | 3 +- tools/testing/selftests/seccomp/Makefile | 2 +- 105 files changed, 881 insertions(+), 359 deletions(-) -- 2.20.1

1 99

[PATCH openEuler-5.10 1/6] slub: add back check for free nonslab objects
by Zheng Zengkai 28 May '22

28 May '22

From: Kefeng Wang <wangkefeng.wang(a)huawei.com> mainline inclusion from mainline-v5.16-rc1 commit d0fe47c64152a63ceed4b9f29ac56371407fa7b4 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I57LS2 CVE: NA backport: openEuler-22.03-LTS -------------------------------- After commit f227f0faf63b ("slub: fix unreclaimable slab stat for bulk free"), the check for free nonslab page is replaced by VM_BUG_ON_PAGE, which only check with CONFIG_DEBUG_VM enabled, but this config may impact performance, so it only for debug. Commit 0937502af7c9 ("slub: Add check for kfree() of non slab objects.") add the ability, which should be needed in any configs to catch the invalid free, they even could be potential issue, eg, memory corruption, use after free and double free, so replace VM_BUG_ON_PAGE to WARN_ON_ONCE, add object address printing to help use to debug the issue. Link: https://lkml.kernel.org/r/20210930070214.61499-1-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Shakeel Butt <shakeelb(a)google.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rienjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Ma Wupeng <mawupeng1(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- mm/slub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index 7a7b0bf82b8e..98452815a066 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3209,7 +3209,9 @@ static inline void free_nonslab_page(struct page *page, void *object) { unsigned int order = compound_order(page); - VM_BUG_ON_PAGE(!PageCompound(page), page); + if (WARN_ON_ONCE(!PageCompound(page))) + pr_warn_once("object pointer: 0x%p\n", object); + kfree_hook(object); mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B, -(PAGE_SIZE << order)); __free_pages(page, order); -- 2.20.1

1 5

[PATCH openEuler-5.10 v2 1/4] ipv6: per-netns exclusive flowlabel checks
by Zheng Zengkai 28 May '22

28 May '22

From: Willem de Bruijn <willemb(a)google.com> stable inclusion from stable-v5.10.102 commit 4f523f15e5d753ac055302bc29ca9677d6692eed bugzilla: https://gitee.com/openeuler/kernel/issues/I575QT Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 0b0dff5b3b98c5c7ce848151df9da0b3cdf0cc8b upstream. Ipv6 flowlabels historically require a reservation before use. Optionally in exclusive mode (e.g., user-private). Commit 59c820b2317f ("ipv6: elide flowlabel check if no exclusive leases exist") introduced a fastpath that avoids this check when no exclusive leases exist in the system, and thus any flowlabel use will be granted. That allows skipping the control operation to reserve a flowlabel entirely. Though with a warning if the fast path fails: This is an optimization. Robust applications still have to revert to requesting leases if the fast path fails due to an exclusive lease. Still, this is subtle. Better isolate network namespaces from each other. Flowlabels are per-netns. Also record per-netns whether exclusive leases are in use. Then behavior does not change based on activity in other netns. Changes v2 - wrap in IS_ENABLED(CONFIG_IPV6) to avoid breakage if disabled Fixes: 59c820b2317f ("ipv6: elide flowlabel check if no exclusive leases exist") Link: https://lore.kernel.org/netdev/MWHPR2201MB1072BCCCFCE779E4094837ACD0329@MWH… Reported-by: Congyu Liu <liu3101(a)purdue.edu> Signed-off-by: Willem de Bruijn <willemb(a)google.com> Tested-by: Congyu Liu <liu3101(a)purdue.edu> Link: https://lore.kernel.org/r/20220215160037.1976072-1-willemdebruijn.kernel@gm… Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/net/ipv6.h | 5 ++++- include/net/netns/ipv6.h | 5 +++++ net/ipv6/ip6_flowlabel.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index c0273ae50296..9392a81a3ae4 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -390,17 +390,20 @@ static inline void txopt_put(struct ipv6_txoptions *opt) kfree_rcu(opt, rcu); } +#if IS_ENABLED(CONFIG_IPV6) struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label); extern struct static_key_false_deferred ipv6_flowlabel_exclusive; static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label) { - if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key)) + if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key) && + READ_ONCE(sock_net(sk)->ipv6.flowlabel_has_excl)) return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT); return NULL; } +#endif struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space, struct ip6_flowlabel *fl, diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index ce5ed87accda..b2a28201f4fd 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -83,6 +83,11 @@ struct netns_ipv6 { unsigned long ip6_rt_last_gc; #ifdef CONFIG_IPV6_MULTIPLE_TABLES unsigned int fib6_rules_require_fldissect; +#endif +#ifndef __GENKSYMS__ + unsigned char flowlabel_has_excl; +#endif +#ifdef CONFIG_IPV6_MULTIPLE_TABLES bool fib6_has_custom_rules; #ifdef CONFIG_IPV6_SUBTREES unsigned int fib6_routes_require_src; diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index aa673a6a7e43..ceb85c67ce39 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -450,8 +450,10 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, err = -EINVAL; goto done; } - if (fl_shared_exclusive(fl) || fl->opt) + if (fl_shared_exclusive(fl) || fl->opt) { + WRITE_ONCE(sock_net(sk)->ipv6.flowlabel_has_excl, 1); static_branch_deferred_inc(&ipv6_flowlabel_exclusive); + } return fl; done: -- 2.20.1

1 3

[PATCH openEuler-5.10 1/7] ipv6: per-netns exclusive flowlabel checks
by Zheng Zengkai 26 May '22

26 May '22

From: Willem de Bruijn <willemb(a)google.com> stable inclusion from stable-v5.10.102 commit 4f523f15e5d753ac055302bc29ca9677d6692eed bugzilla: https://gitee.com/openeuler/kernel/issues/I575QT Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 0b0dff5b3b98c5c7ce848151df9da0b3cdf0cc8b upstream. Ipv6 flowlabels historically require a reservation before use. Optionally in exclusive mode (e.g., user-private). Commit 59c820b2317f ("ipv6: elide flowlabel check if no exclusive leases exist") introduced a fastpath that avoids this check when no exclusive leases exist in the system, and thus any flowlabel use will be granted. That allows skipping the control operation to reserve a flowlabel entirely. Though with a warning if the fast path fails: This is an optimization. Robust applications still have to revert to requesting leases if the fast path fails due to an exclusive lease. Still, this is subtle. Better isolate network namespaces from each other. Flowlabels are per-netns. Also record per-netns whether exclusive leases are in use. Then behavior does not change based on activity in other netns. Changes v2 - wrap in IS_ENABLED(CONFIG_IPV6) to avoid breakage if disabled Fixes: 59c820b2317f ("ipv6: elide flowlabel check if no exclusive leases exist") Link: https://lore.kernel.org/netdev/MWHPR2201MB1072BCCCFCE779E4094837ACD0329@MWH… Reported-by: Congyu Liu <liu3101(a)purdue.edu> Signed-off-by: Willem de Bruijn <willemb(a)google.com> Tested-by: Congyu Liu <liu3101(a)purdue.edu> Link: https://lore.kernel.org/r/20220215160037.1976072-1-willemdebruijn.kernel@gm… Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/net/ipv6.h | 5 ++++- include/net/netns/ipv6.h | 5 +++++ net/ipv6/ip6_flowlabel.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index c0273ae50296..9392a81a3ae4 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -390,17 +390,20 @@ static inline void txopt_put(struct ipv6_txoptions *opt) kfree_rcu(opt, rcu); } +#if IS_ENABLED(CONFIG_IPV6) struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label); extern struct static_key_false_deferred ipv6_flowlabel_exclusive; static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label) { - if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key)) + if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key) && + READ_ONCE(sock_net(sk)->ipv6.flowlabel_has_excl)) return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT); return NULL; } +#endif struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space, struct ip6_flowlabel *fl, diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index ce5ed87accda..b2a28201f4fd 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -83,6 +83,11 @@ struct netns_ipv6 { unsigned long ip6_rt_last_gc; #ifdef CONFIG_IPV6_MULTIPLE_TABLES unsigned int fib6_rules_require_fldissect; +#endif +#ifndef __GENKSYMS__ + unsigned char flowlabel_has_excl; +#endif +#ifdef CONFIG_IPV6_MULTIPLE_TABLES bool fib6_has_custom_rules; #ifdef CONFIG_IPV6_SUBTREES unsigned int fib6_routes_require_src; diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index aa673a6a7e43..ceb85c67ce39 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -450,8 +450,10 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq, err = -EINVAL; goto done; } - if (fl_shared_exclusive(fl) || fl->opt) + if (fl_shared_exclusive(fl) || fl->opt) { + WRITE_ONCE(sock_net(sk)->ipv6.flowlabel_has_excl, 1); static_branch_deferred_inc(&ipv6_flowlabel_exclusive); + } return fl; done: -- 2.20.1

1 6

[PATCH openEuler-5.10 00/73] Backport 5.10.103 LTS
by Zheng Zengkai 26 May '22

26 May '22

Backport 5.10.103 LTS patches from upstream memblock: use kfree() to release kmalloced memblock regions gpio: tegra186: Fix chip_data type confusion tty: n_gsm: fix deadlock in gsmtty_open() tty: n_gsm: fix wrong tty control line for flow control tty: n_gsm: fix NULL pointer access due to DLCI release tty: n_gsm: fix proper link termination after failed open tty: n_gsm: fix encoding of control signal octet bit DV riscv: fix oops caused by irqsoff latency tracer thermal: int340x: fix memory leak in int3400_notify() RDMA/cma: Do not change route.addr.src_addr outside state checks driver core: Free DMA range map when device is released xhci: Prevent futile URB re-submissions due to incorrect return value. xhci: re-initialize the HC during resume if HCE was set usb: dwc3: gadget: Let the interrupt handler disable bottom halves. usb: dwc3: pci: Fix Bay Trail phy GPIO mappings usb: dwc2: drd: fix soft connect when gadget is unconfigured USB: serial: option: add Telit LE910R1 compositions USB: serial: option: add support for DW5829e tracefs: Set the group ownership in apply_options() not parse_options() usb: gadget: rndis: add spinlock for rndis response list Revert "USB: serial: ch341: add new Product ID for CH341A" ata: pata_hpt37x: disable primary channel on HPT371 sc16is7xx: Fix for incorrect data being transmitted iio: Fix error handling for PM iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot iio: adc: ad7124: fix mask used for setting AIN_BUFP & AIN_BUFM bits iio: adc: men_z188_adc: Fix a resource leak in an error handling path tracing: Have traceon and traceoff trigger honor the instance RDMA/ib_srp: Fix a deadlock RDMA/rtrs-clt: Move free_permit from free_clt to rtrs_clt_close RDMA/rtrs-clt: Kill wait_for_inflight_permits regmap-irq: Update interrupt clear register for proper reset spi: spi-zynq-qspi: Fix a NULL pointer dereference in zynq_qspi_exec_mem_op() net/mlx5e: kTLS, Use CHECKSUM_UNNECESSARY for device-offloaded packets net/mlx5: Fix wrong limitation of metadata match on ecpf net/mlx5: Fix possible deadlock on rule deletion udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister() surface: surface3_power: Fix battery readings on batteries without a serial number net/smc: Use a mutex for locking "struct smc_pnettable" netfilter: nf_tables: fix memory leak during stateful obj update nfp: flower: Fix a potential leak in nfp_tunnel_add_shared_mac() net: Force inlining of checksum functions in net/checksum.h net: ll_temac: check the return value of devm_kmalloc() net/sched: act_ct: Fix flow table lookup after ct clear or switching zones net/mlx5e: Fix wrong return value on ioctl EEPROM query failure drm/edid: Always set RGB444 openvswitch: Fix setting ipv6 fields causing hw csum failure gso: do not skip outer ip header in case of ipip and net_failover tipc: Fix end of loop tests for list_for_each_entry() net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends io_uring: add a schedule point in io_add_buffers() bpf: Add schedule points in batch ops selftests: bpf: Check bpf_msg_push_data return value bpf: Do not try bpf_msg_push_data with len 0 hwmon: Handle failure to register sensor with thermal zone correctly bnxt_en: Fix active FEC reporting to ethtool bnx2x: fix driver load from initrd perf data: Fix double free in perf_session__delete() ping: remove pr_err from ping_lookup optee: use driver internal tee_context for some rpc tee: export teedev_open() and teedev_close_context() x86/fpu: Correct pkru/xstate inconsistency CDC-NCM: avoid overflow in sanity checking USB: zaurus: support another broken Zaurus drm/i915: Correctly populate use_sagv_wm for all pipes drm/amdgpu: disable MMHUB PG for Picasso KVM: x86/mmu: make apf token non-zero to fix bug parisc/unaligned: Fix ldw() and stw() unalignment handlers parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel vhost/vsock: don't check owner in vhost_vsock_stop() while releasing clk: jz4725b: fix mmc0 clock gating btrfs: tree-checker: check item_size for dev_item btrfs: tree-checker: check item_size for inode_item already merged: cgroup/cpuset: Fix a race between cpuset_attach() and cpu hotplug netfilter: nf_tables_offload: incorrect flow offload action array size configfs: fix a race in configfs_{,un}register_subsystem() RDMA/rtrs-clt: Fix possible double free in error case USB: gadget: validate endpoint index for xilinx udc sr9700: sanity check for packet length Total patches: 79 - 6 = 73 Alexey Bayduraev (1): perf data: Fix double free in perf_session__delete() Ariel Levkovich (1): net/mlx5: Fix wrong limitation of metadata match on ecpf Bart Van Assche (1): RDMA/ib_srp: Fix a deadlock Brian Geffon (1): x86/fpu: Correct pkru/xstate inconsistency Changbin Du (1): riscv: fix oops caused by irqsoff latency tracer Christophe JAILLET (2): nfp: flower: Fix a potential leak in nfp_tunnel_add_shared_mac() iio: adc: men_z188_adc: Fix a resource leak in an error handling path Christophe Leroy (1): net: Force inlining of checksum functions in net/checksum.h Chuansheng Liu (1): thermal: int340x: fix memory leak in int3400_notify() Cosmin Tanislav (1): iio: adc: ad7124: fix mask used for setting AIN_BUFP & AIN_BUFM bits Daehwan Jung (1): usb: gadget: rndis: add spinlock for rndis response list Dan Carpenter (2): tipc: Fix end of loop tests for list_for_each_entry() udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister() Daniele Palmas (1): USB: serial: option: add Telit LE910R1 compositions Dmytro Bagrii (1): Revert "USB: serial: ch341: add new Product ID for CH341A" Eric Dumazet (3): bpf: Add schedule points in batch ops io_uring: add a schedule point in io_add_buffers() net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends Evan Quan (1): drm/amdgpu: disable MMHUB PG for Picasso Fabio M. De Francesco (1): net/smc: Use a mutex for locking "struct smc_pnettable" Fabrice Gasnier (1): usb: dwc2: drd: fix soft connect when gadget is unconfigured Felix Maurer (2): bpf: Do not try bpf_msg_push_data with len 0 selftests: bpf: Check bpf_msg_push_data return value Florian Westphal (1): netfilter: nf_tables: fix memory leak during stateful obj update Gal Pressman (1): net/mlx5e: Fix wrong return value on ioctl EEPROM query failure Guenter Roeck (1): hwmon: Handle failure to register sensor with thermal zone correctly Guoqing Jiang (1): RDMA/rtrs-clt: Kill wait_for_inflight_permits Hans de Goede (2): surface: surface3_power: Fix battery readings on batteries without a serial number usb: dwc3: pci: Fix Bay Trail phy GPIO mappings Helge Deller (2): parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel parisc/unaligned: Fix ldw() and stw() unalignment handlers Hongyu Xie (1): xhci: Prevent futile URB re-submissions due to incorrect return value. Jason Gunthorpe (1): RDMA/cma: Do not change route.addr.src_addr outside state checks Jens Wiklander (2): tee: export teedev_open() and teedev_close_context() optee: use driver internal tee_context for some rpc Liang Zhang (1): KVM: x86/mmu: make apf token non-zero to fix bug Lorenzo Bianconi (1): iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot Manish Chopra (1): bnx2x: fix driver load from initrd Maor Gottlieb (1): net/mlx5: Fix possible deadlock on rule deletion Marc Zyngier (1): gpio: tegra186: Fix chip_data type confusion Maxime Ripard (1): drm/edid: Always set RGB444 Md Haris Iqbal (1): RDMA/rtrs-clt: Move free_permit from free_clt to rtrs_clt_close Miaohe Lin (1): memblock: use kfree() to release kmalloced memblock regions Miaoqian Lin (1): iio: Fix error handling for PM Mårten Lindahl (1): driver core: Free DMA range map when device is released Oliver Neukum (2): USB: zaurus: support another broken Zaurus CDC-NCM: avoid overflow in sanity checking Paul Blakey (2): openvswitch: Fix setting ipv6 fields causing hw csum failure net/sched: act_ct: Fix flow table lookup after ct clear or switching zones Phil Elwell (1): sc16is7xx: Fix for incorrect data being transmitted Prasad Kumpatla (1): regmap-irq: Update interrupt clear register for proper reset Puma Hsu (1): xhci: re-initialize the HC during resume if HCE was set Sebastian Andrzej Siewior (1): usb: dwc3: gadget: Let the interrupt handler disable bottom halves. Sergey Shtylyov (1): ata: pata_hpt37x: disable primary channel on HPT371 Siarhei Volkau (1): clk: jz4725b: fix mmc0 clock gating Slark Xiao (1): USB: serial: option: add support for DW5829e Somnath Kotur (1): bnxt_en: Fix active FEC reporting to ethtool Stefano Garzarella (1): vhost/vsock: don't check owner in vhost_vsock_stop() while releasing Steven Rostedt (Google) (2): tracing: Have traceon and traceoff trigger honor the instance tracefs: Set the group ownership in apply_options() not parse_options() Su Yue (2): btrfs: tree-checker: check item_size for inode_item btrfs: tree-checker: check item_size for dev_item Tao Liu (1): gso: do not skip outer ip header in case of ipip and net_failover Tariq Toukan (1): net/mlx5e: kTLS, Use CHECKSUM_UNNECESSARY for device-offloaded packets Ville Syrjälä (1): drm/i915: Correctly populate use_sagv_wm for all pipes Xiaoke Wang (1): net: ll_temac: check the return value of devm_kmalloc() Xin Long (1): ping: remove pr_err from ping_lookup Zhou Qingyang (1): spi: spi-zynq-qspi: Fix a NULL pointer dereference in zynq_qspi_exec_mem_op() daniel.starke(a)siemens.com (5): tty: n_gsm: fix encoding of control signal octet bit DV tty: n_gsm: fix proper link termination after failed open tty: n_gsm: fix NULL pointer access due to DLCI release tty: n_gsm: fix wrong tty control line for flow control tty: n_gsm: fix deadlock in gsmtty_open() arch/parisc/kernel/unaligned.c | 14 ++--- arch/riscv/kernel/Makefile | 2 + arch/riscv/kernel/entry.S | 10 ++-- arch/riscv/kernel/trace_irq.c | 27 ++++++++++ arch/riscv/kernel/trace_irq.h | 11 ++++ arch/x86/include/asm/fpu/internal.h | 13 +++-- arch/x86/kernel/process_32.c | 6 +-- arch/x86/kernel/process_64.c | 6 +-- arch/x86/kvm/mmu/mmu.c | 13 ++++- drivers/ata/pata_hpt37x.c | 14 +++++ drivers/base/dd.c | 5 ++ drivers/base/regmap/regmap-irq.c | 20 +++---- drivers/clk/ingenic/jz4725b-cgu.c | 3 +- drivers/gpio/gpio-tegra186.c | 14 +++-- drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- drivers/gpu/drm/drm_edid.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++++---- drivers/hwmon/hwmon.c | 14 ++--- drivers/iio/accel/bmc150-accel-core.c | 5 +- drivers/iio/accel/kxcjk-1013.c | 5 +- drivers/iio/accel/mma9551.c | 5 +- drivers/iio/accel/mma9553.c | 5 +- drivers/iio/adc/ad7124.c | 2 +- drivers/iio/adc/men_z188_adc.c | 9 +++- drivers/iio/gyro/bmg160_core.c | 5 +- drivers/iio/imu/kmx61.c | 5 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 ++- drivers/iio/magnetometer/bmc150_magn.c | 5 +- drivers/infiniband/core/cma.c | 40 ++++++++------ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 19 +++---- drivers/infiniband/ulp/srp/ib_srp.c | 6 ++- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 ++ .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 ++ .../ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +- .../mellanox/mlx5/core/eswitch_offloads.c | 4 -- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 2 + .../netronome/nfp/flower/tunnel_conf.c | 4 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 + drivers/net/usb/cdc_ether.c | 12 +++++ drivers/net/usb/cdc_ncm.c | 8 +-- drivers/net/usb/zaurus.c | 12 +++++ drivers/platform/x86/surface3_power.c | 13 +++-- drivers/spi/spi-zynq-qspi.c | 3 ++ drivers/tee/optee/core.c | 8 +++ drivers/tee/optee/optee_private.h | 2 + drivers/tee/optee/rpc.c | 8 +-- drivers/tee/tee_core.c | 6 ++- .../intel/int340x_thermal/int3400_thermal.c | 4 ++ drivers/tty/n_gsm.c | 22 +++++--- drivers/tty/serial/sc16is7xx.c | 3 ++ drivers/usb/dwc2/core.h | 2 + drivers/usb/dwc2/drd.c | 6 ++- drivers/usb/dwc3/dwc3-pci.c | 4 +- drivers/usb/dwc3/gadget.c | 2 + drivers/usb/gadget/function/rndis.c | 8 +++ drivers/usb/gadget/function/rndis.h | 1 + drivers/usb/host/xhci.c | 28 ++++++---- drivers/usb/serial/ch341.c | 1 - drivers/usb/serial/option.c | 12 +++++ drivers/vhost/vsock.c | 21 +++++--- fs/btrfs/tree-checker.c | 15 ++++++ fs/io_uring.c | 1 + fs/tracefs/inode.c | 5 +- include/linux/tee_drv.h | 14 +++++ include/net/checksum.h | 48 +++++++++-------- kernel/bpf/syscall.c | 3 ++ kernel/trace/trace_events_trigger.c | 52 ++++++++++++++++--- mm/memblock.c | 10 +++- net/core/filter.c | 3 ++ net/core/skbuff.c | 4 +- net/ipv4/af_inet.c | 5 +- net/ipv4/ping.c | 1 - net/ipv4/udp_tunnel_nic.c | 2 +- net/ipv6/ip6_offload.c | 2 + net/netfilter/nf_tables_api.c | 13 +++-- net/openvswitch/actions.c | 46 +++++++++++++--- net/sched/act_ct.c | 5 -- net/smc/smc_pnet.c | 42 +++++++-------- net/smc/smc_pnet.h | 2 +- net/tipc/name_table.c | 2 +- net/tipc/socket.c | 2 +- tools/perf/util/data.c | 7 ++- .../selftests/bpf/progs/test_sockmap_kern.h | 26 +++++++--- 84 files changed, 594 insertions(+), 243 deletions(-) create mode 100644 arch/riscv/kernel/trace_irq.c create mode 100644 arch/riscv/kernel/trace_irq.h -- 2.20.1

1 73

[PATCH openEuler-5.10 01/26] readahead: introduce FMODE_CTL_WILLNEED to read first 2MB of file
by Zheng Zengkai 23 May '22

23 May '22

From: Yufen Yu <yuyufen(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I53R0H CVE: NA backport: openEuler-22.03-LTS ------------------------------------------------- In some scenario, likely spark-sql, almost all meta file's size is less then 2MB and applications read these smaller files in random mode. That means, it may issue multiple times random io to rotate disk, which can cause performance degradation. To improve the small files random read, we try to read the first 2MB into pagecache on the first time of read. Then it can avoid multiple random io. In fact, applications can call fadvise system with POSIX_FADV_WILLNEED to achieve this goal. But, some apps may cannot easily do that. So, we provide a new file flag FMODE_CTL_WILLNEED. Signed-off-by: Yufen Yu <yuyufen(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Conflicts: include/linux/fs.h Value '0x40000000' has been used for flag FMODE_BUF_RASYNC. Signed-off-by: Zhihao Cheng <chengzhihao1(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- include/linux/fs.h | 7 +++++++ mm/readahead.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index db632747781a..dd023a3023b5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -183,6 +183,12 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File supports async buffered reads */ #define FMODE_BUF_RASYNC ((__force fmode_t)0x40000000) +/* File mode control flag, expect random access pattern */ +#define FMODE_CTL_RANDOM ((__force fmode_t)0x1) + +/* File mode control flag, will try to read head of the file into pagecache */ +#define FMODE_CTL_WILLNEED ((__force fmode_t)0x2) + /* * Attribute flags. These should be or-ed together to figure out what * has been changed! @@ -947,6 +953,7 @@ struct file { atomic_long_t f_count; unsigned int f_flags; fmode_t f_mode; + fmode_t f_ctl_mode; struct mutex f_pos_lock; loff_t f_pos; struct fown_struct f_owner; diff --git a/mm/readahead.c b/mm/readahead.c index c5b0457415be..ed23d5dec123 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -26,6 +26,7 @@ #include "internal.h" +#define READAHEAD_FIRST_SIZE (2 * 1024 * 1024) /* * Initialise a struct file's readahead state. Assumes that the caller has * memset *ra to zero. @@ -549,10 +550,41 @@ static void ondemand_readahead(struct readahead_control *ractl, do_page_cache_ra(ractl, ra->size, ra->async_size); } +/* + * Try to read first @ra_size from head of the file. + */ +static bool page_cache_readahead_from_head(struct address_space *mapping, + struct file *filp, pgoff_t offset, + unsigned long req_size, + unsigned long ra_size) +{ + struct backing_dev_info *bdi = inode_to_bdi(mapping->host); + struct file_ra_state *ra = &filp->f_ra; + unsigned long size = min_t(unsigned long, ra_size, + file_inode(filp)->i_size); + unsigned long nrpages = (size + PAGE_SIZE - 1) / PAGE_SIZE; + unsigned long max_pages; + unsigned int offs = 0; + + /* Cannot read date over target size, back to normal way */ + if (offset + req_size > nrpages) + return false; + + max_pages = max_t(unsigned long, bdi->io_pages, ra->ra_pages); + max_pages = min(max_pages, nrpages); + while (offs < nrpages) { + force_page_cache_readahead(mapping, filp, offs, max_pages); + offs += max_pages; + } + return true; +} + void page_cache_sync_ra(struct readahead_control *ractl, struct file_ra_state *ra, unsigned long req_count) { - bool do_forced_ra = ractl->file && (ractl->file->f_mode & FMODE_RANDOM); + bool do_forced_ra = ractl->file && + ((ractl->file->f_mode & FMODE_RANDOM) || + (ractl->file->f_ctl_mode & FMODE_CTL_RANDOM)); /* * Even if read-ahead is disabled, issue this request as read-ahead @@ -567,6 +599,12 @@ void page_cache_sync_ra(struct readahead_control *ractl, do_forced_ra = true; } + /* try to read first READAHEAD_FIRST_SIZE into pagecache */ + if (ractl->file && (ractl->file->f_ctl_mode & FMODE_CTL_WILLNEED) && + page_cache_readahead_from_head(ractl->mapping, ractl->file, + ractl->_index, req_count, READAHEAD_FIRST_SIZE)) + return; + /* be dumb */ if (do_forced_ra) { force_page_cache_ra(ractl, ra, req_count); -- 2.20.1

1 25

[PATCH openEuler-5.10 000/113] Backport 5.10.102 LTS
by Zheng Zengkai 23 May '22

23 May '22

lockdep: Correct lock_classes index mapping i2c: brcmstb: fix support for DSL and CM variants copy_process(): Move fd_install() out of sighand->siglock critical section i2c: qcom-cci: don't put a device tree node before i2c_add_adapter() i2c: qcom-cci: don't delete an unregistered adapter dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe dmaengine: sh: rcar-dmac: Check for error num after setting mask net: sched: limit TC_ACT_REPEAT loops EDAC: Fix calculation of returned address and next offset in edac_align_ptr() scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop kconfig: fix failing to generate auto.conf net: macb: Align the dma and coherent dma masks net: usb: qmi_wwan: Add support for Dell DW5829e tracing: Fix tp_printk option related with tp_printk_stop_on_boot drm/rockchip: dw_hdmi: Do not leave clock enabled in error case xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create soc: aspeed: lpc-ctrl: Block error printing on probe defer cases ata: libata-core: Disable TRIM on M88V29 kconfig: let 'shell' return enough output for deep path names selftests: fixup build warnings in pidfd / clone3 tests pidfd: fix test failure due to stack overflow on some arches arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 arm64: dts: meson-g12: add ATF BL32 reserved-memory region arm64: dts: meson-gx: add ATF BL32 reserved-memory region netfilter: conntrack: don't refresh sctp entries in closed state irqchip/sifive-plic: Add missing thead,c900-plic match string phy: usb: Leave some clocks running during suspend ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of ARM: OMAP2+: hwmod: Add of_node_put() before break NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW KVM: x86/pmu: Don't truncate the PerfEvtSeln MSR when creating a perf event KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() tty: n_tty: do not look ahead for EOL character past the end of the buffer NFS: Do not report writeback errors in nfs_getattr() block/wbt: fix negative inflight counter when remove scsi device ASoC: tas2770: Insert post reset delay KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests mtd: rawnand: gpmi: don't leak PM reference in error path powerpc/lib/sstep: fix 'ptesync' build error ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() ALSA: hda: Fix missing codec probe on Shenker Dock 15 ALSA: hda: Fix regression on forced probe mask option ALSA: hda/realtek: Fix deadlock by COEF mutex ALSA: hda/realtek: Add quirk for Legion Y9000X 2019 selftests/exec: Add non-regular to TEST_GEN_PROGS perf bpf: Defer freeing string after possible strlen() on it dpaa2-eth: Initialize mutex used in one step timestamping path libsubcmd: Fix use-after-free for realloc(..., 0) bonding: fix data-races around agg_select_timer net_sched: add __rcu annotation to netdev->qdisc drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit ping: fix the dif and sdif check in ping_lookup net: ieee802154: ca8210: Fix lifs/sifs periods net: dsa: lantiq_gswip: fix use after free in gswip_remove() net: dsa: lan9303: fix reset on probe ipv6: per-netns exclusive flowlabel checks netfilter: nft_synproxy: unregister hooks on init error path selftests: netfilter: fix exit value for nft_concat_range iwlwifi: pcie: gen2: fix locking when "HW not ready" iwlwifi: pcie: fix locking when "HW not ready" drm/i915/gvt: Make DRM_I915_GVT depend on X86 vsock: remove vsock from connected table when connect is interrupted by a signal drm/i915/opregion: check port number bounds for SWSCI display power state drm/radeon: Fix backlight control on iMac 12,1 iwlwifi: fix use-after-free kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled kbuild: lto: merge module sections random: wake up /dev/random writers after zap gcc-plugins/stackleak: Use noinstr in favor of notrace Revert "module, async: async_synchronize_full() on module init iff async is used" x86/Xen: streamline (and fix) PV CPU enumeration drm/amdgpu: fix logic inversion in check nvme-rdma: fix possible use-after-free in transport error_recovery work nvme-tcp: fix possible use-after-free in transport error_recovery work nvme: fix a possible use-after-free in controller reset during load scsi: pm8001: Fix use-after-free for aborted SSP/STP sas_task scsi: pm8001: Fix use-after-free for aborted TMF sas_task quota: make dquot_quota_sync return errors from ->sync_fs vfs: make freeze_super abort when sync_filesystem returns error selftests: skip mincore.check_file_mmap when fs lacks needed support selftests: openat2: Skip testcases that fail with EOPNOTSUPP selftests: openat2: Add missing dependency in Makefile selftests: openat2: Print also errno in failure messages selftests/zram: Adapt the situation that /dev/zram0 is being used selftests/zram01.sh: Fix compression ratio calculation selftests/zram: Skip max_comp_streams interface on newer kernel net: ieee802154: at86rf230: Stop leaking skb's kselftest: signal all child processes selftests: rtc: Increase test timeout so that all tests run platform/x86: ISST: Fix possible circular locking dependency detected platform/x86: touchscreen_dmi: Add info for the RWC NANOTE P8 AY07J 2-in-1 btrfs: send: in case of IO error log it parisc: Add ioread64_lo_hi() and iowrite64_lo_hi() PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology mm: don't try to NUMA-migrate COW pages that have other uses mmc: block: fix read single on recovery logic parisc: Fix sglist access in ccio-dma.c parisc: Fix data TLB miss in sba_unmap_sg parisc: Drop __init from map_pages declaration serial: parisc: GSC: fix build when IOSAPIC is not set Revert "svm: Add warning message for AVIC IPI invalid target" HID:Add support for UGTABLET WP5540 scsi: lpfc: Fix mailbox command failure during driver initialization can: isotp: add SF_BROADCAST support for functional addressing can: isotp: prevent race between isotp_bind() and isotp_setsockopt() fs/proc: task_mmu.c: don't read mapcount for migration entry mm: memcg: synchronize objcg lists with a dedicated spinlock drm/nouveau/pmu/gm200-: use alternate falcon reset sequence already merged rcu: Do not report strict GPs for outgoing CPUs ax25: improve the incomplete fix to avoid UAF and NPD bugs bonding: force carrier update when releasing slave NFS: LOOKUP_DIRECTORY is also ok with symlinks lib/iov_iter: initialize "flags" in new pipe_buffer fget: clarify and improve __fget_files() implementation deferred (kabi changes) ipv6: per-netns exclusive flowlabel checks Total patches: 120 - 6 - 1 = 113 Al Cooper (1): phy: usb: Leave some clocks running during suspend Alexey Khoroshilov (1): net: dsa: lantiq_gswip: fix use after free in gswip_remove() Anders Roxell (1): powerpc/lib/sstep: fix 'ptesync' build error Andy Shevchenko (1): parisc: Add ioread64_lo_hi() and iowrite64_lo_hi() Arnaldo Carvalho de Melo (1): perf bpf: Defer freeing string after possible strlen() on it Axel Rasmussen (2): pidfd: fix test failure due to stack overflow on some arches selftests: fixup build warnings in pidfd / clone3 tests Ben Skeggs (1): drm/nouveau/pmu/gm200-: use alternate falcon reset sequence Brenda Streiff (1): kconfig: let 'shell' return enough output for deep path names Bryan O'Donoghue (1): mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() Cheng Jui Wang (1): lockdep: Correct lock_classes index mapping Christian Eggers (1): mtd: rawnand: gpmi: don't leak PM reference in error path Christian Hewitt (3): arm64: dts: meson-gx: add ATF BL32 reserved-memory region arm64: dts: meson-g12: add ATF BL32 reserved-memory region arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Christian König (1): drm/amdgpu: fix logic inversion in check Christian Löhle (1): mmc: block: fix read single on recovery logic Cristian Marussi (4): selftests: openat2: Print also errno in failure messages selftests: openat2: Add missing dependency in Makefile selftests: openat2: Skip testcases that fail with EOPNOTSUPP selftests: skip mincore.check_file_mmap when fs lacks needed support Dan Aloni (1): xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create Darrick J. Wong (2): vfs: make freeze_super abort when sync_filesystem returns error quota: make dquot_quota_sync return errors from ->sync_fs Dāvis Mosāns (1): btrfs: send: in case of IO error log it Eliav Farber (1): EDAC: Fix calculation of returned address and next offset in edac_align_ptr() Eric Dumazet (4): drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit net_sched: add __rcu annotation to netdev->qdisc bonding: fix data-races around agg_select_timer net: sched: limit TC_ACT_REPEAT loops Florian Westphal (1): netfilter: conntrack: don't refresh sctp entries in closed state Guo Ren (1): irqchip/sifive-plic: Add missing thead,c900-plic match string Hangbin Liu (1): selftests: netfilter: fix exit value for nft_concat_range Igor Pylypiv (1): Revert "module, async: async_synchronize_full() on module init iff async is used" Jae Hyun Yoo (1): soc: aspeed: lpc-ctrl: Block error printing on probe defer cases JaeSang Yoo (1): tracing: Fix tp_printk option related with tp_printk_stop_on_boot James Smart (2): scsi: lpfc: Fix mailbox command failure during driver initialization scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop Jan Beulich (1): x86/Xen: streamline (and fix) PV CPU enumeration Jani Nikula (1): drm/i915/opregion: check port number bounds for SWSCI display power state Jason A. Donenfeld (1): random: wake up /dev/random writers after zap Jiasheng Jiang (2): dmaengine: sh: rcar-dmac: Check for error num after setting mask dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size Jim Mattson (2): KVM: x86/pmu: Don't truncate the PerfEvtSeln MSR when creating a perf event KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW Jing Leng (1): kconfig: fix failing to generate auto.conf Johannes Berg (3): iwlwifi: fix use-after-free iwlwifi: pcie: fix locking when "HW not ready" iwlwifi: pcie: gen2: fix locking when "HW not ready" John David Anglin (3): parisc: Drop __init from map_pages declaration parisc: Fix data TLB miss in sba_unmap_sg parisc: Fix sglist access in ccio-dma.c John Garry (2): scsi: pm8001: Fix use-after-free for aborted TMF sas_task scsi: pm8001: Fix use-after-free for aborted SSP/STP sas_task Kees Cook (2): gcc-plugins/stackleak: Use noinstr in favor of notrace libsubcmd: Fix use-after-free for realloc(..., 0) Laibin Qiu (1): block/wbt: fix negative inflight counter when remove scsi device Li Zhijian (1): kselftest: signal all child processes Like Xu (1): KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() Linus Torvalds (2): mm: don't try to NUMA-migrate COW pages that have other uses tty: n_tty: do not look ahead for EOL character past the end of the buffer Long Li (1): PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology Mans Rullgard (1): net: dsa: lan9303: fix reset on probe Marc St-Amand (1): net: macb: Align the dma and coherent dma masks Mark Brown (2): ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() Martin Povišer (1): ASoC: tas2770: Insert post reset delay Miaoqian Lin (2): Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj dmaengine: stm32-dmamux: Fix PM disable depth imbalance in stm32_dmamux_probe Miquel Raynal (2): net: ieee802154: at86rf230: Stop leaking skb's net: ieee802154: ca8210: Fix lifs/sifs periods Muhammad Usama Anjum (1): selftests/exec: Add non-regular to TEST_GEN_PROGS Nicholas Bishop (1): drm/radeon: Fix backlight control on iMac 12,1 Norbert Slusarek (1): can: isotp: prevent race between isotp_bind() and isotp_setsockopt() Nícolas F. R. A. Prado (1): selftests: rtc: Increase test timeout so that all tests run Oliver Hartkopp (1): can: isotp: add SF_BROADCAST support for functional addressing Pablo Neira Ayuso (1): netfilter: nft_synproxy: unregister hooks on init error path Radu Bulie (1): dpaa2-eth: Initialize mutex used in one step timestamping path Rafał Miłecki (1): i2c: brcmstb: fix support for DSL and CM variants Randy Dunlap (1): serial: parisc: GSC: fix build when IOSAPIC is not set Roman Gushchin (1): mm: memcg: synchronize objcg lists with a dedicated spinlock Sagi Grimberg (3): nvme: fix a possible use-after-free in controller reset during load nvme-tcp: fix possible use-after-free in transport error_recovery work nvme-rdma: fix possible use-after-free in transport error_recovery work Sami Tolvanen (1): kbuild: lto: merge module sections Sascha Hauer (1): drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sean Christopherson (3): Revert "svm: Add warning message for AVIC IPI invalid target" kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests Sergio Costas (1): HID:Add support for UGTABLET WP5540 Seth Forshee (1): vsock: remove vsock from connected table when connect is interrupted by a signal Siva Mullati (1): drm/i915/gvt: Make DRM_I915_GVT depend on X86 Slark Xiao (1): net: usb: qmi_wwan: Add support for Dell DW5829e Srinivas Pandruvada (1): platform/x86: ISST: Fix possible circular locking dependency detected Takashi Iwai (3): ALSA: hda/realtek: Fix deadlock by COEF mutex ALSA: hda: Fix regression on forced probe mask option ALSA: hda: Fix missing codec probe on Shenker Dock 15 Trond Myklebust (2): NFS: Do not report writeback errors in nfs_getattr() NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache Vladimir Zapolskiy (2): i2c: qcom-cci: don't delete an unregistered adapter i2c: qcom-cci: don't put a device tree node before i2c_add_adapter() Waiman Long (1): copy_process(): Move fd_install() out of sighand->siglock critical section Wan Jiabing (1): ARM: OMAP2+: hwmod: Add of_node_put() before break Xin Long (1): ping: fix the dif and sdif check in ping_lookup Yang Shi (1): fs/proc: task_mmu.c: don't read mapcount for migration entry Yang Xu (3): selftests/zram: Skip max_comp_streams interface on newer kernel selftests/zram01.sh: Fix compression ratio calculation selftests/zram: Adapt the situation that /dev/zram0 is being used Ye Guojin (1): ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Yu Huang (1): ALSA: hda/realtek: Add quirk for Legion Y9000X 2019 Yuka Kawajiri (1): platform/x86: touchscreen_dmi: Add info for the RWC NANOTE P8 AY07J 2-in-1 Zoltán Böszörményi (1): ata: libata-core: Disable TRIM on M88V29 david regan (1): mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 4 +- .../boot/dts/amlogic/meson-g12-common.dtsi | 6 + .../boot/dts/amlogic/meson-g12a-sei510.dts | 8 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 + .../boot/dts/amlogic/meson-sm1-sei610.dts | 8 -- arch/parisc/lib/iomap.c | 18 +++ arch/parisc/mm/init.c | 9 +- arch/powerpc/lib/sstep.c | 2 + arch/x86/kvm/pmu.c | 15 +- arch/x86/kvm/pmu.h | 3 +- arch/x86/kvm/svm/avic.c | 2 - arch/x86/kvm/svm/pmu.c | 8 +- arch/x86/kvm/svm/svm.c | 7 +- arch/x86/kvm/vmx/pmu_intel.c | 9 +- arch/x86/xen/enlighten_pv.c | 4 - arch/x86/xen/smp_pv.c | 26 +--- block/bfq-iosched.c | 2 + drivers/ata/libata-core.c | 1 + drivers/char/random.c | 5 +- drivers/dma/sh/rcar-dmac.c | 9 +- drivers/dma/stm32-dmamux.c | 4 +- drivers/edac/edac_mc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/display/intel_opregion.c | 15 ++ drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 8 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 31 +++- .../gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + drivers/gpu/drm/radeon/atombios_encoders.c | 3 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hv/vmbus_drv.c | 5 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/i2c/busses/i2c-qcom-cci.c | 16 ++- drivers/irqchip/irq-sifive-plic.c | 1 + drivers/mmc/core/block.c | 28 ++-- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +- drivers/mtd/nand/raw/qcom_nandc.c | 14 +- drivers/net/bonding/bond_3ad.c | 30 +++- drivers/net/dsa/lan9303-core.c | 2 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 2 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- drivers/net/ieee802154/at86rf230.c | 13 +- drivers/net/ieee802154/ca8210.c | 4 +- drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 + .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- drivers/nvme/host/core.c | 9 +- drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 + drivers/parisc/ccio-dma.c | 3 +- drivers/parisc/sba_iommu.c | 3 +- drivers/pci/controller/pci-hyperv.c | 13 +- drivers/phy/broadcom/phy-brcm-usb.c | 38 +++++ .../intel_speed_select_if/isst_if_common.c | 97 ++++++++----- drivers/platform/x86/touchscreen_dmi.c | 24 ++++ drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 3 + drivers/scsi/lpfc/lpfc_els.c | 20 ++- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +- drivers/scsi/lpfc/lpfc_sli.c | 15 +- drivers/scsi/pm8001/pm8001_sas.c | 5 + drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 +- drivers/tty/n_tty.c | 6 +- drivers/tty/serial/8250/8250_gsc.c | 2 +- fs/btrfs/send.c | 4 + fs/nfs/inode.c | 23 ++- fs/proc/task_mmu.c | 43 ++++-- fs/quota/dquot.c | 11 +- fs/super.c | 19 ++- include/linux/memcontrol.h | 5 +- include/linux/netdevice.h | 2 +- include/linux/sched.h | 1 - include/net/bond_3ad.h | 2 +- include/uapi/linux/can/isotp.h | 2 +- kernel/async.c | 3 - kernel/fork.c | 7 +- kernel/locking/lockdep.c | 4 +- kernel/module.c | 25 +--- kernel/stackleak.c | 5 +- kernel/trace/trace.c | 4 + mm/memcontrol.c | 10 +- mm/mprotect.c | 2 +- net/can/isotp.c | 71 +++++++--- net/core/drop_monitor.c | 11 +- net/core/rtnetlink.c | 6 +- net/ipv4/ping.c | 11 +- net/netfilter/nf_conntrack_proto_sctp.c | 9 ++ net/netfilter/nft_synproxy.c | 4 +- net/sched/act_api.c | 13 +- net/sched/cls_api.c | 6 +- net/sched/sch_api.c | 22 +-- net/sched/sch_generic.c | 29 ++-- net/sunrpc/xprtrdma/verbs.c | 3 + net/vmw_vsock/af_vsock.c | 1 + scripts/kconfig/confdata.c | 13 +- scripts/kconfig/preprocess.c | 2 +- scripts/module.lds.S | 26 ++++ sound/pci/hda/hda_intel.c | 5 +- sound/pci/hda/patch_realtek.c | 40 ++++-- sound/soc/codecs/tas2770.c | 7 +- sound/soc/soc-ops.c | 29 ++-- tools/lib/subcmd/subcmd-util.h | 11 +- tools/perf/util/bpf-loader.c | 3 +- tools/testing/selftests/clone3/clone3.c | 2 - tools/testing/selftests/exec/Makefile | 4 +- tools/testing/selftests/kselftest_harness.h | 4 +- .../selftests/mincore/mincore_selftest.c | 20 ++- .../selftests/netfilter/nft_concat_range.sh | 2 +- tools/testing/selftests/openat2/Makefile | 2 +- tools/testing/selftests/openat2/helpers.h | 12 +- .../testing/selftests/openat2/openat2_test.c | 12 +- tools/testing/selftests/pidfd/pidfd.h | 13 +- .../selftests/pidfd/pidfd_fdinfo_test.c | 22 ++- tools/testing/selftests/pidfd/pidfd_test.c | 6 +- tools/testing/selftests/pidfd/pidfd_wait.c | 5 +- tools/testing/selftests/rtc/settings | 2 +- tools/testing/selftests/zram/zram.sh | 15 +- tools/testing/selftests/zram/zram01.sh | 33 ++--- tools/testing/selftests/zram/zram02.sh | 1 - tools/testing/selftests/zram/zram_lib.sh | 134 ++++++++++++------ 130 files changed, 941 insertions(+), 479 deletions(-) -- 2.20.1

1 113

[PATCH openEuler-5.10 01/39] skmsg: Lock ingress_skb when purging
by Zheng Zengkai 21 May '22

21 May '22

From: Wang Yufen <wangyufen(a)huawei.com> mainline inclusion from mainline-v5.13-rc1 commit 37f0e514db660f03f8982b8f4fbbd4b2740abe7d category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I545NW Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Currently we purge the ingress_skb queue only when psock refcnt goes down to 0, so locking the queue is not necessary, but in order to be called during ->close, we have to lock it here. Signed-off-by: Cong Wang <cong.wang(a)bytedance.com> Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Acked-by: Jakub Sitnicki <jakub(a)cloudflare.com> Acked-by: John Fastabend <john.fastabend(a)gmail.com> Link: https://lore.kernel.org/bpf/20210331023237.41094-2-xiyou.wangcong@gmail.com Signed-off-by: Wang Yufen <wangyufen(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Liu Jian <liujian56(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/core/skmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 4ee4fe436847..f80428cc7264 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -638,7 +638,7 @@ void __sk_psock_purge_ingress_msg(struct sk_psock *psock) static void sk_psock_zap_ingress(struct sk_psock *psock) { - __skb_queue_purge(&psock->ingress_skb); + skb_queue_purge(&psock->ingress_skb); __sk_psock_purge_ingress_msg(psock); } -- 2.20.1

1 38

[PATCH OLK-5.10 00/90] sw64: Backport sw64 enhancement and bugfix
by Zheng Zengkai 20 May '22

20 May '22

Backport sw64 enhancement and bugfix patches. Cui Mingrui (2): sw64: optimize ip checksum calculation sw64: fix ip checksum calculation Du Yilong (3): sw64: kvm: fix bug when open file with the O_DIRECT flag sw64: add set time support for hypervisor based rtc sw64: kvm: remap pages of guest by vm_insert_page() Gu Zitao (7): config: add initial openeuler_defconfig for sw64 sw64: fix coding style problems sw64: fix the VDSO symbol generation for nm sw64: fix SPDX license identifier in uapi headers sw64: add SO_RCVTIMEO/ SO_SNDTIMEO socket options sw64: remove unnecessary include headers sw64: fix some compile errors He Chuyue (2): sw64: add regs and stack access APIs to support kprobe events sw64: remove unnecessary parameter in REG_OFFSET_NAME He Sheng (20): sw64: clean up useless #if 0 and #if 1 sw64: switch GUP to the generic get_user_pages_fast() implementation sw64: remove unused a.out.h sw64: fix ex_table entries from misalignment handlers sw64: define NR_SYSCALLS as generated __NR_syscalls sw64: clean up a.out and ECOFF binary related headers sw64: ptrace: clean up debug codes sw64: add kbuild defconfig rule sw64: clean up out-of-date selected options sw64: Kconfig: remove dependence on !PREEMPT sw64: Kconfig: remove dependence on ARCH_SUPPORTS_ACPI sw64: add missing global __constant_c_memset sw64: do some cleanups for rt_sigframe sw64: fix setup_rt_frame for non SA_SIGINFO sw64: fix compile error for DISCONTIGMEM=y sw64: force signal and fault for traps and debugging sw64: push and pop kernel stack with ldi instruction sw64: signal: save/restore fpregs with copy user sw64: fix the number of aux entries in ARCH_DLINFO sw64: fix sendfile system call Lu Feifei (6): sw64: fix printk method for guest os sw64: unify access to LONGTIME for guest and emulator sw64: kvm: handle ldl_u and stl_u when exit mmio sw64: kvm: simplify the code sw64: pci: align the address of mmio resource to PAGE_SIZE sw64: unify 32-bit MEMIO address of host and guest Mao Minkai (29): sw64: vdso: add automatic syscall fallback sw64: vdso: change vdso version sw64: vdso: fix time calculation sw64: mm: reorder memblock_init process sw64: mm: warn overlapped memmap and DMA region sw64: mm: use memblock to find the end of memory sw64: print correct initrd address sw64: remove redundant Kconfig source sw64: modify tc_sched_clock debugfs file sw64: simplify cpumask_of_node sw64: remove CONFIG_USE_PERCPU_NUMA_NODE_ID=n code sw64: fix all compile warnings sw64: numa: switch to arch node_distance sw64: mm: mark pci and memmap region as nomap sw64: use jump label for running modes sw64: remove MAX_ASN sw64: kvm: remove MAX_VPN sw64: fix coding style problems sw64: rename kvm_mem variables sw64: reformat syscall.tbl sw64: add missing pkey syscall numbers sw64: add clone3 syscall support sw64: add required include headers to ptrace.h sw64: switch to old-style semctl/shmctl syscalls sw64: increase position index in c_next for cpuinfo sw64: add old sigprocmask back for compatibility sw64: vdso: fix backtrace of vrt_sigreturn sw64: vdso: fix CFI directives for fpregs in vrt_sigreturn sw64: optimize simd version of memcpy and memset Min Fanlei (4): sw64: fix the value of QEMU_PRINTF_BUFF_BASE sw64: add support for emulator running mode sw64: enable more than 32 CPUs for guest sw64: kvm: fix bad page state setting outside of kvm memory pool Tang Jinyang (2): sw64: add dynamic frequency scaling support sw64: add dynamic turning on/off cores support Wang Yingying (3): hwmon: add voltage sensor support for sw64 sw64: add pvt device to chip3.dts hwmon: add support for sw64 temperature sensor Xu Chenjiao (2): sw64: radeon: add a force flush to delay work when radeon uvd suspend sw64: pcie: enable PME and AER support Zhao Yihan (1): sw64: remap PA with |= in early_ioremap Zheng Chongzhen (3): sw64: re-implement sw64_dma_direct_ops according upstream sw64: iommu: fix 32-bit devices dma ops sw64: fix compile error for CONFIG_PCI=n Zhou Xuemei (5): sw64: pci: remove some useless code sw64: switch to generic pcibios_set_master and pci_common_swizzle sw64: clean up some useless codes sw64: dts: rename spi flash partition to fix warning sw64: add ARCH_HAS_PTE_SPECIAL support Zhu Donghong (1): ipmi: add ipmi driver support arch/sw_64/Kconfig | 325 +- arch/sw_64/Makefile | 1 + arch/sw_64/boot/dts/chip3.dts | 41 +- arch/sw_64/chip/chip3/chip.c | 130 +- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +- arch/sw_64/chip/chip3/i2c-lib.c | 4 - arch/sw_64/chip/chip3/irq_chip.c | 13 +- arch/sw_64/chip/chip3/msi.c | 7 +- arch/sw_64/chip/chip3/pci-quirks.c | 7 +- arch/sw_64/chip/chip3/vt_msi.c | 6 - arch/sw_64/configs/openeuler_defconfig | 4312 +++++++++++++++++++++ arch/sw_64/defconfig | 73 - arch/sw_64/include/asm/Kbuild | 1 + arch/sw_64/include/asm/a.out-core.h | 80 - arch/sw_64/include/asm/a.out.h | 16 - arch/sw_64/include/asm/checksum.h | 58 +- arch/sw_64/include/asm/chip3_io.h | 4 +- arch/sw_64/include/asm/clock.h | 56 + arch/sw_64/include/asm/cputime.h | 4 +- arch/sw_64/include/asm/early_ioremap.h | 2 +- arch/sw_64/include/asm/hw_init.h | 29 +- arch/sw_64/include/asm/kvm_host.h | 3 +- arch/sw_64/include/asm/mmu_context.h | 3 +- arch/sw_64/include/asm/numa.h | 1 + arch/sw_64/include/asm/pci.h | 24 +- arch/sw_64/include/asm/pgtable.h | 26 +- arch/sw_64/include/asm/ptrace.h | 8 +- arch/sw_64/include/asm/topology.h | 29 +- arch/sw_64/include/asm/unistd.h | 3 +- arch/sw_64/include/asm/user.h | 53 - arch/sw_64/include/asm/vdso.h | 4 +- arch/sw_64/include/asm/vga.h | 18 +- arch/sw_64/include/uapi/asm/a.out.h | 88 - arch/sw_64/include/uapi/asm/auxvec.h | 25 +- arch/sw_64/include/uapi/asm/bitsperlong.h | 2 +- arch/sw_64/include/uapi/asm/byteorder.h | 2 +- arch/sw_64/include/uapi/asm/compiler.h | 2 +- arch/sw_64/include/uapi/asm/console.h | 2 +- arch/sw_64/include/uapi/asm/errno.h | 2 +- arch/sw_64/include/uapi/asm/fcntl.h | 2 +- arch/sw_64/include/uapi/asm/fpu.h | 2 +- arch/sw_64/include/uapi/asm/gentrap.h | 2 +- arch/sw_64/include/uapi/asm/hmcall.h | 2 +- arch/sw_64/include/uapi/asm/ioctl.h | 2 +- arch/sw_64/include/uapi/asm/ioctls.h | 48 +- arch/sw_64/include/uapi/asm/ipcbuf.h | 2 +- arch/sw_64/include/uapi/asm/kvm.h | 14 +- arch/sw_64/include/uapi/asm/kvm_para.h | 2 +- arch/sw_64/include/uapi/asm/mman.h | 2 +- arch/sw_64/include/uapi/asm/msgbuf.h | 2 +- arch/sw_64/include/uapi/asm/param.h | 2 +- arch/sw_64/include/uapi/asm/poll.h | 2 +- arch/sw_64/include/uapi/asm/posix_types.h | 2 +- arch/sw_64/include/uapi/asm/ptrace.h | 2 +- arch/sw_64/include/uapi/asm/reg.h | 2 +- arch/sw_64/include/uapi/asm/regdef.h | 2 +- arch/sw_64/include/uapi/asm/resource.h | 2 +- arch/sw_64/include/uapi/asm/sembuf.h | 2 +- arch/sw_64/include/uapi/asm/setup.h | 2 +- arch/sw_64/include/uapi/asm/shmbuf.h | 2 +- arch/sw_64/include/uapi/asm/sigcontext.h | 2 +- arch/sw_64/include/uapi/asm/siginfo.h | 2 +- arch/sw_64/include/uapi/asm/signal.h | 2 +- arch/sw_64/include/uapi/asm/socket.h | 34 +- arch/sw_64/include/uapi/asm/sockios.h | 2 +- arch/sw_64/include/uapi/asm/stat.h | 2 +- arch/sw_64/include/uapi/asm/statfs.h | 2 +- arch/sw_64/include/uapi/asm/swab.h | 2 +- arch/sw_64/include/uapi/asm/sysinfo.h | 2 +- arch/sw_64/include/uapi/asm/termbits.h | 2 +- arch/sw_64/include/uapi/asm/termios.h | 2 +- arch/sw_64/include/uapi/asm/types.h | 2 +- arch/sw_64/include/uapi/asm/unistd.h | 7 +- arch/sw_64/kernel/Makefile | 5 +- arch/sw_64/kernel/acpi.c | 19 +- arch/sw_64/kernel/asm-offsets.c | 7 +- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +- arch/sw_64/kernel/clock.c | 184 + arch/sw_64/kernel/core.c | 41 +- arch/sw_64/kernel/cpuautoplug.c | 496 +++ arch/sw_64/kernel/crash_dump.c | 2 - arch/sw_64/kernel/dup_print.c | 10 +- arch/sw_64/kernel/early_printk.c | 4 +- arch/sw_64/kernel/entry.S | 5 +- arch/sw_64/kernel/ftrace.c | 5 - arch/sw_64/kernel/insn.c | 13 - arch/sw_64/kernel/irq.c | 15 - arch/sw_64/kernel/irq_sw64.c | 9 +- arch/sw_64/kernel/jump_label.c | 3 +- arch/sw_64/kernel/kgdb.c | 9 +- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +- arch/sw_64/kernel/kprobes/kprobes.c | 4 - arch/sw_64/kernel/kvm_cma.c | 4 - arch/sw_64/kernel/machine_kexec.c | 7 +- arch/sw_64/kernel/module.c | 9 - arch/sw_64/kernel/msi.c | 25 - arch/sw_64/kernel/pci-noop.c | 8 - arch/sw_64/kernel/pci-sysfs.c | 3 - arch/sw_64/kernel/pci.c | 102 +- arch/sw_64/kernel/pci_common.c | 285 +- arch/sw_64/kernel/pci_impl.h | 49 - arch/sw_64/kernel/perf_event.c | 12 - arch/sw_64/kernel/perf_regs.c | 4 - arch/sw_64/kernel/platform.c | 20 + arch/sw_64/kernel/process.c | 26 - arch/sw_64/kernel/ptrace.c | 132 +- arch/sw_64/kernel/relocate.c | 13 +- arch/sw_64/kernel/segvdbg.c | 4 +- arch/sw_64/kernel/setup.c | 124 +- arch/sw_64/kernel/signal.c | 74 +- arch/sw_64/kernel/smp.c | 25 +- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 22 +- arch/sw_64/kernel/syscalls/syscall.tbl | 28 +- arch/sw_64/kernel/tc.c | 3 - arch/sw_64/kernel/time.c | 31 +- arch/sw_64/kernel/timer.c | 21 +- arch/sw_64/kernel/topology.c | 19 - arch/sw_64/kernel/traps.c | 95 +- arch/sw_64/kernel/unaligned.c | 3 - arch/sw_64/kernel/uprobes.c | 5 - arch/sw_64/kernel/vdso.c | 9 - arch/sw_64/kernel/vdso/so2s.sh | 3 +- arch/sw_64/kernel/vdso/vdso.S | 2 - arch/sw_64/kernel/vdso/vdso.lds.S | 2 +- arch/sw_64/kernel/vdso/vgettimeofday.c | 33 +- arch/sw_64/kernel/vdso/vrt_sigreturn.S | 40 + arch/sw_64/kvm/emulate.c | 2 + arch/sw_64/kvm/kvm-sw64.c | 39 +- arch/sw_64/kvm/vmem.c | 37 +- arch/sw_64/lib/checksum.c | 136 +- arch/sw_64/lib/csum_partial_copy.c | 310 +- arch/sw_64/lib/deep-memcpy.S | 449 ++- arch/sw_64/lib/deep-memset.S | 27 +- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +- arch/sw_64/lib/udelay.c | 5 - arch/sw_64/math-emu/math.c | 10 +- arch/sw_64/mm/fault.c | 21 +- arch/sw_64/mm/hugetlbpage.c | 7 +- arch/sw_64/mm/init.c | 48 +- arch/sw_64/mm/numa.c | 30 +- arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 - drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sw64_cpufreq.c | 186 + drivers/gpu/drm/radeon/radeon_uvd.c | 5 + drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sw64_pvt.c | 222 ++ drivers/iommu/sw64/sunway_iommu.c | 58 +- drivers/iommu/sw64/sunway_iommu.h | 2 +- drivers/rtc/rtc-sw64-virt.c | 24 +- 154 files changed, 7026 insertions(+), 2337 deletions(-) create mode 100644 arch/sw_64/configs/openeuler_defconfig delete mode 100644 arch/sw_64/defconfig delete mode 100644 arch/sw_64/include/asm/a.out-core.h delete mode 100644 arch/sw_64/include/asm/a.out.h create mode 100644 arch/sw_64/include/asm/clock.h delete mode 100644 arch/sw_64/include/asm/user.h delete mode 100644 arch/sw_64/include/uapi/asm/a.out.h create mode 100644 arch/sw_64/kernel/clock.c create mode 100644 arch/sw_64/kernel/cpuautoplug.c create mode 100644 arch/sw_64/kernel/platform.c create mode 100644 drivers/cpufreq/sw64_cpufreq.c create mode 100644 drivers/hwmon/sw64_pvt.c -- 2.20.1

1 90

[PATCH v1 OLK-5.10 00/90] sw64: merge patches
by Zheng Zengkai 20 May '22

20 May '22

From: Gu Zitao <guzitao(a)wxiat.com> Cui Mingrui (2): sw64: optimize ip checksum calculation sw64: fix ip checksum calculation Du Yilong (3): sw64: kvm: fix bug when open file with the O_DIRECT flag sw64: add set time support for hypervisor based rtc sw64: kvm: remap pages of guest by vm_insert_page() Gu Zitao (7): config: add initial openeuler_defconfig for sw64 sw64: fix coding style problems sw64: fix the VDSO symbol generation for nm sw64: fix SPDX license identifier in uapi headers sw64: add SO_RCVTIMEO/ SO_SNDTIMEO socket options sw64: remove unnecessary include headers sw64: fix some compile errors He Chuyue (2): sw64: add regs and stack access APIs to support kprobe events sw64: remove unnecessary parameter in REG_OFFSET_NAME He Sheng (20): sw64: clean up useless #if 0 and #if 1 sw64: switch GUP to the generic get_user_pages_fast() implementation sw64: remove unused a.out.h sw64: fix ex_table entries from misalignment handlers sw64: define NR_SYSCALLS as generated __NR_syscalls sw64: clean up a.out and ECOFF binary related headers sw64: ptrace: clean up debug codes sw64: add kbuild defconfig rule sw64: clean up out-of-date selected options sw64: Kconfig: remove dependence on !PREEMPT sw64: Kconfig: remove dependence on ARCH_SUPPORTS_ACPI sw64: add missing global __constant_c_memset sw64: do some cleanups for rt_sigframe sw64: fix setup_rt_frame for non SA_SIGINFO sw64: fix compile error for DISCONTIGMEM=y sw64: force signal and fault for traps and debugging sw64: push and pop kernel stack with ldi instruction sw64: signal: save/restore fpregs with copy user sw64: fix the number of aux entries in ARCH_DLINFO sw64: fix sendfile system call Lu Feifei (6): sw64: fix printk method for guest os sw64: unify access to LONGTIME for guest and emulator sw64: kvm: handle ldl_u and stl_u when exit mmio sw64: kvm: simplify the code sw64: pci: align the address of mmio resource to PAGE_SIZE sw64: unify 32-bit MEMIO address of host and guest Mao Minkai (29): sw64: vdso: add automatic syscall fallback sw64: vdso: change vdso version sw64: vdso: fix time calculation sw64: mm: reorder memblock_init process sw64: mm: warn overlapped memmap and DMA region sw64: mm: use memblock to find the end of memory sw64: print correct initrd address sw64: remove redundant Kconfig source sw64: modify tc_sched_clock debugfs file sw64: simplify cpumask_of_node sw64: remove CONFIG_USE_PERCPU_NUMA_NODE_ID=n code sw64: fix all compile warnings sw64: numa: switch to arch node_distance sw64: mm: mark pci and memmap region as nomap sw64: use jump label for running modes sw64: remove MAX_ASN sw64: kvm: remove MAX_VPN sw64: fix coding style problems sw64: rename kvm_mem variables sw64: reformat syscall.tbl sw64: add missing pkey syscall numbers sw64: add clone3 syscall support sw64: add required include headers to ptrace.h sw64: switch to old-style semctl/shmctl syscalls sw64: increase position index in c_next for cpuinfo sw64: add old sigprocmask back for compatibility sw64: vdso: fix backtrace of vrt_sigreturn sw64: vdso: fix CFI directives for fpregs in vrt_sigreturn sw64: optimize simd version of memcpy and memset Min Fanlei (4): sw64: fix the value of QEMU_PRINTF_BUFF_BASE sw64: add support for emulator running mode sw64: enable more than 32 CPUs for guest sw64: kvm: fix bad page state setting outside of kvm memory pool Tang Jinyang (2): sw64: add dynamic frequency scaling support sw64: add dynamic turning on/off cores support Wang Yingying (3): hwmon: add voltage sensor support for sw64 sw64: add pvt device to chip3.dts hwmon: add support for sw64 temperature sensor Xu Chenjiao (2): sw64: radeon: add a force flush to delay work when radeon uvd suspend sw64: pcie: enable PME and AER support Zhao Yihan (1): sw64: remap PA with |= in early_ioremap Zheng Chongzhen (3): sw64: re-implement sw64_dma_direct_ops according upstream sw64: iommu: fix 32-bit devices dma ops sw64: fix compile error for CONFIG_PCI=n Zhou Xuemei (5): sw64: pci: remove some useless code sw64: switch to generic pcibios_set_master and pci_common_swizzle sw64: clean up some useless codes sw64: dts: rename spi flash partition to fix warning sw64: add ARCH_HAS_PTE_SPECIAL support Zhu Donghong (1): ipmi: add ipmi driver support arch/sw_64/Kconfig | 325 +- arch/sw_64/Makefile | 1 + arch/sw_64/boot/dts/chip3.dts | 41 +- arch/sw_64/chip/chip3/chip.c | 130 +- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +- arch/sw_64/chip/chip3/i2c-lib.c | 4 - arch/sw_64/chip/chip3/irq_chip.c | 13 +- arch/sw_64/chip/chip3/msi.c | 7 +- arch/sw_64/chip/chip3/pci-quirks.c | 7 +- arch/sw_64/chip/chip3/vt_msi.c | 6 - arch/sw_64/configs/openeuler_defconfig | 4312 +++++++++++++++++++++ arch/sw_64/defconfig | 73 - arch/sw_64/include/asm/Kbuild | 1 + arch/sw_64/include/asm/a.out-core.h | 80 - arch/sw_64/include/asm/a.out.h | 16 - arch/sw_64/include/asm/checksum.h | 58 +- arch/sw_64/include/asm/chip3_io.h | 4 +- arch/sw_64/include/asm/clock.h | 56 + arch/sw_64/include/asm/cputime.h | 4 +- arch/sw_64/include/asm/early_ioremap.h | 2 +- arch/sw_64/include/asm/hw_init.h | 29 +- arch/sw_64/include/asm/kvm_host.h | 3 +- arch/sw_64/include/asm/mmu_context.h | 3 +- arch/sw_64/include/asm/numa.h | 1 + arch/sw_64/include/asm/pci.h | 24 +- arch/sw_64/include/asm/pgtable.h | 26 +- arch/sw_64/include/asm/ptrace.h | 8 +- arch/sw_64/include/asm/topology.h | 29 +- arch/sw_64/include/asm/unistd.h | 3 +- arch/sw_64/include/asm/user.h | 53 - arch/sw_64/include/asm/vdso.h | 4 +- arch/sw_64/include/asm/vga.h | 18 +- arch/sw_64/include/uapi/asm/a.out.h | 88 - arch/sw_64/include/uapi/asm/auxvec.h | 25 +- arch/sw_64/include/uapi/asm/bitsperlong.h | 2 +- arch/sw_64/include/uapi/asm/byteorder.h | 2 +- arch/sw_64/include/uapi/asm/compiler.h | 2 +- arch/sw_64/include/uapi/asm/console.h | 2 +- arch/sw_64/include/uapi/asm/errno.h | 2 +- arch/sw_64/include/uapi/asm/fcntl.h | 2 +- arch/sw_64/include/uapi/asm/fpu.h | 2 +- arch/sw_64/include/uapi/asm/gentrap.h | 2 +- arch/sw_64/include/uapi/asm/hmcall.h | 2 +- arch/sw_64/include/uapi/asm/ioctl.h | 2 +- arch/sw_64/include/uapi/asm/ioctls.h | 48 +- arch/sw_64/include/uapi/asm/ipcbuf.h | 2 +- arch/sw_64/include/uapi/asm/kvm.h | 14 +- arch/sw_64/include/uapi/asm/kvm_para.h | 2 +- arch/sw_64/include/uapi/asm/mman.h | 2 +- arch/sw_64/include/uapi/asm/msgbuf.h | 2 +- arch/sw_64/include/uapi/asm/param.h | 2 +- arch/sw_64/include/uapi/asm/poll.h | 2 +- arch/sw_64/include/uapi/asm/posix_types.h | 2 +- arch/sw_64/include/uapi/asm/ptrace.h | 2 +- arch/sw_64/include/uapi/asm/reg.h | 2 +- arch/sw_64/include/uapi/asm/regdef.h | 2 +- arch/sw_64/include/uapi/asm/resource.h | 2 +- arch/sw_64/include/uapi/asm/sembuf.h | 2 +- arch/sw_64/include/uapi/asm/setup.h | 2 +- arch/sw_64/include/uapi/asm/shmbuf.h | 2 +- arch/sw_64/include/uapi/asm/sigcontext.h | 2 +- arch/sw_64/include/uapi/asm/siginfo.h | 2 +- arch/sw_64/include/uapi/asm/signal.h | 2 +- arch/sw_64/include/uapi/asm/socket.h | 34 +- arch/sw_64/include/uapi/asm/sockios.h | 2 +- arch/sw_64/include/uapi/asm/stat.h | 2 +- arch/sw_64/include/uapi/asm/statfs.h | 2 +- arch/sw_64/include/uapi/asm/swab.h | 2 +- arch/sw_64/include/uapi/asm/sysinfo.h | 2 +- arch/sw_64/include/uapi/asm/termbits.h | 2 +- arch/sw_64/include/uapi/asm/termios.h | 2 +- arch/sw_64/include/uapi/asm/types.h | 2 +- arch/sw_64/include/uapi/asm/unistd.h | 7 +- arch/sw_64/kernel/Makefile | 5 +- arch/sw_64/kernel/acpi.c | 19 +- arch/sw_64/kernel/asm-offsets.c | 7 +- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +- arch/sw_64/kernel/clock.c | 184 + arch/sw_64/kernel/core.c | 41 +- arch/sw_64/kernel/cpuautoplug.c | 496 +++ arch/sw_64/kernel/crash_dump.c | 2 - arch/sw_64/kernel/dup_print.c | 10 +- arch/sw_64/kernel/early_printk.c | 4 +- arch/sw_64/kernel/entry.S | 5 +- arch/sw_64/kernel/ftrace.c | 5 - arch/sw_64/kernel/insn.c | 13 - arch/sw_64/kernel/irq.c | 15 - arch/sw_64/kernel/irq_sw64.c | 9 +- arch/sw_64/kernel/jump_label.c | 3 +- arch/sw_64/kernel/kgdb.c | 9 +- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +- arch/sw_64/kernel/kprobes/kprobes.c | 4 - arch/sw_64/kernel/kvm_cma.c | 4 - arch/sw_64/kernel/machine_kexec.c | 7 +- arch/sw_64/kernel/module.c | 9 - arch/sw_64/kernel/msi.c | 25 - arch/sw_64/kernel/pci-noop.c | 8 - arch/sw_64/kernel/pci-sysfs.c | 3 - arch/sw_64/kernel/pci.c | 102 +- arch/sw_64/kernel/pci_common.c | 285 +- arch/sw_64/kernel/pci_impl.h | 49 - arch/sw_64/kernel/perf_event.c | 12 - arch/sw_64/kernel/perf_regs.c | 4 - arch/sw_64/kernel/platform.c | 20 + arch/sw_64/kernel/process.c | 26 - arch/sw_64/kernel/ptrace.c | 132 +- arch/sw_64/kernel/relocate.c | 13 +- arch/sw_64/kernel/segvdbg.c | 4 +- arch/sw_64/kernel/setup.c | 124 +- arch/sw_64/kernel/signal.c | 74 +- arch/sw_64/kernel/smp.c | 25 +- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 22 +- arch/sw_64/kernel/syscalls/syscall.tbl | 28 +- arch/sw_64/kernel/tc.c | 3 - arch/sw_64/kernel/time.c | 31 +- arch/sw_64/kernel/timer.c | 21 +- arch/sw_64/kernel/topology.c | 19 - arch/sw_64/kernel/traps.c | 95 +- arch/sw_64/kernel/unaligned.c | 3 - arch/sw_64/kernel/uprobes.c | 5 - arch/sw_64/kernel/vdso.c | 9 - arch/sw_64/kernel/vdso/so2s.sh | 3 +- arch/sw_64/kernel/vdso/vdso.S | 2 - arch/sw_64/kernel/vdso/vdso.lds.S | 2 +- arch/sw_64/kernel/vdso/vgettimeofday.c | 33 +- arch/sw_64/kernel/vdso/vrt_sigreturn.S | 40 + arch/sw_64/kvm/emulate.c | 2 + arch/sw_64/kvm/kvm-sw64.c | 39 +- arch/sw_64/kvm/vmem.c | 37 +- arch/sw_64/lib/checksum.c | 136 +- arch/sw_64/lib/csum_partial_copy.c | 310 +- arch/sw_64/lib/deep-memcpy.S | 449 ++- arch/sw_64/lib/deep-memset.S | 27 +- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +- arch/sw_64/lib/udelay.c | 5 - arch/sw_64/math-emu/math.c | 10 +- arch/sw_64/mm/fault.c | 21 +- arch/sw_64/mm/hugetlbpage.c | 7 +- arch/sw_64/mm/init.c | 48 +- arch/sw_64/mm/numa.c | 30 +- arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 - drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sw64_cpufreq.c | 186 + drivers/gpu/drm/radeon/radeon_uvd.c | 5 + drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sw64_pvt.c | 222 ++ drivers/iommu/sw64/sunway_iommu.c | 58 +- drivers/iommu/sw64/sunway_iommu.h | 2 +- drivers/rtc/rtc-sw64-virt.c | 24 +- 154 files changed, 7026 insertions(+), 2337 deletions(-) create mode 100644 arch/sw_64/configs/openeuler_defconfig delete mode 100644 arch/sw_64/defconfig delete mode 100644 arch/sw_64/include/asm/a.out-core.h delete mode 100644 arch/sw_64/include/asm/a.out.h create mode 100644 arch/sw_64/include/asm/clock.h delete mode 100644 arch/sw_64/include/asm/user.h delete mode 100644 arch/sw_64/include/uapi/asm/a.out.h create mode 100644 arch/sw_64/kernel/clock.c create mode 100644 arch/sw_64/kernel/cpuautoplug.c create mode 100644 arch/sw_64/kernel/platform.c create mode 100644 drivers/cpufreq/sw64_cpufreq.c create mode 100644 drivers/hwmon/sw64_pvt.c -- 2.17.1

1 90

[PATCH openEuler-5.10 1/4] perf: hisi: Make irq shared
by Zheng Zengkai 19 May '22

19 May '22

From: Chen Jun <chenjun102(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I584X2 CVE: NA -------------------------------- On some platforms, there are some error: genirq: Flags mismatch irq 23. 00010804 (xxx) vs. 00010804 (xxx) The reason is that there are more than one pmu nodes witch uses the same irq number. Add IROF_SHARED when devm_request_irq Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Reviewed-by: Weilong Chen <chenweilong(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c index 07f0c7015181..d31a497020c2 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c @@ -168,7 +168,7 @@ int hisi_uncore_pmu_init_irq(struct hisi_pmu *hisi_pmu, return irq; ret = devm_request_irq(&pdev->dev, irq, hisi_uncore_pmu_isr, - IRQF_NOBALANCING | IRQF_NO_THREAD, + IRQF_NOBALANCING | IRQF_NO_THREAD | IRQF_SHARED, dev_name(&pdev->dev), hisi_pmu); if (ret < 0) { dev_err(&pdev->dev, -- 2.20.1

1 3

[PATCH OLK-5.10] eulerfs: fix bitmap minimum size calculation error
by Gou Hao 19 May '22

19 May '22

uniontech inclusion category: bugfix bugzilla: NA CVE: NA ---------- If it can't be divided, minimum_size need to add another byte. Signed-off-by: Gou Hao <gouhao(a)uniontech.com> --- fs/eulerfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eulerfs/super.c b/fs/eulerfs/super.c index 43fc717002d7..20c7fe845b6c 100644 --- a/fs/eulerfs/super.c +++ b/fs/eulerfs/super.c @@ -216,7 +216,7 @@ static bool eufs_check_size(struct super_block *sb, unsigned long size) /* For Super Block */ minimum_size = 2 << sb->s_blocksize_bits; /* For Bitmaps */ - minimum_size += size / EUFS_BLOCK_SIZE / 8; + minimum_size += DIV_ROUND_UP(size / EUFS_BLOCK_SIZE, 8); if (size < minimum_size) return false; -- 2.20.1

1 0

[PATCH] eulerfs: fix bitmap minimum size calculation error
by Gou Hao 19 May '22

19 May '22

uniontech inclusion category: bugfix bugzilla: NA CVE: NA ---------- If it can't be divided, minimum_size need to add another byte. Signed-off-by: Gou Hao <gouhao(a)uniontech.com> --- fs/eulerfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/eulerfs/super.c b/fs/eulerfs/super.c index 43fc717002d7..20c7fe845b6c 100644 --- a/fs/eulerfs/super.c +++ b/fs/eulerfs/super.c @@ -216,7 +216,7 @@ static bool eufs_check_size(struct super_block *sb, unsigned long size) /* For Super Block */ minimum_size = 2 << sb->s_blocksize_bits; /* For Bitmaps */ - minimum_size += size / EUFS_BLOCK_SIZE / 8; + minimum_size += DIV_ROUND_UP(size / EUFS_BLOCK_SIZE, 8); if (size < minimum_size) return false; -- 2.20.1

1 0

[PATCH OLK-5.10] config: add SENSORS_ZHAOXIN_CPUTEMP for Zhaoxin CPUs
by LeoLiuoc 18 May '22

18 May '22

Set CONFIG_SENSORS_ZHAOXIN_CPUTEMP to 'm' by default in openeuler_configs Signed-off-by: LeoLiuoc <LeoLiu-oc(a)zhaoxin.com> --- arch/x86/configs/openeuler_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 61c4be815462..4e3692e24b65 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -4052,6 +4052,7 @@ CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m # CONFIG_SENSORS_TMP513 is not set CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_ZHAOXIN_CPUTEMP=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m -- 2.20.1

1 0

[PATCH openEuler-5.10 1/2] net/x25: Fix null-ptr-deref caused by x25_disconnect
by Zheng Zengkai 18 May '22

18 May '22

From: Duoming Zhou <duoming(a)zju.edu.cn> stable inclusion from stable-v5.10.110 commit 5c94b6205e87411dbe9dc1ca088eb36b8837fb47 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5661B CVE: CVE-2022-1516 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 7781607938c8371d4c2b243527430241c62e39c2 ] When the link layer is terminating, x25->neighbour will be set to NULL in x25_disconnect(). As a result, it could cause null-ptr-deref bugs in x25_sendmsg(),x25_recvmsg() and x25_connect(). One of the bugs is shown below. (Thread 1) | (Thread 2) x25_link_terminated() | x25_recvmsg() x25_kill_by_neigh() | ... x25_disconnect() | lock_sock(sk) ... | ... x25->neighbour = NULL //(1) | ... | x25->neighbour->extended //(2) The code sets NULL to x25->neighbour in position (1) and dereferences x25->neighbour in position (2), which could cause null-ptr-deref bug. This patch adds lock_sock() in x25_kill_by_neigh() in order to synchronize with x25_sendmsg(), x25_recvmsg() and x25_connect(). What`s more, the sock held by lock_sock() is not NULL, because it is extracted from x25_list and uses x25_list_lock to synchronize. Fixes: 4becb7ee5b3d ("net/x25: Fix x25_neigh refcnt leak when x25 disconnect") Signed-off-by: Duoming Zhou <duoming(a)zju.edu.cn> Reviewed-by: Lin Ma <linma(a)zju.edu.cn> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/x25/af_x25.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 03ed170b8125..d231d4620c38 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1775,10 +1775,15 @@ void x25_kill_by_neigh(struct x25_neigh *nb) write_lock_bh(&x25_list_lock); - sk_for_each(s, &x25_list) - if (x25_sk(s)->neighbour == nb) + sk_for_each(s, &x25_list) { + if (x25_sk(s)->neighbour == nb) { + write_unlock_bh(&x25_list_lock); + lock_sock(s); x25_disconnect(s, ENETUNREACH, 0, 0); - + release_sock(s); + write_lock_bh(&x25_list_lock); + } + } write_unlock_bh(&x25_list_lock); /* Remove any related forwards */ -- 2.20.1

1 1

[PATCH openEuler-5.10 000/114] Backport 5.10.101 LTS
by Zheng Zengkai 18 May '22

18 May '22

iommu: Fix potential use-after-free during probe perf: Fix list corruption in perf_cgroup_switch() arm64: dts: imx8mq: fix lcdif port node scsi: lpfc: Reduce log messages seen after firmware download scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled can: isotp: fix error path in isotp_sendmsg() to unlock wait queue Makefile.extrawarn: Move -Wunaligned-access to W=1 hwmon: (dell-smm) Speed up setting of fan speed phy: ti: Fix missing sentinel for clk_div_table speakup-dectlk: Restore pitch setting USB: serial: cp210x: add CPI Bulk Coin Recycler id USB: serial: cp210x: add NCR Retail IO box id USB: serial: ch341: add support for GW Instek USB2.0-Serial devices USB: serial: option: add ZTE MF286D modem USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 usb: raw-gadget: fix handling of dual-direction-capable endpoints usb: gadget: f_uac2: Define specific wTerminalType usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition usb: dwc3: gadget: Prevent core from processing stale TRBs usb: ulpi: Call of_node_put correctly usb: ulpi: Move of_node_put to ulpi_dev_release net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" usb: dwc2: drd: fix soft connect when gadget is unconfigured eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX n_tty: wake up poll(POLLRDNORM) on receiving data vt_ioctl: add array_index_nospec to VT_ACTIVATE vt_ioctl: fix array_index_nospec in vt_setactivate net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister net: mscc: ocelot: fix mutex lock error during ethtool stats read ice: fix IPIP and SIT TSO offload ice: fix an error code in ice_cfg_phy_fec() dpaa2-eth: unregister the netdev before disconnecting from the PHY net: amd-xgbe: disable interrupts during pci removal tipc: rate limit warning for received illegal binding update net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE veth: fix races around rq->rx_notify_masked net: fix a memleak when uncloning an skb dst and its metadata net: do not keep the dst cache when uncloning an skb dst and its metadata nfp: flower: fix ida_idx not being released ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path net: dsa: lantiq_gswip: don't use devres for mdiobus net: dsa: felix: don't use devres for mdiobus net: dsa: bcm_sf2: don't use devres for mdiobus net: dsa: ar9331: register the mdiobus under devres net: dsa: mv88e6xxx: don't use devres for mdiobus bonding: pair enable_port with slave_arr_updates gpio: sifive: use the correct register to read output values ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE drm/panel: simple: Assign data from panel_dpi_probe() correctly ixgbevf: Require large buffers for build_skb on 82599VF arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133' netfilter: ctnetlink: disable helper autoassign misc: fastrpc: avoid double fput() on failed usercopy drm/vc4: hdmi: Allow DBLCLK modes even if horz timing is odd. gpio: aggregator: Fix calling into sleeping GPIO controllers usb: f_fs: Fix use-after-free for epfile ARM: dts: imx7ulp: Fix 'assigned-clocks-parents' typo phy: xilinx: zynqmp: Fix bus width setting for SGMII ARM: dts: imx6qdl-udoo: Properly describe the SD card detect staging: fbtft: Fix error path in fbtft_driver_module_init() ARM: dts: meson8b: Fix the UART device-tree schema validation ARM: dts: meson8: Fix the UART device-tree schema validation ARM: dts: meson: Fix the UART compatible strings ARM: dts: Fix timer regression for beagleboard revision c drm/rockchip: vop: Correct RK3399 VOP register fields PM: s2idle: ACPI: Fix wakeup interrupts handling ACPI/IORT: Check node revision for PMCG resources nvme-tcp: fix bogus request completion when failing to send AER ARM: socfpga: fix missing RESET_CONTROLLER ARM: dts: Fix boot regression on Skomer ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group riscv: fix build with binutils 2.38 KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER KVM: eventfd: Fix false positive RCU usage warning net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs perf: Always wake the parent event usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend PM: hibernate: Remove register_nosave_region_late() scsi: myrs: Fix crash in error case scsi: ufs: Treat link loss as fatal error scsi: pm8001: Fix bogus FW crash for maxcpus=1 scsi: qedf: Fix refcount issue when LOGO is received during TMF scsi: qedf: Add stag_work to all the vports scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() scsi: target: iscsi: Make sure the np under each tpg is unique powerpc/fixmap: Fix VM debug warning on unmap net: sched: Clarify error message when qdisc kind is unknown drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer x86/perf: Avoid warning for Arch LBR without XSAVE NFSv4 handle port presence in fs_location server string NFSv4 expose nfs_parse_server_name function NFSv4 remove zero number of fs_locations entries error check NFSv4.1: Fix uninitialised variable in devicenotify nfs: nfs4clinet: check the return value of kstrdup() NFSv4 only print the label when its queried NFS: change nfs_access_get_cached to only report the mask tracing: Propagate is_signed to expression drm/amdgpu: Set a suitable dev_info.gart_page_size NFSD: Fix offset type in I/O trace points NFSD: Clamp WRITE offsets NFS: Fix initialisation of nfs_client cl_flags field net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs can: isotp: fix potential CAN frame reception race in isotp_rcv() mmc: sdhci-of-esdhc: Check for error num after setting mask ima: Do not print policy rule with inactive LSM labels ima: Allow template selection with ima_template[_fmt]= after ima_hash= ima: Remove ima_policy file before directory integrity: check the return value of audit_log_start() already merged fb4ff0f96de3 usb: gadget: rndis: check size of RNDIS_MSG_SET command 22ec10047285 USB: gadget: validate interface OS descriptor requests context conflict: ima: Remove ima_policy file before directory Total patches: 116 - 2 = 114 Adam Ford (1): usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition Alexander Stein (1): arm64: dts: imx8mq: fix lcdif port node Amadeusz Sławiński (1): PM: hibernate: Remove register_nosave_region_late() Amelie Delaunay (1): usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend Andi Kleen (1): x86/perf: Avoid warning for Arch LBR without XSAVE Antoine Tenart (2): net: do not keep the dst cache when uncloning an skb dst and its metadata net: fix a memleak when uncloning an skb dst and its metadata Armin Wolf (1): hwmon: (dell-smm) Speed up setting of fan speed Aurelien Jarno (1): riscv: fix build with binutils 2.38 Brian Norris (1): drm/rockchip: vop: Correct RK3399 VOP register fields Cameron Williams (1): USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 Christoph Niedermaier (1): drm/panel: simple: Assign data from panel_dpi_probe() correctly Christophe Leroy (1): powerpc/fixmap: Fix VM debug warning on unmap Chuck Lever (2): NFSD: Clamp WRITE offsets NFSD: Fix offset type in I/O trace points Colin Foster (1): net: mscc: ocelot: fix mutex lock error during ethtool stats read Dan Carpenter (1): ice: fix an error code in ice_cfg_phy_fec() Dave Stevenson (1): drm/vc4: hdmi: Allow DBLCLK modes even if horz timing is odd. Dongjin Kim (1): arm64: dts: meson-g12b-odroid-n2: fix typo 'dio2133' Eric Dumazet (2): ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path veth: fix races around rq->rx_notify_masked Fabio Estevam (2): ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group ARM: dts: imx6qdl-udoo: Properly describe the SD card detect Fabrice Gasnier (1): usb: dwc2: drd: fix soft connect when gadget is unconfigured Florian Westphal (1): netfilter: ctnetlink: disable helper autoassign Geert Uytterhoeven (1): gpio: aggregator: Fix calling into sleeping GPIO controllers Greg Kroah-Hartman (1): Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" Hou Wenlong (1): KVM: eventfd: Fix false positive RCU usage warning Huacai Chen (1): drm/amdgpu: Set a suitable dev_info.gart_page_size Jakob Koschel (2): vt_ioctl: fix array_index_nospec in vt_setactivate vt_ioctl: add array_index_nospec to VT_ACTIVATE James Clark (1): perf: Always wake the parent event James Smart (2): scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled scsi: lpfc: Reduce log messages seen after firmware download Jann Horn (2): net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup usb: raw-gadget: fix handling of dual-direction-capable endpoints Jesse Brandeburg (1): ice: fix IPIP and SIT TSO offload Jiasheng Jiang (1): mmc: sdhci-of-esdhc: Check for error num after setting mask Jisheng Zhang (1): net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout() Joel Stanley (1): net: mdio: aspeed: Add missing MODULE_DEVICE_TABLE Johan Hovold (2): USB: serial: cp210x: add NCR Retail IO box id USB: serial: cp210x: add CPI Bulk Coin Recycler id John Garry (1): scsi: pm8001: Fix bogus FW crash for maxcpus=1 Jon Maloy (1): tipc: rate limit warning for received illegal binding update Jonas Malaco (1): eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAX Kishon Vijay Abraham I (1): phy: ti: Fix missing sentinel for clk_div_table Kiwoong Kim (1): scsi: ufs: Treat link loss as fatal error Krzysztof Kozlowski (1): ARM: socfpga: fix missing RESET_CONTROLLER Linus Walleij (1): ARM: dts: Fix boot regression on Skomer Louis Peens (1): nfp: flower: fix ida_idx not being released Mahesh Bandewar (1): bonding: pair enable_port with slave_arr_updates Martin Blumenstingl (3): ARM: dts: meson: Fix the UART compatible strings ARM: dts: meson8: Fix the UART device-tree schema validation ARM: dts: meson8b: Fix the UART device-tree schema validation Mathias Krause (1): misc: fastrpc: avoid double fput() on failed usercopy Nathan Chancellor (1): Makefile.extrawarn: Move -Wunaligned-access to W=1 NeilBrown (1): NFS: change nfs_access_get_cached to only report the mask Niklas Cassel (1): gpio: sifive: use the correct register to read output values Olga Kornievskaia (4): NFSv4 only print the label when its queried NFSv4 remove zero number of fs_locations entries error check NFSv4 expose nfs_parse_server_name function NFSv4 handle port presence in fs_location server string Oliver Hartkopp (2): can: isotp: fix potential CAN frame reception race in isotp_rcv() can: isotp: fix error path in isotp_sendmsg() to unlock wait queue Pavel Hofman (1): usb: gadget: f_uac2: Define specific wTerminalType Pavel Parkhomenko (2): net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs Pawel Dembicki (1): USB: serial: option: add ZTE MF286D modem Rafael J. Wysocki (2): PM: s2idle: ACPI: Fix wakeup interrupts handling ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE Raju Rangoju (1): net: amd-xgbe: disable interrupts during pci removal Raymond Jay Golo (1): drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer Rob Herring (1): ARM: dts: imx7ulp: Fix 'assigned-clocks-parents' typo Robert Hancock (1): phy: xilinx: zynqmp: Fix bus width setting for SGMII Robert-Ionut Alexa (1): dpaa2-eth: unregister the netdev before disconnecting from the PHY Roberto Sassu (1): ima: Allow template selection with ima_template[_fmt]= after ima_hash= Robin Murphy (1): ACPI/IORT: Check node revision for PMCG resources Sagi Grimberg (1): nvme-tcp: fix bogus request completion when failing to send AER Samuel Mendoza-Jonas (1): ixgbevf: Require large buffers for build_skb on 82599VF Samuel Thibault (1): speakup-dectlk: Restore pitch setting Saurav Kashyap (2): scsi: qedf: Add stag_work to all the vports scsi: qedf: Fix refcount issue when LOGO is received during TMF Sean Anderson (2): usb: ulpi: Move of_node_put to ulpi_dev_release usb: ulpi: Call of_node_put correctly Sean Christopherson (2): KVM: SVM: Don't kill SEV guest if SMAP erratum triggers in usermode KVM: VMX: Set vmcs.PENDING_DBG.BS on #DB in STI/MOVSS blocking shadow Song Liu (1): perf: Fix list corruption in perf_cgroup_switch() Stefan Berger (2): ima: Remove ima_policy file before directory ima: Do not print policy rule with inactive LSM labels Stephan Brunner (1): USB: serial: ch341: add support for GW Instek USB2.0-Serial devices TATSUKAWA KOSUKE (立川江介) (1): n_tty: wake up poll(POLLRDNORM) on receiving data Tom Zanussi (1): tracing: Propagate is_signed to expression Tong Zhang (1): scsi: myrs: Fix crash in error case Tony Lindgren (1): ARM: dts: Fix timer regression for beagleboard revision c Trond Myklebust (2): NFS: Fix initialisation of nfs_client cl_flags field NFSv4.1: Fix uninitialised variable in devicenotify Udipto Goswami (2): usb: f_fs: Fix use-after-free for epfile usb: dwc3: gadget: Prevent core from processing stale TRBs Uwe Kleine-König (1): staging: fbtft: Fix error path in fbtft_driver_module_init() Victor Nogueira (1): net: sched: Clarify error message when qdisc kind is unknown Vijayanand Jitta (1): iommu: Fix potential use-after-free during probe Vitaly Kuznetsov (2): KVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMER KVM: nVMX: Also filter MSR_IA32_VMX_TRUE_PINBASED_CTLS when eVMCS Vladimir Oltean (6): net: dsa: mv88e6xxx: don't use devres for mdiobus net: dsa: ar9331: register the mdiobus under devres net: dsa: bcm_sf2: don't use devres for mdiobus net: dsa: felix: don't use devres for mdiobus net: dsa: lantiq_gswip: don't use devres for mdiobus net: dsa: mv88e6xxx: fix use-after-free in mv88e6xxx_mdios_unregister Wu Zheng (1): nvme-pci: add the IGNORE_DEV_SUBNQN quirk for Intel P4500/P4600 SSDs Xiaoke Wang (3): integrity: check the return value of audit_log_start() nfs: nfs4clinet: check the return value of kstrdup() scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() ZouMingzhe (1): scsi: target: iscsi: Make sure the np under each tpg is unique .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx23-evk.dts | 1 - arch/arm/boot/dts/imx6qdl-udoo.dtsi | 5 +- arch/arm/boot/dts/imx7ulp.dtsi | 2 +- arch/arm/boot/dts/meson.dtsi | 8 +-- arch/arm/boot/dts/meson8.dtsi | 24 +++---- arch/arm/boot/dts/meson8b.dtsi | 24 +++---- arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 --------- .../arm/boot/dts/ste-ux500-samsung-skomer.dts | 4 -- arch/arm/mach-socfpga/Kconfig | 2 + .../dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 +- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +- arch/powerpc/include/asm/book3s/32/pgtable.h | 1 + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 + arch/powerpc/include/asm/fixmap.h | 6 +- arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + arch/powerpc/mm/pgtable.c | 9 +++ arch/riscv/Makefile | 6 ++ arch/x86/events/intel/lbr.c | 3 + arch/x86/kvm/svm/svm.c | 16 ++++- arch/x86/kvm/vmx/evmcs.c | 1 + arch/x86/kvm/vmx/evmcs.h | 4 +- arch/x86/kvm/vmx/vmx.c | 25 +++++++ .../accessibility/speakup/speakup_dectlk.c | 1 + drivers/acpi/arm64/iort.c | 14 +++- drivers/acpi/ec.c | 10 +++ drivers/acpi/sleep.c | 15 ++-- drivers/base/power/wakeup.c | 41 +++++++++-- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- drivers/gpio/gpio-aggregator.c | 18 +++-- drivers/gpio/gpio-sifive.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- .../gpu/drm/drm_panel_orientation_quirks.c | 12 ++++ drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 ++- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 + drivers/hwmon/dell-smm-hwmon.c | 12 ++-- drivers/iommu/iommu.c | 9 ++- drivers/misc/eeprom/ee1004.c | 3 + drivers/misc/fastrpc.c | 9 ++- drivers/mmc/host/sdhci-of-esdhc.c | 8 ++- drivers/net/bonding/bond_3ad.c | 3 +- drivers/net/dsa/bcm_sf2.c | 7 +- drivers/net/dsa/lantiq_gswip.c | 14 +++- drivers/net/dsa/mv88e6xxx/chip.c | 15 ++-- drivers/net/dsa/ocelot/felix_vsc9959.c | 4 +- drivers/net/dsa/qca/ar9331.c | 3 +- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 3 + .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- drivers/net/ethernet/intel/ice/ice_common.c | 3 +- .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 25 ++++--- .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 13 ++-- drivers/net/ethernet/mscc/ocelot.c | 11 +-- .../netronome/nfp/flower/tunnel_conf.c | 12 ++-- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/mdio/mdio-aspeed.c | 1 + drivers/net/phy/marvell.c | 17 ++--- drivers/net/usb/ax88179_178a.c | 68 +++++++++++-------- drivers/net/veth.c | 13 ++-- drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/tcp.c | 10 ++- drivers/phy/ti/phy-j721e-wiz.c | 1 + drivers/phy/xilinx/phy-zynqmp.c | 11 +-- drivers/scsi/lpfc/lpfc.h | 13 +++- drivers/scsi/lpfc/lpfc_attr.c | 4 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 8 ++- drivers/scsi/myrs.c | 3 +- drivers/scsi/pm8001/pm80xx_hwi.c | 16 ++++- drivers/scsi/pm8001/pm80xx_hwi.h | 6 +- drivers/scsi/qedf/qedf_io.c | 1 + drivers/scsi/qedf/qedf_main.c | 1 + drivers/scsi/ufs/ufshcd-pltfrm.c | 7 ++ drivers/scsi/ufs/ufshci.h | 3 +- drivers/staging/fbtft/fbtft.h | 5 +- drivers/target/iscsi/iscsi_target_tpg.c | 3 + drivers/tty/n_tty.c | 4 +- drivers/tty/vt/vt_ioctl.c | 3 +- drivers/usb/common/ulpi.c | 10 ++- drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc3/gadget.c | 13 ++++ drivers/usb/gadget/function/f_fs.c | 56 +++++++++++---- drivers/usb/gadget/function/f_uac2.c | 4 +- drivers/usb/gadget/legacy/raw_gadget.c | 2 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 + drivers/usb/serial/ch341.c | 1 + drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 3 + drivers/usb/serial/option.c | 2 + fs/nfs/callback.h | 2 +- fs/nfs/callback_proc.c | 2 +- fs/nfs/callback_xdr.c | 18 ++--- fs/nfs/client.c | 2 +- fs/nfs/dir.c | 20 +++--- fs/nfs/nfs4_fs.h | 3 +- fs/nfs/nfs4client.c | 5 +- fs/nfs/nfs4namespace.c | 19 ++++-- fs/nfs/nfs4proc.c | 18 ++--- fs/nfs/nfs4state.c | 3 + fs/nfs/nfs4xdr.c | 9 ++- fs/nfsd/nfs3proc.c | 5 ++ fs/nfsd/nfs4proc.c | 5 +- fs/nfsd/trace.h | 14 ++-- include/linux/nfs_fs.h | 4 +- include/linux/suspend.h | 15 +--- include/net/dst_metadata.h | 14 +++- .../linux/netfilter/nf_conntrack_common.h | 2 +- kernel/events/core.c | 16 +++-- kernel/power/main.c | 5 +- kernel/power/process.c | 2 +- kernel/power/snapshot.c | 21 ++---- kernel/power/suspend.c | 2 - kernel/trace/trace_events_hist.c | 3 + net/can/isotp.c | 27 ++++++-- net/ipv4/ipmr.c | 2 + net/ipv6/ip6mr.c | 2 + net/netfilter/nf_conntrack_netlink.c | 3 +- net/sched/sch_api.c | 2 +- net/tipc/name_distr.c | 2 +- scripts/Makefile.extrawarn | 1 + security/integrity/ima/ima_fs.c | 2 +- security/integrity/ima/ima_policy.c | 8 +++ security/integrity/ima/ima_template.c | 10 ++- security/integrity/integrity_audit.c | 2 + virt/kvm/eventfd.c | 8 +-- 130 files changed, 756 insertions(+), 351 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts -- 2.20.1

1 114

[PATCH OLK-5.10] config: add SENSORS_ZHAOXIN_CPUTEMP for Zhaoxin CPUs
by LeoLiu-oc 17 May '22

17 May '22

Set CONFIG_SENSORS_ZHAOXIN_CPUTEMP to 'm' by default in openeuler_configs Signed-off-by: LeoLiuoc <LeoLiu-oc(a)zhaoxin.com> --- arch/x86/configs/openeuler_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 61c4be815462..4e3692e24b65 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -4052,6 +4052,7 @@ CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m # CONFIG_SENSORS_TMP513 is not set CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_ZHAOXIN_CPUTEMP=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m -- 2.20.1

1 0

[PATCH openEuler-5.10 0/2] Backport 5.10.100 LTS
by Zheng Zengkai 17 May '22

17 May '22

Backport 5.10.100 LTS patches from upstream moxart: fix potential use-after-free on remove path crypto: api - Move cryptomgr soft dependency into algapi Already merged: tipc: improve size validations for received domain records KVM: s390: Return error on SIDA memop on normal guest Total patches: 2 Greg Kroah-Hartman (1): moxart: fix potential use-after-free on remove path Herbert Xu (1): crypto: api - Move cryptomgr soft dependency into algapi crypto/algapi.c | 1 + crypto/api.c | 1 - drivers/mmc/host/moxart-mmc.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1

1 2

[PATCH openEuler-5.10 00/72] Backport 5.10.99 LTS
by Zheng Zengkai 17 May '22

17 May '22

Backport 5.10.99 LTS patches from upstream selftests: nft_concat_range: add test for reload with no element add/del cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning net: dsa: mt7530: make NET_DSA_MT7530 select MEDIATEK_GE_PHY ext4: fix incorrect type issue during replay_del_range ext4: fix error handling in ext4_fc_record_modified_inode() ext4: fix error handling in ext4_restore_inline_data() ext4: modify the logic of ext4_mb_new_blocks_simple ext4: prevent used blocks from being allocated during fast commit replay EDAC/xgene: Fix deferred probing EDAC/altera: Fix deferred probing x86/perf: Default set FREEZE_ON_SMI for all perf/x86/intel/pt: Fix crash with stop filters in single-range mode perf stat: Fix display of grouped aliased events fbcon: Add option to enable legacy hardware acceleration Revert "fbcon: Disable accelerated scrolling" rtc: cmos: Evaluate century appropriate tools/resolve_btfids: Do not print any commands when building silently selftests: futex: Use variable MAKE instead of make selftests/exec: Remove pipe from TEST_GEN_FILES bpf: Use VM_MAP instead of VM_ALLOC for ringbuf gve: fix the wrong AdminQ buffer queue index check nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe pinctrl: bcm2835: Fix a few error paths pinctrl: intel: fix unexpected interrupt pinctrl: intel: Fix a glitch when updating IRQ flags on a preconfigured line ASoC: max9759: fix underflow in speaker_gain_control_put() ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes ASoC: fsl: Add missing error handling in pcm030_fabric_probe drm/i915/overlay: Prevent divide by zero bugs in scaling net: stmmac: ensure PTP time register reads are consistent net: stmmac: dump gmac4 DMA registers correctly net: macsec: Verify that send_sci is on when setting Tx sci explicitly net: macsec: Fix offload support for NETDEV_UNREGISTER event net: ieee802154: Return meaningful error codes from the netlink helpers net: ieee802154: ca8210: Stop leaking skb's net: ieee802154: mcr20a: Fix lifs/sifs periods net: ieee802154: hwsim: Ensure proper channel selection at probe time spi: uniphier: fix reference count leak in uniphier_spi_probe() spi: meson-spicc: add IRQ check in meson_spicc_probe spi: mediatek: Avoid NULL pointer crash in interrupt spi: bcm-qspi: check for valid cs before applying chip select iommu/amd: Fix loop timeout issue in iommu_ga_log_enable() iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping() RDMA/mlx4: Don't continue event handler after memory allocation failure RDMA/siw: Fix broken RDMA Read Fence/Resume logic. IB/rdmavt: Validate remote_addr during loopback atomic tests RDMA/ucma: Protect mc during concurrent multicast leaves RDMA/cma: Use correct address when leaving multicast group Revert "ASoC: mediatek: Check for error clk pointer" IB/hfi1: Fix AIP early init panic dma-buf: heaps: Fix potential spectre v1 gadget block: bio-integrity: Advance seed correctly for larger interval sizes mm/kmemleak: avoid scanning potential huge holes mm/pgtable: define pte_index so that preprocessor could recognize it mm/debug_vm_pgtable: remove pte entry from the page table nvme-fabrics: fix state check in nvmf_ctlr_matches_baseopts() drm/amd/display: Force link_rate as LINK_RATE_RBR2 for 2018 15" Apple Retina panels drm/nouveau: fix off by one in BIOS boundary checking btrfs: fix deadlock between quota disable and qgroup rescan worker ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset) ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks ALSA: hda/realtek: Add quirk for ASUS GU603 ALSA: hda: realtek: Fix race at concurrent COEF updates ALSA: hda: Fix UAF of leds class devs at unbinding ALSA: usb-audio: Correct quirk for VF0770 ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() selinux: fix double free of cond_list on error paths already merged: audit: improve audit queue handling when "audit=1" on cmdline memcg: charge fs_context and legacy_fs_context Total patches: 74 - 2 = 72 Albert Geantă (1): ALSA: hda/realtek: Add quirk for ASUS GU603 Andy Shevchenko (1): pinctrl: intel: Fix a glitch when updating IRQ flags on a preconfigured line Arınç ÜNAL (1): net: dsa: mt7530: make NET_DSA_MT7530 select MEDIATEK_GE_PHY Aun-Ali Zaidi (1): drm/amd/display: Force link_rate as LINK_RATE_RBR2 for 2018 15" Apple Retina panels Benjamin Gaignard (1): spi: mediatek: Avoid NULL pointer crash in interrupt Bernard Metzler (1): RDMA/siw: Fix broken RDMA Read Fence/Resume logic. Camel Guo (1): net: stmmac: dump gmac4 DMA registers correctly Christian Lachner (3): ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset) ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows Dai Ngo (1): nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. Dan Carpenter (2): drm/i915/overlay: Prevent divide by zero bugs in scaling ASoC: max9759: fix underflow in speaker_gain_control_put() Florian Fainelli (1): pinctrl: bcm2835: Fix a few error paths Florian Westphal (1): selftests: nft_concat_range: add test for reload with no element add/del Guenter Roeck (1): Revert "ASoC: mediatek: Check for error clk pointer" Guoqing Jiang (1): iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping() Haiyue Wang (1): gve: fix the wrong AdminQ buffer queue index check Helge Deller (2): Revert "fbcon: Disable accelerated scrolling" fbcon: Add option to enable legacy hardware acceleration Hou Tao (1): bpf: Use VM_MAP instead of VM_ALLOC for ringbuf Ian Rogers (1): perf stat: Fix display of grouped aliased events Jiasheng Jiang (1): ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name Joerg Roedel (1): iommu/amd: Fix loop timeout issue in iommu_ga_log_enable() John Meneghini (1): scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe Jonas Hahnfeld (1): ALSA: usb-audio: Correct quirk for VF0770 Jordy Zomer (1): dma-buf: heaps: Fix potential spectre v1 gadget Kamal Dasu (1): spi: bcm-qspi: check for valid cs before applying chip select Lang Yu (1): mm/kmemleak: avoid scanning potential huge holes Leon Romanovsky (2): RDMA/ucma: Protect mc during concurrent multicast leaves RDMA/mlx4: Don't continue event handler after memory allocation failure Lior Nahmanson (2): net: macsec: Fix offload support for NETDEV_UNREGISTER event net: macsec: Verify that send_sci is on when setting Tx sci explicitly Maor Gottlieb (1): RDMA/cma: Use correct address when leaving multicast group Mark Brown (3): ASoC: ops: Reject out of bounds values in snd_soc_put_volsw() ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx() ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx() Martin K. Petersen (1): block: bio-integrity: Advance seed correctly for larger interval sizes Miaoqian Lin (2): spi: meson-spicc: add IRQ check in meson_spicc_probe ASoC: fsl: Add missing error handling in pcm030_fabric_probe Mike Marciniszyn (2): IB/hfi1: Fix AIP early init panic IB/rdmavt: Validate remote_addr during loopback atomic tests Mike Rapoport (1): mm/pgtable: define pte_index so that preprocessor could recognize it Miquel Raynal (4): net: ieee802154: hwsim: Ensure proper channel selection at probe time net: ieee802154: mcr20a: Fix lifs/sifs periods net: ieee802154: ca8210: Stop leaking skb's net: ieee802154: Return meaningful error codes from the netlink helpers Muhammad Usama Anjum (2): selftests/exec: Remove pipe from TEST_GEN_FILES selftests: futex: Use variable MAKE instead of make Nathan Chancellor (1): tools/resolve_btfids: Do not print any commands when building silently Nick Lopez (1): drm/nouveau: fix off by one in BIOS boundary checking Pasha Tatashin (1): mm/debug_vm_pgtable: remove pte entry from the page table Peter Zijlstra (1): x86/perf: Default set FREEZE_ON_SMI for all Ritesh Harjani (2): ext4: fix error handling in ext4_restore_inline_data() ext4: fix error handling in ext4_fc_record_modified_inode() Riwen Lu (1): rtc: cmos: Evaluate century appropriate Robert Hancock (1): ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes Sergey Shtylyov (2): EDAC/altera: Fix deferred probing EDAC/xgene: Fix deferred probing Shin'ichiro Kawasaki (1): btrfs: fix deadlock between quota disable and qgroup rescan worker Takashi Iwai (2): ALSA: hda: Fix UAF of leds class devs at unbinding ALSA: hda: realtek: Fix race at concurrent COEF updates Tristan Hume (1): perf/x86/intel/pt: Fix crash with stop filters in single-range mode Uday Shankar (1): nvme-fabrics: fix state check in nvmf_ctlr_matches_baseopts() Vratislav Bendel (1): selinux: fix double free of cond_list on error paths Waiman Long (1): cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning Xin Xiong (1): spi: uniphier: fix reference count leak in uniphier_spi_probe() Xin Yin (3): ext4: prevent used blocks from being allocated during fast commit replay ext4: modify the logic of ext4_mb_new_blocks_simple ext4: fix incorrect type issue during replay_del_range Yannick Vignon (1): net: stmmac: ensure PTP time register reads are consistent Łukasz Bartosik (1): pinctrl: intel: fix unexpected interrupt Documentation/gpu/todo.rst | 18 ---- arch/x86/events/intel/core.c | 13 +++ arch/x86/events/intel/pt.c | 5 +- block/bio-integrity.c | 2 +- drivers/dma-buf/dma-heap.c | 2 + drivers/edac/altera_edac.c | 2 +- drivers/edac/xgene_edac.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 20 +++++ drivers/gpu/drm/i915/display/intel_overlay.c | 3 + .../gpu/drm/nouveau/nvkm/subdev/bios/base.c | 2 +- drivers/infiniband/core/cma.c | 22 ++--- drivers/infiniband/core/ucma.c | 34 ++++--- drivers/infiniband/hw/hfi1/ipoib_main.c | 13 +-- drivers/infiniband/hw/mlx4/main.c | 2 +- drivers/infiniband/sw/rdmavt/qp.c | 2 + drivers/infiniband/sw/siw/siw.h | 7 +- drivers/infiniband/sw/siw/siw_qp_rx.c | 20 +++-- drivers/iommu/amd/init.c | 2 + drivers/iommu/intel/irq_remapping.c | 13 ++- drivers/net/dsa/Kconfig | 1 + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 1 + .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 19 +++- .../ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 19 ++-- drivers/net/ieee802154/ca8210.c | 1 + drivers/net/ieee802154/mac802154_hwsim.c | 1 + drivers/net/ieee802154/mcr20a.c | 4 +- drivers/net/macsec.c | 33 ++++--- drivers/nvme/host/fabrics.h | 1 + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 23 +++-- drivers/pinctrl/intel/pinctrl-intel.c | 64 +++++++------ drivers/rtc/rtc-mc146818-lib.c | 2 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 21 +++-- drivers/soc/mediatek/mtk-scpsys.c | 15 +--- drivers/spi/spi-bcm-qspi.c | 2 +- drivers/spi/spi-meson-spicc.c | 5 ++ drivers/spi/spi-mt65xx.c | 2 +- drivers/spi/spi-uniphier.c | 18 +++- drivers/video/console/Kconfig | 20 +++++ drivers/video/fbdev/core/fbcon.c | 68 +++++++++++--- drivers/video/fbdev/core/fbcon.h | 15 +++- drivers/video/fbdev/core/fbcon_ccw.c | 10 +-- drivers/video/fbdev/core/fbcon_cw.c | 10 +-- drivers/video/fbdev/core/fbcon_rotate.h | 4 +- drivers/video/fbdev/core/fbcon_ud.c | 20 ++--- fs/btrfs/qgroup.c | 21 ++++- fs/ext4/ext4.h | 3 + fs/ext4/extents.c | 4 + fs/ext4/fast_commit.c | 89 ++++++++++--------- fs/ext4/inline.c | 10 ++- fs/ext4/mballoc.c | 26 ++++-- fs/nfsd/nfs4state.c | 4 +- include/linux/pgtable.h | 1 + kernel/bpf/ringbuf.c | 2 +- kernel/cgroup/cpuset.c | 10 +++ mm/debug_vm_pgtable.c | 2 + mm/kmemleak.c | 13 +-- net/ieee802154/nl802154.c | 8 +- security/selinux/ss/conditional.c | 3 +- sound/pci/hda/hda_generic.c | 17 +++- sound/pci/hda/hda_generic.h | 3 + sound/pci/hda/patch_realtek.c | 67 +++++++++++--- sound/soc/codecs/cpcap.c | 2 + sound/soc/codecs/max9759.c | 3 +- sound/soc/fsl/pcm030-audio-fabric.c | 11 ++- sound/soc/soc-ops.c | 29 +++++- sound/soc/xilinx/xlnx_formatter_pcm.c | 27 +++++- sound/usb/quirks-table.h | 2 +- tools/bpf/resolve_btfids/Makefile | 6 +- tools/perf/util/stat-display.c | 19 ++-- tools/testing/selftests/exec/Makefile | 2 +- tools/testing/selftests/futex/Makefile | 4 +- .../selftests/netfilter/nft_concat_range.sh | 72 ++++++++++++++- 73 files changed, 725 insertions(+), 300 deletions(-) -- 2.20.1

1 72

[PATCH openEuler-5.10 0/2] Backport 5.10.98 LTS
by Zheng Zengkai 17 May '22

17 May '22

Backport 5.10.98 LTS patches from upstream Total patches: 2 Greg Kroah-Hartman (2): Revert "drm/vc4: hdmi: Make sure the device is powered with CEC" Revert "drm/vc4: hdmi: Make sure the device is powered with CEC" again drivers/gpu/drm/vc4/vc4_hdmi.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) -- 2.20.1

1 2

[PATCH openEuler-22.03-LTS] psi: fix failure of create cgroup psi trigger
by Zheng Zengkai 17 May '22

17 May '22

From: Chen Wandun <chenwandun(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I571CC CVE: NA -------------------------------- Create cgroup psi would fail after commit: 15b551804d8f ("psi: Fix uaf issue when psi trigger is destroyed while being polled"), this is due to wrong use of priv member in kernfs_open_file. Fixes: 15b551804d8f ("psi: Fix uaf issue when psi trigger is destroyed while being polled") Signed-off-by: Chen Wandun <chenwandun(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/cgroup/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 7d47c3b6956f..57f4e19df8c6 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -3655,7 +3655,7 @@ static ssize_t cgroup_pressure_write(struct kernfs_open_file *of, char *buf, cgroup_kn_unlock(of->kn); /* Allow only one trigger per file descriptor */ - if (of->priv) { + if (ctx->psi.trigger) { cgroup_put(cgrp); return -EBUSY; } -- 2.20.1

1 0

openEuler kernel 双周例会&技术分享
by openEuler conference 16 May '22

16 May '22

您好！ Kernel SIG 邀请您参加 2022-05-20 14:00 召开的Zoom会议(自动录制) 会议主题：openEuler kernel 双周例会&技术分享会议内容： openEuler kernel 技术分享：内核调度器简史会议链接：https://us06web.zoom.us/j/81837728501?pwd=THk0TnBjc0ZFbXJ0ZnlJTzBxVCtWUT09 会议纪要：https://etherpad.openeuler.org/p/Kernel-meetings 温馨提醒：建议接入会议后修改参会人的姓名，也可以使用您在gitee.com的ID 更多资讯尽在：https://openeuler.org/zh/ Hello! openEuler Kernel SIG invites you to attend the Zoom conference(auto recording) will be held at 2022-05-20 14:00, The subject of the conference is openEuler kernel 双周例会&技术分享, Summary: openEuler kernel 技术分享：内核调度器简史 You can join the meeting at https://us06web.zoom.us/j/81837728501?pwd=THk0TnBjc0ZFbXJ0ZnlJTzBxVCtWUT09. Add topics at https://etherpad.openeuler.org/p/Kernel-meetings. Note: You are advised to change the participant name after joining the conference or use your ID at gitee.com. More information: https://openeuler.org/en/

1 0

[PATCH v1 OLK-5.10 61/90] sw64: remove unnecessary include headers
by Gu Zitao 12 May '22

12 May '22

Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- It works well if these include headers are cleaned up. Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/chip/chip3/chip.c | 6 +---- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +---- arch/sw_64/chip/chip3/i2c-lib.c | 4 --- arch/sw_64/chip/chip3/irq_chip.c | 13 +--------- arch/sw_64/chip/chip3/msi.c | 7 +---- arch/sw_64/chip/chip3/pci-quirks.c | 3 +-- arch/sw_64/chip/chip3/vt_msi.c | 6 ----- arch/sw_64/kernel/acpi.c | 19 +------------- arch/sw_64/kernel/asm-offsets.c | 7 +++-- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +-- arch/sw_64/kernel/core.c | 18 ------------- arch/sw_64/kernel/crash_dump.c | 2 -- arch/sw_64/kernel/dup_print.c | 5 +--- arch/sw_64/kernel/early_printk.c | 4 +-- arch/sw_64/kernel/ftrace.c | 5 ---- arch/sw_64/kernel/insn.c | 13 ---------- arch/sw_64/kernel/irq.c | 15 ----------- arch/sw_64/kernel/irq_sw64.c | 9 +------ arch/sw_64/kernel/jump_label.c | 3 +-- arch/sw_64/kernel/kgdb.c | 3 --- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +---- arch/sw_64/kernel/kprobes/kprobes.c | 4 --- arch/sw_64/kernel/kvm_cma.c | 4 --- arch/sw_64/kernel/machine_kexec.c | 7 +---- arch/sw_64/kernel/module.c | 5 ---- arch/sw_64/kernel/msi.c | 7 ----- arch/sw_64/kernel/pci-noop.c | 8 ------ arch/sw_64/kernel/pci-sysfs.c | 3 --- arch/sw_64/kernel/pci.c | 13 +--------- arch/sw_64/kernel/pci_common.c | 11 -------- arch/sw_64/kernel/perf_event.c | 12 --------- arch/sw_64/kernel/perf_regs.c | 4 --- arch/sw_64/kernel/process.c | 26 ------------------- arch/sw_64/kernel/ptrace.c | 15 +---------- arch/sw_64/kernel/relocate.c | 13 ++-------- arch/sw_64/kernel/segvdbg.c | 4 +-- arch/sw_64/kernel/setup.c | 34 +------------------------ arch/sw_64/kernel/signal.c | 14 ---------- arch/sw_64/kernel/smp.c | 25 +----------------- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 12 +-------- arch/sw_64/kernel/tc.c | 3 --- arch/sw_64/kernel/time.c | 27 ++------------------ arch/sw_64/kernel/timer.c | 13 +--------- arch/sw_64/kernel/topology.c | 13 ---------- arch/sw_64/kernel/traps.c | 13 ---------- arch/sw_64/kernel/unaligned.c | 3 --- arch/sw_64/kernel/uprobes.c | 5 ---- arch/sw_64/kernel/vdso.c | 9 ------- arch/sw_64/kernel/vdso/vdso.S | 2 -- arch/sw_64/kernel/vdso/vgettimeofday.c | 3 +-- arch/sw_64/kvm/kvm-sw64.c | 13 ---------- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +-- arch/sw_64/lib/udelay.c | 5 ---- arch/sw_64/math-emu/math.c | 10 +++----- arch/sw_64/mm/fault.c | 21 ++------------- arch/sw_64/mm/hugetlbpage.c | 7 +---- arch/sw_64/mm/init.c | 23 ----------------- arch/sw_64/mm/numa.c | 16 ------------ arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 ------- 63 files changed, 36 insertions(+), 547 deletions(-) diff --git a/arch/sw_64/chip/chip3/chip.c b/arch/sw_64/chip/chip3/chip.c index 6c84f4d62e4e..bd20e262e609 100644 --- a/arch/sw_64/chip/chip3/chip.c +++ b/arch/sw_64/chip/chip3/chip.c @@ -1,16 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/pci.h> -#include <linux/seq_file.h> #include <linux/clocksource.h> -#include <linux/msi.h> -#include <linux/delay.h> + #include <asm/sw64_init.h> #include <asm/sw64io.h> #include <asm/pci.h> -#include <asm/core.h> #include <asm/irq_impl.h> #include <asm/wrperfmon.h> -#include <asm/hw_init.h> #include "../../../../drivers/pci/pci.h" static u64 read_longtime(struct clocksource *cs) diff --git a/arch/sw_64/chip/chip3/cpufreq_debugfs.c b/arch/sw_64/chip/chip3/cpufreq_debugfs.c index 3b152f84454f..13696360ef02 100644 --- a/arch/sw_64/chip/chip3/cpufreq_debugfs.c +++ b/arch/sw_64/chip/chip3/cpufreq_debugfs.c @@ -1,15 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/debugfs.h> -#include <linux/list.h> -#include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/mm_types.h> #include <linux/delay.h> #include <linux/uaccess.h> -#include <linux/mm.h> + #include <asm/sw64io.h> -#include <asm/hw_init.h> #include <asm/debug.h> #define CLK_PRT 0x1UL diff --git a/arch/sw_64/chip/chip3/i2c-lib.c b/arch/sw_64/chip/chip3/i2c-lib.c index 581f2b3d81a1..ddf0a187ab5a 100644 --- a/arch/sw_64/chip/chip3/i2c-lib.c +++ b/arch/sw_64/chip/chip3/i2c-lib.c @@ -14,14 +14,10 @@ * of the interrupt mode. */ -#include <linux/module.h> -#include <linux/kernel.h> #include <linux/types.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/fb.h> -#include <linux/init.h> -#include <linux/device.h> #define CPLD_BUSNR 2 diff --git a/arch/sw_64/chip/chip3/irq_chip.c b/arch/sw_64/chip/chip3/irq_chip.c index ee43e87c554b..24dfa1e1a898 100644 --- a/arch/sw_64/chip/chip3/irq_chip.c +++ b/arch/sw_64/chip/chip3/irq_chip.c @@ -1,18 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/platform_device.h> -#include <linux/string.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/i2c.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <linux/of.h> #include <linux/irqdomain.h> #include <linux/irqchip.h> -#include <asm/irq.h> -#include <asm/sw64io.h> + #include <asm/irq_impl.h> static void fake_irq_mask(struct irq_data *data) diff --git a/arch/sw_64/chip/chip3/msi.c b/arch/sw_64/chip/chip3/msi.c index 0c6d415e082e..43688c96ccab 100644 --- a/arch/sw_64/chip/chip3/msi.c +++ b/arch/sw_64/chip/chip3/msi.c @@ -1,15 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/pci.h> -#include <linux/irq.h> -#include <linux/kernel.h> -#include <linux/cpumask.h> #include <linux/module.h> #include <linux/msi.h> #include <linux/irqdomain.h> + #include <asm/irq_impl.h> -#include <asm/msi.h> -#include <asm/pci.h> -#include <asm/sw64io.h> static struct irq_domain *msi_default_domain; static DEFINE_RAW_SPINLOCK(vector_lock); diff --git a/arch/sw_64/chip/chip3/pci-quirks.c b/arch/sw_64/chip/chip3/pci-quirks.c index e70c211df68f..9043e56f9092 100644 --- a/arch/sw_64/chip/chip3/pci-quirks.c +++ b/arch/sw_64/chip/chip3/pci-quirks.c @@ -1,9 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/pci.h> #include <linux/delay.h> -#include <asm/pci.h> + #include <asm/sw64io.h> -#include <asm/hw_init.h> static int handshake(void __iomem *ptr, u32 mask, u32 done, int wait_usec, int delay_usec) diff --git a/arch/sw_64/chip/chip3/vt_msi.c b/arch/sw_64/chip/chip3/vt_msi.c index 31f49d3c3511..428757642342 100644 --- a/arch/sw_64/chip/chip3/vt_msi.c +++ b/arch/sw_64/chip/chip3/vt_msi.c @@ -1,14 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/pci.h> #include <linux/irq.h> -#include <linux/kernel.h> -#include <linux/cpumask.h> #include <linux/module.h> #include <linux/msi.h> -#include <asm/irq_impl.h> -#include <asm/msi.h> -#include <asm/pci.h> -#include <asm/sw64io.h> #define QEMU_MSIX_MSG_ADDR (0x8000fee00000UL) diff --git a/arch/sw_64/kernel/acpi.c b/arch/sw_64/kernel/acpi.c index 1c1afe8e812e..a0b5c4a57a07 100644 --- a/arch/sw_64/kernel/acpi.c +++ b/arch/sw_64/kernel/acpi.c @@ -2,25 +2,8 @@ #include <linux/init.h> #include <linux/acpi.h> -#include <linux/acpi_pmtmr.h> -#include <linux/efi.h> -#include <linux/stddef.h> -#include <linux/cpumask.h> -#include <linux/module.h> -#include <linux/dmi.h> -#include <linux/irq.h> #include <linux/irqdomain.h> -#include <linux/slab.h> -#include <linux/ioport.h> -#include <linux/pci.h> -#include <linux/memblock.h> -#include <acpi/actbl.h> -#include <acpi/actbl2.h> - -#include <asm/pgtable.h> -#include <asm/io.h> -#include <asm/smp.h> -#include <asm/numa.h> + #include <asm/early_ioremap.h> int acpi_disabled = 1; diff --git a/arch/sw_64/kernel/asm-offsets.c b/arch/sw_64/kernel/asm-offsets.c index 44e7fa77265e..bea12d2d96fe 100644 --- a/arch/sw_64/kernel/asm-offsets.c +++ b/arch/sw_64/kernel/asm-offsets.c @@ -5,17 +5,16 @@ * and format the required data. */ -#include <linux/types.h> #include <linux/stddef.h> #include <linux/sched.h> -#include <linux/ptrace.h> #include <linux/kbuild.h> #include <linux/suspend.h> -#include <asm/io.h> + #include <asm/suspend.h> +#include <asm/kvm.h> + #include "traps.c" -#include <asm/kvm.h> void foo(void) { DEFINE(TI_TASK, offsetof(struct thread_info, task)); diff --git a/arch/sw_64/kernel/audit.c b/arch/sw_64/kernel/audit.c index adc4622211d2..dcf58deee3e2 100644 --- a/arch/sw_64/kernel/audit.c +++ b/arch/sw_64/kernel/audit.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> -#include <linux/types.h> #include <linux/audit.h> + #include <asm/unistd.h> static unsigned int dir_class[] = { diff --git a/arch/sw_64/kernel/cacheinfo.c b/arch/sw_64/kernel/cacheinfo.c index 5193d7544b59..87d3f4bcd10f 100644 --- a/arch/sw_64/kernel/cacheinfo.c +++ b/arch/sw_64/kernel/cacheinfo.c @@ -14,9 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/arch_topology.h> #include <linux/cacheinfo.h> -#include <asm/hw_init.h> + #include <asm/topology.h> /* Populates leaf and increments to next leaf */ diff --git a/arch/sw_64/kernel/core.c b/arch/sw_64/kernel/core.c index 4d440de68aae..e26b3a5faab2 100644 --- a/arch/sw_64/kernel/core.c +++ b/arch/sw_64/kernel/core.c @@ -1,24 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/types.h> -#include <linux/pci.h> -#include <linux/sched.h> -#include <linux/init.h> -#include <linux/irq.h> #include <linux/memblock.h> -#include <linux/pfn.h> -#include <linux/export.h> -#include <asm/core.h> -#include <asm/tlbflush.h> -#include <asm/smp.h> -#include <asm/compiler.h> -#include <asm/mmu_context.h> -#include <asm/bitops.h> -#include <asm/sw64_init.h> -#include <asm/hw_init.h> -#ifdef CONFIG_NUMA -#include <asm/memory.h> -#endif -#include "pci_impl.h" #ifdef CONFIG_DISCONTIGMEM #ifdef CONFIG_NUMA diff --git a/arch/sw_64/kernel/crash_dump.c b/arch/sw_64/kernel/crash_dump.c index f3836afe3e25..4484673823b8 100644 --- a/arch/sw_64/kernel/crash_dump.c +++ b/arch/sw_64/kernel/crash_dump.c @@ -14,8 +14,6 @@ * published by the Free Software Foundation. */ -#include <linux/errno.h> -#include <linux/crash_dump.h> #include <linux/uaccess.h> #include <linux/io.h> diff --git a/arch/sw_64/kernel/dup_print.c b/arch/sw_64/kernel/dup_print.c index e1c05cfa864b..1aa7710b5092 100644 --- a/arch/sw_64/kernel/dup_print.c +++ b/arch/sw_64/kernel/dup_print.c @@ -1,11 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/kernel.h> #include <linux/mm.h> -#include <linux/init.h> #include <linux/smp.h> -#include <linux/delay.h> #include <linux/spinlock.h> -#include <linux/uaccess.h> + #include <asm/chip3_io.h> #ifdef CONFIG_SW64_RRK diff --git a/arch/sw_64/kernel/early_printk.c b/arch/sw_64/kernel/early_printk.c index f4d5f2d5c876..62902175217a 100644 --- a/arch/sw_64/kernel/early_printk.c +++ b/arch/sw_64/kernel/early_printk.c @@ -1,9 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/console.h> #include <linux/kernel.h> -#include <linux/init.h> -#include <linux/string.h> -#include <linux/errno.h> + #include <asm/io.h> static unsigned long early_serial_base; /* ttyS0 */ diff --git a/arch/sw_64/kernel/ftrace.c b/arch/sw_64/kernel/ftrace.c index 413562b5d9be..42efca28d386 100644 --- a/arch/sw_64/kernel/ftrace.c +++ b/arch/sw_64/kernel/ftrace.c @@ -10,13 +10,8 @@ */ #include <linux/ftrace.h> -#include <linux/module.h> -#include <linux/swab.h> -#include <linux/uaccess.h> -#include <asm/cacheflush.h> #include <asm/ftrace.h> -#include <asm/insn.h> #ifdef CONFIG_FUNCTION_TRACER EXPORT_SYMBOL(_mcount); diff --git a/arch/sw_64/kernel/insn.c b/arch/sw_64/kernel/insn.c index 71d3832d1fe3..e8dd41b6b7c4 100644 --- a/arch/sw_64/kernel/insn.c +++ b/arch/sw_64/kernel/insn.c @@ -14,22 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/bitops.h> -#include <linux/bug.h> -#include <linux/compiler.h> -#include <linux/kernel.h> -#include <linux/mm.h> -#include <linux/smp.h> #include <linux/spinlock.h> -#include <linux/stop_machine.h> -#include <linux/types.h> -#include <linux/uaccess.h> #include <linux/kprobes.h> -#include <asm/cacheflush.h> -#include <asm/insn.h> - - //static DEFINE_RAW_SPINLOCK(patch_lock); int __kprobes sw64_insn_read(void *addr, u32 *insnp) diff --git a/arch/sw_64/kernel/irq.c b/arch/sw_64/kernel/irq.c index 6cd26af15b23..126fe2f70495 100644 --- a/arch/sw_64/kernel/irq.c +++ b/arch/sw_64/kernel/irq.c @@ -12,24 +12,9 @@ */ #include <linux/kernel.h> -#include <linux/module.h> -#include <linux/errno.h> -#include <linux/kernel_stat.h> -#include <linux/signal.h> -#include <linux/sched.h> -#include <linux/ptrace.h> #include <linux/interrupt.h> -#include <linux/random.h> #include <linux/irq.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/profile.h> -#include <linux/bitops.h> -#include <linux/uaccess.h> - -#include <asm/hw_init.h> -#include <asm/hardirq.h> -#include <asm/io.h> volatile unsigned long irq_err_count; DEFINE_PER_CPU(unsigned long, irq_pmi_count); diff --git a/arch/sw_64/kernel/irq_sw64.c b/arch/sw_64/kernel/irq_sw64.c index 376e8397ba35..8ab845d153eb 100644 --- a/arch/sw_64/kernel/irq_sw64.c +++ b/arch/sw_64/kernel/irq_sw64.c @@ -3,18 +3,11 @@ * SW64 specific irq code. */ -#include <linux/sched.h> #include <linux/irq.h> -#include <linux/kernel_stat.h> -#include <linux/module.h> #include <linux/irqchip.h> -#include <linux/irqdesc.h> -#include <linux/irqdomain.h> + #include <asm/dma.h> #include <asm/irq_impl.h> -#include <asm/core.h> -#include <asm/perf_event.h> -#include <asm/hmcall.h> asmlinkage void do_entInt(unsigned long type, unsigned long vector, diff --git a/arch/sw_64/kernel/jump_label.c b/arch/sw_64/kernel/jump_label.c index a67d16eb3076..f3bc40370e4d 100644 --- a/arch/sw_64/kernel/jump_label.c +++ b/arch/sw_64/kernel/jump_label.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/kernel.h> #include <linux/jump_label.h> -#include <asm/insn.h> + #include <asm/bug.h> #include <asm/cacheflush.h> diff --git a/arch/sw_64/kernel/kgdb.c b/arch/sw_64/kernel/kgdb.c index c1100ef8fcdd..09e9ca7a0303 100644 --- a/arch/sw_64/kernel/kgdb.c +++ b/arch/sw_64/kernel/kgdb.c @@ -20,11 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/irq.h> #include <linux/kdebug.h> #include <linux/kgdb.h> -#include <linux/uaccess.h> -#include <asm/cacheflush.h> struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { { "r0", 8, offsetof(struct pt_regs, r0)}, diff --git a/arch/sw_64/kernel/kprobes/decode-insn.c b/arch/sw_64/kernel/kprobes/decode-insn.c index e3ab856d6084..d376a7e2bee4 100644 --- a/arch/sw_64/kernel/kprobes/decode-insn.c +++ b/arch/sw_64/kernel/kprobes/decode-insn.c @@ -12,12 +12,8 @@ * General Public License for more details. */ -#include <linux/kernel.h> #include <linux/kprobes.h> -#include <linux/module.h> -#include <linux/kallsyms.h> -#include <asm/insn.h> -#include <asm/sections.h> + #include "common.h" static bool __kprobes sw64_insn_is_steppable(u32 insn) diff --git a/arch/sw_64/kernel/kprobes/kprobes.c b/arch/sw_64/kernel/kprobes/kprobes.c index 85400f96f991..59f040eaa3e1 100644 --- a/arch/sw_64/kernel/kprobes/kprobes.c +++ b/arch/sw_64/kernel/kprobes/kprobes.c @@ -5,13 +5,9 @@ */ #include <linux/kprobes.h> -#include <linux/preempt.h> -#include <linux/uaccess.h> #include <linux/kdebug.h> #include <linux/slab.h> -#include <asm/ptrace.h> -#include <asm/insn.h> #include "common.h" static u32 breakpoint_insn = BREAK_KPROBE; diff --git a/arch/sw_64/kernel/kvm_cma.c b/arch/sw_64/kernel/kvm_cma.c index dc61e2e369e8..054dec95b996 100644 --- a/arch/sw_64/kernel/kvm_cma.c +++ b/arch/sw_64/kernel/kvm_cma.c @@ -10,12 +10,8 @@ #include <linux/memblock.h> #include <linux/err.h> -#include <linux/mm.h> #include <linux/sizes.h> #include <linux/slab.h> -#include <linux/log2.h> -#include <linux/highmem.h> -#include <linux/io.h> #include <linux/cma.h> #include <linux/page-isolation.h> diff --git a/arch/sw_64/kernel/machine_kexec.c b/arch/sw_64/kernel/machine_kexec.c index c778bc1374af..c9ca7a728bd4 100644 --- a/arch/sw_64/kernel/machine_kexec.c +++ b/arch/sw_64/kernel/machine_kexec.c @@ -5,18 +5,13 @@ * This source code is licensed under the GNU General Public License, * Version 2. See the file COPYING for more details. */ -#include <linux/compiler.h> #include <linux/kexec.h> #include <linux/mm.h> -#include <linux/device.h> #include <linux/delay.h> #include <linux/irq.h> #include <linux/reboot.h> + #include <asm/cacheflush.h> -#include <asm/page.h> -#include <asm/io.h> -#include <linux/cpu.h> -#include <linux/smp.h> extern void *kexec_control_page; extern const unsigned char relocate_new_kernel[]; diff --git a/arch/sw_64/kernel/module.c b/arch/sw_64/kernel/module.c index d2041afba7bb..2904bb750eb5 100644 --- a/arch/sw_64/kernel/module.c +++ b/arch/sw_64/kernel/module.c @@ -1,10 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/moduleloader.h> -#include <linux/elf.h> -#include <linux/vmalloc.h> -#include <linux/fs.h> -#include <linux/string.h> -#include <linux/kernel.h> #include <linux/slab.h> #define DEBUGP(fmt...) diff --git a/arch/sw_64/kernel/msi.c b/arch/sw_64/kernel/msi.c index d942a688a324..ee1bda3c6447 100644 --- a/arch/sw_64/kernel/msi.c +++ b/arch/sw_64/kernel/msi.c @@ -1,14 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> #include <linux/irq.h> -#include <linux/kernel.h> #include <linux/msi.h> -#include <linux/pci.h> -#include <linux/cpumask.h> -#include <asm/sw64io.h> -#include <asm/msi.h> -#include <asm/pci.h> - int msi_compose_msg(unsigned int irq, struct msi_msg *msg) { diff --git a/arch/sw_64/kernel/pci-noop.c b/arch/sw_64/kernel/pci-noop.c index 4ef694e629e8..a0aa2e5bb675 100644 --- a/arch/sw_64/kernel/pci-noop.c +++ b/arch/sw_64/kernel/pci-noop.c @@ -6,16 +6,8 @@ */ #include <linux/pci.h> -#include <linux/init.h> #include <linux/memblock.h> -#include <linux/gfp.h> -#include <linux/capability.h> -#include <linux/mm.h> -#include <linux/errno.h> -#include <linux/sched.h> #include <linux/dma-mapping.h> -#include <linux/scatterlist.h> -#include <linux/module.h> /* * The PCI controller list. diff --git a/arch/sw_64/kernel/pci-sysfs.c b/arch/sw_64/kernel/pci-sysfs.c index 584243922df9..504fd4a00754 100644 --- a/arch/sw_64/kernel/pci-sysfs.c +++ b/arch/sw_64/kernel/pci-sysfs.c @@ -10,9 +10,6 @@ * drivers/pci/pci-sysfs.c */ -#include <linux/sched.h> -#include <linux/stat.h> -#include <linux/slab.h> #include <linux/pci.h> static int hose_mmap_page_range(struct pci_controller *hose, diff --git a/arch/sw_64/kernel/pci.c b/arch/sw_64/kernel/pci.c index d42f0d0aec92..fb7b071c10f6 100644 --- a/arch/sw_64/kernel/pci.c +++ b/arch/sw_64/kernel/pci.c @@ -1,22 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/string.h> #include <linux/pci.h> #include <linux/acpi.h> #include <linux/init.h> -#include <linux/ioport.h> -#include <linux/kernel.h> #include <linux/memblock.h> -#include <linux/module.h> -#include <linux/cache.h> -#include <linux/slab.h> -#include <linux/msi.h> -#include <linux/irq.h> -#include <asm/msi.h> -#include <linux/delay.h> #include <linux/syscore_ops.h> -#include <linux/platform_device.h> + #include <asm/sw64_init.h> -#include <asm/pci.h> #include "pci_impl.h" diff --git a/arch/sw_64/kernel/pci_common.c b/arch/sw_64/kernel/pci_common.c index f6316ca507a2..f996baca9d93 100644 --- a/arch/sw_64/kernel/pci_common.c +++ b/arch/sw_64/kernel/pci_common.c @@ -3,22 +3,11 @@ * linux/arch/sw_64/kernel/pci_iommu.c */ -#include <linux/kernel.h> -#include <linux/mm.h> #include <linux/pci.h> -#include <linux/gfp.h> -#include <linux/memblock.h> #include <linux/export.h> -#include <linux/scatterlist.h> -#include <linux/log2.h> #include <linux/dma-mapping.h> -#include <linux/iommu-helper.h> -#include <linux/slab.h> #include <linux/dma-direct.h> #include <linux/swiotlb.h> -#include <linux/cache.h> -#include <linux/module.h> -#include <asm/dma.h> static dma_addr_t sw64_direct_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, diff --git a/arch/sw_64/kernel/perf_event.c b/arch/sw_64/kernel/perf_event.c index dac979d4b09a..d2975e17f666 100644 --- a/arch/sw_64/kernel/perf_event.c +++ b/arch/sw_64/kernel/perf_event.c @@ -6,18 +6,6 @@ */ #include <linux/perf_event.h> -#include <linux/kprobes.h> -#include <linux/kernel.h> -#include <linux/kdebug.h> -#include <linux/mutex.h> -#include <linux/init.h> -#include <linux/uaccess.h> - -#include <linux/atomic.h> -#include <asm/irq.h> -#include <asm/irq_regs.h> -#include <asm/hmcall.h> -#include <asm/hw_irq.h> /* For tracking PMCs and the hw events they monitor on each CPU. */ struct cpu_hw_events { diff --git a/arch/sw_64/kernel/perf_regs.c b/arch/sw_64/kernel/perf_regs.c index 8eec2179eb86..4c12a2cdf912 100644 --- a/arch/sw_64/kernel/perf_regs.c +++ b/arch/sw_64/kernel/perf_regs.c @@ -1,11 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/errno.h> -#include <linux/kernel.h> #include <linux/perf_event.h> -#include <linux/bug.h> -#include <linux/perf_regs.h> -#include <asm/ptrace.h> u64 perf_reg_value(struct pt_regs *regs, int idx) { diff --git a/arch/sw_64/kernel/process.c b/arch/sw_64/kernel/process.c index 8fd493776bec..4192d50f5b0e 100644 --- a/arch/sw_64/kernel/process.c +++ b/arch/sw_64/kernel/process.c @@ -3,42 +3,16 @@ * This file handles the architecture-dependent parts of process handling. */ -#include <linux/errno.h> -#include <linux/module.h> -#include <linux/sched.h> #include <linux/sched/debug.h> -#include <linux/sched/task.h> -#include <linux/sched/task_stack.h> -#include <linux/kernel.h> -#include <linux/mm.h> -#include <linux/smp.h> -#include <linux/stddef.h> -#include <linux/unistd.h> #include <linux/ptrace.h> -#include <linux/user.h> -#include <linux/time.h> -#include <linux/major.h> -#include <linux/stat.h> -#include <linux/vt.h> -#include <linux/mman.h> #include <linux/elfcore.h> #include <linux/reboot.h> -#include <linux/tty.h> -#include <linux/console.h> #include <linux/slab.h> -#include <linux/rcupdate.h> -#include <linux/tick.h> #include <linux/random.h> -#include <linux/uaccess.h> -#include <asm/reg.h> -#include <asm/io.h> -#include <asm/pgtable.h> #include <asm/fpu.h> -#include <asm/hcall.h> #include "proto.h" -#include "pci_impl.h" /* * Power off function, if any diff --git a/arch/sw_64/kernel/ptrace.c b/arch/sw_64/kernel/ptrace.c index ede3c1053d81..649572bbe613 100644 --- a/arch/sw_64/kernel/ptrace.c +++ b/arch/sw_64/kernel/ptrace.c @@ -5,24 +5,11 @@ /* mangled further by Bob Manson (manson(a)santafe.edu) */ /* more mutilation by David Mosberger (davidm(a)azstarnet.com) */ -#include <linux/kernel.h> -#include <linux/sched.h> -#include <linux/mm.h> -#include <linux/smp.h> -#include <linux/errno.h> -#include <linux/ptrace.h> -#include <linux/user.h> -#include <linux/security.h> -#include <linux/signal.h> #include <linux/tracehook.h> -#include <linux/seccomp.h> #include <linux/audit.h> -#include <linux/uaccess.h> -#include <asm/pgtable.h> -#include <asm/fpu.h> -#include <asm/core.h> #include <asm/reg.h> + #include "proto.h" #define CREATE_TRACE_POINTS diff --git a/arch/sw_64/kernel/relocate.c b/arch/sw_64/kernel/relocate.c index 36b16d84d5ab..fe403f9c70c7 100644 --- a/arch/sw_64/kernel/relocate.c +++ b/arch/sw_64/kernel/relocate.c @@ -9,21 +9,12 @@ * Copyright (C) 2019 He Sheng * Authors: He Sheng (hesheng05(a)gmail.com) */ -#include <asm/hmcall.h> -#include <asm/setup.h> -#include <asm/sections.h> -#include <linux/mm_types.h> #include <linux/elf.h> -#include <linux/kernel.h> -#include <linux/libfdt.h> -#include <linux/of_fdt.h> -#include <linux/sched.h> -#include <linux/start_kernel.h> -#include <linux/string.h> -#include <linux/printk.h> #include <linux/notifier.h> #include <linux/mm.h> +#include <asm/sections.h> + #define INITRD_ADDR 0x3000000UL #define KTEXT_MAX 0xffffffffa0000000UL #define RELOCATED(x) ((void *)((unsigned long)x + offset)) diff --git a/arch/sw_64/kernel/segvdbg.c b/arch/sw_64/kernel/segvdbg.c index aee4b3863072..5b8a638bf8b9 100644 --- a/arch/sw_64/kernel/segvdbg.c +++ b/arch/sw_64/kernel/segvdbg.c @@ -9,9 +9,7 @@ */ #include <linux/kernel.h> -#include <linux/debugfs.h> -#include <linux/seq_file.h> -#include <linux/uaccess.h> + #include <asm/debug.h> extern bool segv_debug_enabled; diff --git a/arch/sw_64/kernel/setup.c b/arch/sw_64/kernel/setup.c index 61b498e65e4b..2de954a3c086 100644 --- a/arch/sw_64/kernel/setup.c +++ b/arch/sw_64/kernel/setup.c @@ -9,31 +9,13 @@ * Bootup setup stuff. */ -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/mm.h> -#include <linux/stddef.h> -#include <linux/unistd.h> -#include <linux/ptrace.h> -#include <linux/slab.h> -#include <linux/user.h> #include <linux/screen_info.h> #include <linux/delay.h> #include <linux/kexec.h> #include <linux/console.h> -#include <linux/cpu.h> -#include <linux/errno.h> -#include <linux/init.h> -#include <linux/string.h> -#include <linux/ioport.h> -#include <linux/platform_device.h> #include <linux/memblock.h> -#include <linux/pci.h> -#include <linux/seq_file.h> #include <linux/root_dev.h> #include <linux/initrd.h> -#include <linux/eisa.h> -#include <linux/pfn.h> #ifdef CONFIG_MAGIC_SYSRQ #include <linux/sysrq.h> #include <linux/reboot.h> @@ -41,26 +23,12 @@ #ifdef CONFIG_DEBUG_FS #include <linux/debugfs.h> #endif -#include <linux/notifier.h> -#include <linux/log2.h> -#include <linux/export.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> -#include <linux/uaccess.h> -#include <linux/cma.h> #include <linux/genalloc.h> #include <linux/acpi.h> -#include <asm/setup.h> -#include <asm/smp.h> + #include <asm/sw64_init.h> -#include <asm/pgtable.h> -#include <asm/dma.h> -#include <asm/mmu_context.h> -#include <asm/console.h> -#include <asm/core.h> -#include <asm/hw_init.h> -#include <asm/mmzone.h> -#include <asm/memory.h> #include <asm/efi.h> #include <asm/kvm_cma.h> diff --git a/arch/sw_64/kernel/signal.c b/arch/sw_64/kernel/signal.c index 74e98063c874..f7b8d391251a 100644 --- a/arch/sw_64/kernel/signal.c +++ b/arch/sw_64/kernel/signal.c @@ -7,24 +7,10 @@ * 1997-11-02 Modified for POSIX.1b signals by Richard Henderson */ -#include <linux/sched.h> -#include <linux/kernel.h> #include <linux/signal.h> #include <linux/errno.h> -#include <linux/wait.h> -#include <linux/ptrace.h> -#include <linux/unistd.h> -#include <linux/mm.h> -#include <linux/smp.h> -#include <linux/stddef.h> -#include <linux/tty.h> -#include <linux/binfmts.h> -#include <linux/bitops.h> -#include <linux/syscalls.h> #include <linux/tracehook.h> -#include <linux/uaccess.h> -#include <asm/sigcontext.h> #include <asm/ucontext.h> #include <asm/vdso.h> diff --git a/arch/sw_64/kernel/smp.c b/arch/sw_64/kernel/smp.c index 7d9c5c90f1ac..fb915d166069 100644 --- a/arch/sw_64/kernel/smp.c +++ b/arch/sw_64/kernel/smp.c @@ -4,41 +4,18 @@ */ #include <linux/errno.h> -#include <linux/kernel.h> -#include <linux/kernel_stat.h> -#include <linux/module.h> #include <linux/sched/mm.h> #include <linux/sched/hotplug.h> -#include <linux/mm.h> -#include <linux/err.h> -#include <linux/threads.h> #include <linux/smp.h> -#include <linux/interrupt.h> -#include <linux/init.h> #include <linux/delay.h> -#include <linux/spinlock.h> #include <linux/irq.h> -#include <linux/cache.h> -#include <linux/profile.h> -#include <linux/bitops.h> #include <linux/cpu.h> -#include <asm/ptrace.h> -#include <linux/atomic.h> - -#include <asm/core.h> -#include <asm/io.h> -#include <asm/irq.h> -#include <asm/pgtable.h> -#include <asm/pgalloc.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> -#include <asm/suspend.h> -#include <asm/hcall.h> -#include <asm/sw64io.h> #include <asm/sw64_init.h> #include <asm/topology.h> -#include <asm/tc.h> + #include "proto.h" struct smp_rcb_struct *smp_rcb; diff --git a/arch/sw_64/kernel/stacktrace.c b/arch/sw_64/kernel/stacktrace.c index bb501c14565b..41cdff5b4941 100644 --- a/arch/sw_64/kernel/stacktrace.c +++ b/arch/sw_64/kernel/stacktrace.c @@ -6,7 +6,6 @@ */ #include <linux/sched.h> #include <linux/stacktrace.h> -#include <linux/export.h> #include <linux/sched/task_stack.h> #include <linux/sched/debug.h> diff --git a/arch/sw_64/kernel/suspend.c b/arch/sw_64/kernel/suspend.c index b2b07ac3042b..c5de4df9d084 100644 --- a/arch/sw_64/kernel/suspend.c +++ b/arch/sw_64/kernel/suspend.c @@ -1,17 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/suspend.h> -#include <linux/interrupt.h> -#include <linux/pm.h> -#include <linux/irq.h> -#include <linux/types.h> -#include <linux/pci.h> -#include <asm/ptrace.h> + #include <asm/suspend.h> -#include <asm/smp.h> -#include <asm/io.h> -#include <asm/hmcall.h> -#include <asm/delay.h> -#include <asm/sw64io.h> #include <asm/sw64_init.h> struct processor_state suspend_state; diff --git a/arch/sw_64/kernel/tc.c b/arch/sw_64/kernel/tc.c index c047d457e55a..f2de5ac3d9dc 100644 --- a/arch/sw_64/kernel/tc.c +++ b/arch/sw_64/kernel/tc.c @@ -5,9 +5,6 @@ #include <linux/topology.h> -#include <linux/spinlock.h> -#include <linux/kernel.h> -#include <linux/smp.h> #include <asm/tc.h> /* diff --git a/arch/sw_64/kernel/time.c b/arch/sw_64/kernel/time.c index 185db832dfb8..15035a01e48a 100644 --- a/arch/sw_64/kernel/time.c +++ b/arch/sw_64/kernel/time.c @@ -1,34 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/errno.h> #include <linux/module.h> -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/param.h> -#include <linux/string.h> -#include <linux/mm.h> #include <linux/delay.h> -#include <linux/ioport.h> -#include <linux/irq.h> -#include <linux/interrupt.h> -#include <linux/init.h> -#include <linux/bcd.h> -#include <linux/profile.h> -#include <linux/irq_work.h> -#include <linux/uaccess.h> - -#include <asm/io.h> -#include <asm/sw64io.h> -#include <asm/sw64_init.h> -#include <asm/hw_init.h> -#include <asm/irq_impl.h> -#include <asm/debug.h> - #include <linux/time.h> -#include <linux/timex.h> -#include <linux/clocksource.h> #include <linux/clk-provider.h> -#include <linux/sched/clock.h> -#include <linux/sched_clock.h> + +#include <asm/debug.h> #include "proto.h" diff --git a/arch/sw_64/kernel/timer.c b/arch/sw_64/kernel/timer.c index c29e7d1b664b..60c75096d8c4 100644 --- a/arch/sw_64/kernel/timer.c +++ b/arch/sw_64/kernel/timer.c @@ -4,20 +4,9 @@ * Description: percpu local timer, based on arch/x86/kernel/apic/apic.c */ -#include <linux/init.h> -#include <linux/mm.h> -#include <linux/delay.h> -#include <linux/memblock.h> #include <linux/interrupt.h> -#include <linux/kernel_stat.h> -#include <linux/ioport.h> -#include <linux/cpu.h> #include <linux/clockchips.h> -#include <linux/acpi_pmtmr.h> -#include <linux/module.h> -#include <linux/dmi.h> -#include <linux/dmar.h> -#include <asm/hcall.h> + #include <asm/hw_init.h> #include <asm/hardirq.h> diff --git a/arch/sw_64/kernel/topology.c b/arch/sw_64/kernel/topology.c index 2e2878ba8656..964d6a83d901 100644 --- a/arch/sw_64/kernel/topology.c +++ b/arch/sw_64/kernel/topology.c @@ -1,20 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/acpi.h> -#include <linux/arch_topology.h> -#include <linux/cacheinfo.h> -#include <linux/cpu.h> -#include <linux/cpumask.h> -#include <linux/init.h> -#include <linux/percpu.h> -#include <linux/node.h> -#include <linux/nodemask.h> #include <linux/of.h> -#include <linux/sched.h> -#include <linux/sched/topology.h> -#include <linux/slab.h> -#include <linux/smp.h> -#include <linux/string.h> #include <asm/topology.h> diff --git a/arch/sw_64/kernel/traps.c b/arch/sw_64/kernel/traps.c index d4354d72d6aa..2090eda082cf 100644 --- a/arch/sw_64/kernel/traps.c +++ b/arch/sw_64/kernel/traps.c @@ -9,29 +9,16 @@ * This file initializes the trap entry points */ -#include <linux/jiffies.h> -#include <linux/mm.h> -#include <linux/sched/signal.h> -#include <linux/sched/debug.h> -#include <linux/tty.h> -#include <linux/delay.h> #include <linux/extable.h> -#include <linux/kallsyms.h> -#include <linux/ratelimit.h> -#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/kdebug.h> #include <linux/kexec.h> #include <asm/gentrap.h> -#include <asm/unaligned.h> -#include <asm/sysinfo.h> #include <asm/mmu_context.h> -#include <asm/special_insns.h> #include <asm/fpu.h> #include <asm/kprobes.h> #include <asm/uprobes.h> -#include <asm/core.h> #include "proto.h" diff --git a/arch/sw_64/kernel/unaligned.c b/arch/sw_64/kernel/unaligned.c index 4ec1187d6cd0..a1bbdab4a266 100644 --- a/arch/sw_64/kernel/unaligned.c +++ b/arch/sw_64/kernel/unaligned.c @@ -12,9 +12,6 @@ * for more details. */ -#include <linux/kernel.h> -#include <linux/debugfs.h> -#include <linux/seq_file.h> #include <asm/unaligned.h> #include <asm/debug.h> diff --git a/arch/sw_64/kernel/uprobes.c b/arch/sw_64/kernel/uprobes.c index d10464d0dcdd..786f2e38a59f 100644 --- a/arch/sw_64/kernel/uprobes.c +++ b/arch/sw_64/kernel/uprobes.c @@ -1,14 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/highmem.h> #include <linux/kdebug.h> -#include <linux/types.h> -#include <linux/notifier.h> -#include <linux/sched.h> #include <linux/uprobes.h> #include <linux/ptrace.h> -#include <asm/ptrace.h> - #define UPROBE_TRAP_NR ULONG_MAX /** diff --git a/arch/sw_64/kernel/vdso.c b/arch/sw_64/kernel/vdso.c index 32ed952748f0..b4126cbaa4bd 100644 --- a/arch/sw_64/kernel/vdso.c +++ b/arch/sw_64/kernel/vdso.c @@ -14,20 +14,11 @@ * */ -#include <linux/kernel.h> -#include <linux/clocksource.h> #include <linux/elf.h> -#include <linux/err.h> -#include <linux/errno.h> -#include <linux/gfp.h> #include <linux/mm.h> -#include <linux/sched.h> -#include <linux/signal.h> #include <linux/slab.h> #include <linux/timekeeper_internal.h> -#include <linux/vmalloc.h> -#include <asm/cacheflush.h> #include <asm/vdso.h> extern char vdso_start, vdso_end; diff --git a/arch/sw_64/kernel/vdso/vdso.S b/arch/sw_64/kernel/vdso/vdso.S index ce5448d00cf7..edd9be27db9d 100644 --- a/arch/sw_64/kernel/vdso/vdso.S +++ b/arch/sw_64/kernel/vdso/vdso.S @@ -15,9 +15,7 @@ * */ -#include <linux/init.h> #include <linux/linkage.h> -#include <linux/const.h> #include <asm/page.h> __PAGE_ALIGNED_DATA diff --git a/arch/sw_64/kernel/vdso/vgettimeofday.c b/arch/sw_64/kernel/vdso/vgettimeofday.c index 3579e0eddfe2..b9c9a137f9d3 100644 --- a/arch/sw_64/kernel/vdso/vgettimeofday.c +++ b/arch/sw_64/kernel/vdso/vgettimeofday.c @@ -13,10 +13,9 @@ */ #include <linux/time.h> -#include <asm/timex.h> + #include <asm/unistd.h> #include <asm/vdso.h> -#include <asm/io.h> static __always_inline int syscall_fallback(clockid_t clkid, struct timespec64 *ts) { diff --git a/arch/sw_64/kvm/kvm-sw64.c b/arch/sw_64/kvm/kvm-sw64.c index cc9817037b58..bc24a4711311 100644 --- a/arch/sw_64/kvm/kvm-sw64.c +++ b/arch/sw_64/kvm/kvm-sw64.c @@ -5,31 +5,18 @@ * linhn <linhn(a)example.com> */ -#include <linux/cpu.h> #include <linux/errno.h> -#include <linux/err.h> #include <linux/kvm_host.h> #include <linux/module.h> -#include <linux/vmalloc.h> -#include <linux/fs.h> #include <linux/mman.h> #include <linux/sched/signal.h> -#include <linux/freezer.h> -#include <linux/smp.h> #include <linux/kvm.h> #include <linux/uaccess.h> -#include <linux/genalloc.h> -#include <asm/kvm_emulate.h> -#include <asm/kvm_asm.h> -#include <asm/sw64io.h> #include <asm/kvm_timer.h> -#include <asm/kvm_host.h> #include <asm/kvm_emulate.h> -#include <asm/page.h> #include "../kernel/pci_impl.h" - #include "vmem.c" bool set_msi_flag; diff --git a/arch/sw_64/lib/fls.c b/arch/sw_64/lib/fls.c index e960b1c06782..aa4231f7e472 100644 --- a/arch/sw_64/lib/fls.c +++ b/arch/sw_64/lib/fls.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> -#include <linux/bitops.h> /* This is fls(x)-1, except zero is held to zero. This allows most * efficient input into extbl, plus it allows easy handling of fls(0)=0. diff --git a/arch/sw_64/lib/iomap.c b/arch/sw_64/lib/iomap.c index 30d24923624d..39e3d5498ae6 100644 --- a/arch/sw_64/lib/iomap.c +++ b/arch/sw_64/lib/iomap.c @@ -3,10 +3,8 @@ * Sw_64 IO and memory functions. */ -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/string.h> #include <linux/module.h> + #include <asm/io.h> /* diff --git a/arch/sw_64/lib/udelay.c b/arch/sw_64/lib/udelay.c index 595887caa7b3..48356ab8872f 100644 --- a/arch/sw_64/lib/udelay.c +++ b/arch/sw_64/lib/udelay.c @@ -6,11 +6,6 @@ */ #include <linux/module.h> -#include <linux/sched.h> /* for udelay's use of smp_processor_id */ -#include <asm/param.h> -#include <asm/smp.h> -#include <asm/hw_init.h> -#include <linux/delay.h> /* * Use only for very small delays (< 1 msec). diff --git a/arch/sw_64/math-emu/math.c b/arch/sw_64/math-emu/math.c index 3903b421b8f4..9f281d82ad83 100644 --- a/arch/sw_64/math-emu/math.c +++ b/arch/sw_64/math-emu/math.c @@ -8,16 +8,12 @@ * fire3 2008-12-27 Add SIMD floating emulation code for SW64 */ -#include <linux/module.h> -#include <linux/types.h> -#include <linux/kernel.h> -#include <linux/sched.h> -#include <asm/ptrace.h> - - #include <linux/uaccess.h> +#include <asm/ptrace.h> + #include "sfp-util.h" + #include <math-emu/soft-fp.h> #include <math-emu/single.h> #include <math-emu/double.h> diff --git a/arch/sw_64/mm/fault.c b/arch/sw_64/mm/fault.c index c68be4a40d23..b580450893ba 100644 --- a/arch/sw_64/mm/fault.c +++ b/arch/sw_64/mm/fault.c @@ -3,28 +3,11 @@ * Copyright (C) 1995 Linus Torvalds */ -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/mm.h> -#include <asm/io.h> - -#include <asm/mmu_context.h> -#include <asm/tlbflush.h> -#include <asm/core.h> - -#include <linux/signal.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/types.h> -#include <linux/ptrace.h> -#include <linux/mman.h> -#include <linux/fs.h> -#include <linux/smp.h> -#include <linux/interrupt.h> #include <linux/extable.h> #include <linux/perf_event.h> #include <linux/kprobes.h> -#include <linux/uaccess.h> + +#include <asm/mmu_context.h> __read_mostly bool segv_debug_enabled; diff --git a/arch/sw_64/mm/hugetlbpage.c b/arch/sw_64/mm/hugetlbpage.c index 3c03709d441c..2a40225af4d8 100644 --- a/arch/sw_64/mm/hugetlbpage.c +++ b/arch/sw_64/mm/hugetlbpage.c @@ -3,18 +3,13 @@ * SW64 Huge TLB Page Support for Kernel. */ -#include <linux/init.h> -#include <linux/fs.h> #include <linux/mm.h> #include <linux/sched/mm.h> #include <linux/hugetlb.h> -#include <linux/pagemap.h> #include <linux/err.h> -#include <linux/sysctl.h> + #include <asm/mman.h> #include <asm/tlb.h> -#include <asm/tlbflush.h> -#include <asm/pgalloc.h> /* * pmd_huge() returns 1 if @pmd is hugetlb related entry, that is normal diff --git a/arch/sw_64/mm/init.c b/arch/sw_64/mm/init.c index e3c2a20e54a2..4dda5ecb4f2e 100644 --- a/arch/sw_64/mm/init.c +++ b/arch/sw_64/mm/init.c @@ -5,36 +5,13 @@ /* 2.3.x zone allocator, 1999 Andrea Arcangeli <andrea(a)suse.de> */ -#include <linux/pagemap.h> -#include <linux/signal.h> -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/types.h> -#include <linux/ptrace.h> -#include <linux/mman.h> #include <linux/mm.h> #include <linux/swap.h> -#include <linux/init.h> -#include <linux/vmalloc.h> -#include <linux/gfp.h> -#include <linux/uaccess.h> #include <linux/memblock.h> -#include <linux/dma-mapping.h> #include <linux/swiotlb.h> #include <linux/acpi.h> -#include <asm/pgtable.h> -#include <asm/pgalloc.h> -#include <asm/dma.h> #include <asm/mmu_context.h> -#include <asm/console.h> -#include <asm/tlb.h> -#include <asm/setup.h> -#include <asm/sections.h> -#include <asm/memory.h> -#include <asm/hw_init.h> extern void die_if_kernel(char *, struct pt_regs *, long); diff --git a/arch/sw_64/mm/numa.c b/arch/sw_64/mm/numa.c index 940c12fcbb8d..7cb13587e465 100644 --- a/arch/sw_64/mm/numa.c +++ b/arch/sw_64/mm/numa.c @@ -3,27 +3,11 @@ * DISCONTIGMEM NUMA sw64 support. */ -#include <linux/types.h> -#include <linux/kernel.h> -#include <linux/mm.h> #include <linux/memblock.h> -#include <linux/swap.h> -#include <linux/initrd.h> -#include <linux/pfn.h> -#include <linux/module.h> #include <linux/cpuset.h> -#include <linux/init.h> -#ifdef CONFIG_PCI -#include <linux/pci.h> -#endif #include <linux/acpi.h> #include <linux/of.h> -#include <asm/pgalloc.h> -#include <asm/sections.h> -#include <asm/sw64_init.h> -#include <asm/hw_init.h> -#include <asm/memory.h> #include <asm/core.h> int cpu_to_node_map[NR_CPUS]; diff --git a/arch/sw_64/mm/physaddr.c b/arch/sw_64/mm/physaddr.c index d5cf83e671ae..fbb489ae4db5 100644 --- a/arch/sw_64/mm/physaddr.c +++ b/arch/sw_64/mm/physaddr.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/mmdebug.h> #include <linux/module.h> -#include <linux/mm.h> #include <asm/page.h> unsigned long __phys_addr(unsigned long x) diff --git a/arch/sw_64/mm/thp.c b/arch/sw_64/mm/thp.c index 68260dd0e837..833bb59f79d0 100644 --- a/arch/sw_64/mm/thp.c +++ b/arch/sw_64/mm/thp.c @@ -1,13 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/init.h> -#include <linux/fs.h> -#include <linux/mm.h> -#include <linux/hugetlb.h> -#include <linux/pagemap.h> -#include <linux/err.h> -#include <linux/sysctl.h> -#include <asm/mman.h> -#include <asm/tlb.h> #include <asm/tlbflush.h> #include <asm/pgalloc.h> -- 2.17.1

1 8

[PATCH v1 OLK-5.10 60/90] sw64: increase position index in c_next for cpuinfo
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sw_64/kernel/setup.c b/arch/sw_64/kernel/setup.c index 95d25c7c8204..61b498e65e4b 100644 --- a/arch/sw_64/kernel/setup.c +++ b/arch/sw_64/kernel/setup.c @@ -957,6 +957,7 @@ c_start(struct seq_file *f, loff_t *pos) static void * c_next(struct seq_file *f, void *v, loff_t *pos) { + (*pos)++; return NULL; } -- 2.17.1

1 0

[PATCH v1 OLK-5.10 50/90] sw64: define NR_SYSCALLS as generated __NR_syscalls
by Gu Zitao 12 May '22

12 May '22

From: He Sheng <hesheng(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56XYC -------------------------------- With this definition, the asm/unistd.h can keep unchanged if the number of syscalls has changed. Signed-off-by: He Sheng <hesheng(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/include/asm/unistd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sw_64/include/asm/unistd.h b/arch/sw_64/include/asm/unistd.h index b8854163d96f..6d1b8d1e2011 100644 --- a/arch/sw_64/include/asm/unistd.h +++ b/arch/sw_64/include/asm/unistd.h @@ -4,7 +4,7 @@ #include <uapi/asm/unistd.h> -#define NR_SYSCALLS 519 +#define NR_SYSCALLS __NR_syscalls #define NR_syscalls NR_SYSCALLS #define __ARCH_WANT_NEW_STAT -- 2.17.1

1 9

[PATCH v1 OLK-5.10 40/90] sw64: add required include headers to ptrace.h
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/include/asm/ptrace.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/sw_64/include/asm/ptrace.h b/arch/sw_64/include/asm/ptrace.h index 1dde5e6cba8a..33f5cc97c976 100644 --- a/arch/sw_64/include/asm/ptrace.h +++ b/arch/sw_64/include/asm/ptrace.h @@ -3,7 +3,11 @@ #define _ASM_SW64_PTRACE_H #include <uapi/asm/ptrace.h> - +#include <linux/sched/task_stack.h> +#include <asm/hmcall.h> +#include <asm/thread_info.h> +#include <asm/processor.h> +#include <asm/page.h> #define arch_has_single_step() (1) #define user_mode(regs) (((regs)->ps & 8) != 0) -- 2.17.1

1 9

[PATCH v1 OLK-5.10 30/90] sw64: rename kvm_mem variables
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Rename variables for kvm_mem cmdline to improve readability. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/setup.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/sw_64/kernel/setup.c b/arch/sw_64/kernel/setup.c index e5abef2dc593..26a611448ad6 100644 --- a/arch/sw_64/kernel/setup.c +++ b/arch/sw_64/kernel/setup.c @@ -81,8 +81,8 @@ DEFINE_PER_CPU(unsigned long, hard_node_id) = { 0 }; struct cma *sw64_kvm_cma; EXPORT_SYMBOL(sw64_kvm_cma); -static phys_addr_t size_cmdline; -static phys_addr_t base_cmdline; +static phys_addr_t kvm_mem_size; +static phys_addr_t kvm_mem_base; struct gen_pool *sw64_kvm_pool; EXPORT_SYMBOL(sw64_kvm_pool); @@ -748,17 +748,17 @@ static int __init early_kvm_reserved_mem(char *p) return -EINVAL; } - size_cmdline = memparse(p, &p); + kvm_mem_size = memparse(p, &p); if (*p != '@') return -EINVAL; - base_cmdline = memparse(p + 1, &p); + kvm_mem_base = memparse(p + 1, &p); return 0; } early_param("kvm_mem", early_kvm_reserved_mem); void __init sw64_kvm_reserve(void) { - kvm_cma_declare_contiguous(base_cmdline, size_cmdline, 0, + kvm_cma_declare_contiguous(kvm_mem_base, kvm_mem_size, 0, PAGE_SIZE, 0, "sw64_kvm_cma", &sw64_kvm_cma); } #endif @@ -1030,14 +1030,14 @@ static int __init sw64_kvm_pool_init(void) if (!sw64_kvm_cma) goto out; - kvm_pool_virt = (unsigned long)base_cmdline; + kvm_pool_virt = (unsigned long)kvm_mem_base; sw64_kvm_pool = gen_pool_create(PAGE_SHIFT, -1); if (!sw64_kvm_pool) goto out; - status = gen_pool_add_virt(sw64_kvm_pool, kvm_pool_virt, base_cmdline, - size_cmdline, -1); + status = gen_pool_add_virt(sw64_kvm_pool, kvm_pool_virt, kvm_mem_base, + kvm_mem_size, -1); if (status < 0) { pr_err("failed to add memory chunks to sw64 kvm pool\n"); gen_pool_destroy(sw64_kvm_pool); @@ -1046,8 +1046,8 @@ static int __init sw64_kvm_pool_init(void) } gen_pool_set_algo(sw64_kvm_pool, gen_pool_best_fit, NULL); - base_page = pfn_to_page(base_cmdline >> PAGE_SHIFT); - end_page = pfn_to_page((base_cmdline + size_cmdline) >> PAGE_SHIFT); + base_page = pfn_to_page(kvm_mem_base >> PAGE_SHIFT); + end_page = pfn_to_page((kvm_mem_base + kvm_mem_size) >> PAGE_SHIFT); p = base_page; while (page_ref_count(p) == 0 && -- 2.17.1

1 9

[PATCH v1 OLK-5.10 20/90] sw64: fix the value of QEMU_PRINTF_BUFF_BASE
by Gu Zitao 12 May '22

12 May '22

From: Min Fanlei <minfanlei(a)wxiat.com> Sunway inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I56WV8 -------------------------------- Signed-off-by: Min Fanlei <minfanlei(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/dup_print.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/sw_64/kernel/dup_print.c b/arch/sw_64/kernel/dup_print.c index ac0a95d4d30b..fae543625f62 100644 --- a/arch/sw_64/kernel/dup_print.c +++ b/arch/sw_64/kernel/dup_print.c @@ -6,6 +6,7 @@ #include <linux/delay.h> #include <linux/spinlock.h> #include <linux/uaccess.h> +#include <asm/chip3_io.h> #ifdef CONFIG_SW64_RRK @@ -20,7 +21,7 @@ unsigned long sw64_printk_offset; * For output the kernel message on the console * with full-system emulator. */ -#define QEMU_PRINTF_BUFF_BASE (0x805000040000ULL | PAGE_OFFSET) +#define QEMU_PRINTF_BUFF_BASE (IO_BASE | MCU_BASE | 0x40000UL | PAGE_OFFSET) int sw64_printk(const char *fmt, va_list args) { -- 2.17.1

1 9

[PATCH v1 OLK-5.10 12/90] sw64: switch to generic pcibios_set_master and pci_common_swizzle
by Gu Zitao 12 May '22

12 May '22

From: Zhou Xuemei <zhouxuemei(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56U83 -------------------------------- The generic implementation is better than arch-specific version. So we remove the arch-specific one and switch to the generic version. Signed-off-by: Zhou Xuemei <zhouxuemei(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/pci.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/arch/sw_64/kernel/pci.c b/arch/sw_64/kernel/pci.c index b8505ad8972c..2c53e0717c9a 100644 --- a/arch/sw_64/kernel/pci.c +++ b/arch/sw_64/kernel/pci.c @@ -175,21 +175,6 @@ struct pci_dev *sw64_gendev_to_pci(struct device *dev) return NULL; } -/* - * If we set up a device for bus mastering, we need to check the latency - * timer as certain firmware forgets to set it properly. - */ -void pcibios_set_master(struct pci_dev *dev) -{ - u8 lat; - - pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); - if (lat >= 16) - return; - pr_info("PCI: Setting latency timer of device %s to 64\n", pci_name(dev)); - pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64); -} - void __init pcibios_claim_one_bus(struct pci_bus *b) { struct pci_dev *dev; @@ -265,7 +250,7 @@ void __init common_init_pci(void) bridge->sysdata = hose; bridge->busnr = hose->busn_space->start; bridge->ops = &sw64_pci_ops; - bridge->swizzle_irq = sw64_swizzle; + bridge->swizzle_irq = pci_common_swizzle; bridge->map_irq = sw64_map_irq; ret = pci_scan_root_bus_bridge(bridge); @@ -593,11 +578,6 @@ int sw64_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return sw64_chip_init->pci_init.map_irq(dev, slot, pin); } -unsigned char sw64_swizzle(struct pci_dev *dev, u8 *pinp) -{ - return PCI_SLOT(dev->devfn); -} - static void __init sw64_init_host(unsigned long node, unsigned long index) { -- 2.17.1

1 0

[PATCH v1 OLK-5.10 14/90] sw64: modify tc_sched_clock debugfs file
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Use debugfs_create_file() to create debugfs file for tc_sched_clock so it is protected against file removals. Change its name to "tc_sched_clock" to stay consistent with what we use in cmdline. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sw_64/kernel/time.c b/arch/sw_64/kernel/time.c index 0815d06b03d4..185db832dfb8 100644 --- a/arch/sw_64/kernel/time.c +++ b/arch/sw_64/kernel/time.c @@ -237,8 +237,8 @@ static int __init sched_clock_debug_init(void) if (!sw64_debugfs_dir) return -ENODEV; - sched_clock_status = debugfs_create_file_unsafe("use_tc_as_sched_clock", - 0666, sw64_debugfs_dir, NULL, + sched_clock_status = debugfs_create_file("tc_sched_clock", + 0644, sw64_debugfs_dir, NULL, &sched_clock_status_fops); if (!sched_clock_status) -- 2.17.1

1 5

[PATCH v1 OLK-5.10 13/90] sw64: remove redundant Kconfig source
by Gu Zitao 12 May '22

12 May '22

From: Mao Minkai <maominkai(a)wxiat.com> Sunway inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Remove redundant Kconfig source to avoid compiler warning. Signed-off-by: Mao Minkai <maominkai(a)wxiat.com> Signed-off-by: Gu Zitao <guzitao(a)wxiat.com> --- arch/sw_64/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/sw_64/Kconfig b/arch/sw_64/Kconfig index a81d388ed304..318a423d87dd 100644 --- a/arch/sw_64/Kconfig +++ b/arch/sw_64/Kconfig @@ -419,9 +419,6 @@ config ARCH_DISCONTIGMEM_ENABLE or have huge holes in the physical address space for other reasons. See <file:Documentation/vm/numa> for more. -source "kernel/Kconfig.preempt" - - config NUMA bool "NUMA Support" depends on SMP && !FLATMEM -- 2.17.1

1 0

[PATCH v1 OLK-5.10 00/90] sw64: merge patches
by Gu Zitao 12 May '22

12 May '22

Cui Mingrui (2): sw64: optimize ip checksum calculation sw64: fix ip checksum calculation Du Yilong (3): sw64: kvm: fix bug when open file with the O_DIRECT flag sw64: add set time support for hypervisor based rtc sw64: kvm: remap pages of guest by vm_insert_page() Gu Zitao (7): config: add initial openeuler_defconfig for sw64 sw64: fix coding style problems sw64: fix the VDSO symbol generation for nm sw64: fix SPDX license identifier in uapi headers sw64: add SO_RCVTIMEO/ SO_SNDTIMEO socket options sw64: remove unnecessary include headers sw64: fix some compile errors He Chuyue (2): sw64: add regs and stack access APIs to support kprobe events sw64: remove unnecessary parameter in REG_OFFSET_NAME He Sheng (20): sw64: clean up useless #if 0 and #if 1 sw64: switch GUP to the generic get_user_pages_fast() implementation sw64: remove unused a.out.h sw64: fix ex_table entries from misalignment handlers sw64: define NR_SYSCALLS as generated __NR_syscalls sw64: clean up a.out and ECOFF binary related headers sw64: ptrace: clean up debug codes sw64: add kbuild defconfig rule sw64: clean up out-of-date selected options sw64: Kconfig: remove dependence on !PREEMPT sw64: Kconfig: remove dependence on ARCH_SUPPORTS_ACPI sw64: add missing global __constant_c_memset sw64: do some cleanups for rt_sigframe sw64: fix setup_rt_frame for non SA_SIGINFO sw64: fix compile error for DISCONTIGMEM=y sw64: force signal and fault for traps and debugging sw64: push and pop kernel stack with ldi instruction sw64: signal: save/restore fpregs with copy user sw64: fix the number of aux entries in ARCH_DLINFO sw64: fix sendfile system call Lu Feifei (6): sw64: fix printk method for guest os sw64: unify access to LONGTIME for guest and emulator sw64: kvm: handle ldl_u and stl_u when exit mmio sw64: kvm: simplify the code sw64: pci: align the address of mmio resource to PAGE_SIZE sw64: unify 32-bit MEMIO address of host and guest Mao Minkai (29): sw64: vdso: add automatic syscall fallback sw64: vdso: change vdso version sw64: vdso: fix time calculation sw64: mm: reorder memblock_init process sw64: mm: warn overlapped memmap and DMA region sw64: mm: use memblock to find the end of memory sw64: print correct initrd address sw64: remove redundant Kconfig source sw64: modify tc_sched_clock debugfs file sw64: simplify cpumask_of_node sw64: remove CONFIG_USE_PERCPU_NUMA_NODE_ID=n code sw64: fix all compile warnings sw64: numa: switch to arch node_distance sw64: mm: mark pci and memmap region as nomap sw64: use jump label for running modes sw64: remove MAX_ASN sw64: kvm: remove MAX_VPN sw64: fix coding style problems sw64: rename kvm_mem variables sw64: reformat syscall.tbl sw64: add missing pkey syscall numbers sw64: add clone3 syscall support sw64: add required include headers to ptrace.h sw64: switch to old-style semctl/shmctl syscalls sw64: increase position index in c_next for cpuinfo sw64: add old sigprocmask back for compatibility sw64: vdso: fix backtrace of vrt_sigreturn sw64: vdso: fix CFI directives for fpregs in vrt_sigreturn sw64: optimize simd version of memcpy and memset Min Fanlei (4): sw64: fix the value of QEMU_PRINTF_BUFF_BASE sw64: add support for emulator running mode sw64: enable more than 32 CPUs for guest sw64: kvm: fix bad page state setting outside of kvm memory pool Tang Jinyang (2): sw64: add dynamic frequency scaling support sw64: add dynamic turning on/off cores support Wang Yingying (3): hwmon: add voltage sensor support for sw64 sw64: add pvt device to chip3.dts hwmon: add support for sw64 temperature sensor Xu Chenjiao (2): sw64: radeon: add a force flush to delay work when radeon uvd suspend sw64: pcie: enable PME and AER support Zhao Yihan (1): sw64: remap PA with |= in early_ioremap Zheng Chongzhen (3): sw64: re-implement sw64_dma_direct_ops according upstream sw64: iommu: fix 32-bit devices dma ops sw64: fix compile error for CONFIG_PCI=n Zhou Xuemei (5): sw64: pci: remove some useless code sw64: switch to generic pcibios_set_master and pci_common_swizzle sw64: clean up some useless codes sw64: dts: rename spi flash partition to fix warning sw64: add ARCH_HAS_PTE_SPECIAL support Zhu Donghong (1): ipmi: add ipmi driver support arch/sw_64/Kconfig | 325 +- arch/sw_64/Makefile | 1 + arch/sw_64/boot/dts/chip3.dts | 41 +- arch/sw_64/chip/chip3/chip.c | 130 +- arch/sw_64/chip/chip3/cpufreq_debugfs.c | 7 +- arch/sw_64/chip/chip3/i2c-lib.c | 4 - arch/sw_64/chip/chip3/irq_chip.c | 13 +- arch/sw_64/chip/chip3/msi.c | 7 +- arch/sw_64/chip/chip3/pci-quirks.c | 7 +- arch/sw_64/chip/chip3/vt_msi.c | 6 - arch/sw_64/configs/openeuler_defconfig | 4312 +++++++++++++++++++++ arch/sw_64/defconfig | 73 - arch/sw_64/include/asm/Kbuild | 1 + arch/sw_64/include/asm/a.out-core.h | 80 - arch/sw_64/include/asm/a.out.h | 16 - arch/sw_64/include/asm/checksum.h | 58 +- arch/sw_64/include/asm/chip3_io.h | 4 +- arch/sw_64/include/asm/clock.h | 56 + arch/sw_64/include/asm/cputime.h | 4 +- arch/sw_64/include/asm/early_ioremap.h | 2 +- arch/sw_64/include/asm/hw_init.h | 29 +- arch/sw_64/include/asm/kvm_host.h | 3 +- arch/sw_64/include/asm/mmu_context.h | 3 +- arch/sw_64/include/asm/numa.h | 1 + arch/sw_64/include/asm/pci.h | 24 +- arch/sw_64/include/asm/pgtable.h | 26 +- arch/sw_64/include/asm/ptrace.h | 8 +- arch/sw_64/include/asm/topology.h | 29 +- arch/sw_64/include/asm/unistd.h | 3 +- arch/sw_64/include/asm/user.h | 53 - arch/sw_64/include/asm/vdso.h | 4 +- arch/sw_64/include/asm/vga.h | 18 +- arch/sw_64/include/uapi/asm/a.out.h | 88 - arch/sw_64/include/uapi/asm/auxvec.h | 25 +- arch/sw_64/include/uapi/asm/bitsperlong.h | 2 +- arch/sw_64/include/uapi/asm/byteorder.h | 2 +- arch/sw_64/include/uapi/asm/compiler.h | 2 +- arch/sw_64/include/uapi/asm/console.h | 2 +- arch/sw_64/include/uapi/asm/errno.h | 2 +- arch/sw_64/include/uapi/asm/fcntl.h | 2 +- arch/sw_64/include/uapi/asm/fpu.h | 2 +- arch/sw_64/include/uapi/asm/gentrap.h | 2 +- arch/sw_64/include/uapi/asm/hmcall.h | 2 +- arch/sw_64/include/uapi/asm/ioctl.h | 2 +- arch/sw_64/include/uapi/asm/ioctls.h | 48 +- arch/sw_64/include/uapi/asm/ipcbuf.h | 2 +- arch/sw_64/include/uapi/asm/kvm.h | 14 +- arch/sw_64/include/uapi/asm/kvm_para.h | 2 +- arch/sw_64/include/uapi/asm/mman.h | 2 +- arch/sw_64/include/uapi/asm/msgbuf.h | 2 +- arch/sw_64/include/uapi/asm/param.h | 2 +- arch/sw_64/include/uapi/asm/poll.h | 2 +- arch/sw_64/include/uapi/asm/posix_types.h | 2 +- arch/sw_64/include/uapi/asm/ptrace.h | 2 +- arch/sw_64/include/uapi/asm/reg.h | 2 +- arch/sw_64/include/uapi/asm/regdef.h | 2 +- arch/sw_64/include/uapi/asm/resource.h | 2 +- arch/sw_64/include/uapi/asm/sembuf.h | 2 +- arch/sw_64/include/uapi/asm/setup.h | 2 +- arch/sw_64/include/uapi/asm/shmbuf.h | 2 +- arch/sw_64/include/uapi/asm/sigcontext.h | 2 +- arch/sw_64/include/uapi/asm/siginfo.h | 2 +- arch/sw_64/include/uapi/asm/signal.h | 2 +- arch/sw_64/include/uapi/asm/socket.h | 34 +- arch/sw_64/include/uapi/asm/sockios.h | 2 +- arch/sw_64/include/uapi/asm/stat.h | 2 +- arch/sw_64/include/uapi/asm/statfs.h | 2 +- arch/sw_64/include/uapi/asm/swab.h | 2 +- arch/sw_64/include/uapi/asm/sysinfo.h | 2 +- arch/sw_64/include/uapi/asm/termbits.h | 2 +- arch/sw_64/include/uapi/asm/termios.h | 2 +- arch/sw_64/include/uapi/asm/types.h | 2 +- arch/sw_64/include/uapi/asm/unistd.h | 7 +- arch/sw_64/kernel/Makefile | 5 +- arch/sw_64/kernel/acpi.c | 19 +- arch/sw_64/kernel/asm-offsets.c | 7 +- arch/sw_64/kernel/audit.c | 2 +- arch/sw_64/kernel/cacheinfo.c | 3 +- arch/sw_64/kernel/clock.c | 184 + arch/sw_64/kernel/core.c | 41 +- arch/sw_64/kernel/cpuautoplug.c | 496 +++ arch/sw_64/kernel/crash_dump.c | 2 - arch/sw_64/kernel/dup_print.c | 10 +- arch/sw_64/kernel/early_printk.c | 4 +- arch/sw_64/kernel/entry.S | 5 +- arch/sw_64/kernel/ftrace.c | 5 - arch/sw_64/kernel/insn.c | 13 - arch/sw_64/kernel/irq.c | 15 - arch/sw_64/kernel/irq_sw64.c | 9 +- arch/sw_64/kernel/jump_label.c | 3 +- arch/sw_64/kernel/kgdb.c | 9 +- arch/sw_64/kernel/kprobes/decode-insn.c | 6 +- arch/sw_64/kernel/kprobes/kprobes.c | 4 - arch/sw_64/kernel/kvm_cma.c | 4 - arch/sw_64/kernel/machine_kexec.c | 7 +- arch/sw_64/kernel/module.c | 9 - arch/sw_64/kernel/msi.c | 25 - arch/sw_64/kernel/pci-noop.c | 8 - arch/sw_64/kernel/pci-sysfs.c | 3 - arch/sw_64/kernel/pci.c | 102 +- arch/sw_64/kernel/pci_common.c | 285 +- arch/sw_64/kernel/pci_impl.h | 49 - arch/sw_64/kernel/perf_event.c | 12 - arch/sw_64/kernel/perf_regs.c | 4 - arch/sw_64/kernel/platform.c | 20 + arch/sw_64/kernel/process.c | 26 - arch/sw_64/kernel/ptrace.c | 132 +- arch/sw_64/kernel/relocate.c | 13 +- arch/sw_64/kernel/segvdbg.c | 4 +- arch/sw_64/kernel/setup.c | 124 +- arch/sw_64/kernel/signal.c | 74 +- arch/sw_64/kernel/smp.c | 25 +- arch/sw_64/kernel/stacktrace.c | 1 - arch/sw_64/kernel/suspend.c | 22 +- arch/sw_64/kernel/syscalls/syscall.tbl | 28 +- arch/sw_64/kernel/tc.c | 3 - arch/sw_64/kernel/time.c | 31 +- arch/sw_64/kernel/timer.c | 21 +- arch/sw_64/kernel/topology.c | 19 - arch/sw_64/kernel/traps.c | 95 +- arch/sw_64/kernel/unaligned.c | 3 - arch/sw_64/kernel/uprobes.c | 5 - arch/sw_64/kernel/vdso.c | 9 - arch/sw_64/kernel/vdso/so2s.sh | 3 +- arch/sw_64/kernel/vdso/vdso.S | 2 - arch/sw_64/kernel/vdso/vdso.lds.S | 2 +- arch/sw_64/kernel/vdso/vgettimeofday.c | 33 +- arch/sw_64/kernel/vdso/vrt_sigreturn.S | 40 + arch/sw_64/kvm/emulate.c | 2 + arch/sw_64/kvm/kvm-sw64.c | 39 +- arch/sw_64/kvm/vmem.c | 37 +- arch/sw_64/lib/checksum.c | 136 +- arch/sw_64/lib/csum_partial_copy.c | 310 +- arch/sw_64/lib/deep-memcpy.S | 449 ++- arch/sw_64/lib/deep-memset.S | 27 +- arch/sw_64/lib/fls.c | 1 - arch/sw_64/lib/iomap.c | 4 +- arch/sw_64/lib/udelay.c | 5 - arch/sw_64/math-emu/math.c | 10 +- arch/sw_64/mm/fault.c | 21 +- arch/sw_64/mm/hugetlbpage.c | 7 +- arch/sw_64/mm/init.c | 48 +- arch/sw_64/mm/numa.c | 30 +- arch/sw_64/mm/physaddr.c | 1 - arch/sw_64/mm/thp.c | 9 - drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sw64_cpufreq.c | 186 + drivers/gpu/drm/radeon/radeon_uvd.c | 5 + drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/sw64_pvt.c | 222 ++ drivers/iommu/sw64/sunway_iommu.c | 58 +- drivers/iommu/sw64/sunway_iommu.h | 2 +- drivers/rtc/rtc-sw64-virt.c | 24 +- 154 files changed, 7026 insertions(+), 2337 deletions(-) create mode 100644 arch/sw_64/configs/openeuler_defconfig delete mode 100644 arch/sw_64/defconfig delete mode 100644 arch/sw_64/include/asm/a.out-core.h delete mode 100644 arch/sw_64/include/asm/a.out.h create mode 100644 arch/sw_64/include/asm/clock.h delete mode 100644 arch/sw_64/include/asm/user.h delete mode 100644 arch/sw_64/include/uapi/asm/a.out.h create mode 100644 arch/sw_64/kernel/clock.c create mode 100644 arch/sw_64/kernel/cpuautoplug.c create mode 100644 arch/sw_64/kernel/platform.c create mode 100644 drivers/cpufreq/sw64_cpufreq.c create mode 100644 drivers/hwmon/sw64_pvt.c -- 2.17.1

1 11

[PATCH openEuler-5.10 01/43] rcu: Prevent expedited GP from enabling tick on offline CPU
by Zheng Zengkai 10 May '22

10 May '22

From: "Paul E. McKenney" <paulmck(a)kernel.org> mainline inclusion from mainline-v5.17-rc1 commit 147f04b14adde831eb4a0a1e378667429732f9e8 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I53ILL CVE: NA ------------------------------------------------------------------------- If an RCU expedited grace period starts just when a CPU is in the process of going offline, so that the outgoing CPU has completed its pass through stop-machine but has not yet completed its final dive into the idle loop, RCU will attempt to enable that CPU's scheduling-clock tick via a call to tick_dep_set_cpu(). For this to happen, that CPU has to have been online when the expedited grace period completed its CPU-selection phase. This is pointless: The outgoing CPU has interrupts disabled, so it cannot take a scheduling-clock tick anyway. In addition, the tick_dep_set_cpu() function's eventual call to irq_work_queue_on() will splat as follows: smpboot: CPU 1 is now offline WARNING: CPU: 6 PID: 124 at kernel/irq_work.c:95 +irq_work_queue_on+0x57/0x60 Modules linked in: CPU: 6 PID: 124 Comm: kworker/6:2 Not tainted 5.15.0-rc1+ #3 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS +rel-1.14.0-0-g155821a-rebuilt.opensuse.org 04/01/2014 Workqueue: rcu_gp wait_rcu_exp_gp RIP: 0010:irq_work_queue_on+0x57/0x60 Code: 8b 05 1d c7 ea 62 a9 00 00 f0 00 75 21 4c 89 ce 44 89 c7 e8 +9b 37 fa ff ba 01 00 00 00 89 d0 c3 4c 89 cf e8 3b ff ff ff eb ee <0f> 0b eb b7 +0f 0b eb db 90 48 c7 c0 98 2a 02 00 65 48 03 05 91 6f RSP: 0000:ffffb12cc038fe48 EFLAGS: 00010282 RAX: 0000000000000001 RBX: 0000000000005208 RCX: 0000000000000020 RDX: 0000000000000001 RSI: 0000000000000001 RDI: ffff9ad01f45a680 RBP: 000000000004c990 R08: 0000000000000001 R09: ffff9ad01f45a680 R10: ffffb12cc0317db0 R11: 0000000000000001 R12: 00000000fffecee8 R13: 0000000000000001 R14: 0000000000026980 R15: ffffffff9e53ae00 FS: 0000000000000000(0000) GS:ffff9ad01f580000(0000) +knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000000de0c000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: tick_nohz_dep_set_cpu+0x59/0x70 rcu_exp_wait_wake+0x54e/0x870 ? sync_rcu_exp_select_cpus+0x1fc/0x390 process_one_work+0x1ef/0x3c0 ? process_one_work+0x3c0/0x3c0 worker_thread+0x28/0x3c0 ? process_one_work+0x3c0/0x3c0 kthread+0x115/0x140 ? set_kthread_struct+0x40/0x40 ret_from_fork+0x22/0x30 ---[ end trace c5bf75eb6aa80bc6 ]--- This commit therefore avoids invoking tick_dep_set_cpu() on offlined CPUs to limit both futility and false-positive splats. Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- kernel/rcu/tree_exp.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index 0dc16345e668..2bc4538e8a61 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h @@ -507,7 +507,10 @@ static void synchronize_rcu_expedited_wait(void) if (rdp->rcu_forced_tick_exp) continue; rdp->rcu_forced_tick_exp = true; - tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP); + preempt_disable(); + if (cpu_online(cpu)) + tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP); + preempt_enable(); } } j = READ_ONCE(jiffies_till_first_fqs); -- 2.20.1

1 42

[PATCH openEuler-5.10 00/21] Backport 5.10.97 LTS
by Zheng Zengkai 10 May '22

10 May '22

Backport 5.10.97 LTS patches from upstream. Conflicts already merged cgroup-v1: Require capabilities to set release_agent net: sched: fix use-after-free in tc_new_tfilter() context conflict psi: Fix uaf issue when psi trigger is destroyed while being polled Alex Elder (3): net: ipa: fix atomic update in ipa_endpoint_replenish() net: ipa: use a bitmap for endpoint replenish_enabled net: ipa: prevent concurrent replenish Dan Carpenter (1): fanotify: Fix stale file descriptor in copy_event_to_user() Eric Dumazet (3): rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() af_packet: fix data-race in packet_setsockopt / packet_setsockopt tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data() Georgi Valkov (1): ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback Kevin Hilman (1): Revert "drivers: bus: simple-pm-bus: Add support for probing simple bus only devices" Lukas Wunner (1): PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Maher Sanalla (1): net/mlx5: Use del_timer_sync in fw reset flow of halting poll Maor Dickman (2): net/mlx5e: Fix handling of wrong devices during bond netevent net/mlx5: E-Switch, Fix uninitialized variable modact Maxime Ripard (1): drm/vc4: hdmi: Make sure the device is powered with CEC Raju Rangoju (1): net: amd-xgbe: ensure to reset the tx_timer_active flag Sean Christopherson (1): KVM: x86: Forcibly leave nested virt when SMM state is toggled Shyam Sundar S K (1): net: amd-xgbe: Fix skb data length underflow Suren Baghdasaryan (1): psi: Fix uaf issue when psi trigger is destroyed while being polled Tianchen Ding (1): cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() Tony Luck (2): x86/mce: Add Xeon Sapphire Rapids to list of CPUs that support PPIN x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN Documentation/accounting/psi.rst | 3 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kernel/cpu/mce/intel.c | 2 + arch/x86/kvm/svm/nested.c | 10 ++- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/nested.c | 1 + arch/x86/kvm/x86.c | 2 + drivers/bus/simple-pm-bus.c | 39 +---------- drivers/gpu/drm/vc4/vc4_hdmi.c | 25 +++---- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +++- .../ethernet/mellanox/mlx5/core/en/rep/bond.c | 32 ++++----- .../ethernet/mellanox/mlx5/core/fw_reset.c | 2 +- .../mellanox/mlx5/core/lib/fs_chains.c | 2 +- drivers/net/ipa/ipa_endpoint.c | 25 ++++--- drivers/net/ipa/ipa_endpoint.h | 15 ++++- drivers/net/usb/ipheth.c | 6 +- drivers/pci/hotplug/pciehp_hpc.c | 7 +- fs/notify/fanotify/fanotify_user.c | 6 +- include/linux/psi.h | 2 +- include/linux/psi_types.h | 3 - kernel/cgroup/cgroup.c | 11 +++- kernel/cgroup/cpuset.c | 3 +- kernel/sched/psi.c | 66 ++++++++----------- net/core/rtnetlink.c | 6 +- net/ipv4/tcp_input.c | 2 + net/packet/af_packet.c | 8 ++- 27 files changed, 153 insertions(+), 144 deletions(-) -- 2.20.1

1 21

[PATCH openEuler-5.10 00/92] Backport 5.10.96 LTS
by Zheng Zengkai 10 May '22

10 May '22

Backport 5.10.96 LTS patches from upstream. complicts: Already merged(6): udf: Restore i_lenAlloc when inode expansion fails NFSv4: Handle case where the lookup of a directory fails yam: fix a memory leak in yam_siocdevprivate() net: hns3: handle empty unknown interrupt for VF NFSv4: nfs_atomic_open() can race when looking up a non-regular file udf: Fix NULL ptr deref when converting from inline format Context conflict: arm64: errata: Fix exec handling in erratum 1418040 workaround defered (2) (cause symbol kabi changes): net: fix information leakage in /proc/net/ptype perf: Fix perf_event_read_local() time Alan Stern (2): usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge USB: core: Fix hang in usb_kill_urb by adding memory barriers Amir Goldstein (2): fsnotify: fix fsnotify hooks in pseudo filesystems fsnotify: invalidate dcache before IN_DELETE event Ard Biesheuvel (1): efi: runtime: avoid EFIv2 runtime services on Apple x86 machines Athira Rajeev (1): powerpc/perf: Fix power_pmu_disable to call clear_pmi_irq_pending only if PMI is pending Badhri Jagan Sridharan (1): usb: typec: tcpm: Do not disconnect while receiving VBUS off Brian Gix (1): Bluetooth: refactor malicious adv data check Cameron Williams (1): tty: Add support for Brainboxes UC cards. Christophe Leroy (3): powerpc/32s: Allocate one 256k IBAT instead of two consecutives 128k IBATs powerpc/32s: Fix kasan_init_region() for KASAN powerpc/32: Fix boot failure with GCC latent entropy plugin D Scott Phillips (1): arm64: errata: Fix exec handling in erratum 1418040 workaround David Howells (1): rxrpc: Adjust retransmission backoff Dmitry V. Levin (1): usr/include/Makefile: add linux/nfc.h to the compile-test coverage Eric Dumazet (5): ipv4: avoid using shared IP generator for connected sockets ipv6: annotate accesses to fn->fn_sernum ipv4: raw: lock the socket in raw_bind() ipv4: tcp: send zero IPID in SYNACK messages ipv4: remove sparse error in ip_neigh_gw4() Florian Westphal (1): netfilter: conntrack: don't increment invalid counter on NF_REPEAT Frank Li (1): usb: xhci-plat: fix crash when suspend if remote wake enable Geert Uytterhoeven (1): mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip() Greg Kroah-Hartman (1): PM: wakeup: simplify the output logic of pm_show_wakelocks() Guenter Roeck (4): hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649 hwmon: (lm90) Mark alert as broken for MAX6680 hwmon: (lm90) Reduce maximum conversion rate for G781 hwmon: (lm90) Mark alert as broken for MAX6654 Guillaume Nault (1): Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" Ido Schimmel (1): ipv6_tunnel: Rate limit warning messages Ilya Leoshkevich (1): s390/module: fix loading modules with a lot of relocations Jakub Kicinski (1): ipv4: fix ip option filtering for locally generated fragments Jedrzej Jagielski (2): i40e: Increase delay to 1 s after global EMP reset i40e: Fix issue when maximum queues is exceeded Jeff Layton (2): ceph: properly put ceph_string reference after async create attempt ceph: set pool_ns in new inode layout for async creates Jianguo Wu (1): net-procfs: show net devices bound packet types Joe Damato (1): i40e: fix unsigned stat widths John Meneghini (1): scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() Jon Hunter (1): usb: common: ulpi: Fix crash in ulpi_match() Joseph Qi (2): jbd2: export jbd2_journal_[grab|put]_journal_head ocfs2: fix a deadlock when commit trans José Expósito (2): drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable drm/msm/dpu: invalid parameter check in dpu_setup_dspp_pcc Karen Sornek (1): i40e: Fix for failed to init adminq while VF reset Like Xu (1): KVM: x86: Update vCPU's runtime CPUID on write to MSR_IA32_XSS Linyu Yuan (1): usb: roles: fix include/linux/usb/role.h compile issue Lucas Stach (1): drm/etnaviv: relax submit size limits Marc Kleine-Budde (1): dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config Marek Behún (2): net: sfp: ignore disabled SFP node phylib: fix potential use-after-free Mathieu Desnoyers (1): sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask Matthias Kaehlcke (1): rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev Miaoqian Lin (2): drm/msm/dsi: Fix missing put_device() call in dsi_get_phy drm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phy Michael Kelley (1): video: hyperv_fb: Fix validation of screen resolution Mihai Carabas (1): efi/libstub: arm64: Fix image check alignment at entry Mohammad Athari Bin Ismail (1): net: stmmac: skip only stmmac_ptp_register when resume from suspend Naveen N. Rao (2): bpf: Guard against accessing NULL pt_regs in bpf_get_task_stack() powerpc64/bpf: Limit 'ldbrx' to processors compliant with ISA v2.06 Nikolay Aleksandrov (1): net: bridge: vlan: fix single net device option dumping OGAWA Hirofumi (1): block: Fix wrong offset in bio_truncate() Pablo Neira Ayuso (1): netfilter: nft_payload: do not update layer 4 checksum when mangling fragments Pavankumar Kondeti (1): usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS Randy Dunlap (1): kernel: delete repeated words in comments Robert Hancock (2): serial: 8250: of: Fix mapped region size when using reg-offset property net: phy: broadcom: hook up soft_reset for BCM54616S Sean Christopherson (1): Revert "KVM: SVM: avoid infinite loop on NPF from bad address" Sing-Han Chen (1): ucsi_ccg: Check DEV_INT bit only when starting CCG4 Stanimir Varbanov (1): media: venus: core: Drop second v4l2 device unregister Steffen Maier (1): scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices Subbaraya Sundeep (1): octeontx2-pf: Forward error codes to VF Sujit Kautkar (1): rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev Sukadev Bhattiprolu (2): ibmvnic: init ->running_cap_crqs early ibmvnic: don't spin in tasklet Sylwester Dziedziuch (1): i40e: Fix queues reservation for XDP Tim Yi (1): net: bridge: vlan: fix memory leak in __allowed_ingress Toke Høiland-Jørgensen (1): net: cpsw: Properly initialise struct page_pool_params Tom Zanussi (1): tracing: Don't inc err_log entry count if entry allocation fails Trond Myklebust (2): NFS: Ensure the server has an up to date ctime before hardlinking NFS: Ensure the server has an up to date ctime before renaming Valentin Caron (1): serial: stm32: fix software flow control transfer Vasily Gorbik (1): s390/hypfs: include z/VM guests with access control group set Vincent Guittot (1): sched/pelt: Relax the sync of util_sum with util_avg Xianting Tian (1): drm/msm: Fix wrong size calculation Xiaoke Wang (1): tracing/histogram: Fix a potential memory leak for kstrdup() Xin Long (1): ping: fix the sk_bound_dev_if match in ping_lookup Yajun Deng (2): net: ipv4: Move ip_options_fragment() out of loop net: ipv4: Fix the warning for dereference Yazen Ghannam (1): x86/MCE/AMD: Allow thresholding interface updates after init Zhengjun Xing (1): perf/x86/intel/uncore: Fix CAS_COUNT_WRITE issue for ICX daniel.starke(a)siemens.com (1): tty: n_gsm: fix SW flow control encoding/handling .../devicetree/bindings/net/can/tcan4x5x.txt | 2 +- arch/arm64/kernel/process.c | 39 +++--- arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 + arch/powerpc/include/asm/ppc-opcode.h | 1 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/lib/Makefile | 3 + arch/powerpc/mm/book3s32/mmu.c | 15 ++- arch/powerpc/mm/kasan/book3s_32.c | 59 ++++----- arch/powerpc/net/bpf_jit_comp64.c | 22 ++-- arch/powerpc/perf/core-book3s.c | 17 ++- arch/s390/hypfs/hypfs_vm.c | 6 +- arch/s390/kernel/module.c | 37 +++--- arch/x86/events/intel/uncore_snbep.c | 2 +- arch/x86/kernel/cpu/mce/amd.c | 2 +- arch/x86/kvm/svm/svm.c | 7 -- arch/x86/kvm/x86.c | 1 + block/bio.c | 3 +- drivers/firmware/efi/efi.c | 7 ++ drivers/firmware/efi/libstub/arm64-stub.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 11 +- drivers/gpu/drm/msm/dsi/dsi.c | 7 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/hwmon/lm90.c | 7 +- drivers/media/platform/qcom/venus/core.c | 2 - drivers/mtd/nand/raw/mpc5121_nfc.c | 1 - drivers/net/ethernet/ibm/ibmvnic.c | 112 +++++++++++------- drivers/net/ethernet/intel/i40e/i40e.h | 9 +- .../net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 44 ++++--- .../net/ethernet/intel/i40e/i40e_register.h | 3 + .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 103 +++++++++++++++- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 ++-- drivers/net/ethernet/ti/cpsw_priv.c | 2 +- drivers/net/phy/broadcom.c | 1 + drivers/net/phy/phy_device.c | 6 +- drivers/net/phy/sfp-bus.c | 5 + drivers/rpmsg/rpmsg_char.c | 22 +--- drivers/s390/scsi/zfcp_fc.c | 13 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 20 +--- drivers/tty/n_gsm.c | 4 +- drivers/tty/serial/8250/8250_of.c | 11 +- drivers/tty/serial/8250/8250_pci.c | 100 +++++++++++++++- drivers/tty/serial/stm32-usart.c | 2 +- drivers/usb/common/ulpi.c | 7 +- drivers/usb/core/hcd.c | 14 +++ drivers/usb/core/urb.c | 12 ++ drivers/usb/gadget/function/f_sourcesink.c | 1 + drivers/usb/host/xhci-plat.c | 3 + drivers/usb/storage/unusual_devs.h | 10 ++ drivers/usb/typec/tcpm/tcpm.c | 3 +- drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +- drivers/video/fbdev/hyperv_fb.c | 16 +-- fs/btrfs/ioctl.c | 6 +- fs/ceph/file.c | 9 ++ fs/configfs/dir.c | 6 +- fs/devpts/inode.c | 2 +- fs/jbd2/journal.c | 2 + fs/namei.c | 10 +- fs/nfs/dir.c | 4 + fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/suballoc.c | 25 ++-- include/linux/fsnotify.h | 48 +++++++- include/linux/usb/role.h | 6 + include/net/addrconf.h | 2 + include/net/ip.h | 21 ++-- include/net/ip6_fib.h | 2 +- include/net/route.h | 2 +- kernel/bpf/stackmap.c | 5 +- kernel/events/core.c | 8 +- kernel/events/uprobes.c | 2 +- kernel/locking/rtmutex.c | 4 +- kernel/locking/rwsem.c | 2 +- kernel/locking/semaphore.c | 2 +- kernel/power/wakelock.c | 11 +- kernel/sched/fair.c | 18 ++- kernel/sched/membarrier.c | 11 +- kernel/sched/pelt.h | 4 +- kernel/trace/trace.c | 3 +- kernel/trace/trace_events_hist.c | 1 + net/bluetooth/hci_event.c | 10 +- net/bridge/br_vlan.c | 9 +- net/core/net-procfs.c | 35 +++++- net/ipv4/ip_output.c | 41 ++++--- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 5 +- net/ipv6/addrconf.c | 27 +++-- net/ipv6/ip6_fib.c | 23 ++-- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/route.c | 2 +- net/netfilter/nf_conntrack_core.c | 8 +- net/netfilter/nft_payload.c | 3 + net/rxrpc/call_event.c | 8 +- net/rxrpc/output.c | 2 +- net/sunrpc/rpc_pipe.c | 4 +- usr/include/Makefile | 1 - virt/kvm/kvm_main.c | 1 - 101 files changed, 836 insertions(+), 407 deletions(-) -- 2.20.1

1 92

[PATCH openEuler-5.10 0/7] Backport 5.10.95 LTS
by Zheng Zengkai 10 May '22

10 May '22

Backport 5.10.95 LTS patches from upstream. David Matlack (1): KVM: x86/mmu: Fix write-protection of PTs mapped by the TDP MMU Jan Kara (1): select: Fix indefinitely sleeping task in poll_schedule_timeout() Manish Chopra (2): bnx2x: Utilize firmware 7.13.21.0 bnx2x: Invalidate fastpath HSI version for VFs Mathias Krause (1): drm/vmwgfx: Fix stale file descriptors on failed usercopy Paul E. McKenney (1): rcu: Tighten rcu_advance_cbs_nowake() checks Tvrtko Ursulin (1): drm/i915: Flush TLBs before releasing backing store arch/x86/kvm/mmu/tdp_mmu.c | 6 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 1 + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 ++ drivers/gpu/drm/i915/gt/intel_gt.c | 102 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt.h | 2 + drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 11 ++ drivers/gpu/drm/i915/i915_vma.c | 3 + drivers/gpu/drm/i915/intel_uncore.c | 26 ++++- drivers/gpu/drm/i915/intel_uncore.h | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 33 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- .../ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 + .../net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 3 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 75 +++++++++---- .../net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 13 ++- fs/select.c | 63 +++++------ kernel/rcu/tree.c | 7 +- 22 files changed, 296 insertions(+), 91 deletions(-) -- 2.20.1

1 7

[PATCH openEuler-5.10 1/5] arm64: kdump: Update the name of crashk_low_res
by Zheng Zengkai 28 Apr '22

28 Apr '22

From: Zhen Lei <thunder.leizhen(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I545H8 CVE: NA ------------------------------------------------------------------------- To be consistent with the style of other ARCHs such as x86, the kexec commit b5a34a20984c ("arm64: support more than one crash kernel regions") requires all crash regions to be named "Crash kernel". Update the name of crashk_low_res, so that we can directly use the latest kexec tool without having to maintain a private version. Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- arch/arm64/kernel/setup.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 2dd3ea837d35..ddca8d27fca6 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -274,16 +274,9 @@ static void __init request_standard_resources(void) request_memmap_resources(res); #ifdef CONFIG_KEXEC_CORE - /* - * Userspace will find "Crash kernel" or "Crash kernel (low)" - * region in /proc/iomem. - * In order to distinct from the high region and make no effect - * to the use of existing kexec-tools, rename the low region as - * "Crash kernel (low)". - */ + /* Userspace will find "Crash kernel" region in /proc/iomem. */ if (crashk_low_res.end && crashk_low_res.start >= res->start && crashk_low_res.end <= res->end) { - crashk_low_res.name = "Crash kernel (low)"; request_resource(res, &crashk_low_res); } if (crashk_res.end && crashk_res.start >= res->start && -- 2.20.1

1 4

[PATCH openEuler-5.10 1/6] Revert "xfrm: rate limit SA mapping change message to user space"
by Zheng Zengkai 28 Apr '22

28 Apr '22

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- This reverts commit 71022a70c75395d2edbd2bf83101794f65719a69. Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Acked-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- include/net/xfrm.h | 5 ----- include/uapi/linux/xfrm.h | 1 - net/xfrm/xfrm_compat.c | 6 ++---- net/xfrm/xfrm_state.c | 23 +---------------------- net/xfrm/xfrm_user.c | 18 +----------------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c3437ae77e7d..f2875c629d06 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -199,11 +199,6 @@ struct xfrm_state { struct xfrm_algo_aead *aead; const char *geniv; - /* mapping change rate limiting */ - __be16 new_mapping_sport; - u32 new_mapping; /* seconds */ - u32 mapping_maxage; /* seconds for input SA */ - /* Data for encapsulator */ struct xfrm_encap_tmpl *encap; struct sock __rcu *encap_sk; diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index 2290c98b47cf..ffc6a5391bb7 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -308,7 +308,6 @@ enum xfrm_attr_type_t { XFRMA_SET_MARK, /* __u32 */ XFRMA_SET_MARK_MASK, /* __u32 */ XFRMA_IF_ID, /* __u32 */ - XFRMA_MTIMER_THRESH, /* __u32 in seconds for input SA */ __XFRMA_MAX #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK /* Compatibility */ diff --git a/net/xfrm/xfrm_compat.c b/net/xfrm/xfrm_compat.c index a0f62fa02e06..2bf269390163 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -127,7 +127,6 @@ static const struct nla_policy compat_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK] = { .type = NLA_U32 }, [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, - [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, }; static struct nlmsghdr *xfrm_nlmsg_put_compat(struct sk_buff *skb, @@ -275,10 +274,9 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src) case XFRMA_SET_MARK: case XFRMA_SET_MARK_MASK: case XFRMA_IF_ID: - case XFRMA_MTIMER_THRESH: return xfrm_nla_cpy(dst, src, nla_len(src)); default: - BUILD_BUG_ON(XFRMA_MAX != XFRMA_MTIMER_THRESH); + BUILD_BUG_ON(XFRMA_MAX != XFRMA_IF_ID); pr_warn_once("unsupported nla_type %d\n", src->nla_type); return -EOPNOTSUPP; } @@ -433,7 +431,7 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla, int err; if (type > XFRMA_MAX) { - BUILD_BUG_ON(XFRMA_MAX != XFRMA_MTIMER_THRESH); + BUILD_BUG_ON(XFRMA_MAX != XFRMA_IF_ID); NL_SET_ERR_MSG(extack, "Bad attribute"); return -EOPNOTSUPP; } diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 65e2805fa113..c158e70e8ae1 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1557,9 +1557,6 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->km.seq = orig->km.seq; x->replay = orig->replay; x->preplay = orig->preplay; - x->mapping_maxage = orig->mapping_maxage; - x->new_mapping = 0; - x->new_mapping_sport = 0; return x; @@ -2211,7 +2208,7 @@ int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol) } EXPORT_SYMBOL(km_query); -static int __km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport) +int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport) { int err = -EINVAL; struct xfrm_mgr *km; @@ -2226,24 +2223,6 @@ static int __km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 rcu_read_unlock(); return err; } - -int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport) -{ - int ret = 0; - - if (x->mapping_maxage) { - if ((jiffies / HZ - x->new_mapping) > x->mapping_maxage || - x->new_mapping_sport != sport) { - x->new_mapping_sport = sport; - x->new_mapping = jiffies / HZ; - ret = __km_new_mapping(x, ipaddr, sport); - } - } else { - ret = __km_new_mapping(x, ipaddr, sport); - } - - return ret; -} EXPORT_SYMBOL(km_new_mapping); void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 portid) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index d0fdfbf4c5f7..ddf1b3a5f7c1 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -282,10 +282,6 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, err = 0; - if (attrs[XFRMA_MTIMER_THRESH]) - if (!attrs[XFRMA_ENCAP]) - err = -EINVAL; - out: return err; } @@ -525,7 +521,6 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs, struct nlattr *lt = attrs[XFRMA_LTIME_VAL]; struct nlattr *et = attrs[XFRMA_ETIMER_THRESH]; struct nlattr *rt = attrs[XFRMA_REPLAY_THRESH]; - struct nlattr *mt = attrs[XFRMA_MTIMER_THRESH]; if (re) { struct xfrm_replay_state_esn *replay_esn; @@ -557,9 +552,6 @@ static void xfrm_update_ae_params(struct xfrm_state *x, struct nlattr **attrs, if (rt) x->replay_maxdiff = nla_get_u32(rt); - - if (mt) - x->mapping_maxage = nla_get_u32(mt); } static void xfrm_smark_init(struct nlattr **attrs, struct xfrm_mark *m) @@ -977,13 +969,8 @@ static int copy_to_user_state_extra(struct xfrm_state *x, if (ret) goto out; } - if (x->security) { + if (x->security) ret = copy_sec_ctx(x->security, skb); - if (ret) - goto out; - } - if (x->mapping_maxage) - ret = nla_put_u32(skb, XFRMA_MTIMER_THRESH, x->mapping_maxage); out: return ret; } @@ -2937,9 +2924,6 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x) /* Must count x->lastused as it may become non-zero behind our back. */ l += nla_total_size_64bit(sizeof(u64)); - if (x->mapping_maxage) - l += nla_total_size(sizeof(x->mapping_maxage)); - return l; } -- 2.20.1

1 5

[PATCH openEuler-5.10 01/13] ixgbe: add the ability for the PF to disable VF link state
by Zheng Zengkai 27 Apr '22

27 Apr '22

From: Slawomir Mrozowicz <slawomirx.mrozowicz(a)intel.com> mainline inclusion from mainline-v5.18-rc1 commit 366fd1000995d4cf64e1a61a0d78a051550b9841 category: bugfix bugzilla: 186597, https://gitee.com/src-openeuler/kernel/issues/I532H9 CVE: CVE-2021-33061 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Add support for ndo_set_vf_link_state the Network Device Option that allows the PF driver to control the virtual link state of the VF devices. Without this change a VF cannot be disabled/enabled by the administrator. In the implementation the auto state takes over PF link state to VF link setting, the enable state is not supported, the disable state shut off the VF link regardless of the PF setting. Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz(a)intel.com> Tested-by: Konrad Jankowski <konrad0.jankowski(a)intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen(a)intel.com> Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 2 + .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 207 ++++++++++++++---- .../net/ethernet/intel/ixgbe/ixgbe_sriov.h | 4 +- 5 files changed, 182 insertions(+), 44 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index de0fc6ecf491..21bdae9eac75 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -177,6 +177,8 @@ struct vf_data_storage { u16 pf_vlan; /* When set, guest VLAN config not allowed. */ u16 pf_qos; u16 tx_rate; + int link_enable; + int link_state; u8 spoofchk_enabled; bool rss_query_enabled; u8 trusted; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 0109b47b2fe6..c0a56308dfd6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -5683,6 +5683,9 @@ static void ixgbe_up_complete(struct ixgbe_adapter *adapter) ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT); ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD; IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext); + + /* update setting rx tx for all active vfs */ + ixgbe_set_all_vfs(adapter); } void ixgbe_reinit_locked(struct ixgbe_adapter *adapter) @@ -6140,11 +6143,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter) for (i = 0 ; i < adapter->num_vfs; i++) adapter->vfinfo[i].clear_to_send = false; - /* ping all the active vfs to let them know we are going down */ - ixgbe_ping_all_vfs(adapter); - - /* Disable all VFTE/VFRE TX/RX */ - ixgbe_disable_tx_rx(adapter); + /* update setting rx tx for all active vfs */ + ixgbe_set_all_vfs(adapter); } /* disable transmits in the hardware now that interrupts are off */ @@ -10255,6 +10255,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_rate = ixgbe_ndo_set_vf_bw, .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, + .ndo_set_vf_link_state = ixgbe_ndo_set_vf_link_state, .ndo_set_vf_rss_query_en = ixgbe_ndo_set_vf_rss_query_en, .ndo_set_vf_trust = ixgbe_ndo_set_vf_trust, .ndo_get_vf_config = ixgbe_ndo_get_vf_config, diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h index a148534d7256..8f4316b19278 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h @@ -85,6 +85,8 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_IPSEC_ADD 0x0d #define IXGBE_VF_IPSEC_DEL 0x0e +#define IXGBE_VF_GET_LINK_STATE 0x10 /* get vf link state */ + /* length of permanent address message returned from PF */ #define IXGBE_VF_PERMADDR_MSG_LEN 4 /* word in permanent address message with the current multicast type */ diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 214a38de3f41..7f11c0a8e7a9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -96,6 +96,7 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter, for (i = 0; i < num_vfs; i++) { /* enable spoof checking for all VFs */ adapter->vfinfo[i].spoofchk_enabled = true; + adapter->vfinfo[i].link_enable = true; /* We support VF RSS querying only for 82599 and x540 * devices at the moment. These devices share RSS @@ -820,6 +821,57 @@ static inline void ixgbe_write_qde(struct ixgbe_adapter *adapter, u32 vf, } } +/** + * ixgbe_set_vf_rx_tx - Set VF rx tx + * @adapter: Pointer to adapter struct + * @vf: VF identifier + * + * Set or reset correct transmit and receive for vf + **/ +static void ixgbe_set_vf_rx_tx(struct ixgbe_adapter *adapter, int vf) +{ + u32 reg_cur_tx, reg_cur_rx, reg_req_tx, reg_req_rx; + struct ixgbe_hw *hw = &adapter->hw; + u32 reg_offset, vf_shift; + + vf_shift = vf % 32; + reg_offset = vf / 32; + + reg_cur_tx = IXGBE_READ_REG(hw, IXGBE_VFTE(reg_offset)); + reg_cur_rx = IXGBE_READ_REG(hw, IXGBE_VFRE(reg_offset)); + + if (adapter->vfinfo[vf].link_enable) { + reg_req_tx = reg_cur_tx | 1 << vf_shift; + reg_req_rx = reg_cur_rx | 1 << vf_shift; + } else { + reg_req_tx = reg_cur_tx & ~(1 << vf_shift); + reg_req_rx = reg_cur_rx & ~(1 << vf_shift); + } + + /* The 82599 cannot support a mix of jumbo and non-jumbo PF/VFs. + * For more info take a look at ixgbe_set_vf_lpe + */ + if (adapter->hw.mac.type == ixgbe_mac_82599EB) { + struct net_device *dev = adapter->netdev; + int pf_max_frame = dev->mtu + ETH_HLEN; + +#if IS_ENABLED(CONFIG_FCOE) + if (dev->features & NETIF_F_FCOE_MTU) + pf_max_frame = max_t(int, pf_max_frame, + IXGBE_FCOE_JUMBO_FRAME_SIZE); +#endif /* CONFIG_FCOE */ + + if (pf_max_frame > ETH_FRAME_LEN) + reg_req_rx = reg_cur_rx & ~(1 << vf_shift); + } + + /* Enable/Disable particular VF */ + if (reg_cur_tx != reg_req_tx) + IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), reg_req_tx); + if (reg_cur_rx != reg_req_rx) + IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), reg_req_rx); +} + static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) { struct ixgbe_ring_feature *vmdq = &adapter->ring_feature[RING_F_VMDQ]; @@ -845,11 +897,6 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) vf_shift = vf % 32; reg_offset = vf / 32; - /* enable transmit for vf */ - reg = IXGBE_READ_REG(hw, IXGBE_VFTE(reg_offset)); - reg |= BIT(vf_shift); - IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), reg); - /* force drop enable for all VF Rx queues */ reg = IXGBE_QDE_ENABLE; if (adapter->vfinfo[vf].pf_vlan) @@ -857,27 +904,7 @@ static int ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf) ixgbe_write_qde(adapter, vf, reg); - /* enable receive for vf */ - reg = IXGBE_READ_REG(hw, IXGBE_VFRE(reg_offset)); - reg |= BIT(vf_shift); - /* - * The 82599 cannot support a mix of jumbo and non-jumbo PF/VFs. - * For more info take a look at ixgbe_set_vf_lpe - */ - if (adapter->hw.mac.type == ixgbe_mac_82599EB) { - struct net_device *dev = adapter->netdev; - int pf_max_frame = dev->mtu + ETH_HLEN; - -#ifdef CONFIG_FCOE - if (dev->features & NETIF_F_FCOE_MTU) - pf_max_frame = max_t(int, pf_max_frame, - IXGBE_FCOE_JUMBO_FRAME_SIZE); - -#endif /* CONFIG_FCOE */ - if (pf_max_frame > ETH_FRAME_LEN) - reg &= ~BIT(vf_shift); - } - IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), reg); + ixgbe_set_vf_rx_tx(adapter, vf); /* enable VF mailbox for further messages */ adapter->vfinfo[vf].clear_to_send = true; @@ -1202,6 +1229,26 @@ static int ixgbe_update_vf_xcast_mode(struct ixgbe_adapter *adapter, return 0; } +static int ixgbe_get_vf_link_state(struct ixgbe_adapter *adapter, + u32 *msgbuf, u32 vf) +{ + u32 *link_state = &msgbuf[1]; + + /* verify the PF is supporting the correct API */ + switch (adapter->vfinfo[vf].vf_api) { + case ixgbe_mbox_api_12: + case ixgbe_mbox_api_13: + case ixgbe_mbox_api_14: + break; + default: + return -EOPNOTSUPP; + } + + *link_state = adapter->vfinfo[vf].link_enable; + + return 0; +} + static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) { u32 mbx_size = IXGBE_VFMAILBOX_SIZE; @@ -1267,6 +1314,9 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) case IXGBE_VF_UPDATE_XCAST_MODE: retval = ixgbe_update_vf_xcast_mode(adapter, msgbuf, vf); break; + case IXGBE_VF_GET_LINK_STATE: + retval = ixgbe_get_vf_link_state(adapter, msgbuf, vf); + break; case IXGBE_VF_IPSEC_ADD: retval = ixgbe_ipsec_vf_add_sa(adapter, msgbuf, vf); break; @@ -1322,18 +1372,6 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter) } } -void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter) -{ - struct ixgbe_hw *hw = &adapter->hw; - - /* disable transmit and receive for all vfs */ - IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), 0); - IXGBE_WRITE_REG(hw, IXGBE_VFTE(1), 0); - - IXGBE_WRITE_REG(hw, IXGBE_VFRE(0), 0); - IXGBE_WRITE_REG(hw, IXGBE_VFRE(1), 0); -} - static inline void ixgbe_ping_vf(struct ixgbe_adapter *adapter, int vf) { struct ixgbe_hw *hw = &adapter->hw; @@ -1359,6 +1397,21 @@ void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter) } } +/** + * ixgbe_set_all_vfs - update vfs queues + * @adapter: Pointer to adapter struct + * + * Update setting transmit and receive queues for all vfs + **/ +void ixgbe_set_all_vfs(struct ixgbe_adapter *adapter) +{ + int i; + + for (i = 0 ; i < adapter->num_vfs; i++) + ixgbe_set_vf_link_state(adapter, i, + adapter->vfinfo[i].link_state); +} + int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) { struct ixgbe_adapter *adapter = netdev_priv(netdev); @@ -1656,6 +1709,84 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting) return 0; } +/** + * ixgbe_set_vf_link_state - Set link state + * @adapter: Pointer to adapter struct + * @vf: VF identifier + * @state: required link state + * + * Set a link force state on/off a single vf + **/ +void ixgbe_set_vf_link_state(struct ixgbe_adapter *adapter, int vf, int state) +{ + adapter->vfinfo[vf].link_state = state; + + switch (state) { + case IFLA_VF_LINK_STATE_AUTO: + if (test_bit(__IXGBE_DOWN, &adapter->state)) + adapter->vfinfo[vf].link_enable = false; + else + adapter->vfinfo[vf].link_enable = true; + break; + case IFLA_VF_LINK_STATE_ENABLE: + adapter->vfinfo[vf].link_enable = true; + break; + case IFLA_VF_LINK_STATE_DISABLE: + adapter->vfinfo[vf].link_enable = false; + break; + } + + ixgbe_set_vf_rx_tx(adapter, vf); + + /* restart the VF */ + adapter->vfinfo[vf].clear_to_send = false; + ixgbe_ping_vf(adapter, vf); +} + +/** + * ixgbe_ndo_set_vf_link_state - Set link state + * @netdev: network interface device structure + * @vf: VF identifier + * @state: required link state + * + * Set the link state of a specified VF, regardless of physical link state + **/ +int ixgbe_ndo_set_vf_link_state(struct net_device *netdev, int vf, int state) +{ + struct ixgbe_adapter *adapter = netdev_priv(netdev); + int ret = 0; + + if (vf < 0 || vf >= adapter->num_vfs) { + dev_err(&adapter->pdev->dev, + "NDO set VF link - invalid VF identifier %d\n", vf); + return -EINVAL; + } + + switch (state) { + case IFLA_VF_LINK_STATE_ENABLE: + dev_info(&adapter->pdev->dev, + "NDO set VF %d link state %d - not supported\n", + vf, state); + break; + case IFLA_VF_LINK_STATE_DISABLE: + dev_info(&adapter->pdev->dev, + "NDO set VF %d link state disable\n", vf); + ixgbe_set_vf_link_state(adapter, vf, state); + break; + case IFLA_VF_LINK_STATE_AUTO: + dev_info(&adapter->pdev->dev, + "NDO set VF %d link state auto\n", vf); + ixgbe_set_vf_link_state(adapter, vf, state); + break; + default: + dev_err(&adapter->pdev->dev, + "NDO set VF %d - invalid link state %d\n", vf, state); + ret = -EINVAL; + } + + return ret; +} + int ixgbe_ndo_set_vf_rss_query_en(struct net_device *netdev, int vf, bool setting) { diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h index 3ec21923c89c..0690ecb8dfa3 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h @@ -17,8 +17,8 @@ void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter); #endif void ixgbe_msg_task(struct ixgbe_adapter *adapter); int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask); -void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter); void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter); +void ixgbe_set_all_vfs(struct ixgbe_adapter *adapter); int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac); int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan, u8 qos, __be16 vlan_proto); @@ -31,7 +31,9 @@ int ixgbe_ndo_set_vf_rss_query_en(struct net_device *netdev, int vf, int ixgbe_ndo_set_vf_trust(struct net_device *netdev, int vf, bool setting); int ixgbe_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi); +int ixgbe_ndo_set_vf_link_state(struct net_device *netdev, int vf, int state); void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter); +void ixgbe_set_vf_link_state(struct ixgbe_adapter *adapter, int vf, int state); int ixgbe_disable_sriov(struct ixgbe_adapter *adapter); #ifdef CONFIG_PCI_IOV void ixgbe_enable_sriov(struct ixgbe_adapter *adapter, unsigned int max_vfs); -- 2.20.1

1 12

[PATCH openEuler-5.10 01/42] can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
by Zheng Zengkai 27 Apr '22

27 Apr '22

From: Hangyu Hua <hbh25y(a)gmail.com> stable inclusion from stable-v5.10.110 commit 5318cdf4fd834856ce71238b064f35386f9ef528 category: bugfix bugzilla: 186592 https://gitee.com/src-openeuler/kernel/issues/I51YBQ?from=project-issue CVE: CVE-2022-28388 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 3d3925ff6433f98992685a9679613a2cc97f3ce2 upstream. There is no need to call dev_kfree_skb() when usb_submit_urb() fails because can_put_echo_skb() deletes original skb and can_free_echo_skb() deletes the cloned skb. Fixes: 0024d8ad1639 ("can: usb_8dev: Add support for USB2CAN interface from 8 devices") Link: https://lore.kernel.org/all/20220311080614.45229-1-hbh25y@gmail.com Cc: stable(a)vger.kernel.org Signed-off-by: Hangyu Hua <hbh25y(a)gmail.com> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/net/can/usb/usb_8dev.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index ca7c55d6a41d..985e00aee4ee 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c @@ -670,9 +670,20 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb, atomic_inc(&priv->active_tx_urbs); err = usb_submit_urb(urb, GFP_ATOMIC); - if (unlikely(err)) - goto failed; - else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS) + if (unlikely(err)) { + can_free_echo_skb(netdev, context->echo_index); + + usb_unanchor_urb(urb); + usb_free_coherent(priv->udev, size, buf, urb->transfer_dma); + + atomic_dec(&priv->active_tx_urbs); + + if (err == -ENODEV) + netif_device_detach(netdev); + else + netdev_warn(netdev, "failed tx_urb %d\n", err); + stats->tx_dropped++; + } else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS) /* Slow down tx path */ netif_stop_queue(netdev); @@ -691,19 +702,6 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb, return NETDEV_TX_BUSY; -failed: - can_free_echo_skb(netdev, context->echo_index); - - usb_unanchor_urb(urb); - usb_free_coherent(priv->udev, size, buf, urb->transfer_dma); - - atomic_dec(&priv->active_tx_urbs); - - if (err == -ENODEV) - netif_device_detach(netdev); - else - netdev_warn(netdev, "failed tx_urb %d\n", err); - nomembuf: usb_free_urb(urb); -- 2.20.1

1 41

[PATCH openEuler-5.10 v2 000/548] Backport 5.10.94 LTS
by Zheng Zengkai 27 Apr '22

27 Apr '22

Backport 5.10.94 LTS patches from upstream. Complicts: Already merged(-11): f2fs: fix to do sanity check in is_alive() RDMA/hns: Validate the pkey index iommu/iova: Fix race between FQ timeout and teardown By 1bfe3f8bbb24 iommu/iova: wait 'fq_timer' handler to finish before destroying 'fq' scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume() mwifiex: Fix skb_over_panic in mwifiex_usb_recv() By 7c24452ca6d mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv audit: ensure userspace is penalized the same as the kernel when under pressure By 29d444b2cd53 audit: ensure userspace is penalized the same as the kernel when under pressure jffs2: GC deadlock reading a page that is used in jffs2_write_begin() ext4: Fix BUG_ON in ext4_bread when write quota data ext4: fix null-ptr-deref in '__ext4_journal_ensure_credits' RDMA/hns: Modify the mapping attribute of doorbell to device Use mainline mainline-v5.15-rc3 solution by 8d4553b61b1c RDMA/hns: Modify the mapping attribute of doorbell to device block: Fix fsync always failed if once failed Use mainline mainline-v5.17 solution by 2ffb13b95b88 block: Fix fsync always failed if once failed Context conflict: mm_zone: add function to check if managed dma zone exists sched/fair: Fix per-CPU kthread and wakee stacking for asym CPU capacity x86/kbuild: Enable CONFIG_KALLSYMS_ALL=y in the defconfigs PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors Will be merged separately(-2): arm64: lib: Annotate {clear, copy}_page() as position-independent arm64: clear_page() shouldn't use DC ZVA when DCZID_EL0.DZP == 1 Implement changed(reverted old one and reapplied the LTS patch, +1): sched/rt: Try to restart rt period timer when rt runtime exceeded Modified(fix build error): iommu/io-pgtable-arm: Fix table descriptor paddr formatting Total patches: 560 - 11 - 2 + 1(the reverted patch) = 548 Adam Ford (1): clk: imx8mn: Fix imx8mn_clko1_sels Adrian Hunter (1): perf script: Fix hex dump character output Alex Deucher (1): drm/amdgpu/display: set vblank_disable_immediate for DC Alexander Aring (4): fs: dlm: use sk->sk_socket instead of con->sock fs: dlm: don't call kernel_getpeername() in error_report() fs: dlm: fix build with CONFIG_IPV6 disabled fs: dlm: filter user dlm messages for kernel locks Alexander Gordeev (1): s390/mm: fix 2KB pgtable release race Alexander Stein (4): arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+ dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property dt-bindings: display: meson-vpu: Add missing amlogic,canvas property Alexei Starovoitov (1): bpf: Adjust BTF log size limit. Alexey Kardashevskiy (2): KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST Aline Santana Cordeiro (1): media: staging: media: atomisp: pci: Balance braces around conditional statements in file atomisp_cmd.c Alistair Francis (1): HID: quirks: Allow inverting the absolute X/Y values Alistair Popple (1): mm/hmm.c: allow VM_MIXEDMAP to work with hmm_range_fault Alyssa Ross (1): ASoC: fsl_mqs: fix MODULE_ALIAS Amelie Delaunay (1): dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASK Ammar Faizi (2): tools/nolibc: x86-64: Fix startup code bug powerpc/xive: Add missing null check after calling kmalloc Anders Roxell (2): selftests: clone3: clone3: add case CLONE3_ARGS_NO_TEST powerpc/cell: Fix clang -Wimplicit-fallthrough warning Andre Przywara (1): ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding Andreas Oetken (1): mtd: Fixed breaking list in __mtd_del_partition. Andrey Konovalov (1): lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() test Andrey Ryabinin (1): cputime, cpuacct: Include guest time in user time in cpuacct.stat Andrii Nakryiko (1): selftests/bpf: Fix bpf_object leak in skb_ctx selftest Anilkumar Kolli (1): ath11k: Use host CE parameters for CE interrupts configuration Antoine Tenart (1): net-sysfs: update the queue counts in the unregistration path Anton Vasilyev (1): media: dw2102: Fix use after free Antony Antony (3): xfrm: interface with if_id 0 should return error xfrm: state and policy should fail if XFRMA_IF_ID 0 xfrm: rate limit SA mapping change message to user space Arnaud Pouliquen (1): rpmsg: core: Clean up resources on announce_create failure. Arnd Bergmann (1): dmaengine: pxa/mmp: stop referencing config->slave_id Arseny Demidov (1): hwmon: (mr75203) fix wrong power-up delay value Athira Rajeev (2): powerpc/perf: MMCR0 control for PMU registers under PMCC=00 powerpc/perf: Fix PMU callbacks to clear pending PMI before resetting an overflown PMC Avihai Horon (2): RDMA/core: Let ib_find_gid() continue search even after empty entry RDMA/cma: Let cma_resolve_ib_dev() continue search even after empty entry Aya Levin (2): net/mlx5e: Fix page DMA map/unmap attributes Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels" Baochen Qiang (2): ath11k: Fix crash caused by uninitialized TX ring ath11k: Avoid false DEADLOCK warning reported by lockdep Baoquan He (3): mm_zone: add function to check if managed dma zone exists dma/pool: create dma atomic pool only if dma zone has managed pages mm/page_alloc.c: do not warn allocation failure on zone DMA if no managed pages Bart Van Assche (2): scsi: ufs: Fix race conditions related to driver data scsi: core: Show SCMD_LAST in text form Baruch Siach (3): arm64: dts: qcom: ipq6018: Fix gpio-ranges property of: base: Fix phandle argument length mismatch error message of: base: Improve argument length mismatch error Ben Greear (1): ath11k: Fix napi related hang Ben Hutchings (1): firmware: Update Kconfig help text for Google firmware Ben Skeggs (1): drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR Benjamin Li (3): wcn36xx: ensure pairing of init_scan/finish_scan and start_scan/end_scan wcn36xx: populate band before determining rate on RX wcn36xx: fix RX BD rate mapping for 5GHz legacy rates Bernard Zhao (1): selinux: fix potential memleak in selinux_add_opt() Bhaskar Chowdhury (1): crypto: qat - fix spelling mistake: "messge" -> "message" Biju Das (1): arm64: dts: renesas: cat875: Add rx/tx delays Biwen Li (1): arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus Bixuan Cui (1): ALSA: oss: fix compile error when OSS_DEBUG is enabled Borislav Petkov (4): x86/mce: Allow instrumentation during task work queueing x86/mce: Mark mce_panic() noinstr x86/mce: Mark mce_end() noinstr x86/mce: Mark mce_read_aux() noinstr Brian Norris (8): drm/panel: kingdisplay-kd097d04: Delete panel on attach() failure drm/panel: innolux-p079zca: Delete panel on attach() failure drm/rockchip: dsi: Fix unbalanced clock on probe error drm/rockchip: dsi: Hold pm-runtime across bind/unbind drm/rockchip: dsi: Disable PLL clock on bind error drm/rockchip: dsi: Reconfigure hardware on resume() mwifiex: Fix possible ABBA deadlock drm/bridge: analogix_dp: Make PSR-exit block less Bryan O'Donoghue (5): wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND wcn36xx: Fix DMA channel enable/disable cycle wcn36xx: Release DMA channel descriptor allocations wcn36xx: Put DXE block into reset before freeing memory media: venus: core, venc, vdec: Fix probe dependency error Cezary Rojewski (1): ASoC: Intel: catpt: Test dmaengine_submit() result before moving on Changcheng Deng (1): PM: AVS: qcom-cpr: Use div64_ul instead of do_div Chao Yu (1): f2fs: fix to reserve space for IO align feature Chen Jun (1): tpm: add request_locality before write TPM_INT_ENABLE Chengfeng Ye (3): crypto: qce - fix uaf on qce_ahash_register_one crypto: qce - fix uaf on qce_skcipher_register_one HSI: core: Fix return freed object in hsi_new_client Chengguang Xu (1): RDMA/rxe: Fix a typo in opcode name Christian Eggers (1): mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings Christian Hewitt (2): arm64: dts: meson-gxbb-wetek: fix HDMI in early boot arm64: dts: meson-gxbb-wetek: fix missing GPIO binding Christian König (1): drm/radeon: fix error handling in radeon_driver_open_kms Christian Lamparter (1): ARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors Christoph Hellwig (2): dm: fix alloc_dax error handling in alloc_dev scsi: sr: Don't use GFP_DMA Christophe JAILLET (3): media: venus: core: Fix a potential NULL pointer dereference in an error handling path media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()' RDMA/bnxt_re: Scan the whole bitmap when checking if "disabling RCFW with pending cmd-bit" Christophe Jaillet (1): tpm_tis: Fix an error handling path in 'tpm_tis_core_init()' Christophe Leroy (7): lkdtm: Fix content of section containing lkdtm_rodata_do_nothing() powerpc/irq: Add helper to set regs->softe powerpc/32s: Fix shift-out-of-bounds in KASAN init powerpc/powermac: Add additional missing lockdep_register_key() powerpc/powermac: Add missing lockdep_register_key() w1: Misuse of get_user()/put_user() reported by sparse powerpc/40x: Map 32Mbytes of memory at startup Chunguang Xu (1): ext4: fix a possible ABBA deadlock due to busy PA Claudiu Beznea (2): mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP mfd: atmel-flexcom: Use .resume_noirq Clément Léger (1): software node: fix wrong node passed to find nargs_prop Conor Dooley (1): clk: bm1880: remove kfrees on static allocations Dafna Hirschfeld (1): media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released Dan Carpenter (7): drm/bridge: display-connector: fix an uninitialized pointer in probe() media: atomisp: fix uninitialized bug in gmin_get_pmic_id_and_addr() drm/vboxvideo: fix a NULL vs IS_ERR() check rocker: fix a sleeping in atomic bug Bluetooth: L2CAP: uninitialized variables in l2cap_sock_setsockopt() ax25: uninitialized variable in ax25_setsockopt() netrom: fix api breakage in nr_setsockopt() Daniel Borkmann (1): bpf: Don't promote bogus looking registers after null check. Daniel Thompson (1): Documentation: dmaengine: Correctly describe dmatest with channel unset Danielle Ratson (2): mlxsw: pci: Add shutdown method in PCI driver mlxsw: pci: Avoid flow control for EMAD packets David Heidelberg (1): arm64: dts: qcom: msm8996: drop not documented adreno properties Dillon Min (3): media: videobuf2: Fix the size printk format ARM: dts: stm32: fix dtbs_check warning on ili9341 dts binding on stm32f429 disco clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell Dinh Nguyen (1): EDAC/synopsys: Use the quirk for version instead of ddr version Dmitry Baryshkov (2): arm64: dts: qcom: msm8916: fix MMC controller aliases drm/msm/dpu: fix safe status debugfs file Dmitry Osipenko (1): gpu: host1x: Add back arm_iommu_detach_device() Dmitry Torokhov (1): HID: vivaldi: fix handling devices not using numbered reports Dominik Brodowski (1): pcmcia: fix setting of kthread task states Dongliang Mu (1): media: em28xx: fix memory leak in em28xx_init_dev Doyle, Patrick (1): mtd: nand: bbt: Fix corner case in bad block table handling Eli Cohen (1): vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 Eric Dumazet (7): xfrm: fix a small bug in xfrm_sa_len() ppp: ensure minimum packet size in ppp_write() ipv4: update fib_info_cnt under spinlock protection ipv4: avoid quadratic behavior in netns dismantle af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress inet: frags: annotate races around fqdir->dead and fqdir->high_thresh netns: add schedule point in ops_exit_list() Eric W. Biederman (1): taskstats: Cleanup the use of task->exit_code Fabio Estevam (3): media: imx-pxp: Initialize the spinlock prior to using it regmap: Call regmap_debugfs_exit() prior to _init() ath10k: Fix the MTU size on QCA9377 SDIO Fabrice Gasnier (1): counter: stm32-lptimer-cnt: remove iio counter abi Filipe Manana (2): btrfs: fix deadlock between quota enable and other quota operations btrfs: respect the max size in the header when activating swap file Florian Fainelli (1): net: mdio: Demote probed message to debug print Florian Westphal (2): netfilter: bridge: add support for pppoe filtering netfilter: nft_set_pipapo: allocate pcpu scratch maps on clone Frank Rowand (1): of: unittest: 64 bit dma address test requires arch support Frederic Weisbecker (1): rcu/exp: Mark current CPU as exp-QS in IPI loop second pass Fugang Duan (1): tty: serial: imx: disable UCR4_OREN in .stop_rx() instead of .shutdown() Gang Li (1): shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode George G. Davis (1): mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove German Gomez (1): perf evsel: Override attr->sample_period for non-libpfm4 events Ghalem Boudour (1): xfrm: fix policy lookup for ipv6 gre packets Giovanni Cabiddu (1): crypto: qat - fix undetected PFVF timeout in ACK loop Guillaume Nault (3): xfrm: Don't accidentally set RTO_ONLINK in decode_session4() gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst() libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route() Hans Verkuil (2): media: v4l2-ioctl.c: readbuffers depends on V4L2_CAP_READWRITE media: cec-pin: fix interrupt en/disable handling Hans de Goede (9): ACPI: scan: Create platform device for BCM4752 and LNV4752 ACPI nodes media: atomisp-ov2680: Fix ov2680_set_fmt() clobbering the exposure drm: panel-orientation-quirks: Add quirk for the Lenovo Yoga Book X91F/L gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use ACPI / x86: Drop PWM2 device on Lenovo Yoga Book from always present table ACPI: Change acpi_device_always_present() into acpi_device_override_status() ACPI / x86: Allow specifying acpi_device_override_status() quirks by path ACPI / x86: Add not-present quirk for the PCI0.SDHB.BRC1 device on the GPD win PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors Hari Bathini (2): powerpc: handle kdump appropriately with crash_kexec_post_notifiers option powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic Harshad Shirwadkar (1): ext4: initialize err_blk before calling __ext4_get_inode_loc Hector Martin (1): iommu/io-pgtable-arm: Fix table descriptor paddr formatting Heiko Carstens (1): selftests/ftrace: make kprobe profile testcase description unique Heiner Kallweit (2): i2c: i801: Don't silently correct invalid transfer size crypto: omap-aes - Fix broken pm_runtime_and_get() usage Herbert Xu (2): crypto: stm32 - Fix last sparse warning in stm32_cryp_check_ctr_counter crypto: stm32 - Revert broken pm_runtime_resume_and_get changes Hou Tao (1): bpf: Disallow BPF_LOG_KERNEL log level for bpf(BPF_BTF_LOAD) Hyeong-Jun Kim (1): f2fs: compress: fix potential deadlock of compress file Igor Pylypiv (1): scsi: pm80xx: Update WARN_ON check in pm8001_mpi_build_cmd() Ilan Peer (2): iwlwifi: mvm: Fix calculation of frame length iwlwifi: mvm: Increase the scan timeout guard to 30 seconds Ilia Mirkin (1): drm/nouveau/kms/nv04: use vzalloc for nv04_display Ingo Molnar (1): x86/kbuild: Enable CONFIG_KALLSYMS_ALL=y in the defconfigs Iwona Winiarska (1): gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock Jackie Liu (1): drm/msm/dp: displayPort driver need algorithm rational Jakub Kicinski (1): selftests: harness: avoid false negatives if test has no ASSERTs James Hilliard (1): media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. James Smart (1): scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup Jammy Huang (2): media: aspeed: fix mode-detect always time out at 2nd run media: aspeed: Update signal status immediately to ensure sane hw state Jan Kara (4): ext4: avoid trim error on fs with small groups udf: Fix error handling in udf_new_inode() ext4: make sure to reset inode lockdep class when quota enabling fails ext4: make sure quota gets properly shutdown on error Jan Kiszka (1): soc: ti: pruss: fix referenced node in error message Jann Horn (1): HID: uhid: Fix worker destroying device without any protection Jason A. Donenfeld (1): random: do not throw away excess input to crng_fast_load Jason Gerecke (3): HID: wacom: Reset expected and received contact counts at the same time HID: wacom: Ignore the confidence flag when a touch is removed HID: wacom: Avoid using stale array indicies to read contact count Jens Wiklander (1): tee: fix put order in teedev_close_context() Jernej Skrabec (1): media: hantro: Fix probe func error path Jiasheng Jiang (9): media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes power: reset: mt6397: Check for null res pointer staging: greybus: audio: Check null pointer fsl/fman: Check for null pointer after calling devm_ioremap Bluetooth: hci_bcm: Check for error irq can: xilinx_can: xcan_probe(): check for error irq ASoC: rt5663: Handle device_property_read_u32_array error codes ASoC: mediatek: Check for error clk pointer ASoC: samsung: idma: Check of ioremap return value Jie Wang (1): net: bonding: fix bond_xmit_broadcast return value error bug Jim Quinlan (1): of: unittest: fix warning on PowerPC frame size warning Joakim Tjernlund (1): i2c: mpc: Correct I2C reset procedure Joe Thornber (2): dm btree: add a defensive bounds check to insert_at() dm space map common: add bounds check to sm_ll_lookup_bitmap() Joerg Roedel (1): x86/mm: Flush global TLB when switching to trampoline page-table Johan Hovold (9): media: flexcop-usb: fix control-message timeouts media: mceusb: fix control-message timeouts media: em28xx: fix control-message timeouts media: cpia2: fix control-message timeouts media: s2255: fix control-message timeouts media: redrat3: fix control-message timeouts media: pvrusb2: fix control-message timeouts media: stk1160: fix control-message timeouts can: softing_cs: softingcs_probe(): fix memleak on registration failure Johannes Berg (6): iwlwifi: mvm: fix 32-bit build in FTM um: fix ndelay/udelay defines um: virtio_uml: Fix time-travel external time propagation iwlwifi: mvm: synchronize with FW after multicast commands iwlwifi: fix leaks/bad data after failed firmware load iwlwifi: remove module loading failure message John David Anglin (2): parisc: Avoid calling faulthandler_disabled() twice parisc: Fix lpa and lpa_user defines Jonathan Cameron (1): iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs Jordan Niethe (1): powerpc/64s: Convert some cpu_setup() and cpu_restore() functions to C Josef Bacik (3): btrfs: remove BUG_ON() in find_parent_nodes() btrfs: remove BUG_ON(!eie) in find_parent_nodes btrfs: check the root node for uptodate before returning it José Expósito (5): HID: hid-uclogic-params: Invalid parameter check in uclogic_params_init HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init HID: hid-uclogic-params: Invalid parameter check in uclogic_params_frame_init_v1_buttonpad HID: apple: Do not reset quirks when the Fn key is not found Julia Lawall (4): powerpc/6xx: add missing of_node_put powerpc/powernv: add missing of_node_put powerpc/cell: add missing of_node_put powerpc/btext: add missing of_node_put Kai-Heng Feng (1): usb: hub: Add delay for SuperSpeed hub resume to let links transit to U0 Kajol Jain (1): bpf: Remove config check to enable bpf support for branch records Kamal Heib (2): RDMA/qedr: Fix reporting max_{send/recv}_wr attrs RDMA/cxgb4: Set queue pair state when being queried Karthikeyan Kathirvel (2): ath11k: clear the keys properly via DISABLE_KEY ath11k: reset RSN/WPA present state for open BSS Kees Cook (2): x86/uaccess: Move variable into switch case statement char/mwave: Adjust io port register size Kevin Bracey (1): net_sched: restore "mpu xxx" handling Kirill A. Shutemov (1): ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5 Kishon Vijay Abraham I (1): arm64: dts: ti: j7200-main: Fix 'dtbs_check' serdes_ln_ctrl node Konrad Dybcio (1): regulator: qcom_smd: Align probe function with rpmh-regulator Krzysztof Kozlowski (1): nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind() Kunihiko Hayashi (2): spi: uniphier: Fix a bug that doesn't point to private data correctly dmaengine: uniphier-xdmac: Fix type of address variables Kuniyuki Iwashima (1): bpf: Fix SO_RCVBUF/SO_SNDBUF handling in _bpf_setsockopt(). Lad Prabhakar (2): mtd: hyperbus: rpc-if: Check return value of rpcif_sw_init() memory: renesas-rpc-if: Return error in case devm_ioremap_resource() fails Lakshmi Sowjanya D (1): i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters Laurence de Bruxelles (1): rtc: pxa: fix null pointer dereference Laurent Pinchart (1): drm: rcar-du: Fix CRTC timings when CMM is used Leon Romanovsky (1): devlink: Remove misleading internal_flags from health reporter dump Li Hua (1): sched/rt: Try to restart rt period timer when rt runtime exceeded Lino Sanfilippo (1): serial: amba-pl011: do not request memory region twice Linus Lüssing (1): batman-adv: allow netlink usage in unprivileged containers Lizhi Hou (1): tty: serial: uartlite: allow 64 bit address Luca Coelho (1): iwlwifi: pcie: make sure prph_info is set when treating wakeup IRQ Lucas De Marchi (1): x86/gpu: Reserve stolen memory for first integrated Intel GPU Lucas Stach (2): drm/etnaviv: consider completed fence seqno in hang check drm/etnaviv: limit submit sizes Luiz Augusto von Dentz (4): Bluetooth: L2CAP: Fix not initializing sk_peer_pid Bluetooth: L2CAP: Fix using wrong mode Bluetooth: vhci: Set HCI_QUIRK_VALID_LE_STATES Bluetooth: hci_sync: Fix not setting adv set duration Lukas Bulwahn (5): ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA mips: add SYS_HAS_CPU_MIPS64_R5 config for MIPS Release 5 support mips: fix Kconfig reference to PHYS_ADDR_T_64BIT ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Lukas Wunner (3): serial: pl010: Drop CR register reset on set_termios serial: core: Keep mctrl register state and cached copy in sync serial: Fix incorrect rs485 polarity on uart open Luís Henriques (1): ext4: set csum seed in tmp inode while migrating to extents Lv Yunlong (1): wireless: iwlwifi: Fix a double free in iwl_txq_dyn_alloc_dma Mansur Alisha Shaik (1): media: venus: avoid calling core_clk_setrate() concurrently during concurrent video sessions Maor Dickman (1): net/mlx5e: Don't block routes with nexthop objects in SW Marc Kleine-Budde (3): can: mcp251xfd: add missing newline to printed strings can: softing: softing_startstop(): fix set but not used variable warning can: mcp251xfd: mcp251xfd_tef_obj_read(): fix typo in error message Marc Zyngier (1): irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time Marcelo Tosatti (1): KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock Marco Chiappero (2): crypto: qat - remove unnecessary collision prevention step in PFVF crypto: qat - make pfvf send message direction agnostic Marek Behún (1): ARM: dts: armada-38x: Add generic compatible to UART nodes Marek Vasut (1): crypto: stm32/crc32 - Fix kernel BUG triggered in probe() Marijn Suijten (6): backlight: qcom-wled: Validate enabled string indices in DT backlight: qcom-wled: Pass number of elements to read to read_u32_array backlight: qcom-wled: Fix off-by-one maximum with default num_strings backlight: qcom-wled: Override default length with qcom,enabled-strings backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion backlight: qcom-wled: Respect enabled-strings in set_brightness Marina Nikolic (1): amdgpu/pm: Make sysfs pm attributes as read-only for VFs Mark Langsdorf (1): ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions Martin Blumenstingl (1): clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB Martyn Welch (1): drm/bridge: megachips: Ensure both bridges are probed before registration Mateusz Jończyk (1): rtc: cmos: take rtc_lock while reading from CMOS Matthias Schiffer (1): scripts/dtc: dtx_diff: remove broken example from help text Mauro Carvalho Chehab (7): media: atomisp: fix enum formats logic media: atomisp: fix try_fmt logic media: atomisp: set per-device's default mode media: atomisp: handle errors at sh_css_create_isp_params() media: m920x: don't use stack on USB reads scripts: sphinx-pre-install: add required ctex dependency scripts: sphinx-pre-install: Fix ctex support on Debian Maxim Levitsky (1): iommu/amd: Restore GA log/tail pointer on host resume Maxime Ripard (4): clk: bcm-2835: Pick the closest clock rate clk: bcm-2835: Remove rounding up the dividers drm/vc4: hdmi: Set a default HSM rate drm/vc4: hdmi: Make sure the device is powered with CEC Meng Li (1): crypto: caam - replace this_cpu_ptr with raw_cpu_ptr Miaoqian Lin (6): Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe usb: dwc3: qcom: Fix NULL vs IS_ERR checking in dwc3_qcom_probe spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe phy: mediatek: Fix missing check in mtk_mipi_tx_probe parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries lib82596: Fix IRQ check in sni_82596_probe Michael Ellerman (1): powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING Michael Kuron (1): media: dib0700: fix undefined behavior in tuner shutdown Michael S. Tsirkin (1): virtio_ring: mark ring unused on error Michal Suchanek (1): debugfs: lockdown: Allow reading debugfs files that are not world readable Mika Westerberg (1): thunderbolt: Runtime PM activate both ends of the device link Moshe Shemesh (2): net/mlx5: Set command entry semaphore up once got index free Revert "net/mlx5: Add retry mechanism to the command entry index allocation" Nathan Chancellor (3): x86/boot/compressed: Move CLANG_FLAGS to beginning of KBUILD_CFLAGS iwlwifi: mvm: Use div_s64 instead of do_div in iwl_mvm_ftm_rtt_smoothing() MIPS: Loongson64: Use three arguments for slti Nathan Errera (1): iwlwifi: mvm: test roc running status bits before removing the sta Neal Liu (1): usb: uhci: add aspeed ast2600 uhci support Neil Armstrong (1): drm/bridge: dw-hdmi: handle ELD when DRM_BRIDGE_ATTACH_NO_CONNECTOR Nicholas Piggin (3): powerpc/perf: move perf irq/nmi handling details into traps.c powerpc/watchdog: Fix missed watchdog reset due to memory ordering race powerpc/64s/radix: Fix huge vmap false positive Nicolas Toromanoff (6): crypto: stm32/cryp - fix CTR counter carry crypto: stm32/cryp - fix xts and race condition in crypto_engine requests crypto: stm32/cryp - check early input data crypto: stm32/cryp - fix double pm exit crypto: stm32/cryp - fix lrw chaining mode crypto: stm32/cryp - fix bugs and crash in tests Niklas Söderlund (2): dt-bindings: thermal: Fix definition of cooling-maps contribution property media: rcar-vin: Update format alignment constraints Nishanth Menon (3): arm64: dts: ti: k3-j7200: Fix the L2 cache sets arm64: dts: ti: k3-j721e: Fix the L2 cache sets arm64: dts: ti: k3-j7200: Correct the d-cache-sets info Oleksandr Andrushchenko (1): xen/gntdev: fix unmap notification order Oleksij Rempel (1): thermal/drivers/imx: Implement runtime PM support Pali Rohár (5): PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space PCI: pci-bridge-emul: Fix definitions of reserved bits PCI: pci-bridge-emul: Correctly set PCIe capabilities PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device Panicker Harish (1): Bluetooth: hci_qca: Stop IBS timer during BT OFF Paolo Abeni (1): bpf: Do not WARN in bpf_warn_invalid_xdp_action() Patrick Williams (1): tpm: fix NPE on probe for missing device Paul Cercueil (3): mtd: rawnand: davinci: Don't calculate ECC when reading page mtd: rawnand: davinci: Avoid duplicated page read mtd: rawnand: davinci: Rewrite function description Paul Chaignon (1): bpftool: Enable line buffering for stdout Paul E. McKenney (1): clocksource: Reduce clocksource-skew threshold Paul Gerber (1): thermal/drivers/imx8mm: Enable ADC when enabling monitor Pavankumar Kondeti (1): usb: gadget: f_fs: Use stream_open() for endpoint files Pavel Skripkin (2): Bluetooth: stop proccessing malicious adv data net: mcs7830: handle usb read errors properly Peiwei Hu (1): powerpc/prom_init: Fix improper check of prom_getprop() Peng Fan (1): arm64: dts: ti: k3-j721e: correct cache-sets info Petr Cvachoucek (1): ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers Philipp Zabel (1): media: coda: fix CODA960 JPEG encoder buffer overflow Ping-Ke Shih (1): mac80211: allow non-standard VHT MCS-10/11 Po-Hao Huang (1): rtw88: 8822c: update rx settings to prevent potential hw deadlock Qiang Yu (1): drm/lima: fix warning when CONFIG_DEBUG_SG=y & CONFIG_DMA_API_DEBUG=y Quentin Monnet (1): bpftool: Remove inclusion of utilities.mak from Makefiles Rafael J. Wysocki (5): ACPI: EC: Rework flushing of EC work while suspended to idle PM: runtime: Add safety net to supplier device release cpufreq: Fix initialization of min and max frequency QoS requests ACPICA: Utilities: Avoid deleting the same object twice in a row ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R() Rameshkumar Sundaram (2): ath11k: Send PPDU_STATS_CFG with proper pdev mask to firmware ath11k: Fix deleting uninitialized kernel timer during fragment cache flush Randy Dunlap (5): mips: lantiq: add support for clk_set_parent() mips: bcm63xx: add support for clk_set_parent() um: registers: Rename function names to avoid conflicts and build problems media: correct MEDIA_TEST_SUPPORT help text Documentation: fix firewire.rst ABI file path error Rob Herring (1): PCI: xgene: Fix IB window setup Robert Hancock (10): clk: si5341: Fix clock HW provider cleanup net: axienet: increase reset timeout net: axienet: Wait for PhyRstCmplt after core reset net: axienet: reset core on initialization prior to MDIO access net: axienet: add missing memory barriers net: axienet: limit minimum TX ring size net: axienet: Fix TX ring slot available check net: axienet: fix number of TX ring slots for available check net: axienet: fix for TX busy handling net: axienet: increase default TX ring size to 128 Robert Marko (2): arm64: dts: marvell: cn9130: add GPIO and SPI aliases arm64: dts: marvell: cn9130: enable CP0 GPIO controllers Robert Schlabbach (1): media: si2157: Fix "warm" tuner state detection Robin Murphy (1): drm/tegra: vic: Fix DMA API misuse Russell King (Oracle) (4): net: phy: prefer 1000baseT over 1000baseKX net: phy: marvell: configure RGMII delays for 88E1118 net: gemini: allow any RGMII interface mode net: sfp: fix high power modules without diagnostic monitoring Ryuta NAKANISHI (1): phy: uniphier-usb3ss: fix unintended writing zeros to PHY register Sakari Ailus (2): device property: Fix fwnode_graph_devcon_match() fwnode leak Documentation: ACPI: Fix data node reference documentation Sam Protsenko (1): dt-bindings: watchdog: Require samsung,syscon-phandle for Exynos7 Sameer Pujar (2): arm64: tegra: Fix Tegra194 HDA {clock,reset}-names ordering arm64: tegra: Remove non existent Tegra194 reset Sean Wang (1): Bluetooth: btmtksdio: fix resume failure Sean Young (1): media: igorplugusb: receiver overflow should be reported Sebastian Andrzej Siewior (1): ext4: destroy ext4_fc_dentry_cachep kmemcache on module removal Sebastian Gottschall (1): ath10k: Fix tx hanging Sergey Shtylyov (3): mmc: meson-mx-sdhc: add IRQ check mmc: meson-mx-sdio: add IRQ check bcmgenet: add WOL IRQ check Shaul Triebitz (1): iwlwifi: mvm: avoid clearing a just saved session protection id Shengjiu Wang (1): ASoC: fsl_asrc: refine the check of available clock divider Sicelo A. Mhlongo (1): ARM: dts: omap3-n900: Fix lp5523 for multi color Srinivas Kandagatla (2): arm64: dts: qcom: c630: Fix soundcard setup nvmem: core: set size for sysfs bin file Sriram R (1): ath11k: Avoid NULL ptr access during mgmt tx cleanup Stafford Horne (1): openrisc: Add clone3 ABI wrapper Stanimir Varbanov (1): media: venus: pm_helpers: Control core power domain manually Stefan Riedmueller (1): mtd: rawnand: gpmi: Remove explicit default gpmi clock setting for i.MX6 Stephan Müller (1): crypto: jitter - consider 32 LSB for APT Stephen Boyd (2): drm/bridge: ti-sn65dsi86: Set max register for regmap clk: Emit a stern warning with writable debugfs enabled Sudeep Holla (1): ACPICA: Fix wrong interpretation of PCC address Suravee Suthikulpanit (1): iommu/amd: Remove iommu_init_ga() Suresh Kumar (1): net: bonding: debug: avoid printing debug logs when bond is not notifying peers Suresh Udipi (2): media: rcar-csi2: Correct the selection of hsfreqrange media: rcar-csi2: Optimize the selection PHTW register Sven Eckelmann (1): ath11k: Fix ETSI regd with weather radar overlap Takashi Iwai (5): ALSA: jack: Add missing rwsem around snd_ctl_remove() calls ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls ALSA: hda: Add missing rwsem around snd_ctl_remove() calls ALSA: usb-audio: Drop superfluous '0' in Presonus Studio 1810c's ID ALSA: seq: Set upper limit of processed events Tasos Sahanidis (1): floppy: Fix hang in watchdog when disk is ejected Thadeu Lima de Souza Cascardo (1): selftests/powerpc/spectre_v2: Return skip code when miss_percent is high Theodore Ts'o (1): ext4: don't use the orphan list when migrating an inode Thierry Reding (1): arm64: tegra: Adjust length of CCPLEX cluster MMIO region Thomas Gleixner (1): PCI/MSI: Fix pci_irq_vector()/pci_irq_get_affinity() Thomas Hellström (1): dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() Thomas Weißschuh (1): ACPI: battery: Add the ThinkPad "Not Charging" quirk Tianjia Zhang (1): MIPS: Octeon: Fix build errors using clang Tobias Waldekranz (3): powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses net/fsl: xgmac_mdio: Add workaround for erratum A-009885 net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module Todd Kjos (1): binder: fix handling of error during copy Toke Høiland-Jørgensen (1): xdp: check prog type before updating BPF link Tom Rix (2): net: ethernet: mtk_eth_soc: fix error checking in mtk_mac_config() net: mscc: ocelot: fix using match before it is set Tsuchiya Yuto (7): media: atomisp: add missing media_device_cleanup() in atomisp_unregister_entities() media: atomisp: fix punit_ddr_dvfs_enable() argument for mrfld_power up case media: atomisp: fix inverted logic in buffers_needed() media: atomisp: do not use err var when checking port validity for ISP2400 media: atomisp: fix inverted error check for ia_css_mipi_is_source_port_valid() media: atomisp: fix ifdefs in sh_css.c media: atomisp: add NULL check for asd obtained from atomisp_video_pipe Tudor Ambarus (8): tty: serial: atmel: Check return code of dmaengine_submit() tty: serial: atmel: Call dma_async_issue_pending() dmaengine: at_xdmac: Don't start transactions at tx_submit level dmaengine: at_xdmac: Start transfer for cyclic channels in issue_pending dmaengine: at_xdmac: Print debug message after realeasing the lock dmaengine: at_xdmac: Fix concurrency over xfers_list dmaengine: at_xdmac: Fix lld view setting dmaengine: at_xdmac: Fix at_xdmac_lld struct definition Tzung-Bi Shih (2): ASoC: mediatek: mt8173: fix device_node leak ASoC: mediatek: mt8183: fix device_node leak Ulf Hansson (1): mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO Vincent Donnefort (2): sched/fair: Fix detection of per-CPU kthreads waking a task sched/fair: Fix per-CPU kthread and wakee stacking for asym CPU capacity Waiman Long (1): clocksource: Avoid accidental unstable marking of clocksources Wan Jiabing (1): ARM: shmobile: rcar-gen2: Add missing of_node_put() Wang Hai (4): drm: fix null-ptr-deref in drm_dev_init_release() Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails media: dmxdev: fix UAF when dvb_register_device() fails media: msi001: fix possible null-ptr-deref in msi001_probe() Wei Yongjun (3): usb: ftdi-elan: fix memory leak on device disconnect misc: lattice-ecp3-config: Fix task hung when firmware load failed Bluetooth: Fix debugfs entry leak in hci_register_dev() Wen Gong (1): ath11k: avoid deadlock by change ieee80211_queue_work for regd_update_work Wen Gu (1): net/smc: Fix hung_task when removing SMC-R devices William Kucharski (1): cgroup: Trace event cgroup id fields should be u64 Willy Tarreau (2): tools/nolibc: i386: fix initial stack alignment tools/nolibc: fix incorrect truncation of exit code Xiangyang Zhang (1): tracing/kprobes: 'nmissed' not showed correctly for kretprobe Xie Yongji (1): fuse: Pass correct lend value to filemap_write_and_wait_range() Xin Xiong (1): netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check() Xin Yin (3): ext4: fix fast commit may miss tracking range for FALLOC_FL_ZERO_RANGE ext4: use ext4_ext_remove_space() for fast commit replay delete range ext4: fast commit may miss tracking unwritten range during ftruncate Xiongwei Song (1): floppy: Add max size check for user space request Yang Li (1): drm/amd/display: check top_pipe_to_program pointer Yang Yingliang (3): media: si470x-i2c: fix possible memory leak in si470x_i2c_probe() staging: rtl8192e: return error code from rtllib_softmac_init() staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib() Ye Guojin (1): MIPS: OCTEON: add put_device() after of_find_device_by_node() Yifeng Li (1): PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller Yunfei Wang (1): iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure Zechuan Chen (1): perf probe: Fix ppc64 'perf probe add events failed' case Zekun Shen (4): ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply rsi: Fix use-after-free in rsi_rx_done_handler() rsi: Fix out-of-bounds read in rsi_read_pkt() ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream Zhang Zixun (1): x86/mce/inject: Avoid out-of-bounds write when setting flags Zheng Zengkai (1): Revert "sched/rt: Try to restart rt period timer when rt runtime exceeded" Zheyu Ma (1): media: b2c2: Add missing check in flexcop_pci_isr: Zhou Qingyang (9): drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode() drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms() media: dib8000: Fix a memleak in dib8000_init() media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach() ath11k: Fix a NULL pointer dereference in ath11k_mac_op_hw_scan() pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region() pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region() media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach() media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach() Zizhuang Deng (1): lib/mpi: Add the return value check of kcalloc() Zongmin Zhou (1): drm/amdgpu: fixup bad vram size on gmc v8 xinhui pan (1): drm/ttm: Put BO in its memory manager's lru list .../ABI/testing/sysfs-bus-iio-lptimer-stm32 | 62 -- Documentation/admin-guide/hw-vuln/spectre.rst | 2 +- .../display/amlogic,meson-dw-hdmi.yaml | 5 + .../bindings/display/amlogic,meson-vpu.yaml | 6 + .../bindings/thermal/thermal-zones.yaml | 9 +- .../bindings/watchdog/samsung-wdt.yaml | 5 +- .../driver-api/dmaengine/dmatest.rst | 7 +- Documentation/driver-api/firewire.rst | 4 +- .../acpi/dsd/data-node-references.rst | 10 +- arch/arm/Kconfig.debug | 14 +- arch/arm/boot/compressed/efi-header.S | 22 +- arch/arm/boot/compressed/head.S | 3 +- arch/arm/boot/dts/armada-38x.dtsi | 4 +- arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 50 +- arch/arm/boot/dts/stm32f429-disco.dts | 2 +- arch/arm/include/debug/imx-uart.h | 18 +- .../mach-shmobile/regulator-quirk-rcar-gen2.c | 5 +- .../boot/dts/amlogic/meson-g12-common.dtsi | 2 +- .../dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- .../boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 + .../boot/dts/freescale/fsl-ls1028a-qds.dts | 14 +- arch/arm64/boot/dts/marvell/cn9130.dtsi | 15 + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 9 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 - .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 27 + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 +- arch/arm64/boot/dts/ti/k3-j7200.dtsi | 6 +- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 6 +- arch/mips/Kconfig | 6 +- arch/mips/bcm63xx/clk.c | 6 + arch/mips/cavium-octeon/octeon-platform.c | 2 + arch/mips/cavium-octeon/octeon-usb.c | 1 + .../asm/mach-loongson64/kernel-entry-init.h | 4 +- arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 +- arch/mips/lantiq/clk.c | 6 + arch/openrisc/include/asm/syscalls.h | 2 + arch/openrisc/kernel/entry.S | 5 + arch/parisc/include/asm/special_insns.h | 44 +- arch/parisc/kernel/traps.c | 2 +- arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi | 2 + arch/powerpc/include/asm/cpu_setup_power.h | 12 + arch/powerpc/include/asm/hw_irq.h | 51 +- arch/powerpc/include/asm/reg.h | 1 + arch/powerpc/kernel/btext.c | 4 +- arch/powerpc/kernel/cpu_setup_power.S | 252 ----- arch/powerpc/kernel/cpu_setup_power.c | 272 +++++ arch/powerpc/kernel/cputable.c | 12 +- arch/powerpc/kernel/dt_cpu_ftrs.c | 1 + arch/powerpc/kernel/fadump.c | 8 + arch/powerpc/kernel/head_40x.S | 9 +- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kernel/smp.c | 42 + arch/powerpc/kernel/traps.c | 31 +- arch/powerpc/kernel/watchdog.c | 41 +- arch/powerpc/kvm/book3s_hv.c | 8 +- arch/powerpc/kvm/book3s_hv_nested.c | 2 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 4 +- arch/powerpc/mm/kasan/book3s_32.c | 3 +- arch/powerpc/mm/pgtable_64.c | 14 +- arch/powerpc/perf/core-book3s.c | 97 +- arch/powerpc/perf/core-fsl-emb.c | 25 - arch/powerpc/perf/isa207-common.c | 8 + arch/powerpc/platforms/cell/iommu.c | 1 + arch/powerpc/platforms/cell/pervasive.c | 1 + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 1 + arch/powerpc/platforms/powermac/low_i2c.c | 3 + arch/powerpc/platforms/powernv/opal-lpc.c | 1 + arch/powerpc/sysdev/xive/spapr.c | 3 + arch/s390/mm/pgalloc.c | 4 +- arch/um/drivers/virtio_uml.c | 4 + arch/um/include/asm/delay.h | 4 +- arch/um/include/shared/registers.h | 4 +- arch/um/os-Linux/registers.c | 4 +- arch/um/os-Linux/start_up.c | 2 +- arch/x86/boot/compressed/Makefile | 7 +- arch/x86/configs/i386_defconfig | 1 + arch/x86/configs/x86_64_defconfig | 1 + arch/x86/include/asm/realmode.h | 1 + arch/x86/include/asm/uaccess.h | 5 +- arch/x86/kernel/cpu/mce/core.c | 42 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/early-quirks.c | 10 +- arch/x86/kernel/reboot.c | 12 +- arch/x86/kernel/tsc.c | 1 + arch/x86/kvm/vmx/posted_intr.c | 16 +- arch/x86/realmode/init.c | 26 + arch/x86/um/syscalls_64.c | 3 +- crypto/jitterentropy.c | 3 +- drivers/acpi/acpica/exfield.c | 7 +- drivers/acpi/acpica/exoparg1.c | 3 +- drivers/acpi/acpica/hwesleep.c | 4 +- drivers/acpi/acpica/hwsleep.c | 4 +- drivers/acpi/acpica/hwxfsleep.c | 2 - drivers/acpi/acpica/utdelete.c | 1 + drivers/acpi/battery.c | 22 + drivers/acpi/bus.c | 4 +- drivers/acpi/ec.c | 57 +- drivers/acpi/internal.h | 2 + drivers/acpi/scan.c | 13 +- drivers/acpi/x86/utils.c | 116 ++- drivers/android/binder.c | 4 +- drivers/base/core.c | 3 +- drivers/base/power/runtime.c | 41 +- drivers/base/property.c | 4 +- drivers/base/regmap/regmap.c | 1 + drivers/base/swnode.c | 2 +- drivers/block/floppy.c | 6 +- drivers/bluetooth/btmtksdio.c | 2 + drivers/bluetooth/hci_bcm.c | 7 +- drivers/bluetooth/hci_qca.c | 5 +- drivers/bluetooth/hci_vhci.c | 2 + drivers/char/mwave/3780i.h | 2 +- drivers/char/random.c | 19 +- drivers/char/tpm/tpm_tis_core.c | 14 +- drivers/clk/bcm/clk-bcm2835.c | 13 +- drivers/clk/clk-bm1880.c | 20 +- drivers/clk/clk-si5341.c | 2 +- drivers/clk/clk-stm32f4.c | 4 - drivers/clk/clk.c | 18 + drivers/clk/imx/clk-imx8mn.c | 6 +- drivers/clk/meson/gxbb.c | 44 +- drivers/counter/Kconfig | 2 +- drivers/counter/stm32-lptimer-cnt.c | 297 +----- drivers/cpufreq/cpufreq.c | 4 +- drivers/crypto/caam/caamalg_qi2.c | 2 +- drivers/crypto/omap-aes.c | 2 +- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 45 +- drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- drivers/crypto/qce/sha.c | 2 +- drivers/crypto/qce/skcipher.c | 2 +- drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/crypto/stm32/stm32-cryp.c | 938 +++++++----------- drivers/crypto/stm32/stm32-hash.c | 6 +- drivers/dma-buf/dma-fence-array.c | 6 +- drivers/dma/at_xdmac.c | 57 +- drivers/dma/mmp_pdma.c | 6 - drivers/dma/pxa_dma.c | 7 - drivers/dma/stm32-mdma.c | 2 +- drivers/dma/uniphier-xdmac.c | 5 +- drivers/edac/synopsys_edac.c | 3 +- drivers/firmware/google/Kconfig | 6 +- drivers/gpio/gpio-aspeed.c | 52 +- drivers/gpio/gpiolib-acpi.c | 15 +- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 + .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +- drivers/gpu/drm/bridge/display-connector.c | 2 +- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 40 +- .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 + drivers/gpu/drm/drm_drv.c | 9 +- .../gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- drivers/gpu/drm/lima/lima_device.c | 1 + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 2 + drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 37 +- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- .../drm/panel/panel-kingdisplay-kd097d04.c | 8 +- drivers/gpu/drm/radeon/radeon_kms.c | 42 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 20 +- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 82 +- drivers/gpu/drm/tegra/vic.c | 7 +- drivers/gpu/drm/ttm/ttm_bo.c | 2 + drivers/gpu/drm/vboxvideo/vbox_main.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 24 +- drivers/gpu/host1x/dev.c | 15 + drivers/hid/hid-apple.c | 2 +- drivers/hid/hid-input.c | 6 + drivers/hid/hid-uclogic-params.c | 31 +- drivers/hid/hid-vivaldi.c | 34 +- drivers/hid/uhid.c | 29 +- drivers/hid/wacom_wac.c | 39 +- drivers/hsi/hsi_core.c | 1 + drivers/hwmon/mr75203.c | 2 +- drivers/i2c/busses/i2c-designware-pcidrv.c | 8 +- drivers/i2c/busses/i2c-i801.c | 15 +- drivers/i2c/busses/i2c-mpc.c | 23 +- drivers/iio/adc/ti-adc081c.c | 22 +- drivers/infiniband/core/cma.c | 12 +- drivers/infiniband/core/device.c | 3 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 6 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 - drivers/infiniband/hw/cxgb4/qp.c | 1 + drivers/infiniband/hw/qedr/verbs.c | 2 + drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +- drivers/iommu/amd/init.c | 48 +- drivers/iommu/io-pgtable-arm-v7s.c | 6 +- drivers/iommu/io-pgtable-arm.c | 11 +- drivers/irqchip/irq-gic-v3.c | 16 + drivers/md/dm.c | 4 +- drivers/md/persistent-data/dm-btree.c | 8 +- .../md/persistent-data/dm-space-map-common.c | 5 + drivers/media/Kconfig | 8 +- drivers/media/cec/core/cec-pin.c | 31 +- drivers/media/common/saa7146/saa7146_fops.c | 2 +- .../common/videobuf2/videobuf2-dma-contig.c | 8 +- drivers/media/dvb-core/dmxdev.c | 18 +- drivers/media/dvb-frontends/dib8000.c | 4 +- drivers/media/pci/b2c2/flexcop-pci.c | 3 + drivers/media/pci/saa7146/hexium_gemini.c | 7 +- drivers/media/pci/saa7146/hexium_orion.c | 8 +- drivers/media/pci/saa7146/mxb.c | 8 +- drivers/media/platform/aspeed-video.c | 14 +- drivers/media/platform/coda/coda-common.c | 8 +- drivers/media/platform/coda/coda-jpeg.c | 21 +- drivers/media/platform/coda/imx-vdoa.c | 6 +- drivers/media/platform/imx-pxp.c | 4 +- .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- drivers/media/platform/qcom/venus/core.c | 39 +- drivers/media/platform/qcom/venus/core.h | 2 - .../media/platform/qcom/venus/pm_helpers.c | 94 +- .../media/platform/qcom/venus/pm_helpers.h | 7 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 18 +- drivers/media/platform/rcar-vin/rcar-v4l2.c | 15 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +- drivers/media/rc/igorplugusb.c | 4 +- drivers/media/rc/mceusb.c | 8 +- drivers/media/rc/redrat3.c | 22 +- drivers/media/tuners/msi001.c | 7 + drivers/media/tuners/si2157.c | 2 +- drivers/media/usb/b2c2/flexcop-usb.c | 10 +- drivers/media/usb/b2c2/flexcop-usb.h | 12 +- drivers/media/usb/cpia2/cpia2_usb.c | 4 +- drivers/media/usb/dvb-usb/dib0700_core.c | 2 - drivers/media/usb/dvb-usb/dw2102.c | 338 ++++--- drivers/media/usb/dvb-usb/m920x.c | 12 +- drivers/media/usb/em28xx/em28xx-cards.c | 18 +- drivers/media/usb/em28xx/em28xx-core.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +- drivers/media/usb/s2255/s2255drv.c | 4 +- drivers/media/usb/stk1160/stk1160-core.c | 4 +- drivers/media/usb/uvc/uvcvideo.h | 2 +- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- drivers/memory/renesas-rpc-if.c | 2 +- drivers/mfd/atmel-flexcom.c | 11 +- drivers/misc/lattice-ecp3-config.c | 12 +- drivers/misc/lkdtm/Makefile | 2 +- drivers/mmc/core/sdio.c | 4 +- drivers/mmc/host/meson-mx-sdhc-mmc.c | 5 + drivers/mmc/host/meson-mx-sdio.c | 5 + drivers/mtd/hyperbus/rpc-if.c | 8 +- drivers/mtd/mtdpart.c | 2 +- drivers/mtd/nand/bbt.c | 2 +- drivers/mtd/nand/raw/davinci_nand.c | 16 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 37 +- drivers/net/bonding/bond_main.c | 36 +- drivers/net/can/softing/softing_cs.c | 2 +- drivers/net/can/softing/softing_fw.c | 11 +- .../net/can/spi/mcp251xfd/mcp251xfd-core.c | 6 +- drivers/net/can/xilinx_can.c | 7 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 10 +- .../net/ethernet/chelsio/libcxgb/libcxgb_cm.c | 3 +- drivers/net/ethernet/cortina/gemini.c | 9 +- drivers/net/ethernet/freescale/fman/mac.c | 21 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 28 +- drivers/net/ethernet/i825xx/sni_82596.c | 3 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 36 +- .../ethernet/mellanox/mlx5/core/en/xsk/pool.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 10 +- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 7 +- .../net/ethernet/mellanox/mlx5/core/lag_mp.c | 6 +- drivers/net/ethernet/mellanox/mlxsw/cmd.h | 12 + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 +- drivers/net/ethernet/mscc/ocelot_flower.c | 15 +- drivers/net/ethernet/rocker/rocker_ofdpa.c | 3 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 135 ++- drivers/net/phy/marvell.c | 6 + drivers/net/phy/mdio_bus.c | 2 +- drivers/net/phy/phy-core.c | 2 +- drivers/net/phy/sfp.c | 25 +- drivers/net/ppp/ppp_generic.c | 7 +- drivers/net/usb/mcs7830.c | 12 +- drivers/net/wireless/ath/ar5523/ar5523.c | 4 + drivers/net/wireless/ath/ath10k/core.c | 19 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 3 + drivers/net/wireless/ath/ath10k/hw.h | 3 + drivers/net/wireless/ath/ath10k/txrx.c | 2 - drivers/net/wireless/ath/ath11k/ahb.c | 28 +- drivers/net/wireless/ath/ath11k/core.h | 2 +- drivers/net/wireless/ath/ath11k/dp.h | 3 +- drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- drivers/net/wireless/ath/ath11k/hal.c | 22 + drivers/net/wireless/ath/ath11k/hal.h | 2 + drivers/net/wireless/ath/ath11k/hw.c | 2 - drivers/net/wireless/ath/ath11k/mac.c | 52 +- drivers/net/wireless/ath/ath11k/pci.c | 12 +- drivers/net/wireless/ath/ath11k/reg.c | 103 +- drivers/net/wireless/ath/ath11k/wmi.c | 5 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 7 + drivers/net/wireless/ath/wcn36xx/dxe.c | 49 +- drivers/net/wireless/ath/wcn36xx/main.c | 34 +- drivers/net/wireless/ath/wcn36xx/smd.c | 8 +- drivers/net/wireless/ath/wcn36xx/txrx.c | 41 +- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 17 +- .../intel/iwlwifi/mvm/ftm-initiator.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 17 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 27 + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- .../wireless/intel/iwlwifi/mvm/time-event.c | 27 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 +- drivers/net/wireless/intel/iwlwifi/queue/tx.c | 1 + .../net/wireless/marvell/mwifiex/sta_event.c | 8 +- drivers/net/wireless/realtek/rtw88/main.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +- drivers/net/wireless/rsi/rsi_91x_main.c | 4 + drivers/net/wireless/rsi/rsi_91x_usb.c | 9 +- drivers/net/wireless/rsi/rsi_usb.h | 2 + drivers/nvmem/core.c | 2 + drivers/of/base.c | 11 +- drivers/of/unittest.c | 21 +- drivers/parisc/pdc_stable.c | 4 +- drivers/pci/controller/pci-aardvark.c | 4 +- drivers/pci/controller/pci-mvebu.c | 8 + drivers/pci/controller/pci-xgene.c | 2 +- drivers/pci/hotplug/pciehp.h | 3 + drivers/pci/hotplug/pciehp_core.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 21 +- drivers/pci/msi.c | 26 +- drivers/pci/pci-bridge-emul.c | 70 +- drivers/pci/quirks.c | 3 + drivers/pcmcia/cs.c | 8 +- drivers/pcmcia/rsrc_nonstatic.c | 6 + drivers/phy/socionext/phy-uniphier-usb3ss.c | 10 +- drivers/power/reset/mt6323-poweroff.c | 3 + drivers/regulator/qcom_smd-regulator.c | 100 +- drivers/rpmsg/rpmsg_core.c | 20 +- drivers/rtc/rtc-cmos.c | 3 + drivers/rtc/rtc-pxa.c | 4 + drivers/scsi/lpfc/lpfc.h | 2 +- drivers/scsi/lpfc/lpfc_attr.c | 62 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- drivers/scsi/lpfc/lpfc_sli.c | 6 - drivers/scsi/pm8001/pm8001_hwi.c | 4 +- drivers/scsi/scsi_debugfs.c | 1 + drivers/scsi/sr.c | 2 +- drivers/scsi/sr_vendor.c | 4 +- drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 - drivers/scsi/ufs/ufshcd-pci.c | 2 - drivers/scsi/ufs/ufshcd-pltfrm.c | 2 - drivers/scsi/ufs/ufshcd.c | 7 + drivers/soc/mediatek/mtk-scpsys.c | 15 +- drivers/soc/qcom/cpr.c | 2 +- drivers/soc/ti/pruss.c | 2 +- drivers/spi/spi-meson-spifc.c | 1 + drivers/spi/spi-uniphier.c | 11 +- drivers/staging/greybus/audio_topology.c | 15 + drivers/staging/media/atomisp/i2c/ov2680.h | 24 - .../staging/media/atomisp/pci/atomisp_cmd.c | 92 +- .../staging/media/atomisp/pci/atomisp_fops.c | 11 + .../media/atomisp/pci/atomisp_gmin_platform.c | 2 +- .../staging/media/atomisp/pci/atomisp_ioctl.c | 185 +++- .../media/atomisp/pci/atomisp_subdev.c | 15 +- .../media/atomisp/pci/atomisp_subdev.h | 3 + .../staging/media/atomisp/pci/atomisp_v4l2.c | 13 +- .../staging/media/atomisp/pci/atomisp_v4l2.h | 3 +- drivers/staging/media/atomisp/pci/sh_css.c | 27 +- .../staging/media/atomisp/pci/sh_css_mipi.c | 41 +- .../staging/media/atomisp/pci/sh_css_params.c | 8 +- drivers/staging/media/hantro/hantro_drv.c | 3 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_module.c | 16 +- drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- drivers/tee/tee_core.c | 4 +- drivers/thermal/imx8mm_thermal.c | 3 + drivers/thermal/imx_thermal.c | 145 ++- drivers/thunderbolt/acpi.c | 13 + drivers/tty/serial/amba-pl010.c | 3 - drivers/tty/serial/amba-pl011.c | 27 +- drivers/tty/serial/atmel_serial.c | 14 + drivers/tty/serial/imx.c | 7 +- drivers/tty/serial/serial_core.c | 7 +- drivers/tty/serial/uartlite.c | 2 +- drivers/usb/core/hub.c | 5 +- drivers/usb/dwc3/dwc3-qcom.c | 7 +- drivers/usb/gadget/function/f_fs.c | 4 +- drivers/usb/host/uhci-platform.c | 3 +- drivers/usb/misc/ftdi-elan.c | 1 + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 - drivers/video/backlight/qcom-wled.c | 122 ++- drivers/virtio/virtio_ring.c | 4 +- drivers/w1/slaves/w1_ds28e04.c | 26 +- drivers/xen/gntdev.c | 6 +- fs/btrfs/backref.c | 21 +- fs/btrfs/ctree.c | 19 +- fs/btrfs/inode.c | 11 + fs/btrfs/qgroup.c | 19 + fs/debugfs/file.c | 2 +- fs/dlm/lock.c | 9 + fs/dlm/lowcomms.c | 45 +- fs/ext4/ext4.h | 1 + fs/ext4/extents.c | 2 - fs/ext4/fast_commit.c | 18 +- fs/ext4/inode.c | 14 +- fs/ext4/ioctl.c | 2 - fs/ext4/mballoc.c | 48 +- fs/ext4/migrate.c | 23 +- fs/ext4/super.c | 25 +- fs/f2fs/compress.c | 50 +- fs/f2fs/f2fs.h | 11 + fs/f2fs/segment.h | 3 +- fs/f2fs/super.c | 44 + fs/f2fs/sysfs.c | 4 +- fs/fuse/file.c | 2 +- fs/ubifs/super.c | 1 - fs/udf/ialloc.c | 2 + include/acpi/acpi_bus.h | 5 +- include/acpi/actypes.h | 10 +- include/linux/bpf_verifier.h | 7 + include/linux/clocksource.h | 3 + include/linux/hid.h | 2 + include/linux/mmzone.h | 9 + include/linux/pm_runtime.h | 3 + include/net/inet_frag.h | 11 +- include/net/ipv6_frag.h | 3 +- include/net/sch_generic.h | 5 + include/net/xfrm.h | 5 + include/trace/events/cgroup.h | 12 +- include/uapi/linux/xfrm.h | 1 + kernel/bpf/btf.c | 3 +- kernel/bpf/verifier.c | 18 +- kernel/dma/pool.c | 4 +- kernel/rcu/tree_exp.h | 1 + kernel/sched/cputime.c | 4 +- kernel/sched/fair.c | 4 +- kernel/sched/rt.c | 33 +- kernel/time/clocksource.c | 96 +- kernel/time/jiffies.c | 15 +- kernel/trace/bpf_trace.c | 6 +- kernel/trace/trace_kprobe.c | 5 +- kernel/tsacct.c | 7 +- lib/mpi/mpi-mod.c | 2 + lib/test_hmm.c | 24 + lib/test_meminit.c | 1 + mm/hmm.c | 5 +- mm/page_alloc.c | 19 +- mm/shmem.c | 37 +- net/ax25/af_ax25.c | 10 +- net/batman-adv/netlink.c | 30 +- net/bluetooth/cmtp/core.c | 4 +- net/bluetooth/hci_core.c | 1 + net/bluetooth/hci_event.c | 8 +- net/bluetooth/hci_request.c | 2 +- net/bluetooth/l2cap_sock.c | 45 +- net/bridge/br_netfilter_hooks.c | 7 +- net/core/dev.c | 6 + net/core/devlink.c | 2 - net/core/filter.c | 8 +- net/core/net-sysfs.c | 3 + net/core/net_namespace.c | 4 +- net/ipv4/fib_semantics.c | 47 +- net/ipv4/inet_fragment.c | 8 +- net/ipv4/ip_fragment.c | 3 +- net/ipv4/ip_gre.c | 5 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 5 +- net/ipv6/ip6_gre.c | 5 +- net/mac80211/rx.c | 2 +- net/netfilter/nft_set_pipapo.c | 8 + net/netrom/af_netrom.c | 12 +- net/nfc/llcp_sock.c | 5 + net/sched/sch_generic.c | 1 + net/smc/smc_core.c | 17 +- net/unix/garbage.c | 14 +- net/unix/scm.c | 6 +- net/xfrm/xfrm_compat.c | 6 +- net/xfrm/xfrm_interface.c | 14 +- net/xfrm/xfrm_policy.c | 24 +- net/xfrm/xfrm_state.c | 23 +- net/xfrm/xfrm_user.c | 41 +- scripts/dtc/dtx_diff | 8 +- scripts/sphinx-pre-install | 4 + security/selinux/hooks.c | 12 +- sound/core/jack.c | 3 + sound/core/oss/pcm_oss.c | 2 +- sound/core/pcm.c | 6 +- sound/core/seq/seq_queue.c | 14 +- sound/pci/hda/hda_codec.c | 3 + sound/soc/codecs/rt5663.c | 12 +- sound/soc/fsl/fsl_asrc.c | 69 +- sound/soc/fsl/fsl_mqs.c | 2 +- sound/soc/intel/catpt/dsp.c | 14 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 3 + .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 + .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 + .../mediatek/mt8183/mt8183-da7219-max98357.c | 6 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 7 +- sound/soc/samsung/idma.c | 2 + sound/soc/uniphier/Kconfig | 2 - sound/usb/format.c | 2 +- sound/usb/mixer_quirks.c | 2 +- sound/usb/quirks.c | 2 +- tools/bpf/bpftool/Documentation/Makefile | 1 - tools/bpf/bpftool/Makefile | 1 - tools/bpf/bpftool/main.c | 2 + tools/include/nolibc/nolibc.h | 33 +- tools/perf/util/debug.c | 2 +- tools/perf/util/evsel.c | 25 +- tools/perf/util/probe-event.c | 3 + .../selftests/bpf/prog_tests/skb_ctx.c | 2 + tools/testing/selftests/clone3/clone3.c | 6 + .../selftests/ftrace/test.d/kprobe/profile.tc | 2 +- tools/testing/selftests/kselftest_harness.h | 2 +- .../selftests/powerpc/security/spectre_v2.c | 2 +- tools/testing/selftests/vm/hmm-tests.c | 42 + 525 files changed, 5467 insertions(+), 3290 deletions(-) delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-lptimer-stm32 create mode 100644 arch/powerpc/include/asm/cpu_setup_power.h delete mode 100644 arch/powerpc/kernel/cpu_setup_power.S create mode 100644 arch/powerpc/kernel/cpu_setup_power.c -- 2.20.1

1 547

openEuler 22.09 requirements collecting
by Hufeng (Solar, Euler) 27 Apr '22

27 Apr '22

Hello every one The release team is collecting requirements for openEuler 22.09 version. Please submit intel arch feature add into release-plan.md,the url address is below https://gitee.com/openeuler/release-management/blob/master/openEuler-22.09/… We are looking forward to features of intel can merge into openEuler 22.09.

1 0

[PATCH openEuler-1.0-LTS] x86/tsc: Make cur->adjusted values in package#1 to be the same
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V2W CVE: NA ---------------------------------------------------------------- When resume from S4 on Zhaoxin 2 packages platform that support X86_FEATURE_TSC_ADJUST, the following warning messages appear: [ 327.445302] [Firmware Bug]: TSC ADJUST differs: CPU15 45960750 --> 78394770. Restoring [ 329.209120] [Firmware Bug]: TSC ADJUST differs: CPU14 45960750 --> 78394770. Restoring [ 329.209128] [Firmware Bug]: TSC ADJUST differs: CPU13 45960750 --> 78394770. Restoring [ 329.209138] [Firmware Bug]: TSC ADJUST differs: CPU12 45960750 --> 78394770. Restoring [ 329.209151] [Firmware Bug]: TSC ADJUST differs: CPU11 45960750 --> 78394770. Restoring [ 329.209160] [Firmware Bug]: TSC ADJUST differs: CPU10 45960750 --> 78394770. Restoring [ 329.209169] [Firmware Bug]: TSC ADJUST differs: CPU9 45960750 --> 78394770. Restoring The reason is: Step 1: Bring up. TSC is sync after bring up with following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value1 value1 Package#1 non-first CPU value1 value1 Step 2: Suspend to S4. Settings in Step 1 are not changed in this Step. Step 3: Bring up caused by S4 wake up event. TSC is sync when bring up with following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value2 value2 Package#1 non-first CPU value2 value2 Step 4: Resume from S4. When resuming from S4, Current TSC synchronous mechanism cause following settings: MSR 0x3b cur->adjusted Package#0 CPU 0-7 0 0 Package#1 first CPU value2 value2 Package#1 non-first CPU value2 value1 In these Steps, value1 != 0 and value2 != value1. In Step4, as function tsc_store_and_check_tsc_adjust() do, when the value of MSR 0x3b on the non-first online CPU in package#1 is equal to the value of cur->adjusted on the first online CPU in the same package, the cur->adjusted value on this non-first online CPU will hold the old value1. This cause function tsc_verify_tsc_adjust() set the value of MSR 0x3b on the non-first online CPUs in the package#1 to the old value1 and print the beginning warning messages. Fix it by setting cur->adjusted value on the non-first online CPU in a package to the value of MSR 0x3b on the same CPU when they are not equal. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- arch/x86/kernel/tsc_sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index ec534f978867..e0cc4170325c 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -190,6 +190,11 @@ bool tsc_store_and_check_tsc_adjust(bool bootcpu) if (bootval != ref->adjusted) { cur->adjusted = ref->adjusted; wrmsrl(MSR_IA32_TSC_ADJUST, ref->adjusted); + } else if (cur->adjusted != bootval) { + if (boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) { + cur->adjusted = bootval; + } } /* * We have the TSCs forced to be in sync on this package. Skip sync -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS] Add support for PxSCT.LPM set based on actual LPM circumstances
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V2K CVE: NA ---------------------------------------------------------------- AHCI Spec shows that the PxSCTL.IPM field in each port must be programmed to disallow device initiated LPM requests when HBA can not support transitions to the LPM state. The current LPM driver has no restrictions on LPM transitions when enabling device initiated LPM. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/ata/libata-core.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 290ff99bf1d8..c21a079f6d34 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3975,6 +3975,9 @@ int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy, bool spm_wakeup) { struct ata_eh_context *ehc = &link->eh_context; + struct ata_port *ap = ata_is_host_link(link) ? link->ap : NULL; + struct device *dev = ap ? ap->host->dev : NULL; + struct pci_dev *pdev = (!dev || !dev_is_pci(dev)) ? NULL : to_pci_dev(dev); bool woken_up = false; u32 scontrol; int rc; @@ -4001,10 +4004,20 @@ int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy, case ATA_LPM_MED_POWER_WITH_DIPM: case ATA_LPM_MIN_POWER_WITH_PARTIAL: case ATA_LPM_MIN_POWER: - if (ata_link_nr_enabled(link) > 0) + if (ata_link_nr_enabled(link) > 0) { /* no restrictions on LPM transitions */ scontrol &= ~(0x7 << 8); - else { + /* + * If Host does not support partial, then disallows it, + * the same for slumber. + */ + if (pdev && pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) { + if (!(link->ap->host->flags & ATA_HOST_PART)) + scontrol |= (0x1 << 8); + if (!(link->ap->host->flags & ATA_HOST_SSC)) + scontrol |= (0x2 << 8); + } + } else { /* empty port, power off */ scontrol &= ~0xf; scontrol |= (0x1 << 2); -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS] Adding support for PxSCT.LPM setting based on actual LPM circumstances
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V27 CVE: NA ---------------------------------------------------------------- In AHCI spec, PhyRdy Change Interrupt cannot coexist with Link Power Management (LPM). While LPM driver would disable PhyRdy Change interrupt without checking whether HBA supports LPM or not before enabling it. Therefore, if enabling LPM from LPM driver by default, we can not disable it from BIOS without influence Hotplug out capability. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/ata/ahci.c | 11 +++++++++++ drivers/ata/libata-eh.c | 7 +++++++ include/linux/libata.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ebb2bfd4ab0a..8ed2f42b85fd 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1855,6 +1855,17 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) else dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n"); + if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) { + if (hpriv->cap & HOST_CAP_PART) + host->flags |= ATA_HOST_PART; + + if (hpriv->cap & HOST_CAP_SSC) + host->flags |= ATA_HOST_SSC; + + if (hpriv->cap2 & HOST_CAP2_SDS) + host->flags |= ATA_HOST_DEVSLP; + } + if (pi.flags & ATA_FLAG_EM) ahci_reset_em(host); diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index ccc80ff57eb2..e4e0e6d94741 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -3448,6 +3448,8 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, struct ata_device **r_failed_dev) { struct ata_port *ap = ata_is_host_link(link) ? link->ap : NULL; + struct device *device = ap->host->dev; + struct pci_dev *pdev = (!device || !dev_is_pci(device)) ? NULL : to_pci_dev(device); struct ata_eh_context *ehc = &link->eh_context; struct ata_device *dev, *link_dev = NULL, *lpm_dev = NULL; enum ata_lpm_policy old_policy = link->lpm_policy; @@ -3456,6 +3458,11 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, unsigned int err_mask; int rc; + /* if controller does not support lpm, then sets no LPM flags */ + if ((pdev && pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) && + !(ap->host->flags & (ATA_HOST_PART | ATA_HOST_SSC | ATA_HOST_DEVSLP))) + link->flags |= ATA_LFLAG_NO_LPM; + /* if the link or host doesn't do LPM, noop */ if ((link->flags & ATA_LFLAG_NO_LPM) || (ap && !ap->ops->set_lpm)) return 0; diff --git a/include/linux/libata.h b/include/linux/libata.h index dc164b7ebbb0..1cec68e5b104 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -276,6 +276,9 @@ enum { ATA_HOST_STARTED = (1 << 1), /* Host started */ ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */ + ATA_HOST_PART = (1 << 4), /* Host support partial. */ + ATA_HOST_SSC = (1 << 5), /* Host support slumber. */ + ATA_HOST_DEVSLP = (1 << 6), /* Host support devslp. */ /* bits 24:31 of host->flags are reserved for LLD specific flags */ -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS] XHCI:Fix some device identify fail when enable xHCI runtime suspend
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V16 CVE: NA ---------------------------------------------------------------- If plug out device form xhci with runtime suspend enabled. On the one hand, driver will disconnect this device and send disabled slot command to xhci. On the other hand, without no device connect to xhci, PM core will call xhci suspend function to let xhci go to D3 to save power. However there is a temporal competition to get xhci lock between disable slot command interrupt and xhci suspend. If xhci suspend function get xhci lock first, then this function will clear xhci command ring. It will get error command trb when driver to handle disable slot command interrupt. This is a serious error for driver and driver will cleanup xhci. So，any device connect to this xhci port again will not be recognized. In order to fix this issues, we let disable slot command interrupt ISR to get xhci lock first. So, add a delay in xhci suspend function before to get xhci lock. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/usb/host/xhci-pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 238a32cc311c..4c2376a4c1d6 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -223,6 +223,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_ZHAOXIN_HOST; } + if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) + xhci->quirks |= XHCI_SUSPEND_DELAY; + /* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3432) -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS] EHCI: Clear wakeup signal locked in S0, state when device plug in
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V1P CVE: NA ---------------------------------------------------------------- If we plug in a LS/FS device on USB2 port of EHCI, it will latch a wakeup signal in EHCI internal. This is a bug of EHCI for Some project of ZhaoXin. If enable EHCI runtime suspend and no device attach. PM core will let EHCI go to D3 to save power. However, once EHCI go to D3, it will release wakeup signal that latched on device connect to port during S0. Which will generate a SCI interrupt and bring EHCI to D0. But without device connect, EHCI will go to D3 again. So, there is suspend-resume loop and generate SCI interrupt Continuously. In order to fix this issues, we need to clear the wakeup signal latched in EHCI when EHCI suspend function is called. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/pci/pci-driver.c | 6 +++++- drivers/usb/host/ehci-hcd.c | 21 +++++++++++++++++++++ drivers/usb/host/ehci-pci.c | 4 ++++ drivers/usb/host/ehci.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 45c3a78d6004..9329f4881d42 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -513,7 +513,11 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) } pci_restore_state(pci_dev); - pci_pme_restore(pci_dev); + if (!(pci_dev->vendor == PCI_VENDOR_ID_ZHAOXIN && + pci_dev->device == 0x3104 && + (pci_dev->revision & 0xf0) == 0x90 && + pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI)) + pci_pme_restore(pci_dev); return 0; } diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8608ac513fb7..0daa6d98f9b9 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1110,6 +1110,27 @@ int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup) return -EBUSY; } + /* Clear wakeup signal locked in S0 state when device plug in */ + if (ehci->zx_wakeup_clear == 1) { + u32 __iomem *reg = &ehci->regs->port_status[4]; + u32 t1 = ehci_readl(ehci, reg); + + t1 &= (u32)~0xf0000; + t1 |= PORT_TEST_FORCE; + ehci_writel(ehci, t1, reg); + t1 = ehci_readl(ehci, reg); + usleep_range(1000, 2000); + t1 &= (u32)~0xf0000; + ehci_writel(ehci, t1, reg); + usleep_range(1000, 2000); + t1 = ehci_readl(ehci, reg); + ehci_writel(ehci, t1 | PORT_CSC, reg); + udelay(500); + t1 = ehci_readl(ehci, &ehci->regs->status); + ehci_writel(ehci, t1 & STS_PCD, &ehci->regs->status); + ehci_readl(ehci, &ehci->regs->status); + } + return 0; } EXPORT_SYMBOL_GPL(ehci_suspend); diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index baae879dbddd..357dc140e914 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -216,6 +216,10 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci_info(ehci, "applying MosChip frame-index workaround\n"); ehci->frame_index_bug = 1; break; + case PCI_VENDOR_ID_ZHAOXIN: + if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x90) + ehci->zx_wakeup_clear = 1; + break; } /* optional debug port, normally in the first BAR */ diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index c8e9a48e1d51..9625b6030757 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -218,6 +218,7 @@ struct ehci_hcd { /* one per controller */ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ unsigned need_oc_pp_cycle:1; /* MPC834X port power */ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */ + unsigned zx_wakeup_clear:1; /* required for usb32 quirk */ #define OHCI_CTRL_HCFS (3 << 6) -- 2.20.1

1 0

[PATCH openEuler-1.0-LTS] rtc: Fix set RTC time delay 500ms on some Zhaoxin SOCs
by LeoLiuoc 26 Apr '22

26 Apr '22

zhaoxin inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I54V04 CVE: NA ---------------------------------------------------------------- When the RTC divider is changed from reset to an operating time base, the first update cycle should be 500ms later. But on some Zhaoxin SOCs, this first update cycle is one second later. So set RTC time on these Zhaoxin SOCs will causing 500ms delay. Skip setup RTC divider on these SOCs in mc146818_set_time to fix it. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/rtc/rtc-mc146818-lib.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c index 2f1772a358ca..1a866ebbbe62 100644 --- a/drivers/rtc/rtc-mc146818-lib.c +++ b/drivers/rtc/rtc-mc146818-lib.c @@ -7,6 +7,23 @@ #include <linux/acpi.h> #endif +#ifdef CONFIG_X86 +static inline bool follow_mc146818_divider_reset(void) +{ + if ((boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR || + boot_cpu_data.x86_vendor == X86_VENDOR_ZHAOXIN) && + (boot_cpu_data.x86 <= 7 && boot_cpu_data.x86_model <= 59)) { + return false; + } + return true; +} +#else +static inline bool follow_mc146818_divider_reset(void) +{ + return true; +} +#endif + /* * Returns true if a clock update is in progress */ @@ -170,8 +187,10 @@ int mc146818_set_time(struct rtc_time *time) save_control = CMOS_READ(RTC_CONTROL); CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); - save_freq_select = CMOS_READ(RTC_FREQ_SELECT); - CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); + if (follow_mc146818_divider_reset()) { + save_freq_select = CMOS_READ(RTC_FREQ_SELECT); + CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); + } #ifdef CONFIG_MACH_DECSTATION CMOS_WRITE(real_yrs, RTC_DEC_YEAR); @@ -189,7 +208,8 @@ int mc146818_set_time(struct rtc_time *time) #endif CMOS_WRITE(save_control, RTC_CONTROL); - CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); + if (follow_mc146818_divider_reset()) + CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); spin_unlock_irqrestore(&rtc_lock, flags); -- 2.20.1

1 0

[PATCH openEuler-5.10 01/10] mtd: phram: Fix error return code in phram_setup()
by Zheng Zengkai 24 Apr '22

24 Apr '22

From: Yu Kuai <yukuai3(a)huawei.com> mainline inclusion from mainline-v5.14-rc1 commit da1e6fe563e62801fa033255f68c0bb9bf8c2c69 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I53BBP backport: openEuler-22.03-LTS Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Link: https://lore.kernel.org/linux-mtd/20210408133812.1209798-1-yukuai3@huawei.c… Signed-off-by: Yi Yang <yiyang13(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/mtd/devices/phram.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c index aa88558c7edb..d7d17a4b61f5 100644 --- a/drivers/mtd/devices/phram.c +++ b/drivers/mtd/devices/phram.c @@ -270,6 +270,7 @@ static int phram_setup(const char *val) if (len == 0 || erasesize == 0 || erasesize > len || erasesize > UINT_MAX || rem) { parse_err("illegal erasesize or len\n"); + ret = -EINVAL; goto error; } -- 2.20.1

1 9

[PATCH openEuler-5.10 01/28] af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
by Zheng Zengkai 21 Apr '22

21 Apr '22

From: Haimin Zhang <tcs_kernel(a)tencent.com> stable inclusion from stable-v5.10.110 commit 8d3f4ad43054619379ccc697cfcbdb2c266800d8 category: bugfix bugzilla: 186606, https://gitee.com/src-openeuler/kernel/issues/I53SSV CVE: CVE-2022-1353 -------------------------------- [ Upstream commit 9a564bccb78a76740ea9d75a259942df8143d02c ] Add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register to initialize the buffer of supp_skb to fix a kernel-info-leak issue. 1) Function pfkey_register calls compose_sadb_supported to request a sk_buff. 2) compose_sadb_supported calls alloc_sbk to allocate a sk_buff, but it doesn't zero it. 3) If auth_len is greater 0, then compose_sadb_supported treats the memory as a struct sadb_supported and begins to initialize. But it just initializes the field sadb_supported_len and field sadb_supported_exttype without field sadb_supported_reserved. Reported-by: TCS Robot <tcs_robot(a)tencent.com> Signed-off-by: Haimin Zhang <tcs_kernel(a)tencent.com> Signed-off-by: Steffen Klassert <steffen.klassert(a)secunet.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Xu Jia <xujia39(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Wang Weiyang <wangweiyang2(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index ef9b4ac03e7b..b95684b8903e 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1703,7 +1703,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sad xfrm_probe_algs(); - supp_skb = compose_sadb_supported(hdr, GFP_KERNEL); + supp_skb = compose_sadb_supported(hdr, GFP_KERNEL | __GFP_ZERO); if (!supp_skb) { if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC) pfk->registered &= ~(1<<hdr->sadb_msg_satype); -- 2.20.1

1 27

[PATCH openEuler-5.10 01/29] spi: hisi-kunpeng: Add debugfs support
by Zheng Zengkai 19 Apr '22

19 Apr '22

From: Jay Fang <f.fangjian(a)huawei.com> mainline inclusion from mainline-v5.14-rc1 commit 2b2142f247eb category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4UR1H CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ----------------------------------------------------------------------- This patch uses debugfs_regset32 interface to create the registers dump file. Use it instead of creating a generic debugfs file with manually written read callback function. With these entries, users can check all the SPI controller registers during run time. Signed-off-by: Jay Fang <f.fangjian(a)huawei.com> Link: https://lore.kernel.org/r/1622789718-13977-1-git-send-email-f.fangjian@huaw… Signed-off-by: Mark Brown <broonie(a)kernel.org> Reviewed-by: Jay Fang <f.fangjian(a)huawei.com> Acked-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/spi/spi-hisi-kunpeng.c | 51 +++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c index 3f986ba1c328..58b823a16fc4 100644 --- a/drivers/spi/spi-hisi-kunpeng.c +++ b/drivers/spi/spi-hisi-kunpeng.c @@ -9,6 +9,7 @@ #include <linux/acpi.h> #include <linux/bitfield.h> +#include <linux/debugfs.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/interrupt.h> @@ -126,6 +127,7 @@ struct hisi_spi { void __iomem *regs; int irq; u32 fifo_len; /* depth of the FIFO buffer */ + u16 bus_num; /* Current message transfer state info */ const void *tx; @@ -133,8 +135,49 @@ struct hisi_spi { void *rx; unsigned int rx_len; u8 n_bytes; /* current is a 1/2/4 bytes op */ + + struct dentry *debugfs; + struct debugfs_regset32 regset; +}; + +#define HISI_SPI_DBGFS_REG(_name, _off) \ +{ \ + .name = _name, \ + .offset = _off, \ +} + +static const struct debugfs_reg32 hisi_spi_regs[] = { + HISI_SPI_DBGFS_REG("CSCR", HISI_SPI_CSCR), + HISI_SPI_DBGFS_REG("CR", HISI_SPI_CR), + HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR), + HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC), + HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR), + HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN), + HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT), + HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR), + HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR), + HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR), + HISI_SPI_DBGFS_REG("ICR", HISI_SPI_ICR), + HISI_SPI_DBGFS_REG("VERSION", HISI_SPI_VERSION), }; +static int hisi_spi_debugfs_init(struct hisi_spi *hs) +{ + char name[32]; + + snprintf(name, 32, "hisi_spi%d", hs->bus_num); + hs->debugfs = debugfs_create_dir(name, NULL); + if (!hs->debugfs) + return -ENOMEM; + + hs->regset.regs = hisi_spi_regs; + hs->regset.nregs = ARRAY_SIZE(hisi_spi_regs); + hs->regset.base = hs->regs; + debugfs_create_regset32("registers", 0400, hs->debugfs, &hs->regset); + + return 0; +} + static u32 hisi_spi_busy(struct hisi_spi *hs) { return readl(hs->regs + HISI_SPI_SR) & SR_BUSY; @@ -424,6 +467,7 @@ static int hisi_spi_probe(struct platform_device *pdev) hs = spi_controller_get_devdata(master); hs->dev = dev; hs->irq = irq; + hs->bus_num = pdev->id; hs->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hs->regs)) @@ -446,7 +490,7 @@ static int hisi_spi_probe(struct platform_device *pdev) master->use_gpio_descriptors = true; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); - master->bus_num = pdev->id; + master->bus_num = hs->bus_num; master->setup = hisi_spi_setup; master->cleanup = hisi_spi_cleanup; master->transfer_one = hisi_spi_transfer_one; @@ -462,6 +506,9 @@ static int hisi_spi_probe(struct platform_device *pdev) return ret; } + if (hisi_spi_debugfs_init(hs)) + dev_info(dev, "failed to create debugfs dir\n"); + ret = spi_register_controller(master); if (ret) { dev_err(dev, "failed to register spi master, ret=%d\n", ret); @@ -478,7 +525,9 @@ static int hisi_spi_probe(struct platform_device *pdev) static int hisi_spi_remove(struct platform_device *pdev) { struct spi_controller *master = platform_get_drvdata(pdev); + struct hisi_spi *hs = spi_controller_get_devdata(master); + debugfs_remove_recursive(hs->debugfs); spi_unregister_controller(master); return 0; -- 2.20.1

1 28

[PATCH openEuler-5.10 00/12] Backport CVE fix patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport following CVE fix patches: CVE-2022-1055: 04c2a47ffb13c net: sched: fix use-after-free in tc_new_tfilter() CVE-2022-23036: 6b1775f26a2d xen/grant-table: add gnttab_try_end_foreign_access() abf1fd5919d6 xen/blkfront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23037: 31185df7e2b1d xen/netfront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23038: 33172ab50a535 xen/scsifront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23039: d3b6372c5881 xen/gntalloc: don't use gnttab_query_foreign_access() CVE-2022-23040: 3777ea7bac31 xen/xenbus: don't let xenbus_grant_ring() remove grants in error case CVE-2022-23041: 5cadd4bb1d7f xen/9p: use alloc/free_pages_exact() b0576cc9c6b8 xen/pvcalls: use alloc/free_pages_exact() 42baefac638f xen/gnttab: fix gnttab_end_foreign_access() without page specified CVE-2022-23042: 66e3531b33ee5 xen/netfront: react properly to failing gnttab_end_foreign_access_ref() Eric Dumazet (1): net: sched: fix use-after-free in tc_new_tfilter() Juergen Gross (11): xen/xenbus: don't let xenbus_grant_ring() remove grants in error case xen/grant-table: add gnttab_try_end_foreign_access() xen/blkfront: don't use gnttab_query_foreign_access() for mapped status xen/netfront: don't use gnttab_query_foreign_access() for mapped status xen/scsifront: don't use gnttab_query_foreign_access() for mapped status xen/gntalloc: don't use gnttab_query_foreign_access() xen: remove gnttab_query_foreign_access() xen/9p: use alloc/free_pages_exact() xen/pvcalls: use alloc/free_pages_exact() xen/gnttab: fix gnttab_end_foreign_access() without page specified xen/netfront: react properly to failing gnttab_end_foreign_access_ref() drivers/block/xen-blkfront.c | 63 +++++++++++++++----------- drivers/net/xen-netfront.c | 54 ++++++++++++++--------- drivers/scsi/xen-scsifront.c | 3 +- drivers/xen/gntalloc.c | 25 +++-------- drivers/xen/grant-table.c | 71 ++++++++++++++++-------------- drivers/xen/pvcalls-front.c | 8 ++-- drivers/xen/xenbus/xenbus_client.c | 24 +++++----- include/xen/grant_table.h | 19 +++++++- net/9p/trans_xen.c | 14 +++--- net/sched/cls_api.c | 11 +++-- 10 files changed, 162 insertions(+), 130 deletions(-) -- 2.20.1

1 12

[PATCH openEuler-5.10 00/22] Backport 5.10.93 LTS patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport 5.10.93 LTS patches from upstream. Conflicts: already merged(git am --skip): 7f4308792a vfs: fs_context: fix up param length parsing in legacy_parse_param Arie Geiger (1): ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5 devices Arnd Bergmann (1): mtd: fixup CFI on ixp4xx Baole Fang (1): ALSA: hda/realtek: Add quirk for Legion Y9000X 2020 Bart Kroon (1): ALSA: hda: ALC287: Add Lenovo IdeaPad Slim 9i 14ITL5 speaker quirk Christian Brauner (1): 9p: only copy valid iattrs in 9P2000.L setattr implementation Christian Lachner (1): ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows Christophe JAILLET (1): orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc() Eric Farman (1): KVM: s390: Clarify SIGP orders versus STOP/RESTART Javier Martinez Canillas (1): video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Johan Hovold (4): media: uvcvideo: fix division by zero at stream start firmware: qemu_fw_cfg: fix sysfs information leak firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries firmware: qemu_fw_cfg: fix kobject leak in probe error path Larry Finger (1): rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled Nathan Chancellor (1): kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test NeilBrown (1): devtmpfs regression fix: reconfigure on each mount Nicholas Piggin (1): powerpc/pseries: Get entry and uaccess flush required bits from H_GET_CPU_CHARACTERISTICS Sean Christopherson (2): perf: Protect perf_guest_cbs with RCU KVM: x86: Register Processor Trace interrupt hook iff PT enabled in guest Stephen Boyd (1): remoteproc: qcom: pil_info: Don't memcpy_toio more than is provided Takashi Iwai (1): ALSA: hda/realtek: Re-order quirk entries for Lenovo Wei Wang (1): KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all Makefile | 2 +- arch/arm/kernel/perf_callchain.c | 17 ++++--- arch/arm64/kernel/perf_callchain.c | 18 ++++--- arch/csky/kernel/perf_callchain.c | 6 ++- arch/nds32/kernel/perf_event_cpu.c | 17 ++++--- arch/powerpc/include/asm/hvcall.h | 2 + arch/powerpc/platforms/pseries/setup.c | 6 +++ arch/riscv/kernel/perf_callchain.c | 7 ++- arch/s390/kvm/interrupt.c | 7 +++ arch/s390/kvm/kvm-s390.c | 9 +++- arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/sigp.c | 28 ++++++++++ arch/x86/events/core.c | 17 ++++--- arch/x86/events/intel/core.c | 9 ++-- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 7 ++- drivers/base/devtmpfs.c | 7 +++ drivers/firmware/qemu_fw_cfg.c | 20 +++----- drivers/media/usb/uvc/uvc_video.c | 4 ++ drivers/mtd/chips/Kconfig | 2 + drivers/mtd/maps/Kconfig | 2 +- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 1 + drivers/remoteproc/qcom_pil_info.c | 2 +- drivers/video/fbdev/vga16fb.c | 24 +++++++++ fs/9p/vfs_inode_dotl.c | 29 +++++++---- fs/orangefs/orangefs-bufmap.c | 7 ++- fs/super.c | 4 +- include/linux/fs_context.h | 2 + include/linux/perf_event.h | 13 ++++- kernel/events/core.c | 13 +++-- sound/pci/hda/patch_realtek.c | 51 +++++++++++++++++-- 32 files changed, 264 insertions(+), 72 deletions(-) -- 2.20.1

1 22

[PATCH openEuler-5.10 00/23] Backport 5.10.92 LTS patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport 5.10.92 LTS patches from upstream. Conflicts: already merged(git am --skip): 35ab8c9085b0a bpf: Fix out of bounds access from invalid *_or_null type verification Aaron Ma (2): Bluetooth: btusb: Add support for Foxconn MT7922A Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0 Adrian Hunter (1): mmc: sdhci-pci: Add PCI ID for Intel ADL Alan Stern (2): USB: core: Fix bug in resuming hub's handling of wakeup requests USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status Andy Shevchenko (1): mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe() Arnd Bergmann (1): staging: greybus: fix stack size warning with UBSAN Brian Silverman (1): can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved} Daniel Borkmann (1): veth: Do not record rx queue hint in veth_xmit Dominik Brodowski (1): random: fix crash on multiple early calls to add_bootloader_randomness() Eric Biggers (2): random: fix data race on crng_node_pool random: fix data race on crng init time Frederic Weisbecker (1): workqueue: Fix unbind_workers() VS wq_worker_running() race Johan Hovold (1): Bluetooth: bfusb: fix division by zero in send path Marc Kleine-Budde (2): can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data can: isotp: convert struct tpcon::{idx,len} to unsigned int Mark-YW.Chen (1): Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb() Nathan Chancellor (2): staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn() drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() Paul Cercueil (1): ARM: dts: exynos: Fix BCM4330 Bluetooth reset polarity in I9100 Ricardo Ribalda (1): media: Revert "media: uvcvideo: Set unique vdev name based in type" Sven Eckelmann (1): ath11k: Fix buffer overflow when scanning with extraie Zijun Hu (1): Bluetooth: btusb: Add two more Bluetooth parts for WCN6855 arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- drivers/bluetooth/bfusb.c | 3 + drivers/bluetooth/btusb.c | 22 +++++ drivers/char/random.c | 117 +++++++++++++---------- drivers/gpu/drm/i915/intel_pm.c | 6 +- drivers/media/usb/uvc/uvc_driver.c | 7 +- drivers/mfd/intel-lpss-acpi.c | 7 +- drivers/mmc/host/sdhci-pci-core.c | 1 + drivers/mmc/host/sdhci-pci.h | 1 + drivers/net/can/usb/gs_usb.c | 5 +- drivers/net/veth.c | 1 - drivers/net/wireless/ath/ath11k/wmi.c | 6 +- drivers/staging/greybus/audio_topology.c | 92 +++++++++--------- drivers/staging/wlan-ng/hfa384x_usb.c | 22 ++--- drivers/usb/core/hcd.c | 9 +- drivers/usb/core/hub.c | 2 +- kernel/workqueue.c | 9 ++ net/can/isotp.c | 4 +- 18 files changed, 190 insertions(+), 126 deletions(-) -- 2.20.1

1 23