August 2022 - Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS] io_uring: add missing item types for various requests
by Yongqiang Liu 05 Aug '22

05 Aug '22

From: Jens Axboe <axboe(a)kernel.dk> stable inclusion from stable-v5.10.125 commit df3f3bb5059d20ef094d6b2f0256c4bf4127a859 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5IM3T CVE: CVE-2022-2327 -------------------------------- Any read/write should grab current->nsproxy, denoted by IO_WQ_WORK_FILES as it refers to current->files as well, and connect and recv/recvmsg, send/sendmsg should grab current->fs which is denoted by IO_WQ_WORK_FS. No upstream commit exists for this issue. Reported-by: Bing-Jhong Billy Jheng <billy(a)starlabs.sg> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: 1. read/write already grab current->nsproxy, thus don't modified read/write related ops. 2. 'work_flags' doesn't exist, io_op_def is using field 'needs_fs' to decide if 'current->fs' should be grabbed. Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- fs/io_uring.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 8a96b7df4112..d4e430b51098 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -816,6 +816,7 @@ static const struct io_op_def io_op_defs[] = { .async_ctx = 1, .needs_mm = 1, .needs_file = 1, + .needs_fs = 1, .unbound_nonreg_file = 1, .pollout = 1, }, @@ -864,12 +865,14 @@ static const struct io_op_def io_op_defs[] = { [IORING_OP_SEND] = { .needs_mm = 1, .needs_file = 1, + .needs_fs = 1, .unbound_nonreg_file = 1, .pollout = 1, }, [IORING_OP_RECV] = { .needs_mm = 1, .needs_file = 1, + .needs_fs = 1, .unbound_nonreg_file = 1, .pollin = 1, .buffer_select = 1, -- 2.25.1

1 0

[PATCH openEuler-22.09 00/20] Add programmable schedule feature for
by Zheng Zengkai 05 Aug '22

05 Aug '22

Add programmable schedule feature for openEuler-22.09. Chen Hui (12): sched: programmable: Add a tag for the task group sched: programmable: Add user interface of task group tag sched: programmable: Add a tag for the task sched: programmable: Add user interface of task tag sched: programmable: add bpf_sched_task_tag_of helper function sched: programmable: Add convenient helper functions to convert sched entity bpf: BPF samples support SCHED program type samples: bpf: Add bpf sched preempt sample program bpf:programmable: Add four helper functions to get cpu stat bpf:programmable: Add cpumask ops collection sched: programmable: Add lib for sched programmable sched: programmable: Add hook for select_task_rq_fair Guan Jing (2): sched: programmable: Add hook for entity_before samples: bpf: Add bpf sched pick task sample Hui Tang (3): bpf:programmable: Add helper func to check cpu share cache bpf:programmable: Add helper func to set cpus_ptr in task samples:bpf: Add samples for cfs select core Ren Zhijie (3): sched: programmable: add bpf_sched_tg_tag_of helper function sched: programmable: Add helpers to set tag of task or task_group sched: programmable: Add helper function for cpu topology. fs/proc/base.c | 65 ++++ include/linux/bpf_topology.h | 46 +++ include/linux/sched.h | 85 ++++++ include/linux/sched_hook_defs.h | 7 +- include/uapi/linux/bpf.h | 112 +++++++ init/init_task.c | 3 + kernel/bpf/helpers.c | 12 + kernel/bpf/verifier.c | 4 +- kernel/sched/Makefile | 3 +- kernel/sched/bpf_sched.c | 409 +++++++++++++++++++++++++ kernel/sched/bpf_topology.c | 99 ++++++ kernel/sched/core.c | 103 +++++++ kernel/sched/fair.c | 58 ++++ kernel/sched/sched.h | 8 + samples/bpf/Makefile | 9 + samples/bpf/bpf_load.c | 8 +- samples/bpf/sched_pick_task_kern.c | 62 ++++ samples/bpf/sched_pick_task_user.c | 92 ++++++ samples/bpf/sched_preempt_kern.c | 151 ++++++++++ samples/bpf/sched_preempt_user.c | 139 +++++++++ samples/bpf/sched_select_core_kern.c | 239 +++++++++++++++ samples/bpf/sched_select_core_user.c | 114 +++++++ scripts/bpf_helpers_doc.py | 20 ++ tools/include/uapi/linux/bpf.h | 112 +++++++ tools/lib/bpf/libbpf_sched.h | 435 +++++++++++++++++++++++++++ 25 files changed, 2389 insertions(+), 6 deletions(-) create mode 100644 include/linux/bpf_topology.h create mode 100644 kernel/sched/bpf_topology.c create mode 100644 samples/bpf/sched_pick_task_kern.c create mode 100644 samples/bpf/sched_pick_task_user.c create mode 100644 samples/bpf/sched_preempt_kern.c create mode 100644 samples/bpf/sched_preempt_user.c create mode 100644 samples/bpf/sched_select_core_kern.c create mode 100644 samples/bpf/sched_select_core_user.c create mode 100644 tools/lib/bpf/libbpf_sched.h -- 2.20.1

1 20

[PATCH openEuler-1.0-LTS 1/3] net: sched: sch_teql: fix null-pointer dereference
by Yongqiang Liu 05 Aug '22

05 Aug '22

From: Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> stable inclusion from stable-v4.19.187 commit a9a7488979a7d0abfd30bc32f370b8e0c124db33 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5JPWC CVE: NA -------------------------------- commit 1ffbc7ea91606e4abd10eb60de5367f1c86daf5e upstream. Reproduce: modprobe sch_teql tc qdisc add dev teql0 root teql0 This leads to (for instance in Centos 7 VM) OOPS: [ 532.366633] BUG: unable to handle kernel NULL pointer dereference at 00000000000000a8 [ 532.366733] IP: [<ffffffffc06124a8>] teql_destroy+0x18/0x100 [sch_teql] [ 532.366825] PGD 80000001376d5067 PUD 137e37067 PMD 0 [ 532.366906] Oops: 0000 [#1] SMP [ 532.366987] Modules linked in: sch_teql ... [ 532.367945] CPU: 1 PID: 3026 Comm: tc Kdump: loaded Tainted: G ------------ T 3.10.0-1062.7.1.el7.x86_64 #1 [ 532.368041] Hardware name: Virtuozzo KVM, BIOS 1.11.0-2.vz7.2 04/01/2014 [ 532.368125] task: ffff8b7d37d31070 ti: ffff8b7c9fdbc000 task.ti: ffff8b7c9fdbc000 [ 532.368224] RIP: 0010:[<ffffffffc06124a8>] [<ffffffffc06124a8>] teql_destroy+0x18/0x100 [sch_teql] [ 532.368320] RSP: 0018:ffff8b7c9fdbf8e0 EFLAGS: 00010286 [ 532.368394] RAX: ffffffffc0612490 RBX: ffff8b7cb1565e00 RCX: ffff8b7d35ba2000 [ 532.368476] RDX: ffff8b7d35ba2000 RSI: 0000000000000000 RDI: ffff8b7cb1565e00 [ 532.368557] RBP: ffff8b7c9fdbf8f8 R08: ffff8b7d3fd1f140 R09: ffff8b7d3b001600 [ 532.368638] R10: ffff8b7d3b001600 R11: ffffffff84c7d65b R12: 00000000ffffffd8 [ 532.368719] R13: 0000000000008000 R14: ffff8b7d35ba2000 R15: ffff8b7c9fdbf9a8 [ 532.368800] FS: 00007f6a4e872740(0000) GS:ffff8b7d3fd00000(0000) knlGS:0000000000000000 [ 532.368885] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 532.368961] CR2: 00000000000000a8 CR3: 00000001396ee000 CR4: 00000000000206e0 [ 532.369046] Call Trace: [ 532.369159] [<ffffffff84c8192e>] qdisc_create+0x36e/0x450 [ 532.369268] [<ffffffff846a9b49>] ? ns_capable+0x29/0x50 [ 532.369366] [<ffffffff849afde2>] ? nla_parse+0x32/0x120 [ 532.369442] [<ffffffff84c81b4c>] tc_modify_qdisc+0x13c/0x610 [ 532.371508] [<ffffffff84c693e7>] rtnetlink_rcv_msg+0xa7/0x260 [ 532.372668] [<ffffffff84907b65>] ? sock_has_perm+0x75/0x90 [ 532.373790] [<ffffffff84c69340>] ? rtnl_newlink+0x890/0x890 [ 532.374914] [<ffffffff84c8da7b>] netlink_rcv_skb+0xab/0xc0 [ 532.376055] [<ffffffff84c63708>] rtnetlink_rcv+0x28/0x30 [ 532.377204] [<ffffffff84c8d400>] netlink_unicast+0x170/0x210 [ 532.378333] [<ffffffff84c8d7a8>] netlink_sendmsg+0x308/0x420 [ 532.379465] [<ffffffff84c2f3a6>] sock_sendmsg+0xb6/0xf0 [ 532.380710] [<ffffffffc034a56e>] ? __xfs_filemap_fault+0x8e/0x1d0 [xfs] [ 532.381868] [<ffffffffc034a75c>] ? xfs_filemap_fault+0x2c/0x30 [xfs] [ 532.383037] [<ffffffff847ec23a>] ? __do_fault.isra.61+0x8a/0x100 [ 532.384144] [<ffffffff84c30269>] ___sys_sendmsg+0x3e9/0x400 [ 532.385268] [<ffffffff847f3fad>] ? handle_mm_fault+0x39d/0x9b0 [ 532.386387] [<ffffffff84d88678>] ? __do_page_fault+0x238/0x500 [ 532.387472] [<ffffffff84c31921>] __sys_sendmsg+0x51/0x90 [ 532.388560] [<ffffffff84c31972>] SyS_sendmsg+0x12/0x20 [ 532.389636] [<ffffffff84d8dede>] system_call_fastpath+0x25/0x2a [ 532.390704] [<ffffffff84d8de21>] ? system_call_after_swapgs+0xae/0x146 [ 532.391753] Code: 00 00 00 00 00 00 5b 5d c3 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 55 48 89 e5 41 55 41 54 53 48 8b b7 48 01 00 00 48 89 fb <48> 8b 8e a8 00 00 00 48 85 c9 74 43 48 89 ca eb 0f 0f 1f 80 00 [ 532.394036] RIP [<ffffffffc06124a8>] teql_destroy+0x18/0x100 [sch_teql] [ 532.395127] RSP <ffff8b7c9fdbf8e0> [ 532.396179] CR2: 00000000000000a8 Null pointer dereference happens on master->slaves dereference in teql_destroy() as master is null-pointer. When qdisc_create() calls teql_qdisc_init() it imediately fails after check "if (m->dev == dev)" because both devices are teql0, and it does not set qdisc_priv(sch)->m leaving it zero on error path, then qdisc_create() imediately calls teql_destroy() which does not expect zero master pointer and we get OOPS. Fixes: 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation") Signed-off-by: Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> Reviewed-by: Eric Dumazet <edumazet(a)google.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Lu Wei <luwei32(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- net/sched/sch_teql.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 7ed53124069c..163364124691 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -138,6 +138,9 @@ teql_destroy(struct Qdisc *sch) struct teql_sched_data *dat = qdisc_priv(sch); struct teql_master *master = dat->m; + if (!master) + return; + prev = master->slaves; if (prev) { do { -- 2.25.1

1 2

[PATCH openEuler-22.09 0/4] add exec hugetlb support
by Zheng Zengkai 05 Aug '22

05 Aug '22

Some applications has large code and data segment, and this causes high TLB miss when page size is 4K. Mapping these apps into hugetlbfs will boost their performance. A userspace tool libhugetlbfs can do this but it seems to stopped development since 2020, and it does not support debugging. Tmpfs supports transparent hugepage, but it will be split into small pages during copy-on-write. Userspace hotpatch will do mprotect on code segment and trigger pmd split, and some users think performance degradation after hotpatch is unacceptable. This patch set implements hugetlb support in exec, and solved the debugging issue. --- v5: mark new Kconfigs default n and add sysctl knob v4: rebase to 5.10.0-107.0.0 v3: add MAP_FILE_HUGETLB v2: fix kabi Liu Zixian (4): hugetlb: support private file map elf: support hugetlb map enable elf huge map by default fs: add sysctl knob for exec_hugetlb arch/arm64/configs/openeuler_defconfig | 2 + arch/x86/configs/openeuler_defconfig | 2 + fs/Kconfig | 24 ++++++ fs/binfmt_elf.c | 115 +++++++++++++++++++++++++ fs/exec.c | 4 + fs/proc/task_mmu.c | 5 ++ include/linux/elf.h | 4 + include/linux/mm_types.h | 4 + include/uapi/asm-generic/mman-common.h | 1 + include/uapi/linux/elf.h | 1 + kernel/events/core.c | 7 ++ kernel/fork.c | 5 ++ kernel/sysctl.c | 11 +++ mm/hugetlb.c | 25 ++++++ mm/mmap.c | 20 +++++ mm/util.c | 40 +++++++++ 16 files changed, 270 insertions(+) -- 2.20.1

1 4

[PATCH openEuler-5.10 01/20] md: add io accounting for raid0 and raid5
by Zheng Zengkai 04 Aug '22

04 Aug '22

From: Guoqing Jiang <jgq516(a)gmail.com> mainline inclusion from mainline-v5.14-rc1 commit 10764815ff4728d2c57da677cd5d3dd6f446cf5f category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I587H6 CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ------------------------------- We introduce a new bioset (io_acct_set) for raid0 and raid5 since they don't own clone infrastructure to accounting io. And the bioset is added to mddev instead of to raid0 and raid5 layer, because with this way, we can put common functions to md.h and reuse them in raid0 and raid5. Also struct md_io_acct is added accordingly which includes io start_time, the origin bio and cloned bio. Then we can call bio_{start,end}_io_acct to get related io status. Signed-off-by: Guoqing Jiang <jiangguoqing(a)kylinos.cn> Signed-off-by: Song Liu <song(a)kernel.org> Conflict: drivers/md/md.c drivers/md/md.h Signed-off-by: Zhang Wensheng <zhangwensheng5(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/md/md.c | 52 ++++++++++++++++++++++++++++++++++++++++++---- drivers/md/md.h | 8 +++++++ drivers/md/raid0.c | 3 +++ drivers/md/raid5.c | 9 ++++++++ 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index a299fda5b0e9..10d9a8bed604 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2361,7 +2361,8 @@ int md_integrity_register(struct mddev *mddev) bdev_get_integrity(reference->bdev)); pr_debug("md: data integrity enabled on %s\n", mdname(mddev)); - if (bioset_integrity_create(&mddev->bio_set, BIO_POOL_SIZE)) { + if (bioset_integrity_create(&mddev->bio_set, BIO_POOL_SIZE) || + bioset_integrity_create(&mddev->io_acct_set, BIO_POOL_SIZE)) { pr_err("md: failed to create integrity pool for %s\n", mdname(mddev)); return -EINVAL; @@ -5597,6 +5598,7 @@ static void md_free(struct kobject *ko) bioset_exit(&mddev->bio_set); bioset_exit(&mddev->sync_set); + bioset_exit(&mddev->io_acct_set); kfree(mddev); } @@ -5885,7 +5887,13 @@ int md_run(struct mddev *mddev) if (!bioset_initialized(&mddev->sync_set)) { err = bioset_init(&mddev->sync_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS); if (err) - return err; + goto exit_bio_set; + } + if (!bioset_initialized(&mddev->io_acct_set)) { + err = bioset_init(&mddev->io_acct_set, BIO_POOL_SIZE, + offsetof(struct md_io_acct, bio_clone), 0); + if (err) + goto exit_sync_set; } spin_lock(&pers_lock); @@ -6013,6 +6021,7 @@ int md_run(struct mddev *mddev) blk_queue_flag_set(QUEUE_FLAG_NONROT, mddev->queue); else blk_queue_flag_clear(QUEUE_FLAG_NONROT, mddev->queue); + blk_queue_flag_set(QUEUE_FLAG_IO_STAT, mddev->queue); } if (pers->sync_request) { if (mddev->kobj.sd && @@ -6062,8 +6071,11 @@ int md_run(struct mddev *mddev) module_put(pers->owner); md_bitmap_destroy(mddev); abort: - bioset_exit(&mddev->bio_set); + bioset_exit(&mddev->io_acct_set); +exit_sync_set: bioset_exit(&mddev->sync_set); +exit_bio_set: + bioset_exit(&mddev->bio_set); return err; } EXPORT_SYMBOL_GPL(md_run); @@ -6288,6 +6300,7 @@ void md_stop(struct mddev *mddev) __md_stop(mddev); bioset_exit(&mddev->bio_set); bioset_exit(&mddev->sync_set); + bioset_exit(&mddev->io_acct_set); } EXPORT_SYMBOL_GPL(md_stop); @@ -8571,9 +8584,40 @@ void md_write_end(struct mddev *mddev) roundup(jiffies, mddev->safemode_delay) + mddev->safemode_delay); } - EXPORT_SYMBOL(md_write_end); +static void md_end_io_acct(struct bio *bio) +{ + struct md_io_acct *md_io_acct = bio->bi_private; + struct bio *orig_bio = md_io_acct->orig_bio; + + orig_bio->bi_status = bio->bi_status; + + bio_end_io_acct(orig_bio, md_io_acct->start_time); + bio_put(bio); + bio_endio(orig_bio); +} + +/* used by personalities (raid0 and raid5) to account io stats */ +void md_account_bio(struct mddev *mddev, struct bio **bio) +{ + struct md_io_acct *md_io_acct; + struct bio *clone; + + if (!blk_queue_io_stat((*bio)->bi_disk->queue)) + return; + + clone = bio_clone_fast(*bio, GFP_NOIO, &mddev->io_acct_set); + md_io_acct = container_of(clone, struct md_io_acct, bio_clone); + md_io_acct->orig_bio = *bio; + md_io_acct->start_time = bio_start_io_acct(*bio); + + clone->bi_end_io = md_end_io_acct; + clone->bi_private = md_io_acct; + *bio = clone; +} +EXPORT_SYMBOL_GPL(md_account_bio); + /* md_allow_write(mddev) * Calling this ensures that the array is marked 'active' so that writes * may proceed without blocking. It is important to call this before diff --git a/drivers/md/md.h b/drivers/md/md.h index 85177d068322..20c16cfdd6bb 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -491,6 +491,7 @@ struct mddev { struct bio_set sync_set; /* for sync operations like * metadata and bitmap writes */ + struct bio_set io_acct_set; /* for raid0 and raid5 io accounting */ /* Generic flush handling. * The last to finish preflush schedules a worker to submit @@ -687,6 +688,12 @@ struct md_thread { void *private; }; +struct md_io_acct { + struct bio *orig_bio; + unsigned long start_time; + struct bio bio_clone; +}; + #define THREAD_WAKEUP 0 static inline void safe_put_page(struct page *p) @@ -716,6 +723,7 @@ extern void md_write_end(struct mddev *mddev); extern void md_done_sync(struct mddev *mddev, int blocks, int ok); extern void md_error(struct mddev *mddev, struct md_rdev *rdev); extern void md_finish_reshape(struct mddev *mddev); +void md_account_bio(struct mddev *mddev, struct bio **bio); extern bool __must_check md_flush_request(struct mddev *mddev, struct bio *bio); extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev, diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 35843df15b5e..0312b192106a 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -556,6 +556,9 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) bio = split; } + if (bio->bi_pool != &mddev->bio_set) + md_account_bio(mddev, &bio); + orig_sector = sector; zone = find_zone(mddev->private, &sector); switch (conf->layout) { diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index c82953a3299e..35dacc6e754f 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5487,6 +5487,7 @@ static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio) sector_t sector = raid_bio->bi_iter.bi_sector; unsigned chunk_sects = mddev->chunk_sectors; unsigned sectors = chunk_sects - (sector & (chunk_sects-1)); + struct r5conf *conf = mddev->private; if (sectors < bio_sectors(raid_bio)) { struct r5conf *conf = mddev->private; @@ -5496,6 +5497,9 @@ static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio) raid_bio = split; } + if (raid_bio->bi_pool != &conf->bio_split) + md_account_bio(mddev, &raid_bio); + if (!raid5_read_one_chunk(mddev, raid_bio)) return raid_bio; @@ -5775,6 +5779,7 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) DEFINE_WAIT(w); bool do_prepare; bool do_flush = false; + bool do_clone = false; if (unlikely(bi->bi_opf & REQ_PREFLUSH)) { int ret = log_handle_flush_request(conf, bi); @@ -5803,6 +5808,7 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) if (rw == READ && mddev->degraded == 0 && mddev->reshape_position == MaxSector) { bi = chunk_aligned_read(mddev, bi); + do_clone = true; if (!bi) return true; } @@ -5817,6 +5823,9 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) last_sector = bio_end_sector(bi); bi->bi_next = NULL; + if (!do_clone) + md_account_bio(mddev, &bi); + prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE); for (; logical_sector < last_sector; logical_sector += RAID5_STRIPE_SECTORS(conf)) { int previous; -- 2.20.1

1 19

[PATCH openEuler-5.10 00/64] Backport 5.10.115 LTS
by Zheng Zengkai 04 Aug '22

04 Aug '22

Backport 5.10.115 LTS patches from upstream. git cherry-pick v5.10.114..v5.10.115~1 -s Complicts: Already merged(4): 8a9e7c64f4a0 nfc: replace improper check device_is_registered() in netlink related functions 1961c5a688ed nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs 879b075a9a36 NFC: netlink: fix sleep in atomic bug when firmware download timeout a439819f4797 block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern Rejected(2): hinic driver drops related file in the patch: 475237e807a2 hinic: fix bug of wq out of bound access build failed due to reject of patch "845f44ce3d9f1 net/sched: flower: fix parsing of ethertype following VLAN header": d8338a7a0957 net/mlx5e: Don't match double-vlan packets if cvlan is not set Total patches: 70 - 4 - 2 = 64 Andreas Larsson (2): can: grcan: grcan_probe(): fix broken system id check for errata workaround needs can: grcan: only use the NAPI poll budget for RX Andrei Lalaev (1): gpiolib: of: fix bounds check for 'gpio-reserved-ranges' Armin Wolf (1): hwmon: (adt7470) Fix warning on module removal Aya Levin (1): net/mlx5: Fix slab-out-of-bounds while reading resource dump menu Brian Norris (1): mmc: core: Set HS clock speed before sending HS CMD13 Cheng Xu (1): RDMA/siw: Fix a condition race issue in MPA request processing Chengfeng Ye (1): firewire: fix potential uaf in outbound_phy_packet_callback() Codrin Ciubotariu (1): ASoC: dmaengine: Restore NULL prepare_slave_config() callback Daniel Hellstrom (1): can: grcan: use ofdev->dev when allocating DMA memory David Stevens (1): iommu/vt-d: Calculate mask for non-aligned flushes Duoming Zhou (1): can: grcan: grcan_close(): fix deadlock Eric Dumazet (1): net: igmp: respect RCU rules in ip_mc_source() and ip_mc_msfilter() Filipe Manana (1): btrfs: always log symlinks in full mode Frederic Weisbecker (2): rcu: Fix callbacks processing time limit retaining cond_resched() rcu: Apply callbacks processing time limit only on softirq Harry Wentland (1): drm/amd/display: Avoid reading audio pattern past AUDIO_CHANNELS_COUNT Helge Deller (1): parisc: Merge model and model name into one line in /proc/cpuinfo Ido Schimmel (1): selftests: mirror_gre_bridge_1q: Avoid changing PVID while interface is operational Jakob Koschel (1): firewire: remove check of list iterator against head past the loop body Jan Höppner (2): s390/dasd: Fix read for ESE with blksize < 4k s390/dasd: Fix read inconsistency for ESE DASD devices Jann Horn (1): selftests/seccomp: Don't call read() on TTY from background pgrp Kyle Huey (1): KVM: x86/svm: Account for family 17h event renumberings in amd_pmc_perf_hw_id Maciej W. Rozycki (1): MIPS: Fix CP0 counter erratum detection for R4k CPUs Mark Brown (5): ASoC: da7219: Fix change notifications for tone generator frequency ASoC: wm8958: Fix change notifications for DSP controls ASoC: meson: Fix event generation for AUI ACODEC mux ASoC: meson: Fix event generation for G12A tohdmi mux ASoC: meson: Fix event generation for AUI CODEC mux Mark Zhang (1): net/mlx5e: Fix the calling of update_buffer_lossy() API Michael Chan (1): bnxt_en: Fix unnecessary dropping of RX packets Mike Snitzer (1): dm: interlock pending dm_io and dm_wait_for_bios_completion Moshe Shemesh (1): net/mlx5: Avoid double clear or set of sync reset requested Moshe Tal (1): net/mlx5e: Fix trust state reset in reload Niels Dossche (1): firewire: core: extend card->lock in fw_core_handle_bus_reset Oliver Hartkopp (1): can: isotp: remove re-binding of bound socket Pali Rohár (2): PCI: aardvark: Clear all MSIs at setup PCI: aardvark: Fix reading MSI interrupt number Paolo Bonzini (2): KVM: x86: Do not change ICR on write to APIC_SELF_IPI KVM: x86/mmu: avoid NULL-pointer dereference on page freeing bugs Paul Blakey (1): net/mlx5e: CT: Fix queued up restore put() executing after relevant ft release Puyou Lu (1): gpio: pca953x: fix irq_stat not updated when irq is disabled (irq_mask not set) Ricky WU (1): mmc: rtsx: add 74 Clocks in power on flow Sandipan Das (1): kvm: x86/cpuid: Only provide CPUID leaf 0xA if host has architectural PMU Sergey Shtylyov (1): smsc911x: allow using IRQ0 Shaik Sajida Bhanu (1): mmc: sdhci-msm: Reset GCC_SDCC_BCR register for SDHC Shravya Kumbham (1): net: emaclite: Add error handling for of_address_to_resource() Somnath Kotur (1): bnxt_en: Fix possible bnxt_open() failure caused by wrong RFS flag Stefan Haberland (2): s390/dasd: fix data corruption for ESE devices s390/dasd: prevent double format of tracks for ESE devices Takashi Sakamoto (1): ALSA: fireworks: fix wrong return count shorter than expected by 4 bytes Tan Tee Min (1): net: stmmac: disable Split Header (SPH) for Intel platforms Thomas Pfaff (1): genirq: Synchronize interrupt thread startup Trond Myklebust (2): Revert "SUNRPC: attempt AF_LOCAL connect on setup" NFSv4: Don't invalidate inode attributes on delegation return Vladimir Oltean (1): selftests: ocelot: tc_flower_chains: specify conform-exceed action for policer Wanpeng Li (2): x86/kvm: Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume KVM: LAPIC: Enable timer posted-interrupt only when mwait/hlt is advertised Yang Yingliang (4): net: ethernet: mediatek: add missing of_node_put() in mtk_sgmii_init() net: dsa: mt7530: add missing of_node_put() in mt7530_setup() net: stmmac: dwmac-sun8i: add missing of_node_put() in sun8i_dwmac_register_mdio_mux() net: cpsw: add missing of_node_put() in cpsw_probe_dt() Zihao Wang (1): ALSA: hda/realtek: Add quirk for Yoga Duet 7 13ITL6 speakers arch/mips/include/asm/timex.h | 8 ++-- arch/mips/kernel/time.c | 11 ++--- arch/parisc/kernel/processor.c | 3 +- arch/x86/kernel/kvm.c | 13 ++++++ arch/x86/kvm/cpuid.c | 5 ++ arch/x86/kvm/lapic.c | 10 ++-- arch/x86/kvm/mmu/mmu.c | 2 + arch/x86/kvm/svm/pmu.c | 28 +++++++++-- drivers/firewire/core-card.c | 3 ++ drivers/firewire/core-cdev.c | 4 +- drivers/firewire/core-topology.c | 9 ++-- drivers/firewire/core-transaction.c | 30 ++++++------ drivers/firewire/sbp2.c | 13 +++--- drivers/gpio/gpio-pca953x.c | 4 +- drivers/gpio/gpiolib-of.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- drivers/hwmon/adt7470.c | 4 +- drivers/infiniband/sw/siw/siw_cm.c | 7 +-- drivers/iommu/intel/iommu.c | 27 +++++++++-- drivers/md/dm.c | 8 +++- drivers/mmc/core/mmc.c | 23 ++++++++-- drivers/mmc/host/rtsx_pci_sdmmc.c | 31 +++++++++---- drivers/mmc/host/sdhci-msm.c | 42 +++++++++++++++++ drivers/net/can/grcan.c | 46 ++++++++++--------- drivers/net/dsa/mt7530.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 ++++-- drivers/net/ethernet/mediatek/mtk_sgmii.c | 1 + .../mellanox/mlx5/core/diag/rsc_dump.c | 31 ++++++++++--- .../mellanox/mlx5/core/en/port_buffer.c | 4 +- .../ethernet/mellanox/mlx5/core/en/tc_ct.c | 4 ++ .../ethernet/mellanox/mlx5/core/en_dcbnl.c | 10 ++++ .../ethernet/mellanox/mlx5/core/fw_reset.c | 28 +++++++---- drivers/net/ethernet/smsc/smsc911x.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/ti/cpsw_new.c | 5 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 15 ++++-- drivers/pci/controller/pci-aardvark.c | 16 +++---- drivers/s390/block/dasd.c | 18 ++++++-- drivers/s390/block/dasd_eckd.c | 28 ++++++++--- drivers/s390/block/dasd_int.h | 14 ++++++ fs/btrfs/tree-log.c | 14 +++++- fs/nfs/nfs4proc.c | 12 ++++- include/linux/stmmac.h | 1 + kernel/irq/internals.h | 2 + kernel/irq/irqdesc.c | 2 + kernel/irq/manage.c | 39 ++++++++++++---- kernel/rcu/tree.c | 32 +++++++------ net/can/isotp.c | 22 ++------- net/ipv4/igmp.c | 9 ++-- net/sunrpc/xprtsock.c | 3 -- sound/firewire/fireworks/fireworks_hwdep.c | 1 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/da7219.c | 14 ++++-- sound/soc/codecs/wm8958-dsp2.c | 8 ++-- sound/soc/meson/aiu-acodec-ctrl.c | 2 +- sound/soc/meson/aiu-codec-ctrl.c | 2 +- sound/soc/meson/g12a-tohdmitx.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 +-- .../drivers/net/ocelot/tc_flower_chains.sh | 2 +- .../net/forwarding/mirror_gre_bridge_1q.sh | 3 ++ tools/testing/selftests/seccomp/seccomp_bpf.c | 10 ++-- 63 files changed, 501 insertions(+), 215 deletions(-) -- 2.20.1

1 64

[PATCH openEuler-5.10 000/120] Backport 5.10.114 LTS
by Zheng Zengkai 04 Aug '22

04 Aug '22

Backport 5.10.114 LTS patches from upstream. git cherry-pick v5.10.113..v5.10.114~1 -s Complicts: Already merged(5): 54c028cfc496 floppy: disable FDRAWCMD by default e3ec78d82d48 net: hns3: modify the return code of hclge_get_ring_chain_from_mbx 929c30c02de4 net: hns3: add validity check for message data length 9eb25e00f59b net: hns3: add return value for mailbox handling in PF 1781beb87935 tls: Skip tls_append_frag on zero copy size Implementation changed(already merged, use mainline version b98535d09179, 1): 585ef03c9e79 ext4: fix bug_on in start_this_handle during umount filesystem Defered(3, kabi changed): 3c464db03c12 tcp: ensure to use the most recently sent skb when filling the rate sample 6f2bf9c5ddfe mtd: fix 'part' field data corruption in mtd_info 616d354fb9e8 hex2bin: make the function hex_to_bin constant-time Total patches: 129 - 5 - 1 - 3 = 120 Adam Ford (2): ARM: dts: am3517-evm: Fix misc pinmuxing ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 Alexey Kardashevskiy (1): powerpc/perf: Fix 32bit compile Baruch Siach (1): net: phy: marvell10g: fix return value on error Borislav Petkov (1): x86/cpu: Load microcode during restore_processor_state() Bruno Thomsen (1): USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader Chao Song (1): ASoC: Intel: soc-acpi: correct device endpoints for max98373 Christian Hewitt (2): arm64: dts: meson: remove CPU opps below 1GHz for G12B boards arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards Christophe JAILLET (1): bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() Chuanhong Guo (1): mtd: rawnand: fix ecc parameters for mt7622 Claudiu Beznea (1): ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name Damien Le Moal (2): zonefs: Fix management of open zones zonefs: Clear inode information flags on inode creation Dan Vacura (1): usb: gadget: uvc: Fix crash when encoding data for usb request Daniel Starke (13): tty: n_gsm: fix restart handling via CLD command tty: n_gsm: fix decoupled mux resource tty: n_gsm: fix mux cleanup after unregister tty device tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 tty: n_gsm: fix malformed counter for out of frame data tty: n_gsm: fix insufficient txframe size tty: n_gsm: fix wrong DLCI release order tty: n_gsm: fix missing explicit ldisc flush tty: n_gsm: fix wrong command retry handling tty: n_gsm: fix wrong command frame length field encoding tty: n_gsm: fix reset fifo race condition tty: n_gsm: fix incorrect UA handling tty: n_gsm: fix software flow control handling Daniele Palmas (1): USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions Dany Madden (1): Revert "ibmvnic: Add ethtool private flag for driver-defined queue limits" David Yat Sin (1): drm/amdkfd: Fix GWS queue count Dinh Nguyen (1): net: ethernet: stmmac: fix write to sgmii_adapter_base Duoming Zhou (1): drivers: net: hippi: Fix deadlock in rr_close() Eric Dumazet (2): tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT tcp: make sure treq->af_specific is initialized Evan Green (1): xhci: Enable runtime PM on second Alderlake controller Eyal Birger (1): bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook Fabio Estevam (2): ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock Fawzi Khaber (1): iio: imu: inv_icm42600: Fix I2C init possible nack Florian Westphal (1): netfilter: nft_socket: only do sk lookups when indev is available Francesco Ruggeri (1): tcp: md5: incorrect tcp_header_len for incoming connections Geert Uytterhoeven (1): memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode Greg Kroah-Hartman (1): lightnvm: disable the subsystem Guo Ren (1): riscv: patch_text: Fixup last cpu should be master H. Nikolaus Schaller (1): ARM: dts: Fix mmc order for omap3-gta04 Hangyu Hua (1): usb: misc: fix improper handling of refcount in uss720_probe() Heikki Krogerus (2): usb: typec: ucsi: Fix reuse of completion structure usb: typec: ucsi: Fix role swapping Henry Lin (1): xhci: stop polling roothubs after shutdown Imre Deak (1): drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses Johan Hovold (1): serial: imx: fix overrun interrupts in DMA mode Jonathan Lemon (1): net: bcmgenet: hide status block before TX timestamping Kees Cook (2): USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS thermal: int340x: Fix attr.show callback prototype Krzysztof Kozlowski (2): pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config phy: samsung: exynos5250-sata: fix missing device put in probe error paths Leon Romanovsky (1): ixgbe: ensure IPsec VF<->PF compatibility Lijun Pan (1): ibmvnic: fix miscellaneous checks Luca Ceresoli (1): pinctrl: rockchip: fix RK3308 pinmux bits Lv Ruyi (1): pinctrl: pistachio: fix use of irq_of_parse_and_map() Maciej W. Rozycki (2): serial: 8250: Also set sticky MCR bits in console restoration serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device Macpaul Lin (1): usb: mtu3: fix USB 3.0 dual-role-switch from device to host Manish Chopra (1): bnx2x: fix napi API usage sequence Marek Vasut (2): pinctrl: stm32: Do not call stm32_gpio_get() for edge triggered IRQs in EOI pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested Mark Brown (1): ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek Martin Blumenstingl (1): net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK Mathias Nyman (1): xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms Max Krummenacher (1): ARM: dts: imx6ull-colibri: fix vqmmc regulator Miaoqian Lin (8): phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe ARM: OMAP2+: Fix refcount leak in omap_gic_of_init phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe mtd: rawnand: Fix return value check of wait_for_completion_timeout net: dsa: Add missing of_node_put() in dsa_port_link_register_of drm/amd/display: Fix memory leak in dcn21_clock_source_create Michael Hennerich (1): iio: dac: ad5446: Fix read_raw not returning set value Mikulas Patocka (2): hex2bin: fix access beyond string end x86: __memcpy_flushcache: fix wrong alignment if size > 2^32 Namhyung Kim (3): perf symbol: Pass is_kallsyms to symbols__fixup_end() perf symbol: Update symbols__fixup_end() perf symbol: Remove arch__symbols__fixup_end() Nikolay Aleksandrov (1): wireguard: device: check for metadata_dst with skb_valid_dst() Oliver Neukum (2): USB: quirks: add a Realtek card reader USB: quirks: add STRING quirk for VCOM device Pablo Neira Ayuso (1): netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion Pavel Skripkin (1): video: fbdev: udlfb: properly check endpoint type Pawel Laszczak (1): usb: cdns3: Fix issue for clear halt endpoint Peilin Ye (3): ip_gre: Make o_seqno start from 0 in native mode ip6_gre: Make o_seqno start from 0 in native mode ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode Pengcheng Yang (2): ipvs: correctly print the memory size of ip_vs_conn_tab tcp: fix F-RTO may not work correctly when receiving DSACK Ronnie Sahlberg (1): cifs: destage any unwritten data to the server before calling copychunk_write Sean Anderson (1): usb: phy: generic: Get the vbus supply Slark Xiao (1): USB: serial: option: add support for Cinterion MV32-WA/MV32-WB Sven Peter (1): usb: dwc3: Try usb-role-switch first in dwc3_drd_init Tejun Heo (1): iocost: don't reset the inuse weight of under-weighted debtors Thinh Nguyen (3): usb: dwc3: core: Fix tx/rx threshold settings usb: dwc3: core: Only handle soft-reset in DCTL usb: dwc3: gadget: Return proper request status Thomas Gleixner (1): x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests Tong Zhang (1): iio:imu:bmi160: disable regulator in error path Tony Lindgren (1): bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific Vijayavardhan Vennapusa (1): usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() Wang Qing (1): arch_topology: Do not set llc_sibling if llc_id is invalid Weitao Wang (1): USB: Fix xhci event ring dequeue pointer ERDP update issue Xiaobing Luo (1): cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe Xin Long (1): sctp: check asoc strreset_chunk in sctp_generate_reconf_event Yang Yingliang (2): clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() net: fec: add missing of_node_put() in fec_enet_init_stop_mode() YueHaibing (1): pinctrl: mediatek: moore: Fix build error Zheyu Ma (2): iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() ASoC: wm8731: Disable the regulator when probing fails Zizhuang Deng (1): iio: dac: ad5592r: Fix the missing return value. Zqiang (1): kasan: prevent cpu_quarantine corruption when CPU offline and cache shrink occur at same time liuyacan (1): net/smc: sync err code when tcp connection was refused arch/arm/boot/dts/am3517-evm.dts | 45 +++- arch/arm/boot/dts/am3517-som.dtsi | 9 + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 +- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 10 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +- .../boot/dts/logicpd-som-lv-35xx-devkit.dts | 15 ++ .../boot/dts/logicpd-som-lv-37xx-devkit.dts | 15 ++ arch/arm/boot/dts/logicpd-som-lv.dtsi | 15 -- arch/arm/boot/dts/omap3-gta04.dtsi | 2 + arch/arm/mach-exynos/Kconfig | 1 - arch/arm/mach-omap2/omap4-common.c | 2 + .../boot/dts/amlogic/meson-g12b-a311d.dtsi | 40 ---- .../boot/dts/amlogic/meson-g12b-s922x.dtsi | 40 ---- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 20 -- .../boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 + arch/powerpc/perf/Makefile | 4 +- arch/riscv/kernel/patch.c | 2 +- arch/x86/include/asm/microcode.h | 2 + arch/x86/kernel/cpu/microcode/core.c | 6 +- arch/x86/lib/usercopy_64.c | 2 +- arch/x86/pci/xen.c | 6 +- arch/x86/power/cpu.c | 10 +- block/blk-iocost.c | 12 +- drivers/base/arch_topology.c | 2 +- drivers/bus/sunxi-rsb.c | 2 + drivers/bus/ti-sysc.c | 16 +- drivers/clk/sunxi/clk-sun9i-mmc.c | 2 + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 4 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 83 ++++---- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/iio/dac/ad5446.c | 2 +- drivers/iio/dac/ad5592r-base.c | 2 +- drivers/iio/imu/bmi160/bmi160_core.c | 20 +- .../iio/imu/inv_icm42600/inv_icm42600_i2c.c | 15 +- drivers/iio/magnetometer/ak8975.c | 1 + drivers/lightnvm/Kconfig | 2 +- drivers/memory/renesas-rpc-if.c | 60 ++++-- drivers/mtd/nand/raw/mtk_ecc.c | 12 +- drivers/mtd/nand/raw/sh_flctl.c | 14 +- drivers/net/dsa/lantiq_gswip.c | 3 - .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 7 + drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 144 ++++--------- drivers/net/ethernet/ibm/ibmvnic.h | 6 - .../net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 3 +- .../ethernet/stmicro/stmmac/dwmac-socfpga.c | 12 +- drivers/net/hippi/rrunner.c | 2 + drivers/net/phy/marvell10g.c | 2 +- drivers/net/wireguard/device.c | 3 +- drivers/phy/motorola/phy-mapphone-mdm6600.c | 3 +- drivers/phy/samsung/phy-exynos5250-sata.c | 21 +- drivers/phy/ti/phy-am654-serdes.c | 2 +- drivers/phy/ti/phy-omap-usb2.c | 2 +- drivers/pinctrl/mediatek/Kconfig | 1 + drivers/pinctrl/pinctrl-pistachio.c | 6 +- drivers/pinctrl/pinctrl-rockchip.c | 45 ++-- drivers/pinctrl/samsung/Kconfig | 11 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 23 ++- .../intel/int340x_thermal/int3400_thermal.c | 4 +- drivers/tty/n_gsm.c | 194 ++++++++++-------- drivers/tty/serial/8250/8250_pci.c | 8 +- drivers/tty/serial/8250/8250_port.c | 2 +- drivers/tty/serial/imx.c | 2 +- drivers/usb/cdns3/gadget.c | 7 +- drivers/usb/core/quirks.c | 6 + drivers/usb/dwc3/core.c | 11 +- drivers/usb/dwc3/drd.c | 11 +- drivers/usb/dwc3/gadget.c | 31 ++- drivers/usb/gadget/configfs.c | 2 + drivers/usb/gadget/function/uvc_queue.c | 2 + drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/host/xhci-ring.c | 2 + drivers/usb/host/xhci.c | 11 + drivers/usb/misc/uss720.c | 3 +- drivers/usb/mtu3/mtu3_dr.c | 6 +- drivers/usb/phy/phy-generic.c | 7 + drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/option.c | 12 ++ drivers/usb/serial/whiteheat.c | 5 +- drivers/usb/typec/ucsi/ucsi.c | 24 ++- drivers/video/fbdev/udlfb.c | 14 +- fs/cifs/smb2ops.c | 8 + fs/zonefs/super.c | 46 ++++- include/memory/renesas-rpc-if.h | 1 + include/net/ip6_tunnel.h | 2 +- include/net/ip_tunnels.h | 2 +- include/net/tcp.h | 2 + lib/hexdump.c | 9 +- mm/kasan/quarantine.c | 7 + net/core/lwt_bpf.c | 7 +- net/dsa/port.c | 2 + net/ipv4/ip_gre.c | 12 +- net/ipv4/syncookies.c | 8 +- net/ipv4/tcp_input.c | 15 +- net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/tcp_output.c | 1 + net/ipv6/ip6_gre.c | 16 +- net/ipv6/syncookies.c | 3 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/nft_set_rbtree.c | 6 +- net/netfilter/nft_socket.c | 52 +++-- net/sctp/sm_sideeffect.c | 4 + net/smc/af_smc.c | 2 + sound/soc/codecs/wm8731.c | 19 +- .../intel/common/soc-acpi-intel-tgl-match.c | 4 +- tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/arm64/util/machine.c | 27 --- tools/perf/arch/s390/util/machine.c | 16 -- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 37 +++- tools/perf/util/symbol.h | 3 +- 115 files changed, 879 insertions(+), 632 deletions(-) delete mode 100644 tools/perf/arch/arm64/util/machine.c -- 2.20.1

1 120

[PATCH openEuler-1.0-LTS] rcu: Set a maximum limit for back-to-back callback invocation
by Yongqiang Liu 04 Aug '22

04 Aug '22

From: "Paul E. McKenney" <paulmck(a)linux.ibm.com> mainline inclusion from mainline-v5.3-rc1 commit d5a9a8c3bc8068f2e5dfba30150ac09b596b461a category: bugfix bugzilla: 187356, https://gitee.com/openeuler/kernel/issues/I5KOZ5 CVE: NA --------------------------- Currently, if a CPU has more than 10,000 callbacks pending, it will increase rdp->blimit to LONG_MAX. If you are lucky, LONG_MAX is only about two billion, but this is still a bit too many callbacks to invoke back-to-back while otherwise ignoring the world. This commit therefore sets a maximum limit of DEFAULT_MAX_RCU_BLIMIT, which is set to 10,000, for rdp->blimit. Reported-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Signed-off-by: Paul E. McKenney <paulmck(a)linux.ibm.com> Conflicts: kernel/rcu/tree.c Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- kernel/rcu/tree.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index ea05c59096a2..a0dc5385bcbc 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -490,7 +490,8 @@ void rcu_all_qs(void) } EXPORT_SYMBOL_GPL(rcu_all_qs); -#define DEFAULT_RCU_BLIMIT 10 /* Maximum callbacks per rcu_do_batch. */ +#define DEFAULT_RCU_BLIMIT 10 /* Maximum callbacks per rcu_do_batch ... */ +#define DEFAULT_MAX_RCU_BLIMIT 10000 /* ... even during callback flood. */ static long blimit = DEFAULT_RCU_BLIMIT; #define DEFAULT_RCU_QHIMARK 10000 /* If this many pending, ignore blimit. */ static long qhimark = DEFAULT_RCU_QHIMARK; @@ -2604,7 +2605,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp) /* Reinstate batch limit if we have worked down the excess. */ count = rcu_segcblist_n_cbs(&rdp->cblist); - if (rdp->blimit == LONG_MAX && count <= qlowmark) + if (rdp->blimit >= DEFAULT_MAX_RCU_BLIMIT && count <= qlowmark) rdp->blimit = blimit; /* Reset ->qlen_last_fqs_check trigger if enough CBs have drained. */ @@ -2940,7 +2941,7 @@ static void __call_rcu_core(struct rcu_state *rsp, struct rcu_data *rdp, rcu_accelerate_cbs_unlocked(rsp, rdp->mynode, rdp); } else { /* Give the grace period a kick. */ - rdp->blimit = LONG_MAX; + rdp->blimit = DEFAULT_MAX_RCU_BLIMIT; if (rsp->n_force_qs == rdp->n_force_qs_snap && rcu_segcblist_first_pend_cb(&rdp->cblist) != head) force_quiescent_state(rsp); -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] mm: Fix page counter mismatch in shmem_mfill_atomic_pte
by Yongqiang Liu 04 Aug '22

04 Aug '22

From: Ma Wupeng <mawupeng1(a)huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5JT6V CVE: NA -------------------------------- shmem_mfill_atomic_pte() wrongly called mem_cgroup_cancel_charge() in "success" path, it should mem_cgroup_uncharge() to dec memory counter instead. mem_cgroup_cancel_charge() should only be used if this transaction is unsuccessful and mem_cgroup_uncharge() is used to do this if this transaction succeed. This will lead to page->memcg not null and will uncharge one more in put_page(). The page counter will underflow to maximum value and trigger oom to kill all process include sshd and leave system unaccessible. page->memcg is set in the following path: mem_cgroup_commit_charge commit_charge page->mem_cgroup = memcg; extra uncharge will be done in the following path: put_page __put_page __put_single_page mem_cgroup_uncharge if (!page->mem_cgroup) <-- should return return uncharge_page uncharge_batch To fix this, call mem_cgroup_commit_charge() at the end of this transaction to make sure this transaction is really finished. Fixes: 4c27fe4c4c84 ("userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support") Signed-off-by: Ma Wupeng <mawupeng1(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 34981c7aad14..e300395fe308 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2464,8 +2464,6 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, if (ret) goto out_release_uncharge; - mem_cgroup_commit_charge(page, memcg, false, false); - _dst_pte = mk_pte(page, dst_vma->vm_page_prot); if (dst_vma->vm_flags & VM_WRITE) _dst_pte = pte_mkwrite(pte_mkdirty(_dst_pte)); @@ -2491,6 +2489,8 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, if (!pte_none(*dst_pte)) goto out_release_uncharge_unlock; + mem_cgroup_commit_charge(page, memcg, false, false); + lru_cache_add_anon(page); spin_lock_irq(&info->lock); -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] scsi: mpt3sas: Fix unlock imbalance
by Yongqiang Liu 04 Aug '22

04 Aug '22

From: Damien Le Moal <damien.lemoal(a)wdc.com> mainline inclusion from mainline-v5.8-rc5 commit cb551b8dc079d2ef189145782627c99cb68c0255 category: bugfix bugzilla: 187287, https://gitee.com/openeuler/kernel/issues/I5JQML CVE: NA -------------------------------- In BRM_status_show(), if the condition "!ioc->is_warpdrive" tested on entry to the function is true, a "goto out" is called. This results in unlocking ioc->pci_access_mutex without this mutex lock being taken. This generates the following splat: [ 1148.539883] mpt3sas_cm2: BRM_status_show: BRM attribute is only for warpdrive [ 1148.547184] [ 1148.548708] ===================================== [ 1148.553501] WARNING: bad unlock balance detected! [ 1148.558277] 5.8.0-rc3+ #827 Not tainted [ 1148.562183] ------------------------------------- [ 1148.566959] cat/5008 is trying to release lock (&ioc->pci_access_mutex) at: [ 1148.574035] [<ffffffffc070b7a3>] BRM_status_show+0xd3/0x100 [mpt3sas] [ 1148.580574] but there are no more locks to release! [ 1148.585524] [ 1148.585524] other info that might help us debug this: [ 1148.599624] 3 locks held by cat/5008: [ 1148.607085] #0: ffff92aea3e392c0 (&p->lock){+.+.}-{3:3}, at: seq_read+0x34/0x480 [ 1148.618509] #1: ffff922ef14c4888 (&of->mutex){+.+.}-{3:3}, at: kernfs_seq_start+0x2a/0xb0 [ 1148.630729] #2: ffff92aedb5d7310 (kn->active#224){.+.+}-{0:0}, at: kernfs_seq_start+0x32/0xb0 [ 1148.643347] [ 1148.643347] stack backtrace: [ 1148.655259] CPU: 73 PID: 5008 Comm: cat Not tainted 5.8.0-rc3+ #827 [ 1148.665309] Hardware name: HGST H4060-S/S2600STB, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019 [ 1148.678394] Call Trace: [ 1148.684750] dump_stack+0x78/0xa0 [ 1148.691802] lock_release.cold+0x45/0x4a [ 1148.699451] __mutex_unlock_slowpath+0x35/0x270 [ 1148.707675] BRM_status_show+0xd3/0x100 [mpt3sas] [ 1148.716092] dev_attr_show+0x19/0x40 [ 1148.723664] sysfs_kf_seq_show+0x87/0x100 [ 1148.731193] seq_read+0xbc/0x480 [ 1148.737882] vfs_read+0xa0/0x160 [ 1148.744514] ksys_read+0x58/0xd0 [ 1148.751129] do_syscall_64+0x4c/0xa0 [ 1148.757941] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 1148.766240] RIP: 0033:0x7f1230566542 [ 1148.772957] Code: Bad RIP value. [ 1148.779206] RSP: 002b:00007ffeac1bcac8 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 [ 1148.790063] RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007f1230566542 [ 1148.800284] RDX: 0000000000020000 RSI: 00007f1223460000 RDI: 0000000000000003 [ 1148.810474] RBP: 00007f1223460000 R08: 00007f122345f010 R09: 0000000000000000 [ 1148.820641] R10: 0000000000000022 R11: 0000000000000246 R12: 0000000000000000 [ 1148.830728] R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000 Fix this by returning immediately instead of jumping to the out label. Link: https://lore.kernel.org/r/20200701085254.51740-1-damien.lemoal@wdc.com Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com> Acked-by: Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> Signed-off-by: Damien Le Moal <damien.lemoal(a)wdc.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Conflict: drivers/scsi/mpt3sas/mpt3sas_ctl.c Signed-off-by: Zhang Wensheng <zhangwensheng5(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13(a)huawei.com> --- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c index 772d78d92d44..90060af097cc 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c @@ -2965,7 +2965,7 @@ _ctl_BRM_status_show(struct device *cdev, struct device_attribute *attr, if (!ioc->is_warpdrive) { pr_err(MPT3SAS_FMT "%s: BRM attribute is only for" " warpdrive\n", ioc->name, __func__); - goto out; + return 0; } /* pci_access_mutex lock acquired by sysfs show path */ mutex_lock(&ioc->pci_access_mutex); -- 2.25.1

1 0