- Linux-stable-mirror - lists.linaro.org

[PATCH] btrfs: relocation: fix reloc_root lifespan and access

by David Sterba

From: Qu Wenruo <wqu(a)suse.com> This is what I'm going to commit, but as this has a long discussion behind I'm sending it to the mailinglist. * there are 2 helpers to avoid using raw barriers in the tests where there are at least 2 places * each barrier is commented * subject and changelog have been updated to reflect the changes https://lore.kernel.org/linux-btrfs/20200108051200.8909-1-wqu@suse.com/ --- [BUG] There are several different KASAN reports for balance + snapshot workloads. Involved call paths include: should_ignore_root+0x54/0xb0 [btrfs] build_backref_tree+0x11af/0x2280 [btrfs] relocate_tree_blocks+0x391/0xb80 [btrfs] relocate_block_group+0x3e5/0xa00 [btrfs] btrfs_relocate_block_group+0x240/0x4d0 [btrfs] btrfs_relocate_chunk+0x53/0xf0 [btrfs] btrfs_balance+0xc91/0x1840 [btrfs] btrfs_ioctl_balance+0x416/0x4e0 [btrfs] btrfs_ioctl+0x8af/0x3e60 [btrfs] do_vfs_ioctl+0x831/0xb10 create_reloc_root+0x9f/0x460 [btrfs] btrfs_reloc_post_snapshot+0xff/0x6c0 [btrfs] create_pending_snapshot+0xa9b/0x15f0 [btrfs] create_pending_snapshots+0x111/0x140 [btrfs] btrfs_commit_transaction+0x7a6/0x1360 [btrfs] btrfs_mksubvol+0x915/0x960 [btrfs] btrfs_ioctl_snap_create_transid+0x1d5/0x1e0 [btrfs] btrfs_ioctl_snap_create_v2+0x1d3/0x270 [btrfs] btrfs_ioctl+0x241b/0x3e60 [btrfs] do_vfs_ioctl+0x831/0xb10 btrfs_reloc_pre_snapshot+0x85/0xc0 [btrfs] create_pending_snapshot+0x209/0x15f0 [btrfs] create_pending_snapshots+0x111/0x140 [btrfs] btrfs_commit_transaction+0x7a6/0x1360 [btrfs] btrfs_mksubvol+0x915/0x960 [btrfs] btrfs_ioctl_snap_create_transid+0x1d5/0x1e0 [btrfs] btrfs_ioctl_snap_create_v2+0x1d3/0x270 [btrfs] btrfs_ioctl+0x241b/0x3e60 [btrfs] do_vfs_ioctl+0x831/0xb10 [CAUSE] All these call sites are only relying on root->reloc_root, which can undergo btrfs_drop_snapshot(), and since we don't have real refcount based protection to reloc roots, we can reach already dropped reloc root, triggering KASAN. [FIX] To avoid such access to unstable root->reloc_root, we should check BTRFS_ROOT_DEAD_RELOC_TREE bit first. This patch introduces wrappers that provide the correct way to check the bit with memory barriers protection. Most callers don't distinguish merged reloc tree and no reloc tree. The only exception is should_ignore_root(), as merged reloc tree can be ignored, while no reloc tree shouldn't. [CRITICAL SECTION ANALYSIS] Although test_bit()/set_bit()/clear_bit() doesn't imply a barrier, the DEAD_RELOC_TREE bit has extra help from transaction as a higher level barrier, the lifespan of root::reloc_root and DEAD_RELOC_TREE bit are: NULL: reloc_root is NULL PTR: reloc_root is not NULL 0: DEAD_RELOC_ROOT bit not set DEAD: DEAD_RELOC_ROOT bit set (NULL, 0) Initial state __ | /\ Section A btrfs_init_reloc_root() \/ | __ (PTR, 0) reloc_root initialized /\ | | btrfs_update_reloc_root() | Section B | | (PTR, DEAD) reloc_root has been merged \/ | __ === btrfs_commit_transaction() ==================== | /\ clean_dirty_subvols() | | | Section C (NULL, DEAD) reloc_root cleanup starts \/ | __ btrfs_drop_snapshot() /\ | | Section D (NULL, 0) Back to initial state \/ Every have_reloc_root() or test_bit(DEAD_RELOC_ROOT) caller holds transaction handle, so none of such caller can cross transaction boundary. In Section A, every caller just found no DEAD bit, and grab reloc_root. In the cross section A-B, caller may get no DEAD bit, but since reloc_root is still completely valid thus accessing reloc_root is completely safe. No test_bit() caller can cross the boundary of Section B and Section C. In Section C, every caller found the DEAD bit, so no one will access reloc_root. In the cross section C-D, either caller gets the DEAD bit set, avoiding access reloc_root no matter if it's safe or not. Or caller get the DEAD bit cleared, then access reloc_root, which is already NULL, nothing will be wrong. The memory write barriers are between the reloc_root updates and bit set/clear, the pairing read side is before test_bit. Reported-by: Zygo Blaxell <ce3g8jdj(a)umail.furryterror.org> Fixes: d2311e698578 ("btrfs: relocation: Delay reloc tree deletion after merge_reloc_roots") CC: stable(a)vger.kernel.org # 5.4+ Suggested-by: David Sterba <dsterba(a)suse.com> Signed-off-by: Qu Wenruo <wqu(a)suse.com> [ barriers ] Signed-off-by: David Sterba <dsterba(a)suse.com> --- fs/btrfs/relocation.c | 51 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index af4dd49a71c7..995d4b8b1cfd 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -517,6 +517,34 @@ static int update_backref_cache(struct btrfs_trans_handle *trans, return 1; } +static bool reloc_root_is_dead(struct btrfs_root *root) +{ + /* + * Pair with set_bit/clear_bit in clean_dirty_subvols and + * btrfs_update_reloc_root. We need to see the updated bit before + * trying to access reloc_root + */ + smp_rmb(); + if (test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state)) + return true; + return false; +} + +/* + * Check if this subvolume tree has valid reloc tree. + * + * Reloc tree after swap is considered dead, thus not considered as valid. + * This is enough for most callers, as they don't distinguish dead reloc root + * from no reloc root. But should_ignore_root() below is a special case. + */ +static bool have_reloc_root(struct btrfs_root *root) +{ + if (reloc_root_is_dead(root)) + return false; + if (!root->reloc_root) + return false; + return true; +} static int should_ignore_root(struct btrfs_root *root) { @@ -525,6 +553,10 @@ static int should_ignore_root(struct btrfs_root *root) if (!test_bit(BTRFS_ROOT_REF_COWS, &root->state)) return 0; + /* This root has been merged with its reloc tree, we can ignore it */ + if (reloc_root_is_dead(root)) + return 1; + reloc_root = root->reloc_root; if (!reloc_root) return 0; @@ -1439,7 +1471,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans, * The subvolume has reloc tree but the swap is finished, no need to * create/update the dead reloc tree */ - if (test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state)) + if (reloc_root_is_dead(root)) return 0; if (root->reloc_root) { @@ -1478,8 +1510,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, struct btrfs_root_item *root_item; int ret; - if (test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state) || - !root->reloc_root) + if (!have_reloc_root(root)) goto out; reloc_root = root->reloc_root; @@ -1489,6 +1520,11 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, if (fs_info->reloc_ctl->merge_reloc_tree && btrfs_root_refs(root_item) == 0) { set_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state); + /* + * Mark the tree as dead before we change reloc_root so + * have_reloc_root will not touch it from now on. + */ + smp_wmb(); __del_reloc_root(reloc_root); } @@ -2201,6 +2237,11 @@ static int clean_dirty_subvols(struct reloc_control *rc) if (ret2 < 0 && !ret) ret = ret2; } + /* + * Need barrier to ensure clear_bit() only happens after + * root->reloc_root = NULL. Pairs with have_reloc_root. + */ + smp_wmb(); clear_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state); btrfs_put_fs_root(root); } else { @@ -4730,7 +4771,7 @@ void btrfs_reloc_pre_snapshot(struct btrfs_pending_snapshot *pending, struct btrfs_root *root = pending->root; struct reloc_control *rc = root->fs_info->reloc_ctl; - if (!root->reloc_root || !rc) + if (!rc || !have_reloc_root(root)) return; if (!rc->merge_reloc_tree) @@ -4764,7 +4805,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans, struct reloc_control *rc = root->fs_info->reloc_ctl; int ret; - if (!root->reloc_root || !rc) + if (!rc || !have_reloc_root(root)) return 0; rc = root->fs_info->reloc_ctl; -- 2.24.0

5 years, 10 months

3
2
0 0

[patch 10/11] mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid

by Andrew Morton

From: Adrian Huang <ahuang12(a)lenovo.com> Subject: mm: memcg/slab: call flush_memcg_workqueue() only if memcg workqueue is valid When booting with amd_iommu=off, the following WARNING message appears: AMD-Vi: AMD IOMMU disabled on kernel command-line ------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at kernel/workqueue.c:2772 flush_workqueue+0x42e/0x450 Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.5.0-rc3-amd-iommu #6 Hardware name: Lenovo ThinkSystem SR655-2S/7D2WRCZ000, BIOS D8E101L-1.00 12/05/2019 RIP: 0010:flush_workqueue+0x42e/0x450 Code: ff 0f 0b e9 7a fd ff ff 4d 89 ef e9 33 fe ff ff 0f 0b e9 7f fd ff ff 0f 0b e9 bc fd ff ff 0f 0b e9 a8 fd ff ff e8 52 2c fe ff <0f> 0b 31 d2 48 c7 c6 e0 88 c5 95 48 c7 c7 d8 ad f0 95 e8 19 f5 04 RSP: 0000:ffffffff96203d80 EFLAGS: 00010246 RAX: ffffffff96203dc8 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffffffff96a63120 RSI: ffffffff95efcba2 RDI: ffffffff96203dc0 RBP: ffffffff96203e08 R08: 0000000000000000 R09: ffffffff962a1828 R10: 00000000f0000080 R11: dead000000000100 R12: ffff8d8a87c0a770 R13: dead000000000100 R14: 0000000000000456 R15: ffffffff96203da0 FS: 0000000000000000(0000) GS:ffff8d8dbd000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff8d91cfbff000 CR3: 000000078920a000 CR4: 00000000000406b0 Call Trace: ? wait_for_completion+0x51/0x180 kmem_cache_destroy+0x69/0x260 iommu_go_to_state+0x40c/0x5ab amd_iommu_prepare+0x16/0x2a irq_remapping_prepare+0x36/0x5f enable_IR_x2apic+0x21/0x172 default_setup_apic_routing+0x12/0x6f apic_intr_mode_init+0x1a1/0x1f1 x86_late_time_init+0x17/0x1c start_kernel+0x480/0x53f secondary_startup_64+0xb6/0xc0 ---[ end trace 30894107c3749449 ]--- x2apic: IRQ remapping doesn't support X2APIC mode x2apic disabled The warning is caused by the calling of 'kmem_cache_destroy()' in free_iommu_resources(). Here is the call path: free_iommu_resources kmem_cache_destroy flush_memcg_workqueue flush_workqueue The root cause is that the IOMMU subsystem runs before the workqueue subsystem, which the variable 'wq_online' is still 'false'. This leads to the statement 'if (WARN_ON(!wq_online))' in flush_workqueue() is 'true'. Since the variable 'memcg_kmem_cache_wq' is not allocated during the time, it is unnecessary to call flush_memcg_workqueue(). This prevents the WARNING message triggered by flush_workqueue(). Link: http://lkml.kernel.org/r/20200103085503.1665-1-ahuang12@lenovo.com Fixes: 92ee383f6daab ("mm: fix race between kmem_cache destroy, create and deactivate") Signed-off-by: Adrian Huang <ahuang12(a)lenovo.com> Reported-by: Xiaochun Lee <lixc17(a)lenovo.com> Reviewed-by: Shakeel Butt <shakeelb(a)google.com> Cc: Joerg Roedel <jroedel(a)suse.de> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: Michal Hocko <mhocko(a)kernel.org> Cc: Johannes Weiner <hannes(a)cmpxchg.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/slab_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/slab_common.c~mm-memcg-slab-call-flush_memcg_workqueue-only-if-memcg-workqueue-is-valid +++ a/mm/slab_common.c @@ -903,7 +903,8 @@ static void flush_memcg_workqueue(struct * deactivates the memcg kmem_caches through workqueue. Make sure all * previous workitems on workqueue are processed. */ - flush_workqueue(memcg_kmem_cache_wq); + if (likely(memcg_kmem_cache_wq)) + flush_workqueue(memcg_kmem_cache_wq); /* * If we're racing with children kmem_cache deactivation, it might _

5 years, 10 months

1
0
0 0

[patch 06/11] mm, debug_pagealloc: don't rely on static keys too early

by Andrew Morton

From: Vlastimil Babka <vbabka(a)suse.cz> Subject: mm, debug_pagealloc: don't rely on static keys too early Commit 96a2b03f281d ("mm, debug_pagelloc: use static keys to enable debugging") has introduced a static key to reduce overhead when debug_pagealloc is compiled in but not enabled. It relied on the assumption that jump_label_init() is called before parse_early_param() as in start_kernel(), so when the "debug_pagealloc=on" option is parsed, it is safe to enable the static key. However, it turns out multiple architectures call parse_early_param() earlier from their setup_arch(). x86 also calls jump_label_init() even earlier, so no issue was found while testing the commit, but same is not true for e.g. ppc64 and s390 where the kernel would not boot with debug_pagealloc=on as found by our QA. To fix this without tricky changes to init code of multiple architectures, this patch partially reverts the static key conversion from 96a2b03f281d. Init-time and non-fastpath calls (such as in arch code) of debug_pagealloc_enabled() will again test a simple bool variable. Fastpath mm code is converted to a new debug_pagealloc_enabled_static() variant that relies on the static key, which is enabled in a well-defined point in mm_init() where it's guaranteed that jump_label_init() has been called, regardless of architecture. [sfr(a)canb.auug.org.au: export _debug_pagealloc_enabled_early] Link: http://lkml.kernel.org/r/20200106164944.063ac07b@canb.auug.org.au Link: http://lkml.kernel.org/r/20191219130612.23171-1-vbabka@suse.cz Fixes: 96a2b03f281d ("mm, debug_pagelloc: use static keys to enable debugging") Signed-off-by: Vlastimil Babka <vbabka(a)suse.cz> Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Cc: Michal Hocko <mhocko(a)kernel.org> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Qian Cai <cai(a)lca.pw> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/mm.h | 18 +++++++++++++++--- init/main.c | 1 + mm/page_alloc.c | 37 +++++++++++++------------------------ mm/slab.c | 4 ++-- mm/slub.c | 2 +- mm/vmalloc.c | 4 ++-- 6 files changed, 34 insertions(+), 32 deletions(-) --- a/include/linux/mm.h~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/include/linux/mm.h @@ -2658,14 +2658,26 @@ static inline bool want_init_on_free(voi !page_poisoning_enabled(); } -#ifdef CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT -DECLARE_STATIC_KEY_TRUE(_debug_pagealloc_enabled); +#ifdef CONFIG_DEBUG_PAGEALLOC +extern void init_debug_pagealloc(void); #else -DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled); +static inline void init_debug_pagealloc(void) {} #endif +extern bool _debug_pagealloc_enabled_early; +DECLARE_STATIC_KEY_FALSE(_debug_pagealloc_enabled); static inline bool debug_pagealloc_enabled(void) { + return IS_ENABLED(CONFIG_DEBUG_PAGEALLOC) && + _debug_pagealloc_enabled_early; +} + +/* + * For use in fast paths after init_debug_pagealloc() has run, or when a + * false negative result is not harmful when called too early. + */ +static inline bool debug_pagealloc_enabled_static(void) +{ if (!IS_ENABLED(CONFIG_DEBUG_PAGEALLOC)) return false; --- a/init/main.c~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/init/main.c @@ -553,6 +553,7 @@ static void __init mm_init(void) * bigger than MAX_ORDER unless SPARSEMEM. */ page_ext_init_flatmem(); + init_debug_pagealloc(); report_meminit(); mem_init(); kmem_cache_init(); --- a/mm/page_alloc.c~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/mm/page_alloc.c @@ -694,34 +694,27 @@ void prep_compound_page(struct page *pag #ifdef CONFIG_DEBUG_PAGEALLOC unsigned int _debug_guardpage_minorder; -#ifdef CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT -DEFINE_STATIC_KEY_TRUE(_debug_pagealloc_enabled); -#else +bool _debug_pagealloc_enabled_early __read_mostly + = IS_ENABLED(CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT); +EXPORT_SYMBOL(_debug_pagealloc_enabled_early); DEFINE_STATIC_KEY_FALSE(_debug_pagealloc_enabled); -#endif EXPORT_SYMBOL(_debug_pagealloc_enabled); DEFINE_STATIC_KEY_FALSE(_debug_guardpage_enabled); static int __init early_debug_pagealloc(char *buf) { - bool enable = false; - - if (kstrtobool(buf, &enable)) - return -EINVAL; - - if (enable) - static_branch_enable(&_debug_pagealloc_enabled); - - return 0; + return kstrtobool(buf, &_debug_pagealloc_enabled_early); } early_param("debug_pagealloc", early_debug_pagealloc); -static void init_debug_guardpage(void) +void init_debug_pagealloc(void) { if (!debug_pagealloc_enabled()) return; + static_branch_enable(&_debug_pagealloc_enabled); + if (!debug_guardpage_minorder()) return; @@ -1186,7 +1179,7 @@ static __always_inline bool free_pages_p */ arch_free_page(page, order); - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) kernel_map_pages(page, 1 << order, 0); kasan_free_nondeferred_pages(page, order); @@ -1207,7 +1200,7 @@ static bool free_pcp_prepare(struct page static bool bulkfree_pcp_prepare(struct page *page) { - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) return free_pages_check(page); else return false; @@ -1221,7 +1214,7 @@ static bool bulkfree_pcp_prepare(struct */ static bool free_pcp_prepare(struct page *page) { - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) return free_pages_prepare(page, 0, true); else return free_pages_prepare(page, 0, false); @@ -1973,10 +1966,6 @@ void __init page_alloc_init_late(void) for_each_populated_zone(zone) set_zone_contiguous(zone); - -#ifdef CONFIG_DEBUG_PAGEALLOC - init_debug_guardpage(); -#endif } #ifdef CONFIG_CMA @@ -2106,7 +2095,7 @@ static inline bool free_pages_prezeroed( */ static inline bool check_pcp_refill(struct page *page) { - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) return check_new_page(page); else return false; @@ -2128,7 +2117,7 @@ static inline bool check_pcp_refill(stru } static inline bool check_new_pcp(struct page *page) { - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) return check_new_page(page); else return false; @@ -2155,7 +2144,7 @@ inline void post_alloc_hook(struct page set_page_refcounted(page); arch_alloc_page(page, order); - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) kernel_map_pages(page, 1 << order, 1); kasan_alloc_pages(page, order); kernel_poison_pages(page, 1 << order, 1); --- a/mm/slab.c~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/mm/slab.c @@ -1416,7 +1416,7 @@ static void kmem_rcu_free(struct rcu_hea #if DEBUG static bool is_debug_pagealloc_cache(struct kmem_cache *cachep) { - if (debug_pagealloc_enabled() && OFF_SLAB(cachep) && + if (debug_pagealloc_enabled_static() && OFF_SLAB(cachep) && (cachep->size % PAGE_SIZE) == 0) return true; @@ -2008,7 +2008,7 @@ int __kmem_cache_create(struct kmem_cach * to check size >= 256. It guarantees that all necessary small * sized slab is initialized in current slab initialization sequence. */ - if (debug_pagealloc_enabled() && (flags & SLAB_POISON) && + if (debug_pagealloc_enabled_static() && (flags & SLAB_POISON) && size >= 256 && cachep->object_size > cache_line_size()) { if (size < PAGE_SIZE || size % PAGE_SIZE == 0) { size_t tmp_size = ALIGN(size, PAGE_SIZE); --- a/mm/slub.c~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/mm/slub.c @@ -288,7 +288,7 @@ static inline void *get_freepointer_safe unsigned long freepointer_addr; void *p; - if (!debug_pagealloc_enabled()) + if (!debug_pagealloc_enabled_static()) return get_freepointer(s, object); freepointer_addr = (unsigned long)object + s->offset; --- a/mm/vmalloc.c~mm-debug_pagealloc-dont-rely-on-static-keys-too-early +++ a/mm/vmalloc.c @@ -1383,7 +1383,7 @@ static void free_unmap_vmap_area(struct { flush_cache_vunmap(va->va_start, va->va_end); unmap_vmap_area(va); - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) flush_tlb_kernel_range(va->va_start, va->va_end); free_vmap_area_noflush(va); @@ -1681,7 +1681,7 @@ static void vb_free(const void *addr, un vunmap_page_range((unsigned long)addr, (unsigned long)addr + size); - if (debug_pagealloc_enabled()) + if (debug_pagealloc_enabled_static()) flush_tlb_kernel_range((unsigned long)addr, (unsigned long)addr + size); _

5 years, 10 months

1
0
0 0

[patch 05/11] mm: memcg/slab: fix percpu slab vmstats flushing

by Andrew Morton

From: Roman Gushchin <guro(a)fb.com> Subject: mm: memcg/slab: fix percpu slab vmstats flushing Currently slab percpu vmstats are flushed twice: during the memcg offlining and just before freeing the memcg structure. Each time percpu counters are summed, added to the atomic counterparts and propagated up by the cgroup tree. The second flushing is required due to how recursive vmstats are implemented: counters are batched in percpu variables on a local level, and once a percpu value is crossing some predefined threshold, it spills over to atomic values on the local and each ascendant levels. It means that without flushing some numbers cached in percpu variables will be dropped on floor each time a cgroup is destroyed. And with uptime the error on upper levels might become noticeable. The first flushing aims to make counters on ancestor levels more precise. Dying cgroups may resume in the dying state for a long time. After kmem_cache reparenting which is performed during the offlining slab counters of the dying cgroup don't have any chances to be updated, because any slab operations will be performed on the parent level. It means that the inaccuracy caused by percpu batching will not decrease up to the final destruction of the cgroup. By the original idea flushing slab counters during the offlining should minimize the visible inaccuracy of slab counters on the parent level. The problem is that percpu counters are not zeroed after the first flushing. So every cached percpu value is summed twice. It creates a small error (up to 32 pages per cpu, but usually less) which accumulates on parent cgroup level. After creating and destroying of thousands of child cgroups, slab counter on parent level can be way off the real value. For now, let's just stop flushing slab counters on memcg offlining. It can't be done correctly without scheduling a work on each cpu: reading and zeroing it during css offlining can race with an asynchronous update, which doesn't expect values to be changed underneath. With this change, slab counters on parent level will become eventually consistent. Once all dying children are gone, values are correct. And if not, the error is capped by 32 * NR_CPUS pages per dying cgroup. It's not perfect, as slab are reparented, so any updates after the reparenting will happen on the parent level. It means that if a slab page was allocated, a counter on child level was bumped, then the page was reparented and freed, the annihilation of positive and negative counter values will not happen until the child cgroup is released. It makes slab counters different from others, and it might want us to implement flushing in a correct form again. But it's also a question of performance: scheduling a work on each cpu isn't free, and it's an open question if the benefit of having more accurate counters is worth it. We might also consider flushing all counters on offlining, not only slab counters. So let's fix the main problem now: make the slab counters eventually consistent, so at least the error won't grow with uptime (or more precisely the number of created and destroyed cgroups). And think about the accuracy of counters separately. Link: http://lkml.kernel.org/r/20191220042728.1045881-1-guro@fb.com Fixes: bee07b33db78 ("mm: memcontrol: flush percpu slab vmstats on kmem offlining") Signed-off-by: Roman Gushchin <guro(a)fb.com> Acked-by: Johannes Weiner <hannes(a)cmpxchg.org> Acked-by: Michal Hocko <mhocko(a)suse.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/mmzone.h | 5 ++--- mm/memcontrol.c | 37 +++++++++---------------------------- 2 files changed, 11 insertions(+), 31 deletions(-) --- a/include/linux/mmzone.h~mm-memcg-slab-fix-percpu-slab-vmstats-flushing +++ a/include/linux/mmzone.h @@ -215,9 +215,8 @@ enum node_stat_item { NR_INACTIVE_FILE, /* " " " " " */ NR_ACTIVE_FILE, /* " " " " " */ NR_UNEVICTABLE, /* " " " " " */ - NR_SLAB_RECLAIMABLE, /* Please do not reorder this item */ - NR_SLAB_UNRECLAIMABLE, /* and this one without looking at - * memcg_flush_percpu_vmstats() first. */ + NR_SLAB_RECLAIMABLE, + NR_SLAB_UNRECLAIMABLE, NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */ NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */ WORKINGSET_NODES, --- a/mm/memcontrol.c~mm-memcg-slab-fix-percpu-slab-vmstats-flushing +++ a/mm/memcontrol.c @@ -3287,49 +3287,34 @@ static u64 mem_cgroup_read_u64(struct cg } } -static void memcg_flush_percpu_vmstats(struct mem_cgroup *memcg, bool slab_only) +static void memcg_flush_percpu_vmstats(struct mem_cgroup *memcg) { - unsigned long stat[MEMCG_NR_STAT]; + unsigned long stat[MEMCG_NR_STAT] = {0}; struct mem_cgroup *mi; int node, cpu, i; - int min_idx, max_idx; - - if (slab_only) { - min_idx = NR_SLAB_RECLAIMABLE; - max_idx = NR_SLAB_UNRECLAIMABLE; - } else { - min_idx = 0; - max_idx = MEMCG_NR_STAT; - } - - for (i = min_idx; i < max_idx; i++) - stat[i] = 0; for_each_online_cpu(cpu) - for (i = min_idx; i < max_idx; i++) + for (i = 0; i < MEMCG_NR_STAT; i++) stat[i] += per_cpu(memcg->vmstats_percpu->stat[i], cpu); for (mi = memcg; mi; mi = parent_mem_cgroup(mi)) - for (i = min_idx; i < max_idx; i++) + for (i = 0; i < MEMCG_NR_STAT; i++) atomic_long_add(stat[i], &mi->vmstats[i]); - if (!slab_only) - max_idx = NR_VM_NODE_STAT_ITEMS; - for_each_node(node) { struct mem_cgroup_per_node *pn = memcg->nodeinfo[node]; struct mem_cgroup_per_node *pi; - for (i = min_idx; i < max_idx; i++) + for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) stat[i] = 0; for_each_online_cpu(cpu) - for (i = min_idx; i < max_idx; i++) + for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) stat[i] += per_cpu( pn->lruvec_stat_cpu->count[i], cpu); for (pi = pn; pi; pi = parent_nodeinfo(pi, node)) - for (i = min_idx; i < max_idx; i++) + for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) atomic_long_add(stat[i], &pi->lruvec_stat[i]); } } @@ -3403,13 +3388,9 @@ static void memcg_offline_kmem(struct me parent = root_mem_cgroup; /* - * Deactivate and reparent kmem_caches. Then flush percpu - * slab statistics to have precise values at the parent and - * all ancestor levels. It's required to keep slab stats - * accurate after the reparenting of kmem_caches. + * Deactivate and reparent kmem_caches. */ memcg_deactivate_kmem_caches(memcg, parent); - memcg_flush_percpu_vmstats(memcg, true); kmemcg_id = memcg->kmemcg_id; BUG_ON(kmemcg_id < 0); @@ -4913,7 +4894,7 @@ static void mem_cgroup_free(struct mem_c * Flush percpu vmstats and vmevents to guarantee the value correctness * on parent's and all ancestor levels. */ - memcg_flush_percpu_vmstats(memcg, false); + memcg_flush_percpu_vmstats(memcg); memcg_flush_percpu_vmevents(memcg); __mem_cgroup_free(memcg); } _

5 years, 10 months

1
0
0 0

[patch 04/11] mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment

by Andrew Morton

From: "Kirill A. Shutemov" <kirill(a)shutemov.name> Subject: mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment Shmem/tmpfs tries to provide THP-friendly mappings if huge pages are enabled. But it doesn't work well with above-47bit hint address. Normally, the kernel doesn't create userspace mappings above 47-bit, even if the machine allows this (such as with 5-level paging on x86-64). Not all user space is ready to handle wide addresses. It's known that at least some JIT compilers use higher bits in pointers to encode their information. Userspace can ask for allocation from full address space by specifying hint address (with or without MAP_FIXED) above 47-bits. If the application doesn't need a particular address, but wants to allocate from whole address space it can specify -1 as a hint address. Unfortunately, this trick breaks THP alignment in shmem/tmp: shmem_get_unmapped_area() would not try to allocate PMD-aligned area if *any* hint address specified. This can be fixed by requesting the aligned area if the we failed to allocated at user-specified hint address. The request with inflated length will also take the user-specified hint address. This way we will not lose an allocation request from the full address space. [kirill(a)shutemov.name: fold in a fixup] Link: http://lkml.kernel.org/r/20191223231309.t6bh5hkbmokihpfu@box Link: http://lkml.kernel.org/r/20191220142548.7118-3-kirill.shutemov@linux.intel.… Fixes: b569bab78d8d ("x86/mm: Prepare to expose larger address space to userspace") Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Cc: "Willhalm, Thomas" <thomas.willhalm(a)intel.com> Cc: Dan Williams <dan.j.williams(a)intel.com> Cc: "Bruggeman, Otto G" <otto.g.bruggeman(a)intel.com> Cc: "Aneesh Kumar K . V" <aneesh.kumar(a)linux.vnet.ibm.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/shmem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/mm/shmem.c~thp-shmem-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment +++ a/mm/shmem.c @@ -2107,9 +2107,10 @@ unsigned long shmem_get_unmapped_area(st /* * Our priority is to support MAP_SHARED mapped hugely; * and support MAP_PRIVATE mapped hugely too, until it is COWed. - * But if caller specified an address hint, respect that as before. + * But if caller specified an address hint and we allocated area there + * successfully, respect that as before. */ - if (uaddr) + if (uaddr == addr) return addr; if (shmem_huge != SHMEM_HUGE_FORCE) { @@ -2143,7 +2144,7 @@ unsigned long shmem_get_unmapped_area(st if (inflated_len < len) return addr; - inflated_addr = get_area(NULL, 0, inflated_len, 0, flags); + inflated_addr = get_area(NULL, uaddr, inflated_len, 0, flags); if (IS_ERR_VALUE(inflated_addr)) return addr; if (inflated_addr & ~PAGE_MASK) _

5 years, 10 months

1
0
0 0

[patch 03/11] mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment

by Andrew Morton

From: "Kirill A. Shutemov" <kirill(a)shutemov.name> Subject: mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment Patch series "Fix two above-47bit hint address vs. THP bugs". The two get_unmapped_area() implementations have to be fixed to provide THP-friendly mappings if above-47bit hint address is specified. This patch (of 2): Filesystems use thp_get_unmapped_area() to provide THP-friendly mappings. For DAX in particular. Normally, the kernel doesn't create userspace mappings above 47-bit, even if the machine allows this (such as with 5-level paging on x86-64). Not all user space is ready to handle wide addresses. It's known that at least some JIT compilers use higher bits in pointers to encode their information. Userspace can ask for allocation from full address space by specifying hint address (with or without MAP_FIXED) above 47-bits. If the application doesn't need a particular address, but wants to allocate from whole address space it can specify -1 as a hint address. Unfortunately, this trick breaks thp_get_unmapped_area(): the function would not try to allocate PMD-aligned area if *any* hint address specified. Modify the routine to handle it correctly: - Try to allocate the space at the specified hint address with length padding required for PMD alignment. - If failed, retry without length padding (but with the same hint address); - If the returned address matches the hint address return it. - Otherwise, align the address as required for THP and return. The user specified hint address is passed down to get_unmapped_area() so above-47bit hint address will be taken into account without breaking alignment requirements. Link: http://lkml.kernel.org/r/20191220142548.7118-2-kirill.shutemov@linux.intel.… Fixes: b569bab78d8d ("x86/mm: Prepare to expose larger address space to userspace") Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Reported-by: Thomas Willhalm <thomas.willhalm(a)intel.com> Tested-by: Dan Williams <dan.j.williams(a)intel.com> Cc: "Aneesh Kumar K . V" <aneesh.kumar(a)linux.vnet.ibm.com> Cc: "Bruggeman, Otto G" <otto.g.bruggeman(a)intel.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/huge_memory.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) --- a/mm/huge_memory.c~thp-fix-conflict-of-above-47bit-hint-address-and-pmd-alignment +++ a/mm/huge_memory.c @@ -527,13 +527,13 @@ void prep_transhuge_page(struct page *pa set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR); } -static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long len, +static unsigned long __thp_get_unmapped_area(struct file *filp, + unsigned long addr, unsigned long len, loff_t off, unsigned long flags, unsigned long size) { - unsigned long addr; loff_t off_end = off + len; loff_t off_align = round_up(off, size); - unsigned long len_pad; + unsigned long len_pad, ret; if (off_end <= off_align || (off_end - off_align) < size) return 0; @@ -542,30 +542,40 @@ static unsigned long __thp_get_unmapped_ if (len_pad < len || (off + len_pad) < off) return 0; - addr = current->mm->get_unmapped_area(filp, 0, len_pad, + ret = current->mm->get_unmapped_area(filp, addr, len_pad, off >> PAGE_SHIFT, flags); - if (IS_ERR_VALUE(addr)) + + /* + * The failure might be due to length padding. The caller will retry + * without the padding. + */ + if (IS_ERR_VALUE(ret)) return 0; - addr += (off - addr) & (size - 1); - return addr; + /* + * Do not try to align to THP boundary if allocation at the address + * hint succeeds. + */ + if (ret == addr) + return addr; + + ret += (off - ret) & (size - 1); + return ret; } unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { + unsigned long ret; loff_t off = (loff_t)pgoff << PAGE_SHIFT; - if (addr) - goto out; if (!IS_DAX(filp->f_mapping->host) || !IS_ENABLED(CONFIG_FS_DAX_PMD)) goto out; - addr = __thp_get_unmapped_area(filp, len, off, flags, PMD_SIZE); - if (addr) - return addr; - - out: + ret = __thp_get_unmapped_area(filp, addr, len, off, flags, PMD_SIZE); + if (ret) + return ret; +out: return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags); } EXPORT_SYMBOL_GPL(thp_get_unmapped_area); _

5 years, 10 months

1
0
0 0

FAILED: patch "[PATCH] drm/i915/gt: Do not restore invalid RS state" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-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 103309977589fe6be0f4314de4925737cdfc146f Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris(a)chris-wilson.co.uk> Date: Sun, 29 Dec 2019 18:31:50 +0000 Subject: [PATCH] drm/i915/gt: Do not restore invalid RS state Only restore valid resource streamer state from the context image, i.e. avoid restoring if we know the image is invalid. Closes: https://gitlab.freedesktop.org/drm/intel/issues/446 Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Reviewed-by: Matthew Auld <matthew.auld(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191229183153.3719869-4-chri… Cc: stable(a)vger.kernel.org (cherry picked from commit ecfcd2da335816516dc27434a65899a77886d80a) Signed-off-by: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c index a47d5a7c32c9..93026217c121 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c @@ -1413,14 +1413,6 @@ static inline int mi_set_context(struct i915_request *rq, u32 flags) int len; u32 *cs; - flags |= MI_MM_SPACE_GTT; - if (IS_HASWELL(i915)) - /* These flags are for resource streamer on HSW+ */ - flags |= HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN; - else - /* We need to save the extended state for powersaving modes */ - flags |= MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN; - len = 4; if (IS_GEN(i915, 7)) len += 2 + (num_engines ? 4 * num_engines + 6 : 0); @@ -1589,22 +1581,21 @@ static int switch_context(struct i915_request *rq) } if (ce->state) { - u32 hw_flags; + u32 flags; GEM_BUG_ON(rq->engine->id != RCS0); - /* - * The kernel context(s) is treated as pure scratch and is not - * expected to retain any state (as we sacrifice it during - * suspend and on resume it may be corrupted). This is ok, - * as nothing actually executes using the kernel context; it - * is purely used for flushing user contexts. - */ - hw_flags = 0; - if (i915_gem_context_is_kernel(rq->gem_context)) - hw_flags = MI_RESTORE_INHIBIT; + /* For resource streamer on HSW+ and power context elsewhere */ + BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN); + BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN); + + flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT; + if (!i915_gem_context_is_kernel(rq->gem_context)) + flags |= MI_RESTORE_EXT_STATE_EN; + else + flags |= MI_RESTORE_INHIBIT; - ret = mi_set_context(rq, hw_flags); + ret = mi_set_context(rq, flags); if (ret) return ret; }

5 years, 10 months

1
0
0 0

[PATCH 5.4 000/165] 5.4.11-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.11 release. There are 165 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 Mon, 13 Jan 2020 09:46:17 +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.4.11-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.4.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.4.11-rc1 Qi Zhou <atmgnd(a)outlook.com> usb: missing parentheses in USE_NEW_SCHEME Daniele Palmas <dnlplm(a)gmail.com> USB: serial: option: add Telit ME910G1 0x110a composition Johan Hovold <johan(a)kernel.org> USB: core: fix check for duplicate endpoints Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: gadget: Fix request complete check Erez Shitrit <erezsh(a)mellanox.com> net/mlx5: DR, Init lists that are used in rule's member Eli Cohen <eli(a)mellanox.com> net/mlx5e: Fix hairpin RSS table size Yevgeny Kliteynik <kliteyn(a)mellanox.com> net/mlx5: DR, No need for atomic refcount for internal SW steering resources Eran Ben Elisha <eranbe(a)mellanox.com> net/mlx5e: Always print health reporter message to dmesg Baruch Siach <baruch(a)tkos.co.il> net: dsa: mv88e6xxx: force cmode write on 6141/6341 Michael Guralnik <michaelgur(a)mellanox.com> net/mlx5: Move devlink registration before interfaces load Stephen Boyd <sboyd(a)kernel.org> macb: Don't unregister clks unconditionally Eric Dumazet <edumazet(a)google.com> vlan: vlan_changelink() should propagate errors Eric Dumazet <edumazet(a)google.com> vlan: fix memory leak in vlan_dev_set_egress_priority Petr Machata <petrm(a)mellanox.com> net: sch_prio: When ungrafting, replace with FIFO Petr Machata <petrm(a)mellanox.com> mlxsw: spectrum_qdisc: Ignore grafting of invisible FIFO Hangbin Liu <liuhangbin(a)gmail.com> vxlan: fix tos value before xmit Pengcheng Yang <yangpc(a)wangsu.com> tcp: fix "old stuff" D-SACK causing SACK to be treated as D-SACK Xin Long <lucien.xin(a)gmail.com> sctp: free cmd->obj.chunk for the unprocessed SCTP_CMD_REPLY Wen Yang <wenyang(a)linux.alibaba.com> sch_cake: avoid possible divide by zero in cake_enqueue() Eric Dumazet <edumazet(a)google.com> pkt_sched: fq: do not accept silly TCA_FQ_QUANTUM Eric Dumazet <edumazet(a)google.com> net: usb: lan78xx: fix possible skb leak Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Fixed link does not need MDIO Bus Chen-Yu Tsai <wens(a)csie.org> net: stmmac: dwmac-sunxi: Allow all RGMII modes Chen-Yu Tsai <wens(a)csie.org> net: stmmac: dwmac-sun8i: Allow all RGMII modes Andrew Lunn <andrew(a)lunn.ch> net: freescale: fec: Fix ethtool -d runtime PM Andrew Lunn <andrew(a)lunn.ch> net: dsa: mv88e6xxx: Preserve priority when setting CPU port. Eric Dumazet <edumazet(a)google.com> macvlan: do not assume mac_header is set in macvlan_broadcast() Eric Dumazet <edumazet(a)google.com> gtp: fix bad unlock balance in gtp_encap_enable_socket Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Do not create directories if lockdown is in affect Hangbin Liu <liuhangbin(a)gmail.com> selftests: pmtu: fix init mtu value in description Haiyang Zhang <haiyangz(a)microsoft.com> hv_netvsc: Fix unwanted rx_table reset Chan Shu Tak, Alex <alexchan(a)task.com.hk> llc2: Fix return statement of llc_stat_ev_rx_null_dsap_xid_c (and _test_c) Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: don't return -ENOTSUPP to userspace Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix promiscuous mode after reset Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: handle error due to unsupported transport mode David Jeffery <djeffery(a)redhat.com> sbitmap: only queue kyber's wait callback if not already active Helge Deller <deller(a)gmx.de> parisc: Fix compiler warnings in debug_core.c Yang Yingliang <yangyingliang(a)huawei.com> block: fix memleak when __blk_rq_map_user_iov() is failed Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix memleak in path handling error case Jan Höppner <hoeppner(a)linux.ibm.com> s390/dasd/cio: Interpret ccw_device_get_mdc return value correctly Bart Van Assche <bvanassche(a)acm.org> block: Fix a lockdep complaint triggered by request queue flushing Wei Li <liwei391(a)huawei.com> arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list Enrico Weigelt, metux IT consult <info(a)metux.net> platform/x86: pcengines-apuv2: fix simswap GPIO assignment Maxim Mikityanskiy <maximmi(a)mellanox.com> net/ixgbe: Fix concurrency issues between config flow and XSK Maxim Mikityanskiy <maximmi(a)mellanox.com> net/i40e: Fix concurrency issues between config flow and XSK Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix concurrency issues between config flow and XSK Maxim Mikityanskiy <maximmi(a)mellanox.com> xsk: Add rcu_read_lock around the XSK wakeup Pavel Tatashin <pasha.tatashin(a)soleen.com> tpm/tpm_ftpm_tee: add shutdown call back Chuhong Yuan <hslester96(a)gmail.com> drm/exynos: gsc: add missed component_del Christian Borntraeger <borntraeger(a)de.ibm.com> s390/purgatory: do not build purgatory with kcov, kasan and friends Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Always arm TX Timer at end of transmission start Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: RX buffer size must be 16 byte aligned Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: xgmac: Clear previous RX buffer size Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Do not accept invalid MTU values Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Determine earlier the size of RX buffer Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: selftests: Needs to check the number of Multicast regs Olof Johansson <olof(a)lixom.net> clk: Move clk_core_reparent_orphans() under CONFIG_OF Pavel Begunkov <asml.silence(a)gmail.com> io_uring: don't wait when under-submitting Robin Murphy <robin.murphy(a)arm.com> iommu/dma: Relax locking in iommu_dma_prepare_msi() Hanjun Guo <guohanjun(a)huawei.com> perf/smmuv3: Remove the leftover put_cpu() in error path Eric Sandeen <sandeen(a)redhat.com> fs: call fsnotify_sb_delete after evict_inodes Eric Sandeen <sandeen(a)redhat.com> fs: avoid softlockups in s_inodes iterators Roman Penyaev <rpenyaev(a)suse.de> block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT zhong jiang <zhongjiang(a)huawei.com> usb: typec: fusb302: Fix an undefined reference to 'extcon_get_state' Johannes Weiner <hannes(a)cmpxchg.org> psi: Fix a division error in psi poll() Johannes Weiner <hannes(a)cmpxchg.org> sched/psi: Fix sampling error and rare div0 crashes with cgroups and high uptime Alexander Shishkin <alexander.shishkin(a)linux.intel.com> perf/x86/intel: Fix PT PMI handling Peter Zijlstra <peterz(a)infradead.org> perf/x86: Fix potential out-of-bounds access Enrico Weigelt, metux IT consult <info(a)metux.net> scripts: package: mkdebian: add missing rsync dependency Thomas Hebb <tommyhebb(a)gmail.com> kconfig: don't crash on NULL expressions in expr_eq() Xiaotao Yin <xiaotao.yin(a)windriver.com> iommu/iova: Init the struct iova to fix the possible memleak Brendan Higgins <brendanhiggins(a)google.com> staging: axis-fifo: add unspecified HAS_IOMEM dependency Alexandre Belloni <alexandre.belloni(a)bootlin.com> clk: at91: fix possible deadlock Michael Walle <michael(a)walle.cc> spi: nxp-fspi: Ensure width is respected in spi-mem operations Andreas Kemnade <andreas(a)kemnade.info> regulator: rn5t618: fix module aliases Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: wm8962: fix lambda value Aditya Pakki <pakki001(a)umn.edu> rfkill: Fix incorrect check to avoid NULL pointer dereference Sven Schnelle <svens(a)stackframe.org> parisc: add missing __init annotation Sven Schnelle <svens(a)stackframe.org> parisc: fix compilation when KEXEC=n and KEXEC_FILE=y Cristian Birsan <cristian.birsan(a)microchip.com> net: usb: lan78xx: Fix error message format specifier Vishal Kulkarni <vishal(a)chelsio.com> cxgb4: Fix kernel panic while accessing sge_info Manish Chopra <manishc(a)marvell.com> bnx2x: Fix logic to get total no. of PFs per engine Manish Chopra <manishc(a)marvell.com> bnx2x: Do not handle requests from VFs after parity Chen Wandun <chenwandun(a)huawei.com> habanalabs: remove variable 'val' set but not used Oded Gabbay <oded.gabbay(a)gmail.com> habanalabs: rate limit error msg on waiting for CS Lorenz Bauer <lmb(a)cloudflare.com> bpf: Clear skb->tstamp in bpf_redirect when necessary Frederic Barrat <fbarrat(a)linux.ibm.com> ocxl: Fix potential memory leak on context creation Filipe Manana <fdmanana(a)suse.com> Btrfs: fix hole extent items with a zero size after range cloning Josef Bacik <josef(a)toxicpanda.com> btrfs: handle error in btrfs_cache_block_group Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/spinlocks: Include correct header for static key Srikar Dronamraju <srikar(a)linux.vnet.ibm.com> powerpc/vcpu: Assume dedicated processors as non-preempt Filipe Manana <fdmanana(a)suse.com> Btrfs: fix cloning range with a hole when using the NO_HOLES feature Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix error messages in qgroup_rescan_init Mike Rapoport <rppt(a)linux.ibm.com> powerpc: Ensure that swiotlb buffer is allocated from low memory Alexandre Torgue <alexandre.torgue(a)st.com> pinctrl: pinmux: fix a possible null pointer in pinmux_can_be_used_for_gpio Stefan Bühler <source(a)stbuehler.de> cfg80211: fix double-free after changing network namespace Fredrik Olofsson <fredrik.olofsson(a)anyfinetworks.com> mac80211: fix TID field in monitor mode transmit Jerome Brunet <jbrunet(a)baylibre.com> clk: walk orphan list on clock provider registration Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix missing reset delay handling Andrew Jeffery <andrew(a)aj.id.au> pinctrl: aspeed-g6: Fix LPC/eSPI mux configuration Leonard Crestez <leonard.crestez(a)nxp.com> ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS Michael Walle <michael(a)walle.cc> arm64: dts: ls1028a: fix reboot node Daniel T. Lee <danieltimlee(a)gmail.com> samples: bpf: fix syscall_tp due to unused syscall Daniel T. Lee <danieltimlee(a)gmail.com> samples: bpf: Replace symbol compare of trace_event SeongJae Park <sjpark(a)amazon.de> kselftest: Support old perl versions SeongJae Park <sjpark(a)amazon.de> kselftest/runner: Print new line in print of timeout log Tomi Valkeinen <tomi.valkeinen(a)ti.com> ARM: dts: am437x-gp/epos-evm: fix panel compatible Vignesh Raghavendra <vigneshr(a)ti.com> spi: spi-ti-qspi: Fix a bug when accessing non default CS Michael Petlan <mpetlan(a)redhat.com> perf header: Fix false warning when there are no duplicate cache entries Kajol Jain <kjain(a)linux.ibm.com> perf metricgroup: Fix printing event names of metric group with multiple events Toke Høiland-Jørgensen <toke(a)redhat.com> bpftool: Don't crash on missing jited insns or ksyms Paul Chaignon <paul.chaignon(a)orange.com> bpf, mips: Limit to 33 tail calls Paul Chaignon <paul.chaignon(a)orange.com> bpf, riscv: Limit to 33 tail calls Michael Walle <michael(a)walle.cc> arm64: dts: ls1028a: fix typo in TMU calibration data Stefan Wahren <wahrenst(a)gmx.net> ARM: dts: bcm283x: Fix critical trip point Tony Lindgren <tony(a)atomide.com> ARM: omap2plus_defconfig: Add back DEBUG_FS Mans Rullgard <mans(a)mansr.com> ARM: dts: am335x-sancloud-bbe: fix phy mode Curtis Malainey <cujomalainey(a)chromium.org> ASoC: SOF: Intel: split cht and byt debug window sizes Karol Trzcinski <karolx.trzcinski(a)linux.intel.com> ASoC: SOF: loader: snd_sof_fw_parse_ext_data log warning on unknown header Dragos Tarcatu <dragos_tarcatu(a)mentor.com> ASoC: topology: Check return value for soc_tplg_pcm_create() Dragos Tarcatu <dragos_tarcatu(a)mentor.com> ASoC: topology: Check return value for snd_soc_add_dai_link() Geert Uytterhoeven <geert+renesas(a)glider.be> reset: Do not register resource data for missing resets Chuhong Yuan <hslester96(a)gmail.com> spi: spi-cavium-thunderx: Add missing pci_release_regions() Florian Fainelli <f.fainelli(a)gmail.com> ARM: dts: Cygnus: Fix MDIO node address/size cells Marek Szyprowski <m.szyprowski(a)samsung.com> ARM: exynos_defconfig: Restore debugfs support Masami Hiramatsu <mhiramat(a)kernel.org> selftests: safesetid: Fix Makefile to set correct test program Masami Hiramatsu <mhiramat(a)kernel.org> selftests: safesetid: Check the return value of setuid/setgid Masami Hiramatsu <mhiramat(a)kernel.org> selftests: safesetid: Move link library to LDLIBS Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Fix multiple kprobe testcase Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Do not to use absolute debugfs path Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Fix ftrace test cases to check unsupported Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Fix to check the existence of set_ftrace_filter Florian Fainelli <f.fainelli(a)gmail.com> ARM: dts: BCM5301X: Fix MDIO node address/size cells Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables_offload: return EOPNOTSUPP if rule specifies no actions Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: skip module reference count bump on object updates Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: validate NFT_DATA_VALUE after nft_data_init() Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: validate NFT_SET_ELEM_INTERVAL_END Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: bogus lookup/get on consecutive elements in named sets Phil Sutter <phil(a)nwl.cc> netfilter: uapi: Avoid undefined left-shift in xt_sctp.h Sudeep Holla <sudeep.holla(a)arm.com> ARM: vexpress: Set-up shared OPP table instead of individual for each CPU Stefan Roese <sr(a)denx.de> ARM: dts: imx6ul: imx6ul-14x14-evk.dtsi: Fix SPI NOR probing Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> efi/earlycon: Remap entire framebuffer after page initialization Arvind Sankar <nivedita(a)alum.mit.edu> efi/gop: Fix memory leak in __gop_query32/64() Arvind Sankar <nivedita(a)alum.mit.edu> efi/gop: Return EFI_SUCCESS if a usable GOP was found Arvind Sankar <nivedita(a)alum.mit.edu> efi/gop: Return EFI_NOT_FOUND if there are no usable GOPs Florian Westphal <fw(a)strlen.de> selftests: netfilter: use randomized netns names Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcr_rt5640: Update quirk for Teclast X89 Dave Young <dyoung(a)redhat.com> x86/efi: Update e820 with reserved EFI boot services data to fix kexec breakage Wen Yang <wenyang(a)linux.alibaba.com> regulator: core: fix regulator_register() error paths to properly release rdev Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> libtraceevent: Copy pkg-config file to output folder when using O= Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> libtraceevent: Fix lib installation with O= qize wang <wangqize888888888(a)gmail.com> mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() wenxu <wenxu(a)ucloud.cn> netfilter: nf_tables_offload: Check for the NETDEV_UNREGISTER event Kai-Heng Feng <kai.heng.feng(a)canonical.com> x86/intel: Disable HPET on Intel Ice Lake platforms Florian Westphal <fw(a)strlen.de> netfilter: ctnetlink: netns exit must wait for callbacks Marco Elver <elver(a)google.com> locking/spinlock/debug: Fix various data races Linus Walleij <linus.walleij(a)linaro.org> spi: fsl: Handle the single hardwired chipselect case Linus Walleij <linus.walleij(a)linaro.org> gpio: Handle counting of Freescale chipselects Linus Walleij <linus.walleij(a)linaro.org> spi: fsl: Fix GPIO descriptor support Tzung-Bi Shih <tzungbi(a)google.com> ASoC: max98090: fix possible race conditions Wen Yang <wenyang(a)linux.alibaba.com> regulator: fix use after free issue Jarkko Nikula <jarkko.nikula(a)linux.intel.com> spi: pxa2xx: Add support for Intel Jasper Lake Shuming Fan <shumingf(a)realtek.com> ASoC: rt5682: fix i2c arbitration lost issue Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix passing modified ctx to ld/abs/ind instruction Andrey Konovalov <andreyknvl(a)google.com> USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/am335x-sancloud-bbe.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- arch/arm/boot/dts/bcm-cygnus.dtsi | 4 +- arch/arm/boot/dts/bcm283x.dtsi | 2 +- arch/arm/boot/dts/bcm5301x.dtsi | 4 +- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- arch/arm/configs/exynos_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-vexpress/spc.c | 12 +- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 10 +- arch/arm64/kernel/cpu_errata.c | 1 + arch/mips/net/ebpf_jit.c | 9 +- arch/parisc/include/asm/cmpxchg.h | 10 +- arch/parisc/include/asm/kexec.h | 4 - arch/parisc/kernel/Makefile | 2 +- arch/parisc/kernel/drivers.c | 2 +- arch/powerpc/include/asm/spinlock.h | 5 +- arch/powerpc/mm/mem.c | 8 + arch/powerpc/platforms/pseries/setup.c | 7 + arch/riscv/net/bpf_jit_comp.c | 4 +- arch/s390/purgatory/Makefile | 6 +- arch/s390/purgatory/string.c | 3 + arch/x86/events/core.c | 19 +- arch/x86/kernel/early-quirks.c | 2 + arch/x86/platform/efi/quirks.c | 6 +- block/blk-core.c | 11 +- block/blk-flush.c | 5 + block/blk-map.c | 2 +- block/blk.h | 1 + drivers/bus/ti-sysc.c | 4 + drivers/char/tpm/tpm_ftpm_tee.c | 22 +- drivers/clk/at91/at91sam9260.c | 2 +- drivers/clk/at91/at91sam9rl.c | 2 +- drivers/clk/at91/at91sam9x5.c | 2 +- drivers/clk/at91/pmc.c | 2 +- drivers/clk/at91/sama5d2.c | 2 +- drivers/clk/at91/sama5d4.c | 2 +- drivers/clk/clk.c | 62 ++-- drivers/firmware/efi/earlycon.c | 40 +++ drivers/firmware/efi/libstub/gop.c | 80 ++--- drivers/gpio/gpiolib-of.c | 27 ++ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 + drivers/iommu/dma-iommu.c | 17 +- drivers/iommu/iova.c | 2 +- drivers/misc/habanalabs/command_submission.c | 5 +- drivers/misc/habanalabs/context.c | 2 +- drivers/misc/habanalabs/goya/goya.c | 15 +- drivers/misc/ocxl/context.c | 8 +- drivers/net/dsa/mv88e6xxx/global1.c | 5 + drivers/net/dsa/mv88e6xxx/global1.h | 1 + drivers/net/dsa/mv88e6xxx/port.c | 12 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 12 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 12 + drivers/net/ethernet/cadence/macb_main.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 + drivers/net/ethernet/freescale/fec_main.c | 9 + drivers/net/ethernet/intel/i40e/i40e.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 16 + .../net/ethernet/mellanox/mlx5/core/en/health.c | 7 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 22 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 1 + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 16 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 19 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 16 +- .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 5 +- .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 10 +- .../mellanox/mlx5/core/steering/dr_types.h | 14 +- .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 3 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 40 ++- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 + drivers/net/gtp.c | 5 +- drivers/net/hyperv/hyperv_net.h | 3 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/hyperv/rndis_filter.c | 10 +- drivers/net/macvlan.c | 2 +- drivers/net/usb/lan78xx.c | 11 +- drivers/net/vxlan.c | 4 +- drivers/net/wireless/marvell/mwifiex/tdls.c | 70 ++++- drivers/perf/arm_smmuv3_pmu.c | 4 +- drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 24 +- drivers/pinctrl/pinmux.c | 2 +- drivers/platform/x86/pcengines-apuv2.c | 2 +- drivers/regulator/core.c | 12 +- drivers/regulator/rn5t618-regulator.c | 1 + drivers/reset/core.c | 4 +- drivers/s390/block/dasd_eckd.c | 28 +- drivers/s390/cio/device_ops.c | 2 +- drivers/s390/net/qeth_core_main.c | 14 +- drivers/s390/net/qeth_core_mpc.h | 5 + drivers/s390/net/qeth_core_sys.c | 2 +- drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l2_sys.c | 3 +- drivers/s390/net/qeth_l3_main.c | 1 + drivers/spi/spi-cavium-thunderx.c | 2 + drivers/spi/spi-fsl-spi.c | 15 +- drivers/spi/spi-nxp-fspi.c | 2 +- drivers/spi/spi-pxa2xx.c | 4 + drivers/spi/spi-ti-qspi.c | 6 +- drivers/staging/axis-fifo/Kconfig | 2 +- drivers/usb/core/config.c | 70 ++++- drivers/usb/core/hub.c | 2 +- drivers/usb/dwc3/gadget.c | 7 + drivers/usb/gadget/udc/dummy_hcd.c | 8 +- drivers/usb/serial/option.c | 2 + drivers/usb/typec/tcpm/Kconfig | 1 + fs/btrfs/extent-tree.c | 20 +- fs/btrfs/file.c | 4 +- fs/btrfs/ioctl.c | 16 +- fs/btrfs/qgroup.c | 4 +- fs/drop_caches.c | 2 +- fs/inode.c | 7 + fs/io_uring.c | 4 + fs/notify/fsnotify.c | 4 + fs/quota/dquot.c | 1 + fs/super.c | 4 +- include/linux/if_ether.h | 8 + include/uapi/linux/netfilter/xt_sctp.h | 6 +- kernel/bpf/verifier.c | 9 +- kernel/locking/spinlock_debug.c | 32 +- kernel/sched/psi.c | 5 +- kernel/trace/ring_buffer.c | 6 + kernel/trace/trace.c | 17 ++ lib/sbitmap.c | 2 +- net/8021q/vlan.h | 1 + net/8021q/vlan_dev.c | 3 +- net/8021q/vlan_netlink.c | 19 +- net/core/filter.c | 1 + net/ipv4/tcp_input.c | 5 +- net/llc/llc_station.c | 4 +- net/mac80211/tx.c | 9 + net/netfilter/nf_conntrack_netlink.c | 3 + net/netfilter/nf_tables_api.c | 18 +- net/netfilter/nf_tables_offload.c | 6 + net/netfilter/nft_bitwise.c | 4 +- net/netfilter/nft_cmp.c | 6 + net/netfilter/nft_range.c | 10 + net/netfilter/nft_set_rbtree.c | 21 +- net/rfkill/core.c | 7 +- net/sched/sch_cake.c | 2 +- net/sched/sch_fq.c | 6 +- net/sched/sch_prio.c | 10 +- net/sctp/sm_sideeffect.c | 28 +- net/wireless/core.c | 1 + net/xdp/xsk.c | 22 +- samples/bpf/syscall_tp_kern.c | 18 +- samples/bpf/trace_event_user.c | 4 +- scripts/kconfig/expr.c | 7 + scripts/package/mkdebian | 2 +- sound/soc/codecs/max98090.c | 8 +- sound/soc/codecs/max98090.h | 1 - sound/soc/codecs/rt5682.c | 2 + sound/soc/codecs/wm8962.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 8 +- sound/soc/soc-topology.c | 27 +- sound/soc/sof/intel/byt.c | 7 +- sound/soc/sof/loader.c | 2 + tools/bpf/bpftool/prog.c | 2 +- tools/bpf/bpftool/xlated_dumper.c | 2 +- tools/lib/traceevent/Makefile | 6 +- tools/perf/util/header.c | 21 +- tools/perf/util/metricgroup.c | 7 +- .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 2 + .../selftests/ftrace/test.d/ftrace/func_cpumask.tc | 5 + tools/testing/selftests/ftrace/test.d/functions | 5 +- .../ftrace/test.d/kprobe/multiple_kprobes.tc | 6 +- .../inter-event/trigger-action-hist-xfail.tc | 4 +- .../inter-event/trigger-onchange-action-hist.tc | 2 +- .../inter-event/trigger-snapshot-action-hist.tc | 4 +- tools/testing/selftests/kselftest/prefix.pl | 1 + tools/testing/selftests/kselftest/runner.sh | 1 + tools/testing/selftests/net/pmtu.sh | 6 +- tools/testing/selftests/netfilter/nft_nat.sh | 332 +++++++++++---------- tools/testing/selftests/safesetid/Makefile | 5 +- tools/testing/selftests/safesetid/safesetid-test.c | 15 +- 191 files changed, 1240 insertions(+), 687 deletions(-)

5 years, 10 months

5
170
0 0

Please apply 0b9aefea8600 ("tcp: minimize false-positives on TCP/GRO check") to v4.9.y

by Salvatore Bonaccorso

Hi Greg, hi Sasha As per https://bugzilla.kernel.org/show_bug.cgi?id=194569 applying the commit 0b9aefea8600 ("tcp: minimize false-positives on TCP/GRO check") would reduce the false-positives. dcb17d22e1c2 was introduced in v4.9. Thoughs? Can you consider applying it for 4.9.y? Regards, Salvatore

5 years, 10 months

2
1
0 0

[PATCH] Input: keyspan-remote: fix control-message timeouts

by Johan Hovold

The driver was issuing synchronous uninterruptible control requests without using a timeout. This could lead to the driver hanging on probe due to a malfunctioning (or malicious) device until the device is physically disconnected. While sleeping in probe the driver prevents other devices connected to the same hub from being added to (or removed from) the bus. The USB upper limit of five seconds per request should be more than enough. Fixes: 99f83c9c9ac9 ("[PATCH] USB: add driver for Keyspan Digital Remote") Cc: stable <stable(a)vger.kernel.org> # 2.6.13 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/input/misc/keyspan_remote.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c index 83368f1e7c4e..4650f4a94989 100644 --- a/drivers/input/misc/keyspan_remote.c +++ b/drivers/input/misc/keyspan_remote.c @@ -336,7 +336,8 @@ static int keyspan_setup(struct usb_device* dev) int retval = 0; retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), - 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0); + 0x11, 0x40, 0x5601, 0x0, NULL, 0, + USB_CTRL_SET_TIMEOUT); if (retval) { dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n", __func__, retval); @@ -344,7 +345,8 @@ static int keyspan_setup(struct usb_device* dev) } retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), - 0x44, 0x40, 0x0, 0x0, NULL, 0, 0); + 0x44, 0x40, 0x0, 0x0, NULL, 0, + USB_CTRL_SET_TIMEOUT); if (retval) { dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n", __func__, retval); @@ -352,7 +354,8 @@ static int keyspan_setup(struct usb_device* dev) } retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), - 0x22, 0x40, 0x0, 0x0, NULL, 0, 0); + 0x22, 0x40, 0x0, 0x0, NULL, 0, + USB_CTRL_SET_TIMEOUT); if (retval) { dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n", __func__, retval); -- 2.24.1

5 years, 10 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror