July 2021 - Linux-stable-mirror

FAILED: patch "[PATCH] dm writecache: return the exact table values that were set" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 054bee16163df023e2589db09fd27d81f7ad9e72 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka(a)redhat.com> Date: Thu, 4 Feb 2021 05:20:52 -0500 Subject: [PATCH] dm writecache: return the exact table values that were set LVM doesn't like it when the target returns different values from what was set in the constructor. Fix dm-writecache so that the returned table values are exactly the same as requested values. Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com> Cc: stable(a)vger.kernel.org # v4.18+ Signed-off-by: Mike Snitzer <snitzer(a)redhat.com> diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index fd531d5a39c2..e8382d73c73c 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -159,14 +159,22 @@ struct dm_writecache { bool overwrote_committed:1; bool memory_vmapped:1; + bool start_sector_set:1; bool high_wm_percent_set:1; bool low_wm_percent_set:1; bool max_writeback_jobs_set:1; bool autocommit_blocks_set:1; bool autocommit_time_set:1; + bool max_age_set:1; bool writeback_fua_set:1; bool flush_on_suspend:1; bool cleaner:1; + bool cleaner_set:1; + + unsigned high_wm_percent_value; + unsigned low_wm_percent_value; + unsigned autocommit_time_value; + unsigned max_age_value; unsigned writeback_all; struct workqueue_struct *writeback_wq; @@ -2203,6 +2211,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) if (sscanf(string, "%llu%c", &start_sector, &dummy) != 1) goto invalid_optional; wc->start_sector = start_sector; + wc->start_sector_set = true; if (wc->start_sector != start_sector || wc->start_sector >= wc->memory_map_size >> SECTOR_SHIFT) goto invalid_optional; @@ -2212,6 +2221,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) goto invalid_optional; if (high_wm_percent < 0 || high_wm_percent > 100) goto invalid_optional; + wc->high_wm_percent_value = high_wm_percent; wc->high_wm_percent_set = true; } else if (!strcasecmp(string, "low_watermark") && opt_params >= 1) { string = dm_shift_arg(&as), opt_params--; @@ -2219,6 +2229,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) goto invalid_optional; if (low_wm_percent < 0 || low_wm_percent > 100) goto invalid_optional; + wc->low_wm_percent_value = low_wm_percent; wc->low_wm_percent_set = true; } else if (!strcasecmp(string, "writeback_jobs") && opt_params >= 1) { string = dm_shift_arg(&as), opt_params--; @@ -2238,6 +2249,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) if (autocommit_msecs > 3600000) goto invalid_optional; wc->autocommit_jiffies = msecs_to_jiffies(autocommit_msecs); + wc->autocommit_time_value = autocommit_msecs; wc->autocommit_time_set = true; } else if (!strcasecmp(string, "max_age") && opt_params >= 1) { unsigned max_age_msecs; @@ -2247,7 +2259,10 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) if (max_age_msecs > 86400000) goto invalid_optional; wc->max_age = msecs_to_jiffies(max_age_msecs); + wc->max_age_set = true; + wc->max_age_value = max_age_msecs; } else if (!strcasecmp(string, "cleaner")) { + wc->cleaner_set = true; wc->cleaner = true; } else if (!strcasecmp(string, "fua")) { if (WC_MODE_PMEM(wc)) { @@ -2453,7 +2468,6 @@ static void writecache_status(struct dm_target *ti, status_type_t type, struct dm_writecache *wc = ti->private; unsigned extra_args; unsigned sz = 0; - uint64_t x; switch (type) { case STATUSTYPE_INFO: @@ -2465,11 +2479,11 @@ static void writecache_status(struct dm_target *ti, status_type_t type, DMEMIT("%c %s %s %u ", WC_MODE_PMEM(wc) ? 'p' : 's', wc->dev->name, wc->ssd_dev->name, wc->block_size); extra_args = 0; - if (wc->start_sector) + if (wc->start_sector_set) extra_args += 2; - if (wc->high_wm_percent_set && !wc->cleaner) + if (wc->high_wm_percent_set) extra_args += 2; - if (wc->low_wm_percent_set && !wc->cleaner) + if (wc->low_wm_percent_set) extra_args += 2; if (wc->max_writeback_jobs_set) extra_args += 2; @@ -2477,37 +2491,29 @@ static void writecache_status(struct dm_target *ti, status_type_t type, extra_args += 2; if (wc->autocommit_time_set) extra_args += 2; - if (wc->max_age != MAX_AGE_UNSPECIFIED) + if (wc->max_age_set) extra_args += 2; - if (wc->cleaner) + if (wc->cleaner_set) extra_args++; if (wc->writeback_fua_set) extra_args++; DMEMIT("%u", extra_args); - if (wc->start_sector) + if (wc->start_sector_set) DMEMIT(" start_sector %llu", (unsigned long long)wc->start_sector); - if (wc->high_wm_percent_set && !wc->cleaner) { - x = (uint64_t)wc->freelist_high_watermark * 100; - x += wc->n_blocks / 2; - do_div(x, (size_t)wc->n_blocks); - DMEMIT(" high_watermark %u", 100 - (unsigned)x); - } - if (wc->low_wm_percent_set && !wc->cleaner) { - x = (uint64_t)wc->freelist_low_watermark * 100; - x += wc->n_blocks / 2; - do_div(x, (size_t)wc->n_blocks); - DMEMIT(" low_watermark %u", 100 - (unsigned)x); - } + if (wc->high_wm_percent_set) + DMEMIT(" high_watermark %u", wc->high_wm_percent_value); + if (wc->low_wm_percent_set) + DMEMIT(" low_watermark %u", wc->low_wm_percent_value); if (wc->max_writeback_jobs_set) DMEMIT(" writeback_jobs %u", wc->max_writeback_jobs); if (wc->autocommit_blocks_set) DMEMIT(" autocommit_blocks %u", wc->autocommit_blocks); if (wc->autocommit_time_set) - DMEMIT(" autocommit_time %u", jiffies_to_msecs(wc->autocommit_jiffies)); - if (wc->max_age != MAX_AGE_UNSPECIFIED) - DMEMIT(" max_age %u", jiffies_to_msecs(wc->max_age)); - if (wc->cleaner) + DMEMIT(" autocommit_time %u", wc->autocommit_time_value); + if (wc->max_age_set) + DMEMIT(" max_age %u", wc->max_age_value); + if (wc->cleaner_set) DMEMIT(" cleaner"); if (wc->writeback_fua_set) DMEMIT(" %sfua", wc->writeback_fua ? "" : "no"); @@ -2517,7 +2523,7 @@ static void writecache_status(struct dm_target *ti, status_type_t type, static struct target_type writecache_target = { .name = "writecache", - .version = {1, 3, 0}, + .version = {1, 4, 0}, .module = THIS_MODULE, .ctr = writecache_ctr, .dtr = writecache_dtr,

3 years, 5 months

3
2
0 0

