- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] mm/readahead: stop readahead loop if memcg charge fails
by Jinjiang Tu 01 Dec '23

01 Dec '23

From: Liu Shixin <liushixin2(a)huawei.com> When a task in memcg readaheads file pages, page_cache_ra_unbounded() will try to readahead nr_to_read pages. Even if the new allocated page fails to charge, page_cache_ra_unbounded() still tries to readahead next page. This leads to too much memory reclaim. Stop readahead if mem_cgroup_charge() fails, i.e. add_to_page_cache_lru() returns -ENOMEM. Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> Signed-off-by: Jinjiang Tu <tujinjiang(a)huawei.com> --- mm/readahead.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index ed23d5dec123..22dd9c8fe808 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -220,11 +220,18 @@ void page_cache_ra_unbounded(struct readahead_control *ractl, if (mapping->a_ops->readpages) { page->index = index + i; list_add(&page->lru, &page_pool); - } else if (add_to_page_cache_lru(page, mapping, index + i, - gfp_mask) < 0) { - put_page(page); - read_pages(ractl, &page_pool, true); - continue; + } else { + int ret; + + ret = add_to_page_cache_lru(page, mapping, index + i, + gfp_mask); + if (ret < 0) { + put_page(page); + read_pages(ractl, &page_pool, true); + if (ret == -ENOMEM) + break; + continue; + } } if (i == nr_to_read - lookahead_size) SetPageReadahead(page); -- 2.25.1

2 1

[openEuler-1.0-LTS] sched: smart grid: check is active in affinity timer
by Yipeng Zou 01 Dec '23

01 Dec '23

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8KZ3H CVE: NA ---------------------------------------- In the test case like below, there is change going to hang system in stop affinity timer function. for i in `seq 1 100000` do echo $1 > /sys/fs/cgroup/cpu/cpu.dynamic_affinity_mode 2> &1 done [ 259.061097] CPU: 0 PID: 10223 Comm: sh Kdump: loaded Not tainted 5.10.0OLK-5.10-SP3_SG+ #102 [ 259.061098] Hardware name: Huawei TaiShan 200 (Model 5280)/BC82AMDD, BIOS 1.08 12/14/2019 [ 259.061098] pstate: 60400089 (nZCv daIf +PAN -UAO -TCO BTYPE=--) [ 259.061099] pc : hrtimer_active+0x2c/0x7c [ 259.061099] lr : hrtimer_cancel+0x3c/0x60 [ 259.061100] sp : ffff800167f33c10 [ 259.061100] x29: ffff800167f33c10 x28: ffff003006bde040 [ 259.061101] x27: 0000000000000000 x26: 0000000000000000 [ 259.061102] x25: 0000000000000000 x24: ffff0020b2cdea20 [ 259.061103] x23: ffff800167f33d48 x22: ffff800011cc6100 [ 259.061105] x21: ffff80001170a120 x20: ffff800011728d88 [ 259.061106] x19: ffff00208e53c418 x18: 0000000000000000 [ 259.061107] x17: 0000000000000000 x16: 0000000000000000 [ 259.061108] x15: 0000aaab02369e80 x14: 0000000000000000 [ 259.061109] x13: 0000000000000000 x12: 0000000000000000 [ 259.061110] x11: 0000000000000000 x10: 0000000000000008 [ 259.061111] x9 : ffff80001017c6bc x8 : 00000000ffffffc9 [ 259.061112] x7 : ffff0020cb082581 x6 : 0000000000000000 [ 259.061114] x5 : ffff0020cb082582 x4 : 0000000000000000 [ 259.061115] x3 : ffff202fffb9adc0 x2 : ffff202fffb9ae00 [ 259.061116] x1 : 0000000000003b82 x0 : ffff00208e53c418 [ 259.061117] Call trace: [ 259.061117] hrtimer_active+0x2c/0x7c [ 259.061118] stop_auto_affinity+0xf0/0x170 [ 259.061118] cpu_affinity_mode_write_u64+0x2c/0x60 [ 259.061119] cgroup_file_write+0x128/0x1b0 [ 259.061119] kernfs_fop_write_iter+0x130/0x1c0 [ 259.061120] new_sync_write+0xec/0x18c [ 259.061121] vfs_write+0x214/0x2ac [ 259.061121] ksys_write+0x70/0xfc [ 259.061122] __arm64_sys_write+0x24/0x30 [ 259.061122] invoke_syscall+0x50/0x11c [ 259.061123] el0_svc_common.constprop.0+0x158/0x164 [ 259.061123] do_el0_svc+0x2c/0xac [ 259.061123] el0_svc+0x20/0x30 [ 259.061124] el0_sync_handler+0xb0/0xb4 [ 259.061124] el0_sync+0x160/0x180 The root cause was that hrtimer_cancel are holding spin_lock, which the timer are running. Thread: hrtimer: acqurie lock acqurie lock cancel hrtimer sync ... // deadlock ... release lock release lock Thread will wait hrtimer exit forever, and the hrtimer are waiting spin_ lock forever. Fixes: 16980bd872f6 ("sched: Introduce smart grid scheduling strategy for cfs") Signed-off-by: Yipeng Zou <zouyipeng(a)huawei.com> --- kernel/sched/fair.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ccd2a060c2df..ce6bb4304949 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5403,6 +5403,12 @@ static enum hrtimer_restart sched_auto_affi_period_timer(struct hrtimer *timer) } raw_spin_lock_irqsave(&auto_affi->lock, flags); + /* May be re-entrant by stop_auto_affinity, So check again. */ + if (auto_affi->period_active == 0) { + raw_spin_unlock_irqrestore(&auto_affi->lock, flags); + return HRTIMER_NORESTART; + } + if (util_avg_sum * 100 >= tg_capacity * sysctl_sched_util_low_pct) { affinity_domain_up(tg); } else if (util_avg_sum * 100 < tg_capacity * @@ -5496,8 +5502,6 @@ void stop_auto_affinity(struct auto_affinity *auto_affi) mutex_unlock(&smart_grid_used_mutex); return; } - - hrtimer_cancel(&auto_affi->period_timer); auto_affi->period_active = 0; auto_affi->mode = 0; ad->curr_level = ad->dcount > 0 ? ad->dcount - 1 : 0; -- 2.34.1

1 0

[PATCH openEuler-1.0-LTS] lib/notifier-error-inject: fix error when writing -errno to debugfs file
by Zhao Wenhui 01 Dec '23

01 Dec '23

From: Akinobu Mita <akinobu.mita(a)gmail.com> mainline inclusion from mainline-v6.2-rc1 commit f883c3edd2c432a2931ec8773c70a570115a50fe category: bugfix bugzilla: 189394,https://gitee.com/openeuler/kernel/issues/I8KYFI CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- The simple attribute files do not accept a negative value since the commit 488dac0c9237 ("libfs: fix error cast of negative value in simple_attr_write()"). This restores the previous behaviour by using newly introduced DEFINE_SIMPLE_ATTRIBUTE_SIGNED instead of DEFINE_SIMPLE_ATTRIBUTE. Link: https://lkml.kernel.org/r/20220919172418.45257-3-akinobu.mita@gmail.com Fixes: 488dac0c9237 ("libfs: fix error cast of negative value in simple_attr_write()") Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Reported-by: Zhao Gongyi <zhaogongyi(a)huawei.com> Reviewed-by: David Hildenbrand <david(a)redhat.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Oscar Salvador <osalvador(a)suse.de> Cc: Rafael J. Wysocki <rafael(a)kernel.org> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Wei Yongjun <weiyongjun1(a)huawei.com> Cc: Yicong Yang <yangyicong(a)hisilicon.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Zhao Wenhui <zhaowenhui8(a)huawei.com> --- lib/notifier-error-inject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/notifier-error-inject.c b/lib/notifier-error-inject.c index eb4a04afea80..125ea8ce23a4 100644 --- a/lib/notifier-error-inject.c +++ b/lib/notifier-error-inject.c @@ -14,7 +14,7 @@ static int debugfs_errno_get(void *data, u64 *val) return 0; } -DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set, +DEFINE_SIMPLE_ATTRIBUTE_SIGNED(fops_errno, debugfs_errno_get, debugfs_errno_set, "%lld\n"); static struct dentry *debugfs_create_errno(const char *name, umode_t mode, -- 2.34.1

2 1

[PATCH openEuler-1.0-LTS] iio: industrialio-core: Fix debugfs read
by Zhao Wenhui 01 Dec '23

01 Dec '23

From: Alexandru Tachici <alexandru.tachici(a)analog.com> mainline inclusion from mainline-v5.7-rc1 commit 2ddc982a6c172c141183ac954d44f01bc4f2fe72 category: bugfix bugzilla: 94099,https://gitee.com/openeuler/kernel/issues/I8KXZX CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- Currently iio_debugfs_read_reg calls debugfs_reg_access every time it is ran. Reading the same hardware register multiple times during the same reading of a debugfs file can cause unintended effects. For example for each: cat iio:device0/direct_reg_access the file_operations.read function will be called at least twice. First will return the full length of the string in bytes and the second will return 0. This patch makes iio_debugfs_read_reg to call debugfs_reg_access only when the user's buffer position (*ppos) is 0. (meaning it is the beginning of a new reading of the debugfs file). Fixes: e553f182d55b ("staging: iio: core: Introduce debugfs support, add support for direct register access") Signed-off-by: Alexandru Ardelean <alexandru.ardelean(a)analog.com> Signed-off-by: Alexandru Tachici <alexandru.tachici(a)analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Zhao Wenhui <zhaowenhui8(a)huawei.com> --- drivers/iio/industrialio-core.c | 15 +++++++++++---- include/linux/iio/iio.h | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 49d4b4f1a457..421dcbae80f1 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -297,11 +297,14 @@ static ssize_t iio_debugfs_read_reg(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) { struct iio_dev *indio_dev = file->private_data; - char buf[20]; unsigned val = 0; - ssize_t len; int ret; + if (*ppos > 0) + return simple_read_from_buffer(userbuf, count, ppos, + indio_dev->read_buf, + indio_dev->read_buf_len); + ret = indio_dev->info->debugfs_reg_access(indio_dev, indio_dev->cached_reg_addr, 0, &val); @@ -310,9 +313,13 @@ static ssize_t iio_debugfs_read_reg(struct file *file, char __user *userbuf, return ret; } - len = snprintf(buf, sizeof(buf), "0x%X\n", val); + indio_dev->read_buf_len = snprintf(indio_dev->read_buf, + sizeof(indio_dev->read_buf), + "0x%X\n", val); - return simple_read_from_buffer(userbuf, count, ppos, buf, len); + return simple_read_from_buffer(userbuf, count, ppos, + indio_dev->read_buf, + indio_dev->read_buf_len); } static ssize_t iio_debugfs_write_reg(struct file *file, diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index a74cb177dc6f..b715afa06aef 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -569,6 +569,8 @@ struct iio_dev { #if defined(CONFIG_DEBUG_FS) struct dentry *debugfs_dentry; unsigned cached_reg_addr; + char read_buf[20]; + unsigned int read_buf_len; #endif }; -- 2.34.1

2 1

[src-openEuler/rdma-core] libhns: Bugfix for wrong timing of modifying ibv_qp state to err
by Chengchang Tang 01 Dec '23

01 Dec '23

From: Yangyang Li <liyangyang20(a)huawei.com> driver inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/rdma-core/issues/I8KG9M -------------------------------------------------------------------------- Currently the QPC state in HW is modified inside the critical section of spinlock but the ibv_qp state is modified outside. There will be a short period when QPC state has been modified to err with ibv_qp state still remaining RTS. WQEs during this period will still be post-send by RTS-state ibv_qp but then dropped by err-state HW with no flush CQEs generated. To fix this problem, the QPC state in HW and ibv_qp state should be both modified to err inside the critical section of spinlock. Fixes: f1a80cc3dfe2 ("libhns: Bugfix for flush cqe in case multi-process") Signed-off-by: Yangyang Li <liyangyang20(a)huawei.com> --- providers/hns/hns_roce_u_hw_v2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/providers/hns/hns_roce_u_hw_v2.c b/providers/hns/hns_roce_u_hw_v2.c index 2fb738d..68d7110 100644 --- a/providers/hns/hns_roce_u_hw_v2.c +++ b/providers/hns/hns_roce_u_hw_v2.c @@ -1936,6 +1936,8 @@ static int hns_roce_u_v2_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, sizeof(resp_ex)); if (flag) { + if (!ret) + qp->state = IBV_QPS_ERR; hns_roce_spin_unlock(&hr_qp->sq.hr_lock); hns_roce_spin_unlock(&hr_qp->rq.hr_lock); } -- 2.30.0

1 0

[PATCH OLK-6.6 0/2] openeuler_defconfig: enable some mm new
by Kefeng Wang 01 Dec '23

01 Dec '23

Enable some new mm feature for openEuler OLK-6.6. Kefeng Wang (2): x86: openeuler_defconfig: update from new feature arm64: openeuler_defconfig: update for new feature arch/arm64/configs/openeuler_defconfig | 52 +++++++++++++++++++++----- arch/x86/configs/openeuler_defconfig | 35 ++++++++++++++--- 2 files changed, 72 insertions(+), 15 deletions(-) -- 2.27.0

2 3

[PATCH v2 OLK-5.10] spdxcheck.py: Fix a type error
by Jialin Zhang 01 Dec '23

01 Dec '23

From: zhujun2 <zhujun2_yewu(a)cmss.chinamobile.com> mainline inclusion from mainline-v5.18-rc1 commit 28c9f3f9a01d954d8357bdb68fbe36255997bf14 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7E2XC Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ----------------------------- remove unused variable "col", otherwise there will be a type error as below: typeerror: not all arguments converted during string formatting Signed-off-by: Ding Xiang <dingxiang(a)cmss.chinamobile.com> Link: https://lore.kernel.org/r/20220114024058.74536-1-dingxiang@cmss.chinamobile… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: zhujun2 <zhujun2_yewu(a)cmss.chinamobile.com> Signed-off-by: Jialin Zhang <zhangjialin11(a)huawei.com> --- scripts/spdxcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index bc87200f9c7c..2288192967fa 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py @@ -200,7 +200,7 @@ class id_parser(object): tok = pe.tok.value sys.stdout.write('%s: %d:%d %s: %s\n' %(fname, self.curline, col, pe.txt, tok)) else: - sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, col, pe.txt)) + sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, pe.txt)) self.spdx_errors += 1 def scan_git_tree(tree): -- 2.25.1

2 1

[PATCH OLK-5.10 0/2] arm64/mpam: Fix static analysis warning
by Jialin Zhang 30 Nov '23

30 Nov '23

Wang ShaoBo (2): arm64/mpam: Fix uninitialized symbol ret arm64/mpam: Fix buffer overflow in mpam_handle_error_irq() arch/arm64/kernel/mpam/mpam_ctrlmon.c | 2 +- arch/arm64/kernel/mpam/mpam_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1

2 3

[PATCH 0/5 v2] crypto: hisilicon - fix the process to obtain capability register value
by Zhiqi Song 30 Nov '23

30 Nov '23

This seires patch modify the process to obtain the value of capablity registers. Pre-store the valid values of them. Changes in v2: - Modify sec_get_alg_bitmap sequence. Wenkai Lin (1): crypto: hisilicon/qm - add a function to set qm algs Zhiqi Song (4): crypto: hisilicon/qm - save capability registers in qm init process crypto: hisilicon/hpre - save capability registers in probe process crypto: hisilicon/sec2 - save capability registers in probe process crypto: hisilicon/zip - save capability registers in probe process drivers/crypto/hisilicon/hpre/hpre_main.c | 122 +++++++++++---------- drivers/crypto/hisilicon/qm.c | 98 +++++++++++++++-- drivers/crypto/hisilicon/sec2/sec.h | 7 ++ drivers/crypto/hisilicon/sec2/sec_crypto.c | 10 +- drivers/crypto/hisilicon/sec2/sec_main.c | 78 ++++++------- drivers/crypto/hisilicon/zip/zip_main.c | 120 +++++++++++--------- include/linux/hisi_acc_qm.h | 20 +++- 7 files changed, 297 insertions(+), 158 deletions(-) -- 2.30.0

1 5

[PATCH OLK-5.10] spdxcheck.py: Fix a type error
by Jialin Zhang 30 Nov '23

30 Nov '23

From: zhujun2 <zhujun2_yewu(a)cmss.chinamobile.com> mainline inclusion from mainline-v5.18-rc1 commit 28c9f3f9a01d954d8357bdb68fbe36255997bf14 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7E2XC CVE:NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ----------------------------- remove unused variable "col", otherwise there will be a type error as below: typeerror: not all arguments converted during string formatting Signed-off-by: Ding Xiang <dingxiang(a)cmss.chinamobile.com> Link: https://lore.kernel.org/r/20220114024058.74536-1-dingxiang@cmss.chinamobile… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: zhujun2 <zhujun2_yewu(a)cmss.chinamobile.com> Signed-off-by: Jialin Zhang <zhangjialin11(a)huawei.com> --- scripts/spdxcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index bc87200f9c7c..2288192967fa 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py @@ -200,7 +200,7 @@ class id_parser(object): tok = pe.tok.value sys.stdout.write('%s: %d:%d %s: %s\n' %(fname, self.curline, col, pe.txt, tok)) else: - sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, col, pe.txt)) + sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, pe.txt)) self.spdx_errors += 1 def scan_git_tree(tree): -- 2.25.1

2 1