August 2022 - Linux-stable-mirror

by Bart Van Assche

Fix the following use-after-free complaint triggered by blktests nvme/004: BUG: KASAN: user-memory-access in blk_mq_complete_request_remote+0xac/0x350 Read of size 4 at addr 0000607bd1835943 by task kworker/13:1/460 Workqueue: nvmet-wq nvme_loop_execute_work [nvme_loop] Call Trace: show_stack+0x52/0x58 dump_stack_lvl+0x49/0x5e print_report.cold+0x36/0x1e2 kasan_report+0xb9/0xf0 __asan_load4+0x6b/0x80 blk_mq_complete_request_remote+0xac/0x350 nvme_loop_queue_response+0x1df/0x275 [nvme_loop] __nvmet_req_complete+0x132/0x4f0 [nvmet] nvmet_req_complete+0x15/0x40 [nvmet] nvmet_execute_io_connect+0x18a/0x1f0 [nvmet] nvme_loop_execute_work+0x20/0x30 [nvme_loop] process_one_work+0x56e/0xa70 worker_thread+0x2d1/0x640 kthread+0x183/0x1c0 ret_from_fork+0x1f/0x30 Cc: stable(a)vger.kernel.org Fixes: a07b4970f464 ("nvmet: add a generic NVMe target") Signed-off-by: Bart Van Assche <bvanassche(a)acm.org> --- drivers/nvme/target/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index a1345790005f..7f4083cf953a 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -735,6 +735,8 @@ static void nvmet_set_error(struct nvmet_req *req, u16 status) static void __nvmet_req_complete(struct nvmet_req *req, u16 status) { + struct nvmet_ns *ns = req->ns; + if (!req->sq->sqhd_disabled) nvmet_update_sq_head(req); req->cqe->sq_id = cpu_to_le16(req->sq->qid); @@ -745,9 +747,9 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status) trace_nvmet_req_complete(req); - if (req->ns) - nvmet_put_namespace(req->ns); req->ops->queue_response(req); + if (ns) + nvmet_put_namespace(ns); } void nvmet_req_complete(struct nvmet_req *req, u16 status)

1 year, 3 months

3
5
0 0

[PATCH -next] sched/cputime: Fix the bug of reading time backward from /proc/stat

by Li Hua

The problem that the statistical time goes backward, the value read first is 319, and the value read again is 318. As follows： first： cat /proc/stat | grep cpu1 cpu1 319 0 496 41665 0 0 0 0 0 0 then： cat /proc/stat | grep cpu1 cpu1 318 0 497 41674 0 0 0 0 0 0 Time goes back, which is counterintuitive. After debug this, The problem is caused by the implementation of kcpustat_cpu_fetch_vtime. As follows： CPU0 CPU1 First: show_stat(): ->kcpustat_cpu_fetch() ->kcpustat_cpu_fetch_vtime() ->cpustat[CPUTIME_USER] = kcpustat_cpu(cpu) + vtime->utime + delta; rq->curr is in user mod ---> When CPU1 rq->curr running on userspace, need add utime and delta ---> rq->curr->vtime->utime is less than 1 tick Then: show_stat(): ->kcpustat_cpu_fetch() ->kcpustat_cpu_fetch_vtime() ->cpustat[CPUTIME_USER] = kcpustat_cpu(cpu); rq->curr is in kernel mod ---> When CPU1 rq->curr running on kernel space, just got kcpustat Fixes: 74722bb223d0 ("sched/vtime: Bring up complete kcpustat accessor") Signed-off-by: Li Hua <hucool.lihua(a)huawei.com> --- kernel/sched/core.c | 1 + kernel/sched/cputime.c | 33 ++++++++++++++++++++++++++++++++- kernel/sched/sched.h | 6 ++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 189999007f32..c542b61cab54 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9753,6 +9753,7 @@ void __init sched_init(void) rq->core_cookie = 0UL; #endif + cputime_cpu_init(i); } set_load_weight(&init_task, false); diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 95fc77853743..ba3bcb40795e 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -1060,6 +1060,19 @@ static int kcpustat_cpu_fetch_vtime(struct kernel_cpustat *dst, return 0; } +/* + * Stores the time of the last acquisition, which is used to handle the case of + * time backwards. + */ +static DEFINE_PER_CPU(struct kernel_cpustat, cpustat_prev); +static DEFINE_PER_CPU(raw_spinlock_t, cpustat_prev_lock); + +void cputime_cpu_init(int cpu) +{ + raw_spin_lock_init(per_cpu_ptr(&cpustat_prev_lock, cpu)); +} + + void kcpustat_cpu_fetch(struct kernel_cpustat *dst, int cpu) { const struct kernel_cpustat *src = &kcpustat_cpu(cpu); @@ -1087,8 +1100,26 @@ void kcpustat_cpu_fetch(struct kernel_cpustat *dst, int cpu) err = kcpustat_cpu_fetch_vtime(dst, src, curr, cpu); rcu_read_unlock(); - if (!err) + if (!err) { + int i; + int map[5] = {CPUTIME_USER, CPUTIME_SYSTEM, CPUTIME_NICE, + CPUTIME_GUEST, CPUTIME_GUEST_NICE}; + struct kernel_cpustat *prev = &per_cpu(cpustat_prev, cpu); + raw_spinlock_t *cpustat_lock = &per_cpu(cpustat_prev_lock, cpu); + u64 *dst_stat = dst->cpustat; + u64 *prev_stat = prev->cpustat; + + raw_spin_lock(cpustat_lock); + for (i = 0; i < 5; i++) { + int idx = map[i]; + + if (dst_stat[idx] < prev_stat[idx]) + dst_stat[idx] = prev_stat[idx]; + } + *prev = *dst; + raw_spin_unlock(cpustat_lock); return; + } cpu_relax(); } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a6f071b2acac..cbe09795a394 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3156,4 +3156,10 @@ extern int sched_dynamic_mode(const char *str); extern void sched_dynamic_update(int mode); #endif +#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN +extern void cputime_cpu_init(int cpu); +#else +static inline void cputime_cpu_init(int cpu) {} +#endif + #endif /* _KERNEL_SCHED_SCHED_H */ -- 2.17.1

1 year, 3 months

4
5
0 0

[PATCH v2 2/6] x86/sgx: Do not consider unsanitized pages an error

by Jarkko Sakkinen