FAILED: patch "[PATCH] dm writecache: fix writing beyond end of underlying device" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4134455f2aafdfeab50cabb4cccb35e916034b93 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka(a)redhat.com> Date: Tue, 9 Feb 2021 10:56:20 -0500 Subject: [PATCH] dm writecache: fix writing beyond end of underlying device when shrinking Do not attempt to write any data beyond the end of the underlying data device while shrinking it. The DM writecache device must be suspended when the underlying data device is shrunk. Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com> Cc: stable(a)vger.kernel.org Signed-off-by: Mike Snitzer <snitzer(a)redhat.com> diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index e8382d73c73c..baf5a9ce2b25 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -148,6 +148,7 @@ struct dm_writecache { size_t metadata_sectors; size_t n_blocks; uint64_t seq_count; + sector_t data_device_sectors; void *block_start; struct wc_entry *entries; unsigned block_size; @@ -977,6 +978,8 @@ static void writecache_resume(struct dm_target *ti) wc_lock(wc); + wc->data_device_sectors = i_size_read(wc->dev->bdev->bd_inode) >> SECTOR_SHIFT; + if (WC_MODE_PMEM(wc)) { persistent_memory_invalidate_cache(wc->memory_map, wc->memory_map_size); } else { @@ -1646,6 +1649,10 @@ static bool wc_add_block(struct writeback_struct *wb, struct wc_entry *e, gfp_t void *address = memory_data(wc, e); persistent_memory_flush_cache(address, block_size); + + if (unlikely(bio_end_sector(&wb->bio) >= wc->data_device_sectors)) + return true; + return bio_add_page(&wb->bio, persistent_memory_page(address), block_size, persistent_memory_page_offset(address)) != 0; } @@ -1717,6 +1724,9 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba if (writecache_has_error(wc)) { bio->bi_status = BLK_STS_IOERR; bio_endio(bio); + } else if (unlikely(!bio_sectors(bio))) { + bio->bi_status = BLK_STS_OK; + bio_endio(bio); } else { submit_bio(bio); } @@ -1760,6 +1770,14 @@ static void __writecache_writeback_ssd(struct dm_writecache *wc, struct writebac e = f; } + if (unlikely(to.sector + to.count > wc->data_device_sectors)) { + if (to.sector >= wc->data_device_sectors) { + writecache_copy_endio(0, 0, c); + continue; + } + from.count = to.count = wc->data_device_sectors - to.sector; + } + dm_kcopyd_copy(wc->dm_kcopyd, &from, 1, &to, 0, writecache_copy_endio, c); __writeback_throttle(wc, wbl);

3 years, 5 months

3
2
0 0

[PATCH v4.19.y, v5.4.y] mm: slab: fix kmem_cache_create failed when sysfs node not destroyed

by Nanyong Sun

The commit d38a2b7a9c93 ("mm: memcg/slab: fix memory leak at non-root kmem_cache destroy") introduced a problem: If one thread destroy a kmem_cache A and another thread concurrently create a kmem_cache B, which is mergeable with A and has same size with A, the B may fail to create due to the duplicate sysfs node. The scenario in detail: 1) Thread 1 uses kmem_cache_destroy() to destroy kmem_cache A which is mergeable, it decreases A's refcount and if refcount is 0, then call memcg_set_kmem_cache_dying() which set A->memcg_params.dying = true, then unlock the slab_mutex and call flush_memcg_workqueue(), it may cost a while. Note: now the sysfs node(like '/kernel/slab/:0000248') of A is still present, it will be deleted in shutdown_cache() which will be called after flush_memcg_workqueue() is done and lock the slab_mutex again. 2) Now if thread 2 is coming, it use kmem_cache_create() to create B, which is mergeable with A(their size is same), it gain the lock of slab_mutex, then call __kmem_cache_alias() trying to find a mergeable node, because of the below added code in commit d38a2b7a9c93 ("mm: memcg/slab: fix memory leak at non-root kmem_cache destroy"), B is not mergeable with A whose memcg_params.dying is true. int slab_unmergeable(struct kmem_cache *s) if (s->refcount < 0) return 1; /* * Skip the dying kmem_cache. */ if (s->memcg_params.dying) return 1; return 0; } So B has to create its own sysfs node by calling: create_cache-> __kmem_cache_create-> sysfs_slab_add-> kobject_init_and_add Because B is mergeable itself, its filename of sysfs node is based on its size, like '/kernel/slab/:0000248', which is duplicate with A, and the sysfs node of A is still present now, so kobject_init_and_add() will return fail and result in kmem_cache_create() fail. Concurrently modprobe and rmmod the two modules below can reproduce the issue quickly: nf_conntrack_expect, se_sess_cache. See call trace in the end. LTS versions of v4.19.y and v5.4.y have this problem, whereas linux versions after v5.9 do not have this problem because the patchset: ("The new cgroup slab memory controller") almost refactored memcg slab. A potential solution(this patch belongs): Just let the dying kmem_cache be mergeable, the slab_mutex lock can prevent the race between alias kmem_cache creating thread and root kmem_cache destroying thread. In the destroying thread, after flush_memcg_workqueue() is done, judge the refcount again, if someone reference it again during un-lock time, we don't need to destroy the kmem_cache completely, we can reuse it. Another potential solution: revert the commit d38a2b7a9c93 ("mm: memcg/slab: fix memory leak at non-root kmem_cache destroy"), compare to the fail of kmem_cache_create, the memory leak in special scenario seems less harmful. Call trace: sysfs: cannot create duplicate filename '/kernel/slab/:0000248' Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 Call trace: dump_backtrace+0x0/0x198 show_stack+0x24/0x30 dump_stack+0xb0/0x100 sysfs_warn_dup+0x6c/0x88 sysfs_create_dir_ns+0x104/0x120 kobject_add_internal+0xd0/0x378 kobject_init_and_add+0x90/0xd8 sysfs_slab_add+0x16c/0x2d0 __kmem_cache_create+0x16c/0x1d8 create_cache+0xbc/0x1f8 kmem_cache_create_usercopy+0x1a0/0x230 kmem_cache_create+0x50/0x68 init_se_kmem_caches+0x38/0x258 [target_core_mod] target_core_init_configfs+0x8c/0x390 [target_core_mod] do_one_initcall+0x54/0x230 do_init_module+0x64/0x1ec load_module+0x150c/0x16f0 __se_sys_finit_module+0xf0/0x108 __arm64_sys_finit_module+0x24/0x30 el0_svc_common+0x80/0x1c0 el0_svc_handler+0x78/0xe0 el0_svc+0x10/0x260 kobject_add_internal failed for :0000248 with -EEXIST, don't try to register things with the same name in the same directory. kmem_cache_create(se_sess_cache) failed with error -17 Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 Call trace: dump_backtrace+0x0/0x198 show_stack+0x24/0x30 dump_stack+0xb0/0x100 kmem_cache_create_usercopy+0xa8/0x230 kmem_cache_create+0x50/0x68 init_se_kmem_caches+0x38/0x258 [target_core_mod] target_core_init_configfs+0x8c/0x390 [target_core_mod] do_one_initcall+0x54/0x230 do_init_module+0x64/0x1ec load_module+0x150c/0x16f0 __se_sys_finit_module+0xf0/0x108 __arm64_sys_finit_module+0x24/0x30 el0_svc_common+0x80/0x1c0 el0_svc_handler+0x78/0xe0 el0_svc+0x10/0x260 Fixes: d38a2b7a9c93 ("mm: memcg/slab: fix memory leak at non-root kmem_cache destroy") Signed-off-by: Nanyong Sun <sunnanyong(a)huawei.com> Cc: stable(a)vger.kernel.org --- mm/slab_common.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index d208b47e01a8..acc743315bb5 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -326,14 +326,6 @@ int slab_unmergeable(struct kmem_cache *s) if (s->refcount < 0) return 1; -#ifdef CONFIG_MEMCG_KMEM - /* - * Skip the dying kmem_cache. - */ - if (s->memcg_params.dying) - return 1; -#endif - return 0; } @@ -947,6 +939,16 @@ void kmem_cache_destroy(struct kmem_cache *s) get_online_mems(); mutex_lock(&slab_mutex); + + /* + *Another thread referenced it again + */ + if (READ_ONCE(s->refcount)) { + spin_lock_irq(&memcg_kmem_wq_lock); + s->memcg_params.dying = false; + spin_unlock_irq(&memcg_kmem_wq_lock); + goto out_unlock; + } #endif err = shutdown_memcg_caches(s); -- 2.18.0.huawei.25

3 years, 5 months

2
1
0 0

[PATCH 5.12 000/242] 5.12.18-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.12.18 release. There are 242 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.18-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.12.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.12.18-rc1 Chao Yu <chao(a)kernel.org> f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances Pavel Skripkin <paskripkin(a)gmail.com> ext4: fix memory leak in ext4_fill_super Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> smackfs: restrict bytes count in smk_set_cipso() Arnd Bergmann <arnd(a)arndb.de> media: v4l2-core: explicitly clear ioctl input data Pavel Skripkin <paskripkin(a)gmail.com> jfs: fix GPF in diFree Thomas Zimmermann <tzimmermann(a)suse.de> drm/ast: Remove reference to struct drm_device.pdev Zou Wei <zou_wei(a)huawei.com> pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq() Mikulas Patocka <mpatocka(a)redhat.com> dm writecache: write at least 4k when committing Sven Schnelle <svens(a)linux.ibm.com> s390/signal: switch to using vdso for sigreturn and syscall restart Sven Schnelle <svens(a)linux.ibm.com> s390/vdso: add minimal compat vdso Sven Schnelle <svens(a)linux.ibm.com> s390/vdso: rename VDSO64_LBASE to VDSO_LBASE Sven Schnelle <svens(a)linux.ibm.com> s390/vdso64: add sigreturn,rt_sigreturn and restart_syscall Sven Schnelle <svens(a)linux.ibm.com> s390/vdso: always enable vdso Benjamin Drung <bdrung(a)posteo.de> media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K Johan Hovold <johan(a)kernel.org> media: rtl28xxu: fix zero-length control request Johan Hovold <johan(a)kernel.org> media: gspca/sunplus: fix zero-length control requests Johan Hovold <johan(a)kernel.org> media: gspca/sq905: fix control-request direction Bernhard Wimmer <be.wimm(a)gmail.com> media: ccs: Fix the op_pll_multiplier address Pavel Skripkin <paskripkin(a)gmail.com> media: zr364xx: fix memory leak in zr364xx_start_readpipe Johan Hovold <johan(a)kernel.org> media: dtv5100: fix control-request directions Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> media: i2c: ccs-core: fix pm_runtime_get_sync() usage count Arnd Bergmann <arnd(a)arndb.de> media: subdev: disallow ioctl for saa6588/davinci Pali Rohár <pali(a)kernel.org> PCI: aardvark: Implement workaround for the readback value of VEND_ID Pali Rohár <pali(a)kernel.org> PCI: aardvark: Fix checking for PIO Non-posted Request Konstantin Kharlamov <Hi-Angel(a)yandex.ru> PCI: Leave Apple Thunderbolt controllers on for s2idle or standby Hou Tao <houtao1(a)huawei.com> dm btree remove: assign new_root only when removal succeeds Mikulas Patocka <mpatocka(a)redhat.com> dm writecache: flush origin device when writing and cache is full Damien Le Moal <damien.lemoal(a)wdc.com> dm zoned: check zone capacity Sai Prakash Ranjan <saiprakash.ranjan(a)codeaurora.org> coresight: tmc-etf: Fix global-out-of-bounds in tmc_update_etf_buffer() Jeremy Linton <jeremy.linton(a)arm.com> coresight: Propagate symlink failure Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe Paul Burton <paulburton(a)google.com> tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT Paul Burton <paulburton(a)google.com> tracing: Simplify & fix saved_tgids logic Jan Kara <jack(a)suse.cz> rq-qos: fix missed wake-ups in rq_qos_throttle try two Yun Zhou <yun.zhou(a)windriver.com> seq_buf: Fix overflow in seq_buf_putmem_hex() Kees Cook <keescook(a)chromium.org> lkdtm: Enable DOUBLE_FAULT on all architectures Ferry Toth <ftoth(a)exalondelft.nl> extcon: intel-mrfld: Sync hardware and software state on init Kees Cook <keescook(a)chromium.org> selftests/lkdtm: Fix expected text for CR4 pinning Kees Cook <keescook(a)chromium.org> lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> nvmem: core: add a missing of_node_put Limeng <Meng.Li(a)windriver.com> mfd: syscon: Free the allocated name field of struct regmap_config Linus Walleij <linus.walleij(a)linaro.org> power: supply: ab8500: Fix an old bug Zhihao Cheng <chengzhihao1(a)huawei.com> ubifs: Fix races between xattr_{set|get} and listxattr operations Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> thermal/drivers/int340x/processor_thermal: Fix tcc setting Varad Gautam <varad.gautam(a)suse.com> xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype Petr Pavlu <petr.pavlu(a)suse.com> ipmi/watchdog: Stop watchdog timer when the current action is 'none' Nathan Chancellor <nathan(a)kernel.org> qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute Jesse Brandeburg <jesse.brandeburg(a)intel.com> i40e: fix PTP on 5Gb links Brian Norris <briannorris(a)chromium.org> mwifiex: bring down link before deleting interface Dmitry Osipenko <digetx(a)gmail.com> ASoC: tegra: Set driver_name=tegra for all machine drivers Russ Weight <russell.h.weight(a)intel.com> fpga: stratix10-soc: Add missing fpga_mgr_free() call Samuel Holland <samuel(a)sholland.org> clocksource/arm_arch_timer: Improve Allwinner A64 timer workaround Thomas Gleixner <tglx(a)linutronix.de> cpu/hotplug: Cure the cpusets trainwreck Zhenyu Ye <yezhenyu2(a)huawei.com> arm64: tlb: fix the TTL value of tlb_get_level Timo Sigurdsson <public_timo.s(a)silentcreek.de> ata: ahci_sunxi: Disable DIPM Kees Cook <keescook(a)chromium.org> docs: Makefile: Use CONFIG_SHELL not SHELL Christian Löhle <CLoehle(a)hyperstone.com> mmc: core: Allow UHS-I voltage switch for SDSC cards if supported Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: core: clear flags before allowing to retune Al Cooper <alcooperx(a)gmail.com> mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode Hans de Goede <hdegoede(a)redhat.com> mmc: sdhci-acpi: Disable write protect detection on Toshiba Encore 2 WT8-B Kees Cook <keescook(a)chromium.org> drm/i915/display: Do not zero past infoframes.vsc Paul Cercueil <paul(a)crapouillou.net> drm/ingenic: Switch IPU plane to type OVERLAY Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/nouveau: Don't set allow_fb_modifiers explicitly Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/arm/malidp: Always list modifiers Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/msm/mdp4: Fix modifier support enabling Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/tegra: Don't set allow_fb_modifiers explicitly Paul Cercueil <paul(a)crapouillou.net> drm/ingenic: Fix pixclock rate for 24-bit serial panels Harry Wentland <harry.wentland(a)amd.com> drm/amd/display: Reject non-zero src_y and src_x for video planes Maximilian Luz <luzmaximilian(a)gmail.com> pinctrl/amd: Add device HID for new AMD GPIO controller Guchun Chen <guchun.chen(a)amd.com> drm/amd/display: fix incorrrect valid irq check Thomas Hebb <tommyhebb(a)gmail.com> drm/rockchip: dsi: remove extra component_del() call Lyude Paul <lyude(a)redhat.com> drm/dp: Handle zeroed port counts in drm_dp_read_downstream_info() Maxime Ripard <maxime(a)cerno.tech> drm/vc4: hdmi: Prevent clock unbalance Maxime Ripard <maxime(a)cerno.tech> drm/vc4: crtc: Skip the TXP Maxime Ripard <maxime(a)cerno.tech> drm/vc4: txp: Properly set the possible_crtcs mask Tiezhu Yang <yangtiezhu(a)loongson.cn> drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64 Jing Xiangfeng <jingxiangfeng(a)huawei.com> drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create() Evan Quan <evan.quan(a)amd.com> drm/amdgpu: fix the hang caused by PCIe link width switch Evan Quan <evan.quan(a)amd.com> drm/amdgpu: fix NAK-G generation during PCI-e link width switch Aaron Liu <aaron.liu(a)amd.com> drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Joseph Greathouse <Joseph.Greathouse(a)amd.com> drm/amdgpu: Update NV SIMD-per-CU to 2 Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: add new dimgrey cavefish DID Haren Myneni <haren(a)linux.ibm.com> powerpc/powernv/vas: Release reference to tgid during window close Nathan Chancellor <nathan(a)kernel.org> powerpc/barrier: Avoid collision with clang's __lwsync macro Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/mm: Fix lockup on kernel exec fault Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> mm/mremap: hold the rmap lock in write mode when moving page table entries. Paul Cercueil <paul(a)crapouillou.net> MIPS: MT extensions are not available on MIPS32r1 Xiaochen Shen <xiaochen.shen(a)intel.com> selftests/resctrl: Fix incorrect parsing of option "-t" Vidya Sagar <vidyas(a)nvidia.com> PCI: tegra194: Fix host initialization during resume 周琰杰 (Zhou Yanjie) <zhouyanjie(a)wanyeetech.com> MIPS: CI20: Reduce clocksource to 750 kHz. Nick Desaulniers <ndesaulniers(a)google.com> MIPS: set mips32r5 for virt extensions zhanglianjie <zhanglianjie(a)uniontech.com> MIPS: loongsoon64: Reserve memory below starting pfn to prevent Oops Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: add size validation when walking chunks Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: validate from_addr_param return gushengxian <gushengxian(a)yulong.com> flow_offload: action should not be NULL when it is referenced Rustam Kovhaev <rkovhaev(a)gmail.com> bpf: Fix false positive kmemleak report in bpf_ringbuf_area_alloc() Odin Ugedal <odin(a)uged.al> sched/fair: Ensure _sum and _avg values stay consistent Tim Jiang <tjiang(a)codeaurora.org> Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc. Tim Jiang <tjiang(a)codeaurora.org> Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855. Tedd Ho-Jeong An <tedd.an(a)intel.com> Bluetooth: mgmt: Fix the command returns garbage parameter value Hilda Wu <hildawu(a)realtek.com> Bluetooth: btusb: Add support USB ALT 3 for WBS Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: L2CAP: Fix invalid access on ECRED Connection response Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: L2CAP: Fix invalid access if ECRED Reconfigure fails Daniel Lenski <dlenski(a)gmail.com> Bluetooth: btusb: Add a new QCA_ROME device (0cf3:e500) Kai-Heng Feng <kai.heng.feng(a)canonical.com> Bluetooth: Shutdown controller after workqueues are flushed or cancelled Kiran K <kiran.k(a)intel.com> Bluetooth: Fix alt settings for incoming SCO with transparent coding format Yu Liu <yudiliu(a)google.com> Bluetooth: Fix the HCI to MGMT status conversion table mark-yw.chen <mark-yw.chen(a)mediatek.com> Bluetooth: btusb: Fixed too many in-token issue for Mediatek Chip. Gerd Rausch <gerd.rausch(a)oracle.com> RDMA/cma: Fix rdma_resolve_route() memory leak Jakub Kicinski <kuba(a)kernel.org> net: ip: avoid OOM kills with large UDP sends over loopback Martynas Pumputis <m(a)lambda.lt> net: retrieve netns cookie via getsocketopt Sean Young <sean(a)mess.org> media, bpf: Do not copy more entries than user space requested Max Gurtovoy <mgurtovoy(a)nvidia.com> IB/isert: Align target max I/O size to initiator size Ilan Peer <ilan.peer(a)intel.com> mac80211: Properly WARN on HW scan before restart Weilun Du <wdu(a)google.com> mac80211_hwsim: add concurrent channels scanning support over virtio Johannes Berg <johannes.berg(a)intel.com> mac80211: consider per-CPU statistics if present Ping-Ke Shih <pkshih(a)realtek.com> cfg80211: fix default HE tx bitrate mask in 2G band Gustavo A. R. Silva <gustavoars(a)kernel.org> wireless: wext-spy: Fix out-of-bounds warning Íñigo Huguet <ihuguet(a)redhat.com> sfc: error code if SRIOV cannot be disabled Íñigo Huguet <ihuguet(a)redhat.com> sfc: avoid double pci_remove of VFs Ping-Ke Shih <pkshih(a)realtek.com> rtw88: add quirks to disable pci capabilities Po-Hao Huang <phhuang(a)realtek.com> rtw88: 8822c: update RF parameter tables to v62 Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: fix context info freeing Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: free IML DMA memory allocation Shaul Triebitz <shaul.triebitz(a)intel.com> iwlwifi: mvm: fix error print when session protection ends Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: apply RX diversity per PHY context Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: don't change band on bound PHY contexts Xiao Yang <yangx.jy(a)fujitsu.com> RDMA/rxe: Don't overwrite errno from ib_umem_get() Logush Oliver <ollogush(a)amd.com> drm/amd/display: Fix edp_bootup_bl_level initialization issue Longpeng(Mike) <longpeng2(a)huawei.com> vsock: notify server to shutdown when client has pending signal Zheyu Ma <zheyuma97(a)gmail.com> atm: nicstar: register the interrupt handler in the right place Zheyu Ma <zheyuma97(a)gmail.com> atm: nicstar: use 'dma_free_coherent' instead of 'kfree' Fugang Duan <fugang.duan(a)nxp.com> net: fec: add ndo_select_queue to fix TX bandwidth fluctuations Joakim Zhang <qiangqing.zhang(a)nxp.com> net: fec: add FEC_QUIRK_HAS_MULTI_QUEUES represents i.MX6SX ENET IP Huang Pei <huangpei(a)loongson.cn> MIPS: add PMD table accounting into MIPS'pmd_alloc_one Pascal Terjan <pterjan(a)google.com> rtl8xxxu: Fix device info for RTL8192EU devices Ryder Lee <ryder.lee(a)mediatek.com> mt76: fix iv and CCMP header insertion Ryder Lee <ryder.lee(a)mediatek.com> mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode Evelyn Tsai <evelyn.tsai(a)mediatek.com> mt76: mt7915: fix tssi indication field of DBDC NICs xinhui pan <xinhui.pan(a)amd.com> drm/amdkfd: Walk through list with dqm lock hold Stanley.Yang <Stanley.Yang(a)amd.com> drm/amdgpu: fix bad address translation for sienna_cichlid Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix false WARN_ONCE Yang Yingliang <yangyingliang(a)huawei.com> net: sched: fix error return code in tcf_del_walker() Yang Yingliang <yangyingliang(a)huawei.com> net: ipa: Add missing of_node_put() in ipa_firmware_load() Jian Shen <shenjian15(a)huawei.com> net: fix mistake path for netdev_features_strings Felix Fietkau <nbd(a)nbd.name> mt76: dma: use ieee80211_tx_status_ext to free packets when tx fails Felix Fietkau <nbd(a)nbd.name> mt76: mt7615: fix fixed-rate tx status reporting Jacob Keller <jacob.e.keller(a)intel.com> ice: mark PTYPE 2 as reserved Jacob Keller <jacob.e.keller(a)intel.com> ice: fix incorrect payload indicator on PTYPE Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix up register-based shifts in interpreter to silence KUBSAN George McCollister <george.mccollister(a)gmail.com> net: hsr: don't check sequence number if tag removal is offloaded Amber Lin <Amber.Lin(a)amd.com> drm/amdkfd: Fix circular lock in nocpsch path Jonathan Kim <jonathan.kim(a)amd.com> drm/amdkfd: fix circular locking on get_wave_state Zou Wei <zou_wei(a)huawei.com> cw1200: add missing MODULE_DEVICE_TABLE Lee Gibson <leegib(a)gmail.com> wl1251: Fix possible buffer overflow in wl1251_cmd_scan Tony Lindgren <tony(a)atomide.com> wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP Mikulas Patocka <mpatocka(a)redhat.com> dm writecache: commit just one block, not a full page Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix error reporting in xfrm_state_construct. Lijun Pan <lijunp213(a)gmail.com> ibmvnic: fix kernel build warnings in build_hdr_descs_arr Mark Yacoub <markyacoub(a)chromium.org> drm/amd/display: Verify Gamma & Degamma LUT sizes in amdgpu_dm_atomic_check Heiner Kallweit <hkallweit1(a)gmail.com> r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM Minchan Kim <minchan(a)kernel.org> selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC Yang Yingliang <yangyingliang(a)huawei.com> fjes: check return value after calling platform_get_resource() Nirmoy Das <nirmoy.das(a)amd.com> drm/amdkfd: use allowed domain for vmbo validation Yang Yingliang <yangyingliang(a)huawei.com> net: sgi: ioc3-eth: check return value after calling platform_get_resource() Amit Cohen <amcohen(a)nvidia.com> selftests: Clean forgotten resources as part of cleanup() Joakim Zhang <qiangqing.zhang(a)nxp.com> net: phy: realtek: add delay to fix RXC generation issue Aric Cyr <aric.cyr(a)amd.com> drm/amd/display: Fix crash during MPO + ODM combine mode recalculation Wesley Chalmers <Wesley.Chalmers(a)amd.com> drm/amd/display: Fix off-by-one error in DML Wesley Chalmers <Wesley.Chalmers(a)amd.com> drm/amd/display: Set DISPCLK_MAX_ERRDET_CYCLES to 7 Vladimir Stempen <vladimir.stempen(a)amd.com> drm/amd/display: Release MST resources on switch from MST to SST Roman Li <roman.li(a)amd.com> drm/amd/display: Update scaling settings on modeset Nikola Cornij <nikola.cornij(a)amd.com> drm/amd/display: Fix DCN 3.01 DSCCLK validation Yang Yingliang <yangyingliang(a)huawei.com> net: moxa: Use devm_platform_get_and_ioremap_resource() Yang Yingliang <yangyingliang(a)huawei.com> net: micrel: check return value after calling platform_get_resource() Yang Yingliang <yangyingliang(a)huawei.com> net: mvpp2: check return value after calling platform_get_resource() Yang Yingliang <yangyingliang(a)huawei.com> net: bcmgenet: check return value after calling platform_get_resource() Yang Yingliang <yangyingliang(a)huawei.com> net: mscc: ocelot: check return value after calling platform_get_resource() Xianting Tian <xianting.tian(a)linux.alibaba.com> virtio_net: Remove BUG() to avoid machine dead Paul M Stillwell Jr <paul.m.stillwell.jr(a)intel.com> ice: fix clang warning regarding deadcode.DeadStores Liwei Song <liwei.song(a)windriver.com> ice: set the value of global config lock timeout longer Radim Pavlik <radim.pavlik(a)tbs-biometrics.com> pinctrl: mcp23s08: fix race condition in irq handler Horatiu Vultur <horatiu.vultur(a)microchip.com> net: bridge: mrp: Update ring transitions. Damien Le Moal <damien.lemoal(a)wdc.com> block: introduce BIO_ZONE_WRITE_LOCKED bio flag Damien Le Moal <damien.lemoal(a)wdc.com> dm: Fix dm_accept_partial_bio() relative to zone management commands Mikulas Patocka <mpatocka(a)redhat.com> dm writecache: don't split bios when overwriting contiguous cache content Joe Thornber <ejt(a)redhat.com> dm space maps: don't reset space map allocation cursor when committing Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> RDMA/cxgb4: Fix missing error code in create_qp() Yuchung Cheng <ycheng(a)google.com> net: tcp better handling of reordering then loss cases Yang Yingliang <yangyingliang(a)huawei.com> clk: tegra: tegra124-emc: Fix clock imbalance in emc_set_timing() Jiansong Chen <Jiansong.Chen(a)amd.com> drm/amdgpu: remove unsafe optimization to drop preamble ib Kees Cook <keescook(a)chromium.org> drm/amd/display: Avoid HDCP over-read and corruption Kevin Wang <kevin1.wang(a)amd.com> drm/amdgpu: fix sdma firmware version error in sriov Paul Cercueil <paul(a)crapouillou.net> MIPS: ingenic: Select CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER Paul Cercueil <paul(a)crapouillou.net> MIPS: cpu-probe: Fix FPU detection on Ingenic JZ4760(B) Willy Tarreau <w(a)1wt.eu> ipv6: use prandom_u32() for ID generation Xie Yongji <xieyongji(a)bytedance.com> virtio-net: Add validation for used length Yu Kuai <yukuai3(a)huawei.com> drm: bridge: cdns-mhdp8546: Fix PM reference leak in Dmitry Osipenko <digetx(a)gmail.com> clk: tegra: Ensure that PLLU configuration is applied properly Dmitry Osipenko <digetx(a)gmail.com> clk: tegra: Fix refcounting of gate clocks Gioh Kim <gi-oh.kim(a)cloud.ionos.com> RDMA/rtrs: Change MAX_SESS_QUEUE_DEPTH Vladimir Oltean <vladimir.oltean(a)nxp.com> net: stmmac: the XPCS obscures a potential "PHY not found" error Alex Bee <knaerzche(a)gmail.com> drm: rockchip: add missing registers for RK3066 Alex Bee <knaerzche(a)gmail.com> drm: rockchip: add missing registers for RK3188 Eli Cohen <elic(a)nvidia.com> net/mlx5: Fix lag port remapping logic Huy Nguyen <huyn(a)nvidia.com> net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet Dmytro Laktyushkin <Dmytro.Laktyushkin(a)amd.com> drm/amd/display: fix odm scaling Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> clk: renesas: r8a77995: Add ZA2 clock Zou Wei <zou_wei(a)huawei.com> drm/bridge: cdns: Fix PM reference leak in cdns_dsi_transfer() Jesse Brandeburg <jesse.brandeburg(a)intel.com> igb: fix assignment on big endian machines Jesse Brandeburg <jesse.brandeburg(a)intel.com> igb: handle vlan types with checker enabled Jesse Brandeburg <jesse.brandeburg(a)intel.com> e100: handle eeprom as little endian Zou Wei <zou_wei(a)huawei.com> drm/vc4: hdmi: Fix PM reference leak in vc4_hdmi_encoder_pre_crtc_co() Mateusz Kwiatkowski <kfyatek+publicgit(a)gmail.com> drm/vc4: Fix clock source for VEC PixelValve on BCM2711 YueHaibing <yuehaibing(a)huawei.com> net: xilinx_emaclite: Do not print real IOMEM pointer Arturo Giusti <koredump(a)protonmail.com> udf: Fix NULL pointer dereference in udf_symlink function Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/sched: Avoid data corruptions Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/scheduler: Fix hang when sched_entity released Bixuan Cui <cuibixuan(a)huawei.com> pinctrl: equilibrium: Add missing MODULE_DEVICE_TABLE Davide Caratti <dcaratti(a)redhat.com> net/sched: cls_api: increase max_reclassify_loop Vladimir Oltean <olteanv(a)gmail.com> net: mdio: provide shim implementation of devm_of_mdiobus_register Xie Yongji <xieyongji(a)bytedance.com> drm/virtio: Fix double free on probe failure Pavel Skripkin <paskripkin(a)gmail.com> reiserfs: add check for invalid 1st journal block Zou Wei <zou_wei(a)huawei.com> drm/bridge: lt9611: Add missing MODULE_DEVICE_TABLE Ansuel Smith <ansuelsmth(a)gmail.com> net: mdio: ipq8064: add regmap config to disable REGCACHE Wang Li <wangli74(a)huawei.com> drm/mediatek: Fix PM reference leak in mtk_crtc_ddp_hw_init() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT Zou Wei <zou_wei(a)huawei.com> atm: nicstar: Fix possible use-after-free in nicstar_cleanup() Zou Wei <zou_wei(a)huawei.com> mISDN: fix possible use-after-free in HFC_cleanup() Zou Wei <zou_wei(a)huawei.com> atm: iphase: fix possible use-after-free in ia_module_exit() Bibo Mao <maobibo(a)loongson.cn> hugetlb: clear huge pte during flush function on mips platform Dinghao Liu <dinghao.liu(a)zju.edu.cn> clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe() Dmytro Laktyushkin <Dmytro.Laktyushkin(a)amd.com> drm/amd/display: fix use_max_lb flag for 420 pixel formats Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: change the default timeout for kernel compute queues Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> net: pch_gbe: Use proper accessors to BE data in pch_ptp_match() Liu Ying <victor.liu(a)nxp.com> drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be true Dan Carpenter <dan.carpenter(a)oracle.com> drm/vc4: fix argument ordering in vc4_crtc_get_margins() Jack Zhang <Jack.Zhang1(a)amd.com> drm/amd/amdgpu/sriov disable all ip hw status by default Brandon Syu <Brandon.Syu(a)amd.com> drm/amd/display: fix HDCP reset sequence on reinitialize KuoHsiang Chou <kuohsiang_chou(a)aspeedtech.com> drm/ast: Fixed CVE for DP501 Thomas Zimmermann <tzimmermann(a)suse.de> drm/zte: Don't select DRM_KMS_FB_HELPER Thomas Zimmermann <tzimmermann(a)suse.de> drm/mxsfb: Don't select DRM_KMS_FB_HELPER ------------- Diffstat: Documentation/Makefile | 2 +- Makefile | 4 +- arch/alpha/include/uapi/asm/socket.h | 2 + arch/arm64/include/asm/tlb.h | 4 + arch/mips/Kconfig | 2 + arch/mips/boot/dts/ingenic/ci20.dts | 4 +- arch/mips/include/asm/cpu-features.h | 4 +- arch/mips/include/asm/hugetlb.h | 8 +- arch/mips/include/asm/mipsregs.h | 8 +- arch/mips/include/asm/pgalloc.h | 10 +- arch/mips/include/uapi/asm/socket.h | 2 + arch/mips/kernel/cpu-probe.c | 5 + arch/mips/loongson64/numa.c | 3 + arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/include/asm/barrier.h | 2 + arch/powerpc/mm/fault.c | 4 +- arch/powerpc/platforms/powernv/vas-window.c | 9 +- arch/s390/Kconfig | 1 + arch/s390/Makefile | 13 + arch/s390/include/asm/elf.h | 13 +- arch/s390/include/asm/vdso.h | 25 +- arch/s390/include/asm/vdso/gettimeofday.h | 1 - arch/s390/kernel/Makefile | 1 + arch/s390/kernel/compat_signal.c | 13 +- arch/s390/kernel/process.c | 6 + arch/s390/kernel/signal.c | 39 +- arch/s390/kernel/syscall.c | 4 + arch/s390/kernel/vdso.c | 63 +- arch/s390/kernel/vdso32/.gitignore | 2 + arch/s390/kernel/vdso32/Makefile | 75 ++ arch/s390/kernel/vdso32/gen_vdso_offsets.sh | 15 + arch/s390/kernel/vdso32/note.S | 13 + arch/s390/kernel/vdso32/vdso32.lds.S | 141 +++ arch/s390/kernel/vdso32/vdso32_wrapper.S | 15 + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 21 + arch/s390/kernel/vdso64/Makefile | 8 + arch/s390/kernel/vdso64/gen_vdso_offsets.sh | 15 + arch/s390/kernel/vdso64/vdso64.lds.S | 5 +- arch/s390/kernel/vdso64/vdso_user_wrapper.S | 17 + arch/sparc/include/uapi/asm/socket.h | 2 + block/blk-rq-qos.c | 4 +- drivers/ata/ahci_sunxi.c | 2 +- drivers/atm/iphase.c | 2 +- drivers/atm/nicstar.c | 26 +- drivers/bluetooth/btusb.c | 36 +- drivers/char/ipmi/ipmi_watchdog.c | 22 +- drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 +- drivers/clk/tegra/clk-periph-gate.c | 72 +- drivers/clk/tegra/clk-periph.c | 11 + drivers/clk/tegra/clk-pll.c | 9 +- drivers/clk/tegra/clk-tegra124-emc.c | 4 +- drivers/clocksource/arm_arch_timer.c | 2 +- drivers/extcon/extcon-intel-mrfld.c | 9 + drivers/firmware/qemu_fw_cfg.c | 8 +- drivers/fpga/stratix10-soc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 41 + drivers/gpu/drm/amd/amdgpu/nv.c | 6 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +- drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 68 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 41 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 573 ++++------- drivers/gpu/drm/amd/display/dc/dc_types.h | 5 - .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 21 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 14 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 78 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 13 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 4 - drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 4 +- drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- drivers/gpu/drm/arm/malidp_planes.c | 9 +- drivers/gpu/drm/ast/ast_dp501.c | 139 ++- drivers/gpu/drm/ast/ast_drv.h | 12 + drivers/gpu/drm/ast/ast_main.c | 10 +- .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 +- drivers/gpu/drm/bridge/cdns-dsi.c | 2 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + drivers/gpu/drm/bridge/nwl-dsi.c | 61 +- drivers/gpu/drm/drm_dp_helper.c | 7 + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 13 +- drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 - drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +- drivers/gpu/drm/mxsfb/Kconfig | 1 - drivers/gpu/drm/nouveau/nouveau_display.c | 1 - drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 8 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 4 - drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 21 +- drivers/gpu/drm/scheduler/sched_entity.c | 8 +- drivers/gpu/drm/scheduler/sched_main.c | 24 + drivers/gpu/drm/tegra/dc.c | 10 +- drivers/gpu/drm/tegra/drm.c | 2 - drivers/gpu/drm/vc4/vc4_crtc.c | 5 +- drivers/gpu/drm/vc4/vc4_drv.h | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + drivers/gpu/drm/zte/Kconfig | 1 - drivers/hwtracing/coresight/coresight-core.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/hw/cxgb4/qp.c | 1 + drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 4 +- drivers/infiniband/ulp/isert/ib_isert.h | 3 - drivers/infiniband/ulp/rtrs/rtrs-pri.h | 13 +- drivers/ipack/carriers/tpci200.c | 5 +- drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- drivers/md/dm-writecache.c | 48 +- drivers/md/dm-zoned-metadata.c | 7 + drivers/md/dm.c | 8 +- drivers/md/persistent-data/dm-btree-remove.c | 3 +- drivers/md/persistent-data/dm-space-map-disk.c | 9 +- drivers/md/persistent-data/dm-space-map-metadata.c | 9 +- drivers/media/i2c/ccs/ccs-core.c | 32 +- drivers/media/i2c/ccs/ccs-limits.c | 4 + drivers/media/i2c/ccs/ccs-limits.h | 4 + drivers/media/i2c/ccs/ccs-regs.h | 6 +- drivers/media/i2c/saa6588.c | 4 +- drivers/media/pci/bt8xx/bttv-driver.c | 6 +- drivers/media/pci/saa7134/saa7134-video.c | 6 +- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpbe_venc.c | 6 +- drivers/media/rc/bpf-lirc.c | 3 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 +- drivers/media/usb/dvb-usb/dtv5100.c | 7 +- drivers/media/usb/gspca/sq905.c | 2 +- drivers/media/usb/gspca/sunplus.c | 8 +- drivers/media/usb/uvc/uvc_video.c | 27 + drivers/media/usb/zr364xx/zr364xx.c | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + drivers/mfd/syscon.c | 2 +- drivers/misc/lkdtm/bugs.c | 3 + drivers/misc/lkdtm/core.c | 2 - drivers/mmc/core/core.c | 7 +- drivers/mmc/core/sd.c | 10 +- drivers/mmc/host/sdhci-acpi.c | 11 + drivers/mmc/host/sdhci.c | 4 + drivers/mmc/host/sdhci.h | 1 + drivers/net/dsa/ocelot/seville_vsc9953.c | 5 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 + drivers/net/ethernet/freescale/fec.h | 5 + drivers/net/ethernet/freescale/fec_main.c | 43 +- drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/intel/e100.c | 12 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 8 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 6 +- drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 4 +- drivers/net/ethernet/intel/ice/ice_type.h | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 9 +- drivers/net/ethernet/intel/igbvf/netdev.c | 4 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 +- drivers/net/ethernet/micrel/ks8842.c | 4 + drivers/net/ethernet/moxa/moxart_ether.c | 5 +- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 19 +- drivers/net/ethernet/realtek/r8169_main.c | 1 - drivers/net/ethernet/sfc/ef10_sriov.c | 25 +- drivers/net/ethernet/sgi/ioc3-eth.c | 4 + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 21 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 +- drivers/net/fjes/fjes_main.c | 4 + drivers/net/ipa/ipa_main.c | 1 + drivers/net/mdio/mdio-ipq8064.c | 33 +- drivers/net/phy/realtek.c | 15 +- drivers/net/virtio_net.c | 22 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 15 +- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 4 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 28 +- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 15 +- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 3 + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- drivers/net/wireless/mac80211_hwsim.c | 48 +- drivers/net/wireless/marvell/mwifiex/main.c | 13 +- drivers/net/wireless/mediatek/mt76/dma.c | 18 +- drivers/net/wireless/mediatek/mt76/mt76.h | 16 + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 33 +- drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 12 - drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 74 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 42 - drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 28 +- drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 18 +- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 11 +- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 6 +- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 29 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 30 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 23 +- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 29 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 30 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 23 +- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 11 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 59 +- drivers/net/wireless/realtek/rtw88/pci.c | 32 + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 1008 ++++++++++---------- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + drivers/net/wireless/ti/wl1251/cmd.c | 9 +- drivers/net/wireless/ti/wl12xx/main.c | 7 + drivers/nvmem/core.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 2 + drivers/pci/controller/pci-aardvark.c | 13 +- drivers/pci/quirks.c | 11 + drivers/pinctrl/pinctrl-amd.c | 1 + drivers/pinctrl/pinctrl-equilibrium.c | 1 + drivers/pinctrl/pinctrl-mcp23s08.c | 10 +- .../int340x_thermal/processor_thermal_device.c | 20 +- fs/ext4/ext4.h | 4 + fs/ext4/mmp.c | 28 +- fs/ext4/super.c | 10 +- fs/f2fs/f2fs.h | 2 + fs/f2fs/recovery.c | 23 +- fs/f2fs/super.c | 8 +- fs/io-wq.c | 5 +- fs/jfs/inode.c | 3 +- fs/reiserfs/journal.c | 14 + fs/ubifs/super.c | 1 + fs/ubifs/ubifs.h | 2 + fs/ubifs/xattr.c | 44 +- fs/udf/namei.c | 4 + include/linux/blk_types.h | 1 + include/linux/mfd/abx500/ux500_chargalg.h | 2 +- include/linux/netdev_features.h | 2 +- include/linux/of_mdio.h | 7 + include/linux/wait.h | 2 +- include/media/v4l2-subdev.h | 4 + include/net/flow_offload.h | 12 +- include/net/sctp/structs.h | 2 +- include/uapi/asm-generic/socket.h | 2 + include/uapi/linux/ethtool.h | 4 +- kernel/bpf/core.c | 61 +- kernel/bpf/ringbuf.c | 2 + kernel/cpu.c | 49 + kernel/sched/fair.c | 6 +- kernel/sched/wait.c | 9 +- kernel/trace/trace.c | 91 +- lib/seq_buf.c | 4 +- mm/mremap.c | 4 +- net/bluetooth/hci_core.c | 16 +- net/bluetooth/hci_event.c | 6 +- net/bluetooth/l2cap_core.c | 8 +- net/bluetooth/mgmt.c | 5 + net/bridge/br_mrp.c | 6 +- net/core/dev.c | 11 +- net/core/sock.c | 7 + net/hsr/hsr_framereg.c | 3 +- net/ipv4/ip_output.c | 32 +- net/ipv4/tcp_input.c | 45 +- net/ipv6/ip6_output.c | 32 +- net/ipv6/output_core.c | 28 +- net/mac80211/main.c | 7 +- net/mac80211/sta_info.c | 11 +- net/sched/act_api.c | 3 +- net/sched/cls_api.c | 2 +- net/sctp/bind_addr.c | 19 +- net/sctp/input.c | 8 +- net/sctp/ipv6.c | 7 +- net/sctp/protocol.c | 7 +- net/sctp/sm_make_chunk.c | 29 +- net/vmw_vsock/af_vsock.c | 2 +- net/wireless/nl80211.c | 9 +- net/wireless/wext-spy.c | 14 +- net/xfrm/xfrm_policy.c | 21 +- net/xfrm/xfrm_user.c | 28 +- security/selinux/avc.c | 13 +- security/smack/smackfs.c | 2 + sound/soc/tegra/tegra_alc5632.c | 1 + sound/soc/tegra/tegra_max98090.c | 1 + sound/soc/tegra/tegra_rt5640.c | 1 + sound/soc/tegra/tegra_rt5677.c | 1 + sound/soc/tegra/tegra_sgtl5000.c | 1 + sound/soc/tegra/tegra_wm8753.c | 1 + sound/soc/tegra/tegra_wm8903.c | 1 + sound/soc/tegra/tegra_wm9712.c | 1 + sound/soc/tegra/trimslice.c | 1 + .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 3 + .../net/mlxsw/devlink_trap_l3_exceptions.sh | 3 + .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 + tools/testing/selftests/lkdtm/tests.txt | 2 +- .../selftests/net/forwarding/pedit_dsfield.sh | 2 + .../selftests/net/forwarding/pedit_l4port.sh | 2 + .../selftests/net/forwarding/skbedit_priority.sh | 2 + tools/testing/selftests/resctrl/README | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 4 +- 304 files changed, 3305 insertions(+), 2031 deletions(-)

3 years, 5 months

8
258
0 0

[PATCH] mt76: mt7921: fix the insmod hangs

by Deren Wu

From: Sean Wang <sean.wang(a)mediatek.com> [ Upstream commit 49897c529f85504139a6e54417a65f26a07492d2 ] Fix the second insert module causing the device hangs after remove module. Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support") Signed-off-by: Sean Wang <sean.wang(a)mediatek.com> Signed-off-by: Felix Fietkau <nbd(a)nbd.name> Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… Signed-off-by: Deren Wu <deren.wu(a)mediatek.com> Cc: <stable(a)vger.kernel.org> # 5.12 --- drivers/net/wireless/mediatek/mt76/mt7921/init.c | 2 -- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 13 +------------ drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 1 + 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c index 262c9d150bf0..9046bbfc0690 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c @@ -273,8 +273,6 @@ void mt7921_unregister_device(struct mt7921_dev *dev) { mt76_unregister_device(&dev->mt76); mt7921_mcu_exit(dev); - mt7921_dma_cleanup(dev); - mt7921_tx_token_put(dev); tasklet_disable(&dev->irq_tasklet); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index f3a537c6e3c8..36eaa9d97f64 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1207,8 +1207,7 @@ void mt7921_update_channel(struct mt76_dev *mdev) mt76_connac_power_save_sched(&dev->mphy, &dev->pm); } -static int -mt7921_wfsys_reset(struct mt7921_dev *dev) +int mt7921_wfsys_reset(struct mt7921_dev *dev) { mt76_set(dev, 0x70002600, BIT(0)); msleep(200); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index 353877f1c762..b233b12860ef 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -960,18 +960,7 @@ int mt7921_mcu_init(struct mt7921_dev *dev) void mt7921_mcu_exit(struct mt7921_dev *dev) { - u32 reg = mt7921_reg_map_l1(dev, MT_TOP_MISC); - - __mt76_mcu_restart(&dev->mt76); - if (!mt76_poll_msec(dev, reg, MT_TOP_MISC_FW_STATE, - FIELD_PREP(MT_TOP_MISC_FW_STATE, - FW_STATE_FW_DOWNLOAD), 1000)) { - dev_err(dev->mt76.dev, "Failed to exit mcu\n"); - return; - } - - reg = mt7921_reg_map_l1(dev, MT_TOP_LPCR_HOST_BAND0); - mt76_wr(dev, reg, MT_TOP_LPCR_HOST_FW_OWN); + mt7921_wfsys_reset(dev); skb_queue_purge(&dev->mt76.mcu.res_q); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index ebe51017dd55..e4211b049040 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -351,4 +351,5 @@ void mt7921_coredump_work(struct work_struct *work); int mt7921_mcu_update_arp_filter(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info); +int mt7921_wfsys_reset(struct mt7921_dev *dev); #endif -- 2.25.1

3 years, 5 months

2
1
0 0

[PATCH 5.4] f2fs: Show casefolding support only when supported

by Eric Biggers

From: Daniel Rosenberg <drosen(a)google.com> commit 39307f8ee3539478c28e71b4909b5b028cce14b1 upstream. [Please apply to 5.4-stable.] The casefolding feature is only supported when CONFIG_UNICODE is set. This modifies the feature list f2fs presents under sysfs accordingly. Fixes: 5aba54302a46 ("f2fs: include charset encoding information in the superblock") Cc: stable(a)vger.kernel.org # v5.4+ Signed-off-by: Daniel Rosenberg <drosen(a)google.com> Reviewed-by: Eric Biggers <ebiggers(a)google.com> Reviewed-by: Chao Yu <yuchao0(a)huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 029e693e201c..3a5360e045cf 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -499,7 +499,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND); F2FS_FEATURE_RO_ATTR(verity, FEAT_VERITY); #endif F2FS_FEATURE_RO_ATTR(sb_checksum, FEAT_SB_CHECKSUM); +#ifdef CONFIG_UNICODE F2FS_FEATURE_RO_ATTR(casefold, FEAT_CASEFOLD); +#endif #define ATTR_LIST(name) (&f2fs_attr_##name.attr) static struct attribute *f2fs_attrs[] = { @@ -568,7 +570,9 @@ static struct attribute *f2fs_feat_attrs[] = { ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif NULL, }; ATTRIBUTE_GROUPS(f2fs_feat); -- 2.32.0.402.g57bb445576-goog

3 years, 5 months

2
1
0 0

FAILED: patch "[PATCH] mm/page_alloc: fix memory map initialization for descending" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 122e093c1734361dedb64f65c99b93e28e4624f4 Mon Sep 17 00:00:00 2001 From: Mike Rapoport <rppt(a)kernel.org> Date: Mon, 28 Jun 2021 19:33:26 -0700 Subject: [PATCH] mm/page_alloc: fix memory map initialization for descending nodes On systems with memory nodes sorted in descending order, for instance Dell Precision WorkStation T5500, the struct pages for higher PFNs and respectively lower nodes, could be overwritten by the initialization of struct pages corresponding to the holes in the memory sections. For example for the below memory layout [ 0.245624] Early memory node ranges [ 0.248496] node 1: [mem 0x0000000000001000-0x0000000000090fff] [ 0.251376] node 1: [mem 0x0000000000100000-0x00000000dbdf8fff] [ 0.254256] node 1: [mem 0x0000000100000000-0x0000001423ffffff] [ 0.257144] node 0: [mem 0x0000001424000000-0x0000002023ffffff] the range 0x1424000000 - 0x1428000000 in the beginning of node 0 starts in the middle of a section and will be considered as a hole during the initialization of the last section in node 1. The wrong initialization of the memory map causes panic on boot when CONFIG_DEBUG_VM is enabled. Reorder loop order of the memory map initialization so that the outer loop will always iterate over populated memory regions in the ascending order and the inner loop will select the zone corresponding to the PFN range. This way initialization of the struct pages for the memory holes will be always done for the ranges that are actually not populated. [akpm(a)linux-foundation.org: coding style fixes] Link: https://lkml.kernel.org/r/YNXlMqBbL+tBG7yq@kernel.org Link: https://bugzilla.kernel.org/show_bug.cgi?id=213073 Link: https://lkml.kernel.org/r/20210624062305.10940-1-rppt@kernel.org Fixes: 0740a50b9baa ("mm/page_alloc.c: refactor initialization of struct page for holes in memory layout") Signed-off-by: Mike Rapoport <rppt(a)linux.ibm.com> Cc: Boris Petkov <bp(a)alien8.de> Cc: Robert Shteynfeld <robert.shteynfeld(a)gmail.com> Cc: Baoquan He <bhe(a)redhat.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: David Hildenbrand <david(a)redhat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/include/linux/mm.h b/include/linux/mm.h index 8ae31622deef..9afb8998e7e5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2474,7 +2474,6 @@ extern void set_dma_reserve(unsigned long new_dma_reserve); extern void memmap_init_range(unsigned long, int, unsigned long, unsigned long, unsigned long, enum meminit_context, struct vmem_altmap *, int migratetype); -extern void memmap_init_zone(struct zone *zone); extern void setup_per_zone_wmarks(void); extern int __meminit init_per_zone_wmark_min(void); extern void mem_init(void); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ef2265f86b91..5b5c9f5813b9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6400,7 +6400,7 @@ void __ref memmap_init_zone_device(struct zone *zone, return; /* - * The call to memmap_init_zone should have already taken care + * The call to memmap_init should have already taken care * of the pages reserved for the memmap, so we can just jump to * the end of that region and start processing the device pages. */ @@ -6465,7 +6465,7 @@ static void __meminit zone_init_free_lists(struct zone *zone) /* * Only struct pages that correspond to ranges defined by memblock.memory * are zeroed and initialized by going through __init_single_page() during - * memmap_init_zone(). + * memmap_init_zone_range(). * * But, there could be struct pages that correspond to holes in * memblock.memory. This can happen because of the following reasons: @@ -6484,9 +6484,9 @@ static void __meminit zone_init_free_lists(struct zone *zone) * zone/node above the hole except for the trailing pages in the last * section that will be appended to the zone/node below. */ -static u64 __meminit init_unavailable_range(unsigned long spfn, - unsigned long epfn, - int zone, int node) +static void __init init_unavailable_range(unsigned long spfn, + unsigned long epfn, + int zone, int node) { unsigned long pfn; u64 pgcnt = 0; @@ -6502,56 +6502,77 @@ static u64 __meminit init_unavailable_range(unsigned long spfn, pgcnt++; } - return pgcnt; + if (pgcnt) + pr_info("On node %d, zone %s: %lld pages in unavailable ranges", + node, zone_names[zone], pgcnt); } #else -static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, - int zone, int node) +static inline void init_unavailable_range(unsigned long spfn, + unsigned long epfn, + int zone, int node) { - return 0; } #endif -void __meminit __weak memmap_init_zone(struct zone *zone) +static void __init memmap_init_zone_range(struct zone *zone, + unsigned long start_pfn, + unsigned long end_pfn, + unsigned long *hole_pfn) { unsigned long zone_start_pfn = zone->zone_start_pfn; unsigned long zone_end_pfn = zone_start_pfn + zone->spanned_pages; - int i, nid = zone_to_nid(zone), zone_id = zone_idx(zone); - static unsigned long hole_pfn; + int nid = zone_to_nid(zone), zone_id = zone_idx(zone); + + start_pfn = clamp(start_pfn, zone_start_pfn, zone_end_pfn); + end_pfn = clamp(end_pfn, zone_start_pfn, zone_end_pfn); + + if (start_pfn >= end_pfn) + return; + + memmap_init_range(end_pfn - start_pfn, nid, zone_id, start_pfn, + zone_end_pfn, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); + + if (*hole_pfn < start_pfn) + init_unavailable_range(*hole_pfn, start_pfn, zone_id, nid); + + *hole_pfn = end_pfn; +} + +static void __init memmap_init(void) +{ unsigned long start_pfn, end_pfn; - u64 pgcnt = 0; + unsigned long hole_pfn = 0; + int i, j, zone_id, nid; - for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) { - start_pfn = clamp(start_pfn, zone_start_pfn, zone_end_pfn); - end_pfn = clamp(end_pfn, zone_start_pfn, zone_end_pfn); + for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid) { + struct pglist_data *node = NODE_DATA(nid); + + for (j = 0; j < MAX_NR_ZONES; j++) { + struct zone *zone = node->node_zones + j; - if (end_pfn > start_pfn) - memmap_init_range(end_pfn - start_pfn, nid, - zone_id, start_pfn, zone_end_pfn, - MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); + if (!populated_zone(zone)) + continue; - if (hole_pfn < start_pfn) - pgcnt += init_unavailable_range(hole_pfn, start_pfn, - zone_id, nid); - hole_pfn = end_pfn; + memmap_init_zone_range(zone, start_pfn, end_pfn, + &hole_pfn); + zone_id = j; + } } #ifdef CONFIG_SPARSEMEM /* - * Initialize the hole in the range [zone_end_pfn, section_end]. - * If zone boundary falls in the middle of a section, this hole - * will be re-initialized during the call to this function for the - * higher zone. + * Initialize the memory map for hole in the range [memory_end, + * section_end]. + * Append the pages in this hole to the highest zone in the last + * node. + * The call to init_unavailable_range() is outside the ifdef to + * silence the compiler warining about zone_id set but not used; + * for FLATMEM it is a nop anyway */ - end_pfn = round_up(zone_end_pfn, PAGES_PER_SECTION); + end_pfn = round_up(end_pfn, PAGES_PER_SECTION); if (hole_pfn < end_pfn) - pgcnt += init_unavailable_range(hole_pfn, end_pfn, - zone_id, nid); #endif - - if (pgcnt) - pr_info(" %s zone: %llu pages in unavailable ranges\n", - zone->name, pgcnt); + init_unavailable_range(hole_pfn, end_pfn, zone_id, nid); } static int zone_batchsize(struct zone *zone) @@ -7254,7 +7275,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat) set_pageblock_order(); setup_usemap(zone); init_currently_empty_zone(zone, zone->zone_start_pfn, size); - memmap_init_zone(zone); } } @@ -7780,6 +7800,8 @@ void __init free_area_init(unsigned long *max_zone_pfn) node_set_state(nid, N_MEMORY); check_for_memory(pgdat, nid); } + + memmap_init(); } static int __init cmdline_parse_core(char *p, unsigned long *core,

3 years, 5 months

3
4
0 0

[PATCH stable 5.10.y 0/2] mm/thp: Fix uffd-wp with fork(); crash on pmd migration entry on fork

by Peter Xu

In summary, this series should be needed for 5.10/5.12/5.13. This is the 5.10.y backport of the series. Patch 1 is a dependency of patch 2, while patch 2 should be the real fix. There's a minor conflict on patch 2 when cherry pick due to not having the new helper called page_needs_cow_for_dma(). It's also mentioned at the entry of patch 2. This series should be able to fix a rare race that mentioned in thread: https://lore.kernel.org/linux-mm/796cbb7-5a1c-1ba0-dde5-479aba8224f2@google… This fact wasn't discovered when the fix got proposed and merged, because the fix was originally about uffd-wp and its fork event. However it turns out that the problematic commit b569a1760782f3d is also causing crashing on fork() of pmd migration entries which is even more severe than the original uffd-wp problem. Stable kernels at least on 5.12.y has the crash reproduced, and it's possible 5.13.y and 5.10.y could hit it due to having the problematic commit b569a1760782f3d but lacking of the uffd-wp fix patch (8f34f1eac382, which is also patch 2 of this series). The pmd entry crash problem was reported by Igor Raits <igor(a)gooddata.com> and debugged by Hugh Dickins <hughd(a)google.com>. Please review, thanks. Peter Xu (2): mm/thp: simplify copying of huge zero page pmd when fork mm/userfaultfd: fix uffd-wp special cases for fork() include/linux/huge_mm.h | 2 +- include/linux/swapops.h | 2 ++ mm/huge_memory.c | 36 +++++++++++++++++------------------- mm/memory.c | 25 +++++++++++++------------ 4 files changed, 33 insertions(+), 32 deletions(-) -- 2.31.1

3 years, 5 months

3
4
0 0

[PATCH 5.10, 5.12, 5.13] f2fs: Show casefolding support only when supported

by Eric Biggers

From: Daniel Rosenberg <drosen(a)google.com> commit 39307f8ee3539478c28e71b4909b5b028cce14b1 upstream. [Please apply to 5.10-stable, 5.12-stable, and 5.13-stable.] The casefolding feature is only supported when CONFIG_UNICODE is set. This modifies the feature list f2fs presents under sysfs accordingly. Fixes: 5aba54302a46 ("f2fs: include charset encoding information in the superblock") Cc: stable(a)vger.kernel.org # v5.4+ Signed-off-by: Daniel Rosenberg <drosen(a)google.com> Reviewed-by: Eric Biggers <ebiggers(a)google.com> Reviewed-by: Chao Yu <yuchao0(a)huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org> Signed-off-by: Eric Biggers <ebiggers(a)google.com> --- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index ec77ccfea923..b8850c81068a 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -612,7 +612,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND); F2FS_FEATURE_RO_ATTR(verity, FEAT_VERITY); #endif F2FS_FEATURE_RO_ATTR(sb_checksum, FEAT_SB_CHECKSUM); +#ifdef CONFIG_UNICODE F2FS_FEATURE_RO_ATTR(casefold, FEAT_CASEFOLD); +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION F2FS_FEATURE_RO_ATTR(compression, FEAT_COMPRESSION); #endif @@ -700,7 +702,9 @@ static struct attribute *f2fs_feat_attrs[] = { ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION ATTR_LIST(compression), #endif -- 2.32.0.402.g57bb445576-goog

3 years, 5 months

2
1
0 0

[PATCH stable 5.13.y/5.12.y 0/2] mm/thp: Fix uffd-wp with fork(); crash on pmd migration entry on fork

by Peter Xu

In summary: this series should be needed for 5.10/5.12/5.13. This is the 5.13.y/5.12.y backport of the series, and it should be able to be applied on both of the branches. Patch 1 is a dependency of patch 2, while patch 2 should be the real fix. This series should be able to fix a rare race that mentioned in thread: https://lore.kernel.org/linux-mm/796cbb7-5a1c-1ba0-dde5-479aba8224f2@google… This fact wasn't discovered when the fix got proposed and merged, because the fix was originally about uffd-wp and its fork event. However it turns out that the problematic commit b569a1760782f3d is also causing crashing on fork() of pmd migration entries which is even more severe than the original uffd-wp problem. Stable kernels at least on 5.12.y has the crash reproduced, and it's possible 5.13.y and 5.10.y could hit it due to having the problematic commit b569a1760782f3d but lacking of the uffd-wp fix patch (8f34f1eac382, which is also patch 2 of this series). The pmd entry crash problem was reported by Igor Raits <igor(a)gooddata.com> and debugged by Hugh Dickins <hughd(a)google.com>. Please review, thanks. Peter Xu (2): mm/thp: simplify copying of huge zero page pmd when fork mm/userfaultfd: fix uffd-wp special cases for fork() include/linux/huge_mm.h | 2 +- include/linux/swapops.h | 2 ++ mm/huge_memory.c | 36 +++++++++++++++++------------------- mm/memory.c | 25 +++++++++++++------------ 4 files changed, 33 insertions(+), 32 deletions(-) -- 2.31.1

3 years, 5 months

3
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2021