In sgx_init(), if misc_register() fails or misc_register() succeeds but neither sgx_drv_init() nor sgx_vepc_init() succeeds, then ksgxd will be prematurely stopped. This may leave some unsanitized pages, which does not matter, because SGX will be disabled for the whole power cycle. This triggers WARN_ON() because sgx_dirty_page_list ends up being non-empty, and dumps the call stack: [ 0.268103] sgx: EPC section 0x40200000-0x45f7ffff [ 0.268591] ------------[ cut here ]------------ [ 0.268592] WARNING: CPU: 6 PID: 83 at arch/x86/kernel/cpu/sgx/main.c:401 ksgxd+0x1b7/0x1d0 [ 0.268598] Modules linked in: [ 0.268600] CPU: 6 PID: 83 Comm: ksgxd Not tainted 6.0.0-rc2 #382 [ 0.268603] Hardware name: Dell Inc. XPS 13 9370/0RMYH9, BIOS 1.21.0 07/06/2022 [ 0.268604] RIP: 0010:ksgxd+0x1b7/0x1d0 [ 0.268607] Code: ff e9 f2 fe ff ff 48 89 df e8 75 07 0e 00 84 c0 0f 84 c3 fe ff ff 31 ff e8 e6 07 0e 00 84 c0 0f 85 94 fe ff ff e9 af fe ff ff <0f> 0b e9 7f fe ff ff e8 dd 9c 95 00 66 66 2e 0f 1f 84 00 00 00 00 [ 0.268608] RSP: 0000:ffffb6c7404f3ed8 EFLAGS: 00010287 [ 0.268610] RAX: ffffb6c740431a10 RBX: ffff8dcd8117b400 RCX: 0000000000000000 [ 0.268612] RDX: 0000000080000000 RSI: ffffb6c7404319d0 RDI: 00000000ffffffff [ 0.268613] RBP: ffff8dcd820a4d80 R08: ffff8dcd820a4180 R09: ffff8dcd820a4180 [ 0.268614] R10: 0000000000000000 R11: 0000000000000006 R12: ffffb6c74006bce0 [ 0.268615] R13: ffff8dcd80e63880 R14: ffffffffa8a60f10 R15: 0000000000000000 [ 0.268616] FS: 0000000000000000(0000) GS:ffff8dcf25580000(0000) knlGS:0000000000000000 [ 0.268617] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 0.268619] CR2: 0000000000000000 CR3: 0000000213410001 CR4: 00000000003706e0 [ 0.268620] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 0.268621] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 0.268622] Call Trace: [ 0.268624] <TASK> [ 0.268627] ? _raw_spin_lock_irqsave+0x24/0x60 [ 0.268632] ? _raw_spin_unlock_irqrestore+0x23/0x40 [ 0.268634] ? __kthread_parkme+0x36/0x90 [ 0.268637] kthread+0xe5/0x110 [ 0.268639] ? kthread_complete_and_exit+0x20/0x20 [ 0.268642] ret_from_fork+0x1f/0x30 [ 0.268647] </TASK> [ 0.268648] ---[ end trace 0000000000000000 ]--- Ultimately this can crash the kernel, if the following is set: /proc/sys/kernel/panic_on_warn In premature stop, print nothing, as the number is by practical means a random number. Otherwise, it is an indicator of a bug in the driver, and therefore print the number of unsanitized pages with pr_err(). Link: https://lore.kernel.org/linux-sgx/20220825051827.246698-1-jarkko@kernel.org… Fixes: 51ab30eb2ad4 ("x86/sgx: Replace section->init_laundry_list with sgx_dirty_page_list") Cc: stable(a)vger.kernel.org # v5.13+ Reported-by: Paul Menzel <pmenzel(a)molgen.mpg.de> Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> --- v6: - Address Reinette's feedback: https://lore.kernel.org/linux-sgx/Yw6%2FiTzSdSw%2FY%2FVO@kernel.org/ v5: - Add the klog dump and sysctl option to the commit message. v4: - Explain expectations for dirty_page_list in the function header, instead of an inline comment. - Improve commit message to explain the conditions better. - Return the number of pages left dirty to ksgxd() and print warning after the 2nd call, if there are any. v3: - Remove WARN_ON(). - Tuned comments and the commit message a bit. v2: - Replaced WARN_ON() with optional pr_info() inside __sgx_sanitize_pages(). - Rewrote the commit message. - Added the fixes tag. --- arch/x86/kernel/cpu/sgx/main.c | 42 ++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 515e2a5f25bb..bcd6b64961bd 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -49,17 +49,20 @@ static LIST_HEAD(sgx_dirty_page_list); * Reset post-kexec EPC pages to the uninitialized state. The pages are removed * from the input list, and made available for the page allocator. SECS pages * prepending their children in the input list are left intact. + * + * Contents of the @dirty_page_list must be thread-local, i.e. + * not shared by multiple threads. */ -static void __sgx_sanitize_pages(struct list_head *dirty_page_list) +static long __sgx_sanitize_pages(struct list_head *dirty_page_list) { struct sgx_epc_page *page; + long left_dirty = 0; LIST_HEAD(dirty); int ret; - /* dirty_page_list is thread-local, no need for a lock: */ while (!list_empty(dirty_page_list)) { if (kthread_should_stop()) - return; + return -ECANCELED; page = list_first_entry(dirty_page_list, struct sgx_epc_page, list); @@ -92,12 +95,14 @@ static void __sgx_sanitize_pages(struct list_head *dirty_page_list) } else { /* The page is not yet clean - move to the dirty list. */ list_move_tail(&page->list, &dirty); + left_dirty++; } cond_resched(); } list_splice(&dirty, dirty_page_list); + return left_dirty; } static bool sgx_reclaimer_age(struct sgx_epc_page *epc_page) @@ -388,17 +393,40 @@ void sgx_reclaim_direct(void) static int ksgxd(void *p) { + long ret; + set_freezable(); /* * Sanitize pages in order to recover from kexec(). The 2nd pass is * required for SECS pages, whose child pages blocked EREMOVE. */ - __sgx_sanitize_pages(&sgx_dirty_page_list); - __sgx_sanitize_pages(&sgx_dirty_page_list); + ret = __sgx_sanitize_pages(&sgx_dirty_page_list); + if (ret == -ECANCELED) + /* kthread stopped */ + return 0; - /* sanity check: */ - WARN_ON(!list_empty(&sgx_dirty_page_list)); + ret = __sgx_sanitize_pages(&sgx_dirty_page_list); + switch (ret) { + case 0: + /* success, no unsanitized pages */ + break; + + case -ECANCELED: + /* kthread stopped */ + return 0; + + default: + /* + * Never expected to happen in a working driver. If it happens + * the bug is expected to be in the sanitization process, but + * successfully sanitized pages are still valid and driver can + * be used and most importantly debugged without issues. To put + * short, the global state of kernel is not corrupted so no + * reason to do any more complicated rollback. + */ + pr_err("%ld unsanitized pages\n", ret); + } while (!kthread_should_stop()) { if (try_to_freeze()) -- 2.37.2

1 year, 3 months

4
14
0 0

[PATCH 5.19 000/158] 5.19.6-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.19.6 release. There are 158 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 Wed, 31 Aug 2022 10:57:37 +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.19.6-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.19.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.19.6-rc1 Daniel Borkmann <daniel(a)iogearbox.net> bpf: Don't use tnum_range on array range checking for poke descriptors Conor Dooley <conor.dooley(a)microchip.com> riscv: dts: microchip: mpfs: remove pci axi address translation property Conor Dooley <conor.dooley(a)microchip.com> riscv: dts: microchip: mpfs: remove bogus card-detect-delay Conor Dooley <conor.dooley(a)microchip.com> riscv: dts: microchip: mpfs: remove ti,fifo-depth property Conor Dooley <conor.dooley(a)microchip.com> riscv: dts: microchip: mpfs: fix incorrect pcie child node name Mike Christie <michael.christie(a)oracle.com> scsi: core: Fix passthrough retry counter handling Saurabh Sengar <ssengar(a)linux.microsoft.com> scsi: storvsc: Remove WQ_MEM_RECLAIM from storvsc_error_wq Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Enable link lost interrupt Mark Brown <broonie(a)kernel.org> arm64/sme: Don't flush SVE register state when handling SME traps Mark Brown <broonie(a)kernel.org> arm64/sme: Don't flush SVE register state when allocating SME storage Mark Brown <broonie(a)kernel.org> arm64/signal: Flush FPSIMD register state when disabling streaming mode Mark Rutland <mark.rutland(a)arm.com> arm64: fix rodata=full Ian Rogers <irogers(a)google.com> perf stat: Clear evsel->reset_group for each stat run Stephane Eranian <eranian(a)google.com> perf/x86/intel/ds: Fix precise store latency handling Stephane Eranian <eranian(a)google.com> perf/x86/intel/uncore: Fix broken read_counter() for SNB IMC PMU James Clark <james.clark(a)arm.com> perf python: Fix build when PYTHON_CONFIG is user supplied Yu Kuai <yukuai3(a)huawei.com> blk-mq: fix io hung due to missing commit_rqs Salvatore Bonaccorso <carnil(a)debian.org> Documentation/ABI: Mention retbleed vulnerability info file for sysfs Prike Liang <Prike.Liang(a)amd.com> drm/amdkfd: Fix isa version for the GC 10.3.7 Peter Zijlstra <peterz(a)infradead.org> x86/nospec: Fix i386 RSB stuffing Liam Howlett <liam.howlett(a)oracle.com> binder_alloc: add missing mmap_lock calls when using the VMA Zenghui Yu <yuzenghui(a)huawei.com> arm64: Fix match_list for erratum 1286807 on Arm Cortex-A76 Guoqing Jiang <guoqing.jiang(a)linux.dev> md: call __md_stop_writes in md_stop Guoqing Jiang <guoqing.jiang(a)linux.dev> Revert "md-raid: destroy the bitmap after destroying the thread" David Hildenbrand <david(a)redhat.com> mm/hugetlb: fix hugetlb not supporting softdirty tracking Jens Axboe <axboe(a)kernel.dk> io_uring: fix issue with io_write() not always undoing sb_start_write() Jiri Slaby <jirislaby(a)kernel.org> Revert "zram: remove double compression logic" Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> riscv: dts: microchip: correct L2 cache interrupts Conor Dooley <conor.dooley(a)microchip.com> riscv: traps: add missing prototype Conor Dooley <conor.dooley(a)microchip.com> riscv: signal: fix missing prototype warning Juergen Gross <jgross(a)suse.com> xen/privcmd: fix error exit of privcmd_ioctl_dm_op() Heming Zhao <ocfs2-devel(a)oss.oracle.com> ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown David Howells <dhowells(a)redhat.com> smb3: missing inode locks in punch hole Karol Herbst <kherbst(a)redhat.com> nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf Riwen Lu <luriwen(a)kylinos.cn> ACPI: processor: Remove freq Qos request for all CPUs Matthew Wilcox (Oracle) <willy(a)infradead.org> shmem: update folio if shmem_replace_page() updates the page Shakeel Butt <shakeelb(a)google.com> Revert "memcg: cleanup racy sum avoidance code" Shigeru Yoshida <syoshida(a)redhat.com> fbdev: fbcon: Properly revert changes when vc_resize() failed Brian Foster <bfoster(a)redhat.com> s390: fix double free of GS and RI CBs on fork() failure Paulo Alcantara <pc(a)cjr.nz> cifs: skip extra NULL byte in filenames Peter Xu <peterx(a)redhat.com> mm/mprotect: only reference swap pfn page if type match Miaohe Lin <linmiaohe(a)huawei.com> mm/hugetlb: avoid corrupting page->mapping in hugetlb_mcopy_atomic_pte Liu Shixin <liushixin2(a)huawei.com> bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> s390/mm: do not trigger write fault when vma does not allow VM_WRITE Badari Pulavarty <badari.pulavarty(a)intel.com> mm/damon/dbgfs: avoid duplicate context directory creation Quanyang Wang <quanyang.wang(a)windriver.com> asm-generic: sections: refactor memory_intersects Richard Guy Briggs <rgb(a)redhat.com> audit: move audit_return_fixup before the filters Khazhismel Kumykov <khazhy(a)chromium.org> writeback: avoid use-after-free after removing device Siddh Raman Pant <code(a)siddh.me> loop: Check for overflow while configuring loop Jan Beulich <jbeulich(a)suse.com> x86/PAT: Have pat_enabled() properly reflect state when running on Xen Peter Zijlstra <peterz(a)infradead.org> x86/nospec: Unwreck the RSB stuffing Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/bugs: Add "unknown" reporting for MMIO Stale Data Tom Lendacky <thomas.lendacky(a)amd.com> x86/sev: Don't use cc_platform_has() for early SEV-SNP calls Chen Zhongjin <chenzhongjin(a)huawei.com> x86/unwind/orc: Unwind ftrace trampolines with correct ORC entry Juergen Gross <jgross(a)suse.com> x86/entry: Fix entry_INT80_compat for Xen PV guests Kan Liang <kan.liang(a)linux.intel.com> perf/x86/lbr: Enable the branch type for the Arch LBR by default Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Fix pebs event constraints for ADL Michael Roth <michael.roth(a)amd.com> x86/boot: Don't propagate uninitialized boot_params->cc_blob_address Filipe Manana <fdmanana(a)suse.com> btrfs: update generation of hole file extent item when merging holes Zixuan Fu <r33s3n6(a)gmail.com> btrfs: fix possible memory leak in btrfs_get_dev_args_from_path() Goldwyn Rodrigues <rgoldwyn(a)suse.de> btrfs: check if root is readonly while setting security xattr Omar Sandoval <osandov(a)fb.com> btrfs: fix space cache corruption and potential double allocations Anand Jain <anand.jain(a)oracle.com> btrfs: add info when mount fails due to stale replace target Anand Jain <anand.jain(a)oracle.com> btrfs: replace: drop assert for suspended replace Filipe Manana <fdmanana(a)suse.com> btrfs: fix silent failure when deleting root reference Aleksander Jan Bajkowski <olek2(a)wp.pl> net: lantiq_xrx200: restore buffer if memory allocation failed Aleksander Jan Bajkowski <olek2(a)wp.pl> net: lantiq_xrx200: fix lock under memory pressure Aleksander Jan Bajkowski <olek2(a)wp.pl> net: lantiq_xrx200: confirm skb is allocated before using Heiner Kallweit <hkallweit1(a)gmail.com> net: stmmac: work around sporadic tx issue on link-up R Mohamed Shah <mohamed(a)pensando.io> ionic: VF initial random MAC address if no assigned mac Shannon Nelson <snelson(a)pensando.io> ionic: fix up issues with handling EAGAIN on FW cmds Shannon Nelson <snelson(a)pensando.io> ionic: clear broken state on generation change David Howells <dhowells(a)redhat.com> rxrpc: Fix locking in rxrpc's sendmsg Lorenzo Bianconi <lorenzo(a)kernel.org> net: ethernet: mtk_eth_soc: fix hw hash reporting for MTK_NETSYS_V2 Lorenzo Bianconi <lorenzo(a)kernel.org> net: ethernet: mtk_eth_soc: enable rx cksum offload for MTK_NETSYS_V2 Sylwester Dziedziuch <sylwesterx.dziedziuch(a)intel.com> i40e: Fix incorrect address type for IPv6 flow rules Jacob Keller <jacob.e.keller(a)intel.com> ixgbe: stop resetting SYSTIME in ixgbe_ptp_start_cyclecounter Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_somaxconn. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around netdev_unregister_timeout_secs. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around gro_normal_batch. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_devconf_inherit_init_net. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_fb_tunnels_only_for_init_net. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around netdev_budget_usecs. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_max_skb_frags. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around netdev_budget. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_net_busy_read. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_net_busy_poll. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_tstamp_allow_data. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_optmem_max. Kuniyuki Iwashima <kuniyu(a)amazon.com> ratelimit: Fix data-races in ___ratelimit(). Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around netdev_tstamp_prequeue. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around netdev_max_backlog. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around weight_p and dev_weight_[rt]x_bias. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_[rw]mem_(max|default). Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: flowtable: fix stuck flows on cleanup due to pending work Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: flowtable: add function to invoke garbage collection immediately Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow binding to already bound chain Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_tunnel: restrict it to netdev family Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_osf: restrict osf to ipv4, ipv6 and inet families Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: do not leave chain stats enabled on error Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_payload: do not truncate csum_offset and csum_type Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_payload: report ERANGE for too long offset and length Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: make table handle allocation per-netns friendly Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow updates of implicit chain Vikas Gupta <vikas.gupta(a)broadcom.com> bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback Vikas Gupta <vikas.gupta(a)broadcom.com> bnxt_en: fix NQ resource accounting during vf creation on 57500 chips Vikas Gupta <vikas.gupta(a)broadcom.com> bnxt_en: set missing reload flag in devlink features Pavan Chebbi <pavan.chebbi(a)broadcom.com> bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in use Florian Westphal <fw(a)strlen.de> netfilter: nft_tproxy: restrict to prerouting hook Florian Westphal <fw(a)strlen.de> netfilter: ebtables: reject blobs that don't provide all entry points Maciej Żenczykowski <maze(a)google.com> net: ipvtap - add __init/__exit annotations to module init/exit funcs Jonathan Toppins <jtoppins(a)redhat.com> bonding: 802.3ad: fix no transmission of LACPDUs Sergei Antonov <saproj(a)gmail.com> net: moxa: get rid of asymmetry in DMA mapping/unmapping Xiaolei Wang <xiaolei.wang(a)windriver.com> net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume() Alex Elder <elder(a)linaro.org> net: ipa: don't assume SMEM is page-aligned Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: microchip: keep compatibility with device tree blobs with no phy-mode Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: update the ksz_phylink_get_caps Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: move the port mirror to ksz_common Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: move vlan functionality to ksz_common Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: move tag_protocol to ksz_common Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: move switch chip_id detection to ksz_common Arun Ramadoss <arun.ramadoss(a)microchip.com> net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detect Maor Dickman <maord(a)nvidia.com> net/mlx5e: Fix wrong tc flag used when set hw-tc-offload off Aya Levin <ayal(a)nvidia.com> net/mlx5e: Fix wrong application of the LRO state Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Avoid false positive lockdep warning by adding lock_class_key Roy Novich <royno(a)nvidia.com> net/mlx5: Fix cmd error logging for manage pages cmd Vlad Buslov <vladbu(a)nvidia.com> net/mlx5: Disable irq when locking lag_lock Eli Cohen <elic(a)nvidia.com> net/mlx5: Eswitch, Fix forwarding decision to uplink Eli Cohen <elic(a)nvidia.com> net/mlx5: LAG, fix logic over MLX5_LAG_FLAG_NDEVS_READY Vlad Buslov <vladbu(a)nvidia.com> net/mlx5e: Properly disable vlan strip on non-UL reps Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> ice: xsk: use Rx ring's XDP ring when picking NAPI context Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> ice: xsk: prohibit usage of non-balanced queue id Duoming Zhou <duoming(a)zju.edu.cn> nfc: pn533: Fix use-after-free bugs caused by pn532_cmd_timeout Hayes Wang <hayeswang(a)realtek.com> r8152: fix the RX FIFO settings when suspending Hayes Wang <hayeswang(a)realtek.com> r8152: fix the units of some registers for RTL8156A Bernard Pidoux <f6bvp(a)free.fr> rose: check NULL rose_loopback_neigh->loopback Christian Brauner <brauner(a)kernel.org> ntfs: fix acl handling Peter Xu <peterx(a)redhat.com> mm/smaps: don't access young/dirty bit if pte unpresent Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: RPC level errors should set task->tk_rpc_status Olga Kornievskaia <kolga(a)netapp.com> NFSv4.2 fix problems with __nfs42_ssc_open Sabrina Dubroca <sd(a)queasysnail.net> Revert "net: macsec: update SCI upon MAC address change." Seth Forshee <sforshee(a)digitalocean.com> fs: require CAP_SYS_ADMIN in target namespace for idmapped mounts Nikolay Aleksandrov <razor(a)blackwall.org> xfrm: policy: fix metadata dst->dev xmit null pointer dereference Herbert Xu <herbert(a)gondor.apana.org.au> af_key: Do not call xfrm_probe_algs in parallel Antony Antony <antony.antony(a)secunet.com> xfrm: clone missing x->lastused in xfrm_do_migrate Antony Antony <antony.antony(a)secunet.com> Revert "xfrm: update SA curlft.use_time" Xin Xiong <xiongx18(a)fudan.edu.cn> xfrm: fix refcount leak in __xfrm_policy_check() Deren Wu <deren.wu(a)mediatek.com> mt76: mt7921: fix command timeout in AP stop period David Hildenbrand <david(a)redhat.com> mm/hugetlb: support write-faults in shared mappings Peter Xu <peterx(a)redhat.com> mm/uffd: reset write protection when unregister with wp-mode Kuniyuki Iwashima <kuniyu(a)amazon.com> kprobes: don't call disarm_kprobe() for disabled kprobes Randy Dunlap <rdunlap(a)infradead.org> kernel/sys_ni: add compat entry for fadvise64_64 Helge Deller <deller(a)gmx.de> parisc: Fix exception handler for fldw and fstw instructions Helge Deller <deller(a)gmx.de> parisc: Make CONFIG_64BIT available for ARCH=parisc64 only Jing-Ting Wu <Jing-Ting.Wu(a)mediatek.com> cgroup: Fix race condition at rebind_subsystems() Gaosheng Cui <cuigaosheng1(a)huawei.com> audit: fix potential double free on error path from fsnotify_add_inode_mark Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix another fsync() issue after a server reboot David Hildenbrand <david(a)redhat.com> mm/gup: fix FOLL_FORCE COW security issue and remove FOLL_COW ------------- Diffstat: Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + .../hw-vuln/processor_mmio_stale_data.rst | 14 ++ Documentation/admin-guide/kernel-parameters.txt | 2 + Documentation/admin-guide/sysctl/net.rst | 2 +- Makefile | 4 +- arch/arm64/include/asm/fpsimd.h | 4 +- arch/arm64/include/asm/setup.h | 17 ++ arch/arm64/kernel/cpu_errata.c | 2 + arch/arm64/kernel/fpsimd.c | 21 +-- arch/arm64/kernel/ptrace.c | 6 +- arch/arm64/kernel/signal.c | 12 +- arch/arm64/mm/mmu.c | 18 --- arch/parisc/Kconfig | 21 +-- arch/parisc/kernel/unaligned.c | 2 +- arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 3 - arch/riscv/boot/dts/microchip/mpfs-polarberry.dts | 3 - arch/riscv/boot/dts/microchip/mpfs.dtsi | 5 +- arch/riscv/include/asm/signal.h | 12 ++ arch/riscv/include/asm/thread_info.h | 2 + arch/riscv/kernel/signal.c | 1 + arch/riscv/kernel/traps.c | 3 +- arch/s390/kernel/process.c | 22 ++- arch/s390/mm/fault.c | 4 +- arch/x86/boot/compressed/misc.h | 12 +- arch/x86/boot/compressed/sev.c | 8 + arch/x86/entry/entry_64_compat.S | 2 +- arch/x86/events/intel/ds.c | 12 +- arch/x86/events/intel/lbr.c | 8 + arch/x86/events/intel/uncore_snb.c | 18 ++- arch/x86/include/asm/cpufeatures.h | 5 +- arch/x86/include/asm/nospec-branch.h | 92 ++++++----- arch/x86/kernel/cpu/bugs.c | 14 +- arch/x86/kernel/cpu/common.c | 42 +++-- arch/x86/kernel/sev.c | 16 +- arch/x86/kernel/unwind_orc.c | 15 +- arch/x86/mm/pat/memtype.c | 10 +- block/blk-mq.c | 5 +- drivers/acpi/processor_thermal.c | 2 +- drivers/android/binder_alloc.c | 31 ++-- drivers/block/loop.c | 5 + drivers/block/zram/zram_drv.c | 42 +++-- drivers/block/zram/zram_drv.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 9 ++ drivers/md/md.c | 3 +- drivers/net/bonding/bond_3ad.c | 38 ++--- drivers/net/dsa/microchip/ksz8795.c | 102 +++--------- drivers/net/dsa/microchip/ksz8795_reg.h | 16 -- drivers/net/dsa/microchip/ksz9477.c | 89 +++-------- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 173 ++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 47 +++++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/ice/ice.h | 36 +++-- drivers/net/ethernet/intel/ice/ice_lib.c | 4 +- drivers/net/ethernet/intel/ice/ice_main.c | 25 ++- drivers/net/ethernet/intel/ice/ice_xsk.c | 18 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 59 +++++-- drivers/net/ethernet/lantiq_xrx200.c | 9 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 29 ++-- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 5 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 57 ++++--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 9 +- drivers/net/ethernet/moxa/moxart_ether.c | 11 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 95 ++++++++++- drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- drivers/net/ipa/ipa_mem.c | 2 +- drivers/net/ipvlan/ipvtap.c | 4 +- drivers/net/macsec.c | 11 +- drivers/net/phy/phy_device.c | 8 +- drivers/net/usb/r8152.c | 27 ++-- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 47 ++++-- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 5 +- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 + drivers/nfc/pn533/uart.c | 1 + drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/storvsc_drv.c | 2 +- drivers/video/fbdev/core/fbcon.c | 27 +++- drivers/xen/privcmd.c | 21 +-- fs/btrfs/block-group.c | 47 ++---- fs/btrfs/block-group.h | 4 +- fs/btrfs/ctree.h | 1 - fs/btrfs/dev-replace.c | 5 +- fs/btrfs/extent-tree.c | 30 +--- fs/btrfs/file.c | 2 + fs/btrfs/root-tree.c | 5 +- fs/btrfs/volumes.c | 5 +- fs/btrfs/xattr.c | 3 + fs/cifs/smb2ops.c | 12 +- fs/cifs/smb2pdu.c | 16 +- fs/fs-writeback.c | 12 +- fs/namespace.c | 7 + fs/nfs/file.c | 15 +- fs/nfs/inode.c | 1 + fs/nfs/nfs4file.c | 6 + fs/nfs/write.c | 6 +- fs/ntfs3/xattr.c | 16 +- fs/ocfs2/dlmglue.c | 8 +- fs/ocfs2/super.c | 3 +- fs/proc/task_mmu.c | 7 +- fs/userfaultfd.c | 4 + include/asm-generic/sections.h | 7 +- include/linux/memcontrol.h | 15 +- include/linux/mlx5/driver.h | 1 + include/linux/mm.h | 1 - include/linux/netdevice.h | 20 ++- include/linux/netfilter_bridge/ebtables.h | 4 - include/linux/nfs_fs.h | 1 + include/linux/userfaultfd_k.h | 2 + include/net/busy_poll.h | 2 +- include/net/gro.h | 2 +- include/net/netfilter/nf_flow_table.h | 3 + include/net/netfilter/nf_tables.h | 1 + include/ufs/ufshci.h | 6 +- init/main.c | 18 ++- io_uring/io_uring.c | 7 +- kernel/audit_fsnotify.c | 1 + kernel/auditsc.c | 4 +- kernel/bpf/verifier.c | 10 +- kernel/cgroup/cgroup.c | 1 + kernel/kprobes.c | 9 +- kernel/sys_ni.c | 1 + lib/ratelimit.c | 12 +- mm/backing-dev.c | 10 +- mm/bootmem_info.c | 2 + mm/damon/dbgfs.c | 3 + mm/gup.c | 69 +++++--- mm/huge_memory.c | 65 +++++--- mm/hugetlb.c | 28 +++- mm/mmap.c | 8 +- mm/mprotect.c | 3 +- mm/page-writeback.c | 6 +- mm/shmem.c | 1 + mm/userfaultfd.c | 29 ++-- net/bridge/netfilter/ebtable_broute.c | 8 - net/bridge/netfilter/ebtable_filter.c | 8 - net/bridge/netfilter/ebtable_nat.c | 8 - net/bridge/netfilter/ebtables.c | 8 +- net/core/bpf_sk_storage.c | 5 +- net/core/dev.c | 20 +-- net/core/filter.c | 13 +- net/core/gro_cells.c | 2 +- net/core/skbuff.c | 2 +- net/core/sock.c | 18 ++- net/core/sysctl_net_core.c | 15 +- net/ipv4/devinet.c | 16 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ip_sockglue.c | 6 +- net/ipv4/tcp.c | 4 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/addrconf.c | 5 +- net/ipv6/ipv6_sockglue.c | 4 +- net/key/af_key.c | 3 + net/mptcp/protocol.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_flow_table_core.c | 15 +- net/netfilter/nf_flow_table_offload.c | 8 + net/netfilter/nf_tables_api.c | 14 +- net/netfilter/nft_osf.c | 18 ++- net/netfilter/nft_payload.c | 29 +++- net/netfilter/nft_tproxy.c | 8 + net/netfilter/nft_tunnel.c | 1 + net/rose/rose_loopback.c | 3 +- net/rxrpc/call_object.c | 4 +- net/rxrpc/sendmsg.c | 92 ++++++----- net/sched/sch_generic.c | 2 +- net/socket.c | 2 +- net/sunrpc/clnt.c | 2 +- net/xfrm/espintcp.c | 2 +- net/xfrm/xfrm_input.c | 3 +- net/xfrm/xfrm_output.c | 1 - net/xfrm/xfrm_policy.c | 3 +- net/xfrm/xfrm_state.c | 1 + tools/perf/Makefile.config | 2 +- tools/perf/builtin-stat.c | 1 + 187 files changed, 1603 insertions(+), 917 deletions(-)

1 year, 3 months

14
173
0 0

[PATCH v2 1/3] xen-blkback: Advertise feature-persistent as user requested

by SeongJae Park

The advertisement of the persistent grants feature (writing 'feature-persistent' to xenbus) should mean not the decision for using the feature but only the availability of the feature. However, commit aac8a70db24b ("xen-blkback: add a parameter for disabling of persistent grants") made a field of blkback, which was a place for saving only the negotiation result, to be used for yet another purpose: caching of the 'feature_persistent' parameter value. As a result, the advertisement, which should follow only the parameter value, becomes inconsistent. This commit fixes the misuse of the semantic by making blkback saves the parameter value in a separate place and advertises the support based on only the saved value. Fixes: aac8a70db24b ("xen-blkback: add a parameter for disabling of persistent grants") Cc: <stable(a)vger.kernel.org> # 5.10.x Suggested-by: Juergen Gross <jgross(a)suse.com> Signed-off-by: SeongJae Park <sj(a)kernel.org> --- drivers/block/xen-blkback/common.h | 3 +++ drivers/block/xen-blkback/xenbus.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index bda5c815e441..a28473470e66 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -226,6 +226,9 @@ struct xen_vbd { sector_t size; unsigned int flush_support:1; unsigned int discard_secure:1; + /* Connect-time cached feature_persistent parameter value */ + unsigned int feature_gnt_persistent_parm:1; + /* Persistent grants feature negotiation result */ unsigned int feature_gnt_persistent:1; unsigned int overflow_max_grants:1; }; diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index ee7ad2fb432d..c0227dfa4688 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -907,7 +907,7 @@ static void connect(struct backend_info *be) xen_blkbk_barrier(xbt, be, be->blkif->vbd.flush_support); err = xenbus_printf(xbt, dev->nodename, "feature-persistent", "%u", - be->blkif->vbd.feature_gnt_persistent); + be->blkif->vbd.feature_gnt_persistent_parm); if (err) { xenbus_dev_fatal(dev, err, "writing %s/feature-persistent", dev->nodename); @@ -1085,7 +1085,9 @@ static int connect_ring(struct backend_info *be) return -ENOSYS; } - blkif->vbd.feature_gnt_persistent = feature_persistent && + blkif->vbd.feature_gnt_persistent_parm = feature_persistent; + blkif->vbd.feature_gnt_persistent = + blkif->vbd.feature_gnt_persistent_parm && xenbus_read_unsigned(dev->otherend, "feature-persistent", 0); blkif->vbd.overflow_max_grants = 0; -- 2.25.1

1 year, 3 months

4
4
0 0

[PATCH 01/11] drm/edid: Handle EDID 1.4 range descriptor h/vfreq offsets

by Ville Syrjala

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> EDID 1.4 introduced some extra flags in the range descriptor to support min/max h/vfreq >= 255. Consult them to correctly parse the vfreq limits. Note that some combinations of the flags are documented as "reserved" (as are some other values in the descriptor) but explicitly checking for those doesn't seem particularly worthwile since we end up with bogus results whether we decode them or not. v2: Increase the storage to u16 to make it work (Jani) Note the "reserved" values situation (Jani) v3: Document the EDID version number in the defines Drop some bogus (u8) casts Cc: stable(a)vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6519 Reviewed-by: Jani Nikula <jani.nikula(a)intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/drm_debugfs.c | 4 ++-- drivers/gpu/drm/drm_edid.c | 24 ++++++++++++++++++------ include/drm/drm_connector.h | 4 ++-- include/drm/drm_edid.h | 5 +++++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 493922069c90..01ee3febb813 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -377,8 +377,8 @@ static int vrr_range_show(struct seq_file *m, void *data) if (connector->status != connector_status_connected) return -ENODEV; - seq_printf(m, "Min: %u\n", (u8)connector->display_info.monitor_range.min_vfreq); - seq_printf(m, "Max: %u\n", (u8)connector->display_info.monitor_range.max_vfreq); + seq_printf(m, "Min: %u\n", connector->display_info.monitor_range.min_vfreq); + seq_printf(m, "Max: %u\n", connector->display_info.monitor_range.max_vfreq); return 0; } diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 90a5e26eafa8..4005dab6147d 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6020,12 +6020,14 @@ static void drm_parse_cea_ext(struct drm_connector *connector, } static -void get_monitor_range(const struct detailed_timing *timing, - void *info_monitor_range) +void get_monitor_range(const struct detailed_timing *timing, void *c) { - struct drm_monitor_range_info *monitor_range = info_monitor_range; + struct detailed_mode_closure *closure = c; + struct drm_display_info *info = &closure->connector->display_info; + struct drm_monitor_range_info *monitor_range = &info->monitor_range; const struct detailed_non_pixel *data = &timing->data.other_data; const struct detailed_data_monitor_range *range = &data->data.range; + const struct edid *edid = closure->drm_edid->edid; if (!is_display_descriptor(timing, EDID_DETAIL_MONITOR_RANGE)) return; @@ -6041,18 +6043,28 @@ void get_monitor_range(const struct detailed_timing *timing, monitor_range->min_vfreq = range->min_vfreq; monitor_range->max_vfreq = range->max_vfreq; + + if (edid->revision >= 4) { + if (data->pad2 & DRM_EDID_RANGE_OFFSET_MIN_VFREQ) + monitor_range->min_vfreq += 255; + if (data->pad2 & DRM_EDID_RANGE_OFFSET_MAX_VFREQ) + monitor_range->max_vfreq += 255; + } } static void drm_get_monitor_range(struct drm_connector *connector, const struct drm_edid *drm_edid) { - struct drm_display_info *info = &connector->display_info; + const struct drm_display_info *info = &connector->display_info; + struct detailed_mode_closure closure = { + .connector = connector, + .drm_edid = drm_edid, + }; if (!version_greater(drm_edid, 1, 1)) return; - drm_for_each_detailed_block(drm_edid, get_monitor_range, - &info->monitor_range); + drm_for_each_detailed_block(drm_edid, get_monitor_range, &closure); DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n", info->monitor_range.min_vfreq, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 248206bbd975..56aee949c6fa 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -319,8 +319,8 @@ enum drm_panel_orientation { * EDID's detailed monitor range */ struct drm_monitor_range_info { - u8 min_vfreq; - u8 max_vfreq; + u16 min_vfreq; + u16 max_vfreq; }; /** diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 2181977ae683..1ed61e2b30a4 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -92,6 +92,11 @@ struct detailed_data_string { u8 str[13]; } __attribute__((packed)); +#define DRM_EDID_RANGE_OFFSET_MIN_VFREQ (1 << 0) /* 1.4 */ +#define DRM_EDID_RANGE_OFFSET_MAX_VFREQ (1 << 1) /* 1.4 */ +#define DRM_EDID_RANGE_OFFSET_MIN_HFREQ (1 << 2) /* 1.4 */ +#define DRM_EDID_RANGE_OFFSET_MAX_HFREQ (1 << 3) /* 1.4 */ + #define DRM_EDID_DEFAULT_GTF_SUPPORT_FLAG 0x00 #define DRM_EDID_RANGE_LIMITS_ONLY_FLAG 0x01 #define DRM_EDID_SECONDARY_GTF_SUPPORT_FLAG 0x02 -- 2.35.1

1 year, 3 months

3
2
0 0

[PATCH 5.15 000/136] 5.15.64-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.64 release. There are 136 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 Wed, 31 Aug 2022 10:57:37 +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.15.64-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.15.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.15.64-rc1 Daniel Borkmann <daniel(a)iogearbox.net> bpf: Don't use tnum_range on array range checking for poke descriptors Saurabh Sengar <ssengar(a)linux.microsoft.com> scsi: storvsc: Remove WQ_MEM_RECLAIM from storvsc_error_wq Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Enable link lost interrupt Ian Rogers <irogers(a)google.com> perf stat: Clear evsel->reset_group for each stat run Stephane Eranian <eranian(a)google.com> perf/x86/intel/ds: Fix precise store latency handling Stephane Eranian <eranian(a)google.com> perf/x86/intel/uncore: Fix broken read_counter() for SNB IMC PMU James Clark <james.clark(a)arm.com> perf python: Fix build when PYTHON_CONFIG is user supplied Yu Kuai <yukuai3(a)huawei.com> blk-mq: fix io hung due to missing commit_rqs Salvatore Bonaccorso <carnil(a)debian.org> Documentation/ABI: Mention retbleed vulnerability info file for sysfs Peter Zijlstra <peterz(a)infradead.org> x86/nospec: Fix i386 RSB stuffing Liam Howlett <liam.howlett(a)oracle.com> binder_alloc: add missing mmap_lock calls when using the VMA Zenghui Yu <yuzenghui(a)huawei.com> arm64: Fix match_list for erratum 1286807 on Arm Cortex-A76 Yonglong Li <liyonglong(a)chinatelecom.cn> mptcp: Fix crash due to tcp_tsorted_anchor was initialized before release skb Guoqing Jiang <guoqing.jiang(a)linux.dev> md: call __md_stop_writes in md_stop Guoqing Jiang <guoqing.jiang(a)linux.dev> Revert "md-raid: destroy the bitmap after destroying the thread" David Hildenbrand <david(a)redhat.com> mm/hugetlb: fix hugetlb not supporting softdirty tracking Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usbnet: smsc95xx: Forward PHY interrupts to PHY driver to avoid polling" Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usbnet: smsc95xx: Fix deadlock on runtime resume" Jens Axboe <axboe(a)kernel.dk> io_uring: fix issue with io_write() not always undoing sb_start_write() Conor Dooley <conor.dooley(a)microchip.com> riscv: traps: add missing prototype Juergen Gross <jgross(a)suse.com> xen/privcmd: fix error exit of privcmd_ioctl_dm_op() David Howells <dhowells(a)redhat.com> smb3: missing inode locks in punch hole Karol Herbst <kherbst(a)redhat.com> nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf Riwen Lu <luriwen(a)kylinos.cn> ACPI: processor: Remove freq Qos request for all CPUs Shakeel Butt <shakeelb(a)google.com> Revert "memcg: cleanup racy sum avoidance code" Shigeru Yoshida <syoshida(a)redhat.com> fbdev: fbcon: Properly revert changes when vc_resize() failed Brian Foster <bfoster(a)redhat.com> s390: fix double free of GS and RI CBs on fork() failure Liu Shixin <liushixin2(a)huawei.com> bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> s390/mm: do not trigger write fault when vma does not allow VM_WRITE Badari Pulavarty <badari.pulavarty(a)intel.com> mm/damon/dbgfs: avoid duplicate context directory creation Quanyang Wang <quanyang.wang(a)windriver.com> asm-generic: sections: refactor memory_intersects Khazhismel Kumykov <khazhy(a)chromium.org> writeback: avoid use-after-free after removing device Siddh Raman Pant <code(a)siddh.me> loop: Check for overflow while configuring loop Peter Zijlstra <peterz(a)infradead.org> x86/nospec: Unwreck the RSB stuffing Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/bugs: Add "unknown" reporting for MMIO Stale Data Chen Zhongjin <chenzhongjin(a)huawei.com> x86/unwind/orc: Unwind ftrace trampolines with correct ORC entry Kan Liang <kan.liang(a)linux.intel.com> perf/x86/lbr: Enable the branch type for the Arch LBR by default Zixuan Fu <r33s3n6(a)gmail.com> btrfs: fix possible memory leak in btrfs_get_dev_args_from_path() Goldwyn Rodrigues <rgoldwyn(a)suse.de> btrfs: check if root is readonly while setting security xattr Anand Jain <anand.jain(a)oracle.com> btrfs: add info when mount fails due to stale replace target Anand Jain <anand.jain(a)oracle.com> btrfs: replace: drop assert for suspended replace Filipe Manana <fdmanana(a)suse.com> btrfs: fix silent failure when deleting root reference Heiner Kallweit <hkallweit1(a)gmail.com> net: stmmac: work around sporadic tx issue on link-up R Mohamed Shah <mohamed(a)pensando.io> ionic: VF initial random MAC address if no assigned mac Shannon Nelson <snelson(a)pensando.io> ionic: fix up issues with handling EAGAIN on FW cmds Shannon Nelson <snelson(a)pensando.io> ionic: clear broken state on generation change Shannon Nelson <snelson(a)pensando.io> ionic: widen queue_lock use around lif init and deinit David Howells <dhowells(a)redhat.com> rxrpc: Fix locking in rxrpc's sendmsg Sylwester Dziedziuch <sylwesterx.dziedziuch(a)intel.com> i40e: Fix incorrect address type for IPv6 flow rules Jacob Keller <jacob.e.keller(a)intel.com> ixgbe: stop resetting SYSTIME in ixgbe_ptp_start_cyclecounter Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_somaxconn. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_devconf_inherit_init_net. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_fb_tunnels_only_for_init_net. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around netdev_budget_usecs. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_max_skb_frags. Paolo Abeni <pabeni(a)redhat.com> mptcp: stop relying on tcp_tx_skb_cache Paolo Abeni <pabeni(a)redhat.com> tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around netdev_budget. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_net_busy_read. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_net_busy_poll. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix a data-race around sysctl_tstamp_allow_data. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_optmem_max. Kuniyuki Iwashima <kuniyu(a)amazon.com> ratelimit: Fix data-races in ___ratelimit(). Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around netdev_tstamp_prequeue. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around netdev_max_backlog. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around weight_p and dev_weight_[rt]x_bias. Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix data-races around sysctl_[rw]mem_(max|default). Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: flowtable: fix stuck flows on cleanup due to pending work Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: flowtable: add function to invoke garbage collection immediately Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow binding to already bound chain Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow jump to implicit chain from set element Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: upfront validation of data via nft_data_init() Jeremy Sowden <jeremy(a)azazel.net> netfilter: bitwise: improve error goto labels Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_cmp: optimize comparison for 16-bytes Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: consolidate rule verdict trace call Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_tunnel: restrict it to netdev family Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_osf: restrict osf to ipv4, ipv6 and inet families Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: do not leave chain stats enabled on error Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_payload: do not truncate csum_offset and csum_type Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_payload: report ERANGE for too long offset and length Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: make table handle allocation per-netns friendly Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow updates of implicit chain Vikas Gupta <vikas.gupta(a)broadcom.com> bnxt_en: fix NQ resource accounting during vf creation on 57500 chips Florian Westphal <fw(a)strlen.de> netfilter: ebtables: reject blobs that don't provide all entry points Maciej Żenczykowski <maze(a)google.com> net: ipvtap - add __init/__exit annotations to module init/exit funcs Jonathan Toppins <jtoppins(a)redhat.com> bonding: 802.3ad: fix no transmission of LACPDUs Sergei Antonov <saproj(a)gmail.com> net: moxa: get rid of asymmetry in DMA mapping/unmapping Xiaolei Wang <xiaolei.wang(a)windriver.com> net: phy: Don't WARN for PHY_READY state in mdio_bus_phy_resume() Alex Elder <elder(a)linaro.org> net: ipa: don't assume SMEM is page-aligned Maor Dickman <maord(a)nvidia.com> net/mlx5e: Fix wrong tc flag used when set hw-tc-offload off Aya Levin <ayal(a)nvidia.com> net/mlx5e: Fix wrong application of the LRO state Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Avoid false positive lockdep warning by adding lock_class_key Vlad Buslov <vladbu(a)nvidia.com> net/mlx5e: Properly disable vlan strip on non-UL reps Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> ice: xsk: prohibit usage of non-balanced queue id Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> ice: xsk: Force rings to be sized to power of 2 Duoming Zhou <duoming(a)zju.edu.cn> nfc: pn533: Fix use-after-free bugs caused by pn532_cmd_timeout Hayes Wang <hayeswang(a)realtek.com> r8152: fix the RX FIFO settings when suspending Hayes Wang <hayeswang(a)realtek.com> r8152: fix the units of some registers for RTL8156A Bernard Pidoux <f6bvp(a)free.fr> rose: check NULL rose_loopback_neigh->loopback Christian Brauner <brauner(a)kernel.org> ntfs: fix acl handling Peter Xu <peterx(a)redhat.com> mm/smaps: don't access young/dirty bit if pte unpresent Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: RPC level errors should set task->tk_rpc_status Olga Kornievskaia <kolga(a)netapp.com> NFSv4.2 fix problems with __nfs42_ssc_open Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Don't allocate nfs_fattr on the stack in __nfs42_ssc_open() Sabrina Dubroca <sd(a)queasysnail.net> Revert "net: macsec: update SCI upon MAC address change." Jakub Kicinski <kuba(a)kernel.org> net: use eth_hw_addr_set() instead of ether_addr_copy() Seth Forshee <sforshee(a)digitalocean.com> fs: require CAP_SYS_ADMIN in target namespace for idmapped mounts Nikolay Aleksandrov <razor(a)blackwall.org> xfrm: policy: fix metadata dst->dev xmit null pointer dereference Herbert Xu <herbert(a)gondor.apana.org.au> af_key: Do not call xfrm_probe_algs in parallel Antony Antony <antony.antony(a)secunet.com> xfrm: clone missing x->lastused in xfrm_do_migrate Xin Xiong <xiongx18(a)fudan.edu.cn> xfrm: fix refcount leak in __xfrm_policy_check() Chen Lifu <chenlifu(a)huawei.com> riscv: lib: uaccess: fix CSR_STATUS SR_SUM bit Jisheng Zhang <jszhang(a)kernel.org> riscv: lib: uaccess: fold fixups into body Qu Wenruo <wqu(a)suse.com> btrfs: remove unnecessary parameter delalloc_start for writepage_delalloc() Filipe Manana <fdmanana(a)suse.com> btrfs: pass the dentry to btrfs_log_new_name() instead of the inode Filipe Manana <fdmanana(a)suse.com> btrfs: put initial index value of a directory in a constant Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: edif: Fix dropped IKE message Arun Easi <aeasi(a)marvell.com> scsi: qla2xxx: Fix response queue handler reading stale packets Phil Auld <pauld(a)redhat.com> drivers/base: fix userspace break from using bin_attributes for cpumap and cpulist Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add additional TUXEDO devices to i8042 quirk tables Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add TUXEDO devices to i8042 quirk tables Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - merge quirk tables Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - move __initconst to fix code styling warning Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: convert count_max_extents() to use fs_info->max_extent_size Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: zoned: revive max_zone_append_bytes Naohiro Aota <naohiro.aota(a)wdc.com> block: add bdev_max_segments() helper Christoph Hellwig <hch(a)lst.de> block: add a bdev_max_zone_append_sectors helper Lai Jiangshan <jiangshan.ljs(a)antgroup.com> x86/entry: Move CLD to the start of the idtentry macro Randy Dunlap <rdunlap(a)infradead.org> kernel/sys_ni: add compat entry for fadvise64_64 Helge Deller <deller(a)gmx.de> parisc: Fix exception handler for fldw and fstw instructions Helge Deller <deller(a)gmx.de> parisc: Make CONFIG_64BIT available for ARCH=parisc64 only Jing-Ting Wu <Jing-Ting.Wu(a)mediatek.com> cgroup: Fix race condition at rebind_subsystems() Gaosheng Cui <cuigaosheng1(a)huawei.com> audit: fix potential double free on error path from fsnotify_add_inode_mark Martin Liška <mliska(a)suse.cz> eth: sun: cassini: remove dead code Jakub Kicinski <kuba(a)kernel.org> wifi: rtlwifi: remove always-true condition pointed out by GCC 12 ------------- Diffstat: Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + .../hw-vuln/processor_mmio_stale_data.rst | 14 + Documentation/admin-guide/sysctl/net.rst | 2 +- Makefile | 4 +- arch/arm64/kernel/cpu_errata.c | 2 + arch/parisc/Kconfig | 21 +- arch/parisc/kernel/unaligned.c | 2 +- arch/riscv/include/asm/thread_info.h | 2 + arch/riscv/kernel/traps.c | 3 +- arch/riscv/lib/uaccess.S | 24 +- arch/s390/kernel/process.c | 22 +- arch/s390/mm/fault.c | 4 +- arch/x86/entry/entry_64.S | 8 +- arch/x86/events/intel/ds.c | 10 +- arch/x86/events/intel/lbr.c | 8 + arch/x86/events/intel/uncore_snb.c | 18 +- arch/x86/include/asm/cpufeatures.h | 5 +- arch/x86/include/asm/nospec-branch.h | 92 +- arch/x86/kernel/cpu/bugs.c | 14 +- arch/x86/kernel/cpu/common.c | 42 +- arch/x86/kernel/unwind_orc.c | 15 +- block/blk-mq.c | 5 +- drivers/acpi/processor_thermal.c | 2 +- drivers/android/binder_alloc.c | 31 +- drivers/base/node.c | 4 +- drivers/base/topology.c | 28 +- drivers/block/loop.c | 5 + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 + drivers/input/serio/i8042-x86ia64io.h | 1251 ++++++++++++-------- drivers/md/md.c | 3 +- drivers/net/bonding/bond_3ad.c | 38 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/ice/ice_xsk.c | 14 + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 59 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 + drivers/net/ethernet/moxa/moxart_ether.c | 11 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 109 +- drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- drivers/net/ethernet/sun/cassini.c | 4 +- drivers/net/ipa/ipa_mem.c | 2 +- drivers/net/ipvlan/ipvlan_main.c | 2 +- drivers/net/ipvlan/ipvtap.c | 4 +- drivers/net/macsec.c | 13 +- drivers/net/macvlan.c | 2 +- drivers/net/phy/phy_device.c | 8 +- drivers/net/usb/r8152.c | 27 +- drivers/net/usb/smsc95xx.c | 139 +-- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 5 +- drivers/nfc/pn533/uart.c | 1 + drivers/nvme/target/zns.c | 3 +- drivers/scsi/qla2xxx/qla_gbl.h | 2 + drivers/scsi/qla2xxx/qla_isr.c | 76 +- drivers/scsi/qla2xxx/qla_os.c | 10 + drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/ufs/ufshci.h | 6 +- drivers/video/fbdev/core/fbcon.c | 27 +- drivers/xen/privcmd.c | 21 +- fs/btrfs/btrfs_inode.h | 12 +- fs/btrfs/ctree.h | 29 +- fs/btrfs/delalloc-space.c | 6 +- fs/btrfs/dev-replace.c | 5 +- fs/btrfs/disk-io.c | 2 + fs/btrfs/extent_io.c | 18 +- fs/btrfs/inode.c | 40 +- fs/btrfs/root-tree.c | 5 +- fs/btrfs/tree-log.c | 19 +- fs/btrfs/tree-log.h | 2 +- fs/btrfs/volumes.c | 5 +- fs/btrfs/xattr.c | 3 + fs/btrfs/zoned.c | 20 + fs/btrfs/zoned.h | 1 + fs/cifs/smb2ops.c | 12 +- fs/fs-writeback.c | 12 +- fs/io_uring.c | 7 +- fs/namespace.c | 7 + fs/nfs/nfs4file.c | 16 +- fs/ntfs3/xattr.c | 16 +- fs/proc/task_mmu.c | 7 +- fs/zonefs/super.c | 3 +- include/asm-generic/sections.h | 7 +- include/linux/blkdev.h | 11 + include/linux/cpumask.h | 18 + include/linux/memcontrol.h | 15 +- include/linux/mlx5/driver.h | 1 + include/linux/netdevice.h | 20 +- include/linux/netfilter_bridge/ebtables.h | 4 - include/net/busy_poll.h | 2 +- include/net/netfilter/nf_flow_table.h | 3 + include/net/netfilter/nf_tables.h | 10 +- include/net/netfilter/nf_tables_core.h | 9 + include/net/tcp.h | 2 + kernel/audit_fsnotify.c | 1 + kernel/bpf/verifier.c | 10 +- kernel/cgroup/cgroup.c | 1 + kernel/sys_ni.c | 1 + lib/ratelimit.c | 12 +- mm/backing-dev.c | 10 +- mm/bootmem_info.c | 2 + mm/damon/dbgfs.c | 3 + mm/mmap.c | 8 +- mm/page-writeback.c | 6 +- net/8021q/vlan_dev.c | 6 +- net/bridge/netfilter/ebtable_broute.c | 8 - net/bridge/netfilter/ebtable_filter.c | 8 - net/bridge/netfilter/ebtable_nat.c | 8 - net/bridge/netfilter/ebtables.c | 8 +- net/core/bpf_sk_storage.c | 5 +- net/core/dev.c | 18 +- net/core/filter.c | 13 +- net/core/gro_cells.c | 2 +- net/core/skbuff.c | 2 +- net/core/sock.c | 18 +- net/core/sysctl_net_core.c | 15 +- net/dsa/slave.c | 4 +- net/hsr/hsr_device.c | 2 +- net/hsr/hsr_main.c | 2 +- net/ipv4/devinet.c | 16 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ip_sockglue.c | 6 +- net/ipv4/tcp.c | 12 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/addrconf.c | 5 +- net/ipv6/ipv6_sockglue.c | 4 +- net/key/af_key.c | 3 + net/mptcp/protocol.c | 138 ++- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_flow_table_core.c | 15 +- net/netfilter/nf_flow_table_offload.c | 8 + net/netfilter/nf_tables_api.c | 96 +- net/netfilter/nf_tables_core.c | 55 +- net/netfilter/nft_bitwise.c | 67 +- net/netfilter/nft_cmp.c | 140 ++- net/netfilter/nft_immediate.c | 22 +- net/netfilter/nft_osf.c | 18 +- net/netfilter/nft_payload.c | 29 +- net/netfilter/nft_range.c | 27 +- net/netfilter/nft_tunnel.c | 1 + net/rose/rose_loopback.c | 3 +- net/rxrpc/call_object.c | 4 +- net/rxrpc/sendmsg.c | 92 +- net/sched/sch_generic.c | 2 +- net/socket.c | 2 +- net/sunrpc/clnt.c | 2 +- net/xfrm/espintcp.c | 2 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_policy.c | 3 +- net/xfrm/xfrm_state.c | 1 + tools/perf/Makefile.config | 2 +- tools/perf/builtin-stat.c | 1 + 154 files changed, 2271 insertions(+), 1316 deletions(-)

1 year, 3 months

11
154
0 0

[PATCH] drm/i915/slpc: Fix PCODE IA Freq requests when using SLPC

by Rodrigo Vivi

We need to inform PCODE of a desired ring frequencies so PCODE update the memory frequencies to us. rps->min_freq and rps->max_freq are the frequencies used in that request. However they were unset when SLPC was enabled and PCODE never updated the memory freq. v2 (as Suggested by Ashutosh): if SLPC is in use, let's pick the right frequencies from the get_ia_constants instead of the fake init of rps' min and max. Fixes: 7ba79a671568 ("drm/i915/guc/slpc: Gate Host RPS when SLPC is enabled") Cc: <stable(a)vger.kernel.org> # v5.15+ Cc: Ashutosh Dixit <ashutosh.dixit(a)intel.com> Tested-by: Sushma Venkatesh Reddy <sushma.venkatesh.reddy(a)intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> --- drivers/gpu/drm/i915/gt/intel_llc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_llc.c b/drivers/gpu/drm/i915/gt/intel_llc.c index 14fe65812e42..766f9526da99 100644 --- a/drivers/gpu/drm/i915/gt/intel_llc.c +++ b/drivers/gpu/drm/i915/gt/intel_llc.c @@ -49,6 +49,7 @@ static unsigned int cpu_max_MHz(void) static bool get_ia_constants(struct intel_llc *llc, struct ia_constants *consts) { + struct intel_guc_slpc *slpc = &llc_to_gt(llc)->uc.guc.slpc; struct drm_i915_private *i915 = llc_to_gt(llc)->i915; struct intel_rps *rps = &llc_to_gt(llc)->rps; @@ -65,8 +66,13 @@ static bool get_ia_constants(struct intel_llc *llc, /* convert DDR frequency from units of 266.6MHz to bandwidth */ consts->min_ring_freq = mult_frac(consts->min_ring_freq, 8, 3); - consts->min_gpu_freq = rps->min_freq; - consts->max_gpu_freq = rps->max_freq; + if (intel_uc_uses_guc_slpc(&llc_to_gt(llc)->uc)) { + consts->min_gpu_freq = slpc->min_freq; + consts->max_gpu_freq = slpc->rp0_freq; + } else { + consts->min_gpu_freq = rps->min_freq; + consts->max_gpu_freq = rps->max_freq; + } if (GRAPHICS_VER(i915) >= 9) { /* Convert GT frequency to 50 HZ units */ consts->min_gpu_freq /= GEN9_FREQ_SCALER; -- 2.37.1

1 year, 3 months

3
10
0 0

[PATCH v3] driver core: Don't probe devices after bus_type.match() probe deferral

by Isaac J. Manjarres

Both __device_attach_driver() and __driver_attach() check the return code of the bus_type.match() function to see if the device needs to be added to the deferred probe list. After adding the device to the list, the logic attempts to bind the device to the driver anyway, as if the device had matched with the driver, which is not correct. If __device_attach_driver() detects that the device in question is not ready to match with a driver on the bus, then it doesn't make sense for the device to attempt to bind with the current driver or continue attempting to match with any of the other drivers on the bus. So, update the logic in __device_attach_driver() to reflect this. If __driver_attach() detects that a driver tried to match with a device that is not ready to match yet, then the driver should not attempt to bind with the device. However, the driver can still attempt to match and bind with other devices on the bus, as drivers can be bound to multiple devices. So, update the logic in __driver_attach() to reflect this. Cc: stable(a)vger.kernel.org Cc: Saravana Kannan <saravanak(a)google.com> Fixes: 656b8035b0ee ("ARM: 8524/1: driver cohandle -EPROBE_DEFER from bus_type.match()") Reported-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Isaac J. Manjarres <isaacmanjarres(a)google.com> Tested-by: Guenter Roeck <linux(a)roeck-us.net> Reviewed-by: Saravana Kannan <saravanak(a)google.com> --- drivers/base/dd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) v1 -> v2: - Fixed the logic in __driver_attach() to allow a driver to continue attempting to match and bind with devices in case of any error, not just probe deferral. v2 -> v3: - Restored the patch back to v1. - Added Guenter's Tested-by tag. - Added Saravana's Reviewed-by tag. - Cc'd stable(a)vger.kernel.org Greg, This is the final version of this patch. Can you please pick this up? Thanks, Isaac diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 70f79fc71539..90b31fb141a5 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -881,6 +881,11 @@ static int __device_attach_driver(struct device_driver *drv, void *_data) dev_dbg(dev, "Device match requests probe deferral\n"); dev->can_match = true; driver_deferred_probe_add(dev); + /* + * Device can't match with a driver right now, so don't attempt + * to match or bind with other drivers on the bus. + */ + return ret; } else if (ret < 0) { dev_dbg(dev, "Bus failed to match device: %d\n", ret); return ret; @@ -1120,6 +1125,11 @@ static int __driver_attach(struct device *dev, void *data) dev_dbg(dev, "Device match requests probe deferral\n"); dev->can_match = true; driver_deferred_probe_add(dev); + /* + * Driver could not match with device, but may match with + * another device on the bus. + */ + return 0; } else if (ret < 0) { dev_dbg(dev, "Bus failed to match device: %d\n", ret); return ret; -- 2.37.1.595.g718a3a8f04-goog

1 year, 3 months

5
5
0 0

[PATCH v3] arm64/kexec: Fix missing extra range for crashkres_low.

by Levi Yun

Like crashk_res, Calling crash_exclude_mem_range function with crashk_low_res area would need extra crash_mem range too. Add one more extra cmem slot in case of crashk_low_res is used. Signed-off-by: Levi Yun <ppbuk5246(a)gmail.com> Fixes: 944a45abfabc ("arm64: kdump: Reimplement crashkernel=X") Cc: <stable(a)vger.kernel.org> # 5.19.x Acked-by: Baoquan He <bhe(a)redhat.com> Reviewed-by: Catalin Marinas <catalin.marinas(a)arm.com> --- arch/arm64/kernel/machine_kexec_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 889951291cc0..a11a6e14ba89 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -47,7 +47,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) u64 i; phys_addr_t start, end; - nr_ranges = 1; /* for exclusion of crashkernel region */ + nr_ranges = 2; /* for exclusion of crashkernel region */ for_each_mem_range(i, &start, &end) nr_ranges++; -- 2.35.1

1 year, 3 months

2
1
0 0

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2022