6.18.52-rc1 review
Greg Kroah-Hartman
maintainerPATCH 79/1518 dm-pcache: reject a kset that overruns its segment
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryam Vargas <[email protected]>
[ Upstream commit 7ac1f10f987a2ffae4aecf0e2ceca8f552b665cb ]
cache_replay(), the writeback worker and the GC worker read a kset of get_kset_onmedia_size() bytes and advance the position by it. A forged key_num makes that size exceed the segment's remaining space, so the advance walks past the segment and trips the cache_pos_advance() BUG_ON.
Reject a kset whose on-media size exceeds cache_seg_remain() before use.
--- drivers/md/dm-pcache/cache.h | 1 + drivers/md/dm-pcache/cache_gc.c | 5 +++++ drivers/md/dm-pcache/cache_key.c | 5 +++++ drivers/md/dm-pcache/cache_writeback.c | 8 ++++++++ 4 files changed, 19 insertions(+)
drivers/md/dm-pcache/cache.h +1 -0
@@ -180,6 +180,7 @@ struct pcache_cache {u32 advance;int ret; } writeback_ctx; +atomic_t writeback_errors;char gc_kset_onmedia_buf[PCACHE_KSET_ONMEDIA_SIZE_MAX ];struct delayed_work gc_work;
drivers/md/dm-pcache/cache_gc.c +5 -0
@@ -134,6 +134,11 @@ void pcache_cache_gc_fn(struct work_strucontinue ; } +if (get_kset_onmedia_size (kset_onmedia) >cache_seg_remain (&key_tail)) { +atomic_inc (&cache->gc_errors); +return ; + } +for (i =0 ; i < kset_onmedia->key_num; i++) {struct pcache_cache_key key_tmp = {0 };
drivers/md/dm-pcache/cache_key.c +5 -0
@@ -811,6 +811,11 @@ int cache_replay(struct pcache_cache *ca }/* Replay the kset and check for errors. */ +if (get_kset_onmedia_size (kset_onmedia) >cache_seg_remain (pos)) { + ret = -EIO ; + goto out; + } + ret =kset_replay (cache, kset_onmedia);if (ret) goto out;
drivers/md/dm-pcache/cache_writeback.c +8 -0
@@ -229,6 +229,9 @@ void cache_writeback_fn(struct work_struif (pcache_is_stopping (pcache)) goto unlock; +if (atomic_read (&cache->writeback_errors)) + goto unlock; + kset_onmedia = (struct pcache_cache_kset_onmedia *)cache->wb_kset_onmedia_buf;mutex_lock (&cache->dirty_tail_lock);
@@ -246,6 +249,11 @@ void cache_writeback_fn(struct work_stru goto queue_work; } +if (get_kset_onmedia_size (kset_onmedia) >cache_seg_remain (&dirty_tail)) { +atomic_inc (&cache->writeback_errors); + goto unlock; + } + ret =cache_kset_insert_tree (cache, kset_onmedia);if (ret) { delay =PCACHE_CACHE_WRITEBACK_INTERVAL ;
Greg Kroah-Hartman
maintainerPATCH 80/1518 dm-pcache: bound the logical key offset from persistent memory
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryam Vargas <[email protected]>
[ Upstream commit 97fc4b53dbe4a983fdf093243067fa6a64562307 ]
cache_key_decode() takes a key's logical off from the cache device and later indexes req_key_tree->subtrees[] by it in get_subtree(). An off past the device forms a subtree pointer outside the array, which rb_insert() writes through during replay.
Reject a key of zero length, or whose off+len (computed in 64 bits) exceeds the device size, before it is used.
--- drivers/md/dm-pcache/cache_key.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/md/dm-pcache/cache_key.c +9 -0
@@ -90,10 +90,19 @@ int cache_key_decode(struct pcache_cache struct pcache_cache_key *key) {struct dm_pcache *pcache =CACHE_TO_PCACHE (cache); +u64 dev_bytes = (u64 )cache->dev_size <<SECTOR_SHIFT ; key->off = key_onmedia->off; key->len = key_onmedia->len; +if (key_onmedia->len ==0 || + key_onmedia->len > dev_bytes || + key_onmedia->off > dev_bytes - key_onmedia->len) { +pcache_dev_err (pcache,"key off %llu + len %u exceeds device size\n" , + key_onmedia->off, key_onmedia->len); +return -EIO ; + } + key->cache_pos.cache_seg = &cache->segments[key_onmedia->cache_seg_id]; key->cache_pos.seg_off = key_onmedia->cache_seg_off;
Greg Kroah-Hartman
maintainerPATCH 81/1518 dm-pcache: validate the persisted dirty_tail chain at load
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryam Vargas <[email protected]>
[ Upstream commit 58d620ee9e01d4bdbceaf2ae1450d307a2a9d58b ]
The writeback worker follows the persisted dirty_tail chain, which is decoded from the cache device independently of the key_tail chain that cache_replay() walks and bounds. A crafted image, whose on-media fields are authenticated only by a crc32c with a fixed seed, can aim dirty_tail at a chain of last ksets that never terminates, so cache_writeback_fn() re-arms itself with no delay forever.
Walk the dirty_tail chain once at load with the same hop cap cache_replay() uses and fail the table load with -EIO if it does not reach an end within n_segs hops.
--- drivers/md/dm-pcache/cache.c | 7 +++ drivers/md/dm-pcache/cache.h | 2 + drivers/md/dm-pcache/cache_key.c | 69 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+)
drivers/md/dm-pcache/cache.c +7 -0
@@ -197,6 +197,7 @@ static int cache_tail_init(struct pcache {struct dm_pcache *pcache =CACHE_TO_PCACHE (cache);bool new_cache = !(cache->cache_info.flags &PCACHE_CACHE_FLAGS_INIT_DONE ); +int ret;if (new_cache) {__set_bit (0 , cache->seg_map);
@@ -213,6 +214,12 @@ static int cache_tail_init(struct pcachepcache_dev_err (pcache,"Corrupted key tail or dirty tail.\n" );return -EIO ; } + + ret =cache_verify_dirty_tail (cache); +if (ret) { +pcache_dev_err (pcache,"dirty tail chain does not terminate (crafted cache image?)\n" ); +return ret; + } }return 0 ;
drivers/md/dm-pcache/cache.h +2 -0
@@ -652,6 +652,8 @@ static inline int cache_decode_dirty_tai &cache->dirty_tail_index); } +int cache_verify_dirty_tail (struct pcache_cache *cache); +int pcache_cache_init (void );void pcache_cache_exit (void );#endif /* _PCACHE_CACHE_H */
drivers/md/dm-pcache/cache_key.c +69 -0
75 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 82/1518 KVM: arm64: nv: Fully update VNCR fixmap state in kvm_translate_vncr()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Upton <[email protected]>
[ Upstream commit 5949004d7032767e8fde1e8c986a33f241b2a192 ]
kvm_translate_vncr() first invalidates the pseudo-TLB entry and corresponding fixmap in anticipation of installing a new translation.
While the fixmap invalidation does clear the mapping from host stage-1, it does not clear the L1_VNCR_MAPPED flag. Depending on the state of the VNCR TLB at vcpu_put(), this could potentially precipitate a BUG_ON() if vt->cpu is reset.
Share a helper with kvm_vcpu_put_hw_mmu(), ensuring that KVM's view of the VNCR fixmap is in sync with the state of the VNCR TLB. Give it a slightly verbose name to make it obvious that it is meant to be used local to a CPU, unlike other VNCR TLB maintenance.
Stable-dep-of: 38640bc32be3 ("KVM: arm64: Handle VNCR TLB invalidation race with vcpu_put() VNCR unmapping")
--- arch/arm64/kvm/nested.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
arch/arm64/kvm/nested.c +17 -10
@@ -771,18 +771,24 @@ void kvm_vcpu_load_hw_mmu(struct kvm_vcp } } +static void this_cpu_reset_vncr_fixmap (struct kvm_vcpu *vcpu) +{ +if (!host_data_test_flag (L1_VNCR_MAPPED )) +return ; + +BUG_ON (vcpu->arch.vncr_tlb->cpu !=smp_processor_id ()); +BUG_ON (is_hyp_ctxt (vcpu)); + +clear_fixmap (vncr_fixmap (vcpu->arch.vncr_tlb->cpu)); + vcpu->arch.vncr_tlb->cpu =-1 ; +host_data_clear_flag (L1_VNCR_MAPPED ); +atomic_dec (&vcpu->kvm->arch.vncr_map_count); +} +void kvm_vcpu_put_hw_mmu (struct kvm_vcpu *vcpu) {/* Unconditionally drop the VNCR mapping if we have one */ -if (host_data_test_flag (L1_VNCR_MAPPED )) { -BUG_ON (vcpu->arch.vncr_tlb->cpu !=smp_processor_id ()); -BUG_ON (is_hyp_ctxt (vcpu)); - -clear_fixmap (vncr_fixmap (vcpu->arch.vncr_tlb->cpu)); - vcpu->arch.vncr_tlb->cpu =-1 ; -host_data_clear_flag (L1_VNCR_MAPPED ); -atomic_dec (&vcpu->kvm->arch.vncr_map_count); - } +this_cpu_reset_vncr_fixmap (vcpu);/* * Keep a reference on the associated stage-2 MMU if the vCPU is
@@ -1244,7 +1250,8 @@ static int kvm_translate_vncr(struct kvm* We also prepare the next walk wilst we're at it. */ scoped_guard(write_lock, &vcpu->kvm->mmu_lock) { -invalidate_vncr (vt); +this_cpu_reset_vncr_fixmap (vcpu); + vt->valid = false; vt->wi = (struct s1_walk_info ) { .regime =TR_EL20 ,
Greg Kroah-Hartman
maintainerPATCH 83/1518 KVM: arm64: Handle VNCR TLB invalidation race with vcpu_put() VNCR unmapping
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 38640bc32be3fcf9526d477155bc19d3f146231f ]
While VNCR TLB invalidation always occurs under the MMU lock, vcpu_put() doesn't, while it unmaps the VNCR page.
The problem is that the invalidation evaluates vncr_tlb::cpu to decide whether an unmapping needs to take place (cpu != -1) before performing it. On the other hand, this_cpu_reset_vncr_fixmap() unconditionally unmaps if L1_VNCR_MAPPED is set.
These two obviously can race, with a TOCTOU pattern on the TLBI path, and a BUG_ON() on the vcpu_put() path. And the two can end-up calling vncr_fixmap(-1), with extra lethal effects.
Move the reset of vncr_tlb::cpu to -1 to a common function, and make this update atomic so that only a single thread can reset the field and perform the corresponding unmap. The vcpu_put() still need to unconditionally unmap the current VNCR to close another ugly race.
Finally, the assignment of vncr_tlb::cpu is moved to be kept in sync with the actual mapping, similar to L1_VNCR_MAPPED being set.
--- arch/arm64/kvm/nested.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)
arch/arm64/kvm/nested.c +32 -10
@@ -27,7 +27,7 @@ struct vncr_tlb {bool hpa_writable;/* -1 when not mapped on a CPU */ -int cpu; +atomic_t cpu;/* * true if the TLB is valid. Can only be changed with the
@@ -771,16 +771,40 @@ void kvm_vcpu_load_hw_mmu(struct kvm_vcp } } +/* +* Unmapping an L1 VNCR can happen concurrently without the mmu lock being +* effective (vcpu_put() vs TLBI handling). The atomic_xchg below ensures +* that only one CPU sets it to -1 while getting a valid CPU number back. +*/ +static int unmap_l1_vncr (struct vncr_tlb *vt) +{ +int cpu =atomic_xchg_relaxed (&vt->cpu,-1 ); + +if (cpu !=-1 ) +clear_fixmap (vncr_fixmap (cpu)); + +return cpu; +} +static void this_cpu_reset_vncr_fixmap (struct kvm_vcpu *vcpu) {if (!host_data_test_flag (L1_VNCR_MAPPED ))return ; -BUG_ON (vcpu->arch.vncr_tlb->cpu !=smp_processor_id ());BUG_ON (is_hyp_ctxt (vcpu)); -clear_fixmap (vncr_fixmap (vcpu->arch.vncr_tlb->cpu)); - vcpu->arch.vncr_tlb->cpu =-1 ; +/* +* Unconditionally unmap the local VNCR if we have lost the race +* against a concurrent TLBI. Otherwise we could end-up running +* another vcpu with VNCR still mapped if the TLBI thread is +* preempted between the exchange and the clear_fixmap(). +* +* Note that we do not care about the TLBI nuking the fixmap behind +* the back of an running vcpu. This will only generate a fault and +* possibly a retranslation. +*/ +if (unmap_l1_vncr (vcpu->arch.vncr_tlb) ==-1 ) +clear_fixmap (vncr_fixmap (smp_processor_id ()));host_data_clear_flag (L1_VNCR_MAPPED );atomic_dec (&vcpu->kvm->arch.vncr_map_count); }
@@ -870,8 +894,7 @@ u16 get_asid_by_regime(struct kvm_vcpu *static void invalidate_vncr (struct vncr_tlb *vt) { vt->valid = false; -if (vt->cpu !=-1 ) -clear_fixmap (vncr_fixmap (vt->cpu)); +unmap_l1_vncr (vt); } static bool vncr_tlb_intersects(struct vncr_tlb *vt, u64 addr,
@@ -1321,7 +1344,7 @@ static int kvm_translate_vncr(struct kvm vt->hpa = pfn <<PAGE_SHIFT ; vt->hpa_writable = writable; vt->valid = true; - vt->cpu =-1 ; +atomic_set (&vt->cpu,-1 );kvm_make_request (KVM_REQ_MAP_L1_VNCR_EL2 , vcpu);kvm_release_faultin_page (vcpu->kvm, page, false, vt->wr.pw && vt->hpa_writable);
@@ -1452,8 +1475,6 @@ static void kvm_map_l1_vncr(struct kvm_vif (vt->wr.nG &&get_asid_by_regime (vcpu,TR_EL20 ) != vt->wr.asid)return ; - vt->cpu =smp_processor_id (); -if (vt->hpa_writable && vt->wr.pw && vt->wr.pr) prot =PAGE_KERNEL ;else if (vt->wr.pr)
@@ -1468,7 +1489,8 @@ static void kvm_map_l1_vncr(struct kvm_v* FIXME: WO doesn't work at all, need POE support in the kernel. */ if (pgprot_val (prot) !=pgprot_val (PAGE_NONE )) { -__set_fixmap (vncr_fixmap (vt->cpu), vt->hpa, prot); +atomic_set (&vt->cpu,smp_processor_id ()); +__set_fixmap (vncr_fixmap (atomic_read (&vt->cpu)), vt->hpa, prot);host_data_set_flag (L1_VNCR_MAPPED );atomic_inc (&vcpu->kvm->arch.vncr_map_count); }
Greg Kroah-Hartman
maintainerPATCH 84/1518 media: dt-bindings: nxp,imx8-isi: Drop fsl,blk-ctrl requirement for i.MX8ULP
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoniu Zhou <[email protected]>
[ Upstream commit fc312f830d8df6c082bd6f7250aa5c0ff063eea4 ]
The i.MX8ULP variant does not require the fsl,blk-ctrl property. Add fsl,imx8ulp-isi to the exception list alongside fsl,imx91-isi.
--- Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml +10 -1
@@ -66,7 +66,6 @@ required: - interrupts - clocks - clock-names - - fsl,blk-ctrl - ports allOf:
@@ -109,6 +108,16 @@ allOf: - port@0 - port@1 + - if: + properties: + compatible: + not: + contains: + const: fsl,imx8ulp-isi + then: + required: + - fsl,blk-ctrl + additionalProperties: false examples:
Greg Kroah-Hartman
maintainerPATCH 85/1518 KVM: arm64: Remove VM-wide VNCR mapping counter
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit c55bc773b6e814406658fae7dc5c15f639ed816e ]
The global VNCR mapping counter is used to decide whether an L1 provided VNCR page is mapped in L0 on any CPU at the point of dealing with a TLB invalidation. It is incremented when a mapping is made in the fixmap, and decremented when unmapped.
As it turns out, this tracking has several flaws:
- we are trying to invalidate TLBs, and the mapping is only an opportunistic consequence of the TLB. Checking this counter to decide whether a TLB needs to be invalidated may result in missed invalidations.
- an L1 vcpu invalidating its own TLB (a very likely case) will not succeed in invalidating the VNCR pseudo TLB because that page is not mapped in L0 at this stage.
Given that this tracking fails at delivering the minimum guarantees that are required and is only a performance optimisation, remove it completely.
--- arch/arm64/include/asm/kvm_host.h | 3 --- arch/arm64/kvm/hyp/vhe/switch.c | 3 +-- arch/arm64/kvm/nested.c | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-)
arch/arm64/include/asm/kvm_host.h +0 -3
@@ -397,9 +397,6 @@ struct kvm_arch {/* Masks for VNCR-backed and general EL2 sysregs */ struct kvm_sysreg_masks *sysreg_masks; -/* Count the number of VNCR_EL2 currently mapped */ -atomic_t vncr_map_count; -/* * For an untrusted host VM, 'pkvm.handle' is used to lookup * the associated pKVM instance in the hypervisor.
arch/arm64/kvm/hyp/vhe/switch.c +1 -2
@@ -427,8 +427,7 @@ static bool kvm_hyp_handle_tlbi_el2(stru* If we have to check for any VNCR mapping being invalidated, * go back to the slow path for further processing. */ -if (vcpu_el2_e2h_is_set (vcpu) &&vcpu_el2_tge_is_set (vcpu) && -atomic_read (&vcpu->kvm->arch.vncr_map_count)) +if (vcpu_el2_e2h_is_set (vcpu) &&vcpu_el2_tge_is_set (vcpu))return false;__kvm_skip_instr (vcpu);
arch/arm64/kvm/nested.c +0 -3
@@ -48,7 +48,6 @@ void kvm_init_nested(struct kvm *kvm) { kvm->arch.nested_mmus =NULL ; kvm->arch.nested_mmus_size =0 ; -atomic_set (&kvm->arch.vncr_map_count,0 ); }static int init_nested_s2_mmu (struct kvm *kvm,struct kvm_s2_mmu *mmu)
@@ -806,7 +805,6 @@ static void this_cpu_reset_vncr_fixmap(sif (unmap_l1_vncr (vcpu->arch.vncr_tlb) ==-1 )clear_fixmap (vncr_fixmap (smp_processor_id ()));host_data_clear_flag (L1_VNCR_MAPPED ); -atomic_dec (&vcpu->kvm->arch.vncr_map_count); }void kvm_vcpu_put_hw_mmu (struct kvm_vcpu *vcpu)
@@ -1492,7 +1490,6 @@ static void kvm_map_l1_vncr(struct kvm_vatomic_set (&vt->cpu,smp_processor_id ());__set_fixmap (vncr_fixmap (atomic_read (&vt->cpu)), vt->hpa, prot);host_data_set_flag (L1_VNCR_MAPPED ); -atomic_inc (&vcpu->kvm->arch.vncr_map_count); } }
Greg Kroah-Hartman
maintainerPATCH 86/1518 KVM: x86: Disallow EFER.LME and EFER.LMA if long mode is not supported
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yosry Ahmed <[email protected]>
[ Upstream commit e62392bf39ebfdf60d1d082799397fe1cbf8dfc5 ]
Remove EFER.LME and EFER.LMA from EFER reserved bits only if long mode is actually supported. KVM does check long-mode support before allowing the bits for guest writes and userspace writes through KVM_SET_SREGS* (in __kvm_valid_efer()), but userspace writes through KVM_SET_MSRS only check reserved bits.
In practice, this doesn't really matter. The true motiviation is getting rid of the #ifdeffery when initializing efer_reserved_bits.
--- arch/x86/kvm/x86.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
arch/x86/kvm/x86.c +4 -9
@@ -106,16 +106,8 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_host)#define emul_to_vcpu (ctxt) \ ((struct kvm_vcpu *)(ctxt)->vcpu) -/* EFER defaults: -* - enable syscall per default because its emulated by KVM -* - enable LME and LMA per default on 64 bit KVM -*/ -#ifdef CONFIG_X86_64 -static -u64 __read_mostly efer_reserved_bits = ~((u64)(EFER_SCE |EFER_LME |EFER_LMA )); -#else +/* Enable syscall by default because its emulated by KVM */ static u64 __read_mostly efer_reserved_bits = ~((u64 )EFER_SCE ); -#endif #define KVM_EXIT_HYPERCALL_VALID_MASK (1 << KVM_HC_MAP_GPA_RANGE)
@@ -10157,6 +10149,9 @@ int kvm_x86_vendor_init(struct kvm_x86_iif (r !=0 ) goto out_mmu_exit; +if (kvm_cpu_cap_has (X86_FEATURE_LM )) +kvm_enable_efer_bits (EFER_LME |EFER_LMA ); + enable_device_posted_irqs &= enable_apicv &&irq_remapping_cap (IRQ_POSTING_CAP );
Greg Kroah-Hartman
maintainerPATCH 87/1518 KVM: s390: Zero initialize data structures for inject_pfault_token
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
[ Upstream commit 4e2c7f7cbc27418f9a290399b986c1b85ff93b90 ]
__kvm_inject_pfault_token() only sets .type and .u.ext.ext_params2 of the on-stack struct kvm_s390_irq but the full ext substructure is copied into the cpu local variable on inject. ext_params and pad contain stale stack values.
Interrupt delivery only uses ext_params2, so nothing leaks to the guest, but a host user can use the migration ioctls to get to the data.
Fix by zero-initializing the irq struct.
Do the same for the inti data structure.
Message-ID: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/kvm-s390.c +2 -2
@@ -4705,8 +4705,8 @@ int kvm_s390_try_set_tod_clock(struct kvstatic void __kvm_inject_pfault_token (struct kvm_vcpu *vcpu,bool start_token,unsigned long token) { -struct kvm_s390_interrupt inti; -struct kvm_s390_irq irq; +struct kvm_s390_interrupt inti = {}; +struct kvm_s390_irq irq = {};if (start_token) { irq.u.ext.ext_params2 = token;
Greg Kroah-Hartman
maintainerPATCH 88/1518 KVM: x86: Extract REGS and SREGS runtime sync code to helpers
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 6a8a98aa9c147eb63f5a360f157f207bf46c05ee ]
Extract the REGS and SREGS portions of {store,sync}_regs() into separate helpers in anticipation of moving the register specific code out of x86.c and into regs.c.
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: 184bd464bdb6 ("KVM: x86: Check EFER validity on KVM_SET_SREGS*")
--- arch/x86/kvm/x86.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +15 -2
@@ -12627,7 +12627,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kreturn 0 ; } -static void store_regs (struct kvm_vcpu *vcpu) +static void kvm_run_sync_regs_to_user (struct kvm_vcpu *vcpu) {BUILD_BUG_ON (sizeof (struct kvm_sync_regs ) >SYNC_REGS_SIZE_BYTES );
@@ -12636,13 +12636,18 @@ static void store_regs(struct kvm_vcpu *if (vcpu->run->kvm_valid_regs &KVM_SYNC_X86_SREGS )__get_sregs (vcpu, &vcpu->run->s.regs.sregs); +} + +static void store_regs (struct kvm_vcpu *vcpu) +{ +kvm_run_sync_regs_to_user (vcpu);if (vcpu->run->kvm_valid_regs &KVM_SYNC_X86_EVENTS )kvm_vcpu_ioctl_x86_get_vcpu_events ( vcpu, &vcpu->run->s.regs.events); } -static int sync_regs (struct kvm_vcpu *vcpu) +static int kvm_run_sync_regs_from_user (struct kvm_vcpu *vcpu) {if (vcpu->run->kvm_dirty_regs &KVM_SYNC_X86_REGS ) {__set_regs (vcpu, &vcpu->run->s.regs.regs);
@@ -12658,6 +12663,14 @@ static int sync_regs(struct kvm_vcpu *vc vcpu->run->kvm_dirty_regs &= ~KVM_SYNC_X86_SREGS ; } +return 0 ; +} + +static int sync_regs (struct kvm_vcpu *vcpu) +{ +if (kvm_run_sync_regs_from_user (vcpu)) +return -EINVAL ; +if (vcpu->run->kvm_dirty_regs &KVM_SYNC_X86_EVENTS ) {struct kvm_vcpu_events events = vcpu->run->s.regs.events;
Greg Kroah-Hartman
maintainerPATCH 89/1518 KVM: x86: Rename __{g,s}et_sregs2() => kvm_vcpu_ioctl_x86_{g,s}et_sregs2()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit bd130c8d72a1c7dde5523b3f3fae9867eafaa1dc ]
Rename the KVM_{G,S}ET_SREGS2 helpers in anticipation of moving them out of x86.c (while leaving the ioctl dispatch behind). Having globally visible APIs named __{g,s}et_sregs2() would be "fine", but ugly, given that __{g,s}et_sregs() will NOT be globally visible. As a bonus, this makes it a bit more obvious that the helpers implement newer versions of kvm_arch_vcpu_ioctl_set_sregs().
No functional change intended.
Message-ID: <[email protected]>
Stable-dep-of: 184bd464bdb6 ("KVM: x86: Check EFER validity on KVM_SET_SREGS*")
--- arch/x86/kvm/x86.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/x86/kvm/x86.c +10 -6
@@ -124,8 +124,10 @@ static void store_regs(struct kvm_vcpu *static int sync_regs (struct kvm_vcpu *vcpu);static int kvm_vcpu_do_singlestep (struct kvm_vcpu *vcpu); -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2); +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2); +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2);static DEFINE_MUTEX (vendor_module_lock);static void kvm_load_guest_fpu (struct kvm_vcpu *vcpu);
@@ -6653,7 +6655,7 @@ long kvm_arch_vcpu_ioctl(struct file *fi r = -ENOMEM ;if (!u.sregs2) goto out; -__get_sregs2 (vcpu, u.sregs2); +kvm_vcpu_ioctl_x86_get_sregs2 (vcpu, u.sregs2); r = -EFAULT ;if (copy_to_user (argp, u.sregs2,sizeof (struct kvm_sregs2 ))) goto out;
@@ -6672,7 +6674,7 @@ long kvm_arch_vcpu_ioctl(struct file *fi u.sregs2 =NULL ; goto out; } - r =__set_sregs2 (vcpu, u.sregs2); + r =kvm_vcpu_ioctl_x86_set_sregs2 (vcpu, u.sregs2);break ; }case KVM_HAS_DEVICE_ATTR :
@@ -12157,7 +12159,8 @@ static void __get_sregs(struct kvm_vcpu (unsigned long *)sregs->interrupt_bitmap); } -static void __get_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int i;
@@ -12425,7 +12428,8 @@ static int __set_sregs(struct kvm_vcpu *return 0 ; } -static int __set_sregs2 (struct kvm_vcpu *vcpu,struct kvm_sregs2 *sregs2) +static int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2) {int mmu_reset_needed =0 ;bool valid_pdptrs = sregs2->flags &KVM_SREGS2_FLAGS_PDPTRS_VALID ;
Greg Kroah-Hartman
maintainerPATCH 90/1518 KVM: x86: Move the bulk of register specific code from x86.c to regs.c
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 2f5bb3fe583510cf20f9d64aa73089577be3dc36 ]
Introduce regs.c, and move the vast majority of register specific code out of x86.c and into regs.c. Deliberately leave behind MSR code, as KVM's MSR support is complex enough to warrant its own compilation unit, and doesn't have much in common with the other register code.
Note, "struct kvm_sregs" has fields for EFER and MSR_IA32_APICBASE, and so the {G,S}ET_REGS flows technically contain a tiny amount of MSR code. MSR_IA32_APICBASE is already managed by lapic.c, and so doesn't require a "placement decision". As for EFER, leave all other EFER handling in x86.c (later to be moved to msrs.c). The primary interface to EFER, set_efer(), is very much MSR specific, even though EFER is arguably more of a Control Register than an MSR.
No functional change intended.
Message-ID: <[email protected]>
Stable backport notes:
Move the existing 6.18 register implementations, retaining its cached register accessors, MMU-owned PDPTR array, VCPU_EXREG identifiers, and kvm_translate_gpa() calling convention. Put cross-file declarations in x86.h, since this branch still uses kvm_cache_regs.h rather than regs.h.
Keep the RIP/RFLAGS helpers and kvm_post_set_cr0() in x86.c, alongside their private get_segment_base() and kvm_pv_async_pf_enabled() helpers. Omit the upstream kvm_get_effective_dr7() header change, which is not needed by this tree. Preserve all existing function bodies and the diagnostic prefix; only change linkage where required by the move.
This relocates kvm_is_valid_sregs() to regs.c so that target commit 184bd464bdb66daa9173670904f24c29c7b7f7d4 applies without modification.
[ sashal: Reduced backport -- upstream 2f5bb3fe58351 touches 5 file(s), this
backport carries 4. Not backported here:
arch/x86/kvm/regs.h
This note is generated from the file lists only; see the resolution record for the reasoning. ]
Stable-dep-of: 184bd464bdb6 ("KVM: x86: Check EFER validity on KVM_SET_SREGS*")
--- arch/x86/kvm/Makefile | 4 arch/x86/kvm/regs.c | 786 +++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 787 -------------------------------------------------- arch/x86/kvm/x86.h | 16 + 4 files changed, 806 insertions(+), 787 deletions(-) create mode 100644 arch/x86/kvm/regs.c
arch/x86/kvm/Makefile +2 -2
@@ -5,8 +5,8 @@ ccflags-$(CONFIG_KVM_WERROR) += -Werror include $(srctree)/virt/kvm/Makefile.kvm -kvm-y += x86.o emulate.o irq.o lapic.o cpuid.o pmu.o mtrr.o \ - debugfs.o mmu/mmu.o mmu/page_track.o mmu/spte.o +kvm-y += x86.o emulate.o irq.o lapic.o cpuid.o pmu.o regs.o \ + mtrr.o debugfs.o mmu/mmu.o mmu/page_track.o mmu/spte.o kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o kvm-$(CONFIG_KVM_IOAPIC) += i8259.o i8254.o ioapic.o
arch/x86/kvm/regs.c new file +786 -0
786 lines not on this page · raw message
arch/x86/kvm/x86.c +2 -785
853 lines not on this page · raw message
arch/x86/kvm/x86.h +16 -0
@@ -54,6 +54,20 @@ struct kvm_host_values {u64 arch_capabilities; }; +void kvm_vcpu_ioctl_x86_get_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2); +int kvm_vcpu_ioctl_x86_set_sregs2 (struct kvm_vcpu *vcpu, +struct kvm_sregs2 *sregs2); + +void kvm_run_sync_regs_to_user (struct kvm_vcpu *vcpu); +int kvm_run_sync_regs_from_user (struct kvm_vcpu *vcpu); + +void kvm_update_dr0123 (struct kvm_vcpu *vcpu); +int kvm_vcpu_ioctl_x86_get_debugregs (struct kvm_vcpu *vcpu, +struct kvm_debugregs *dbgregs); +int kvm_vcpu_ioctl_x86_set_debugregs (struct kvm_vcpu *vcpu, +struct kvm_debugregs *dbgregs); +void kvm_spurious_fault (void );#define SIZE_OF_MEMSLOTS_HASHTABLE \
@@ -439,6 +453,7 @@ int handle_ud(struct kvm_vcpu *vcpu);void kvm_deliver_exception_payload (struct kvm_vcpu *vcpu,struct kvm_queued_exception *ex); +void kvm_handle_exception_payload_quirk (struct kvm_vcpu *vcpu);int kvm_mtrr_set_msr (struct kvm_vcpu *vcpu,u32 msr,u64 data);int kvm_mtrr_get_msr (struct kvm_vcpu *vcpu,u32 msr,u64 *pdata);
@@ -629,6 +644,7 @@ void kvm_load_host_xsave_state(struct kvint kvm_spec_ctrl_test_value (u64 value);int kvm_handle_memory_failure (struct kvm_vcpu *vcpu,int r,struct x86_exception *e); +void kvm_invalidate_pcid (struct kvm_vcpu *vcpu,unsigned long pcid);int kvm_handle_invpcid (struct kvm_vcpu *vcpu,unsigned long type,gva_t gva);bool kvm_msr_allowed (struct kvm_vcpu *vcpu,u32 index,u32 type);
Greg Kroah-Hartman
maintainerPATCH 91/1518 KVM: x86: Check EFER validity on KVM_SET_SREGS*
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yosry Ahmed <[email protected]>
[ Upstream commit 184bd464bdb66daa9173670904f24c29c7b7f7d4 ]
When handling userspace SREGS writes, check the validity of EFER (i.e. allowed bits) before writing the new value of EFER through the per-vendor set_efer callbacks. This prevents userspace from writing bogus values (e.g. EFER.SVME=1 with nested=0).
Note: on KVM_SET_MSRS, KVM only checks EFER validity in terms of KVM caps, not guest caps, so it is possible to set EFER bits that are supported by KVM but not by the guest CPUID. Potentially allowing userspace to set msrs before CPUID.
However, for KVM_SET_SREGS*, check the validity of the set bits against both KVM and guest caps. This is consistent with other validity checks (e.g. for CR4) that check validity against guest caps, which already imposes the need to set CPUID before SREGS.
--- arch/x86/kvm/regs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/regs.c +2 -1
@@ -476,7 +476,8 @@ static bool kvm_is_valid_sregs(struct kv }return kvm_is_valid_cr4 (vcpu, sregs->cr4) && -kvm_is_valid_cr0 (vcpu, sregs->cr0); +kvm_is_valid_cr0 (vcpu, sregs->cr0) && +kvm_valid_efer (vcpu, sregs->efer); } static int __set_sregs_common(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs,
Greg Kroah-Hartman
maintainerPATCH 92/1518 Smack: Fix error in capability bypass
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Schaufler <[email protected]>
[ Upstream commit b2faddc13112489f8f11eb40b9456db8c1b58362 ]
A bug in smack_inode_xattr_skipcap() was introduced in the inode capability handling. The strncmp guard at the top of the function is coded backwards, resulting in consistently incorrect results. Correct the check, and the code functions as it should. The error manifests as requiring CAP_SYS_ADMIN as well as CAP_MAC_ADMIN to change an inode's MAC attributes.
--- security/smack/smack_lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/smack/smack_lsm.c +1 -1
@@ -1312,7 +1312,7 @@ static int smack_inode_getattr(const struct path *path)*/ static int smack_inode_xattr_skipcap (const char *name) { -if (strncmp (name,XATTR_SMACK_SUFFIX ,strlen (XATTR_SMACK_SUFFIX ))) +if (strncmp (name,XATTR_SMACK_SUFFIX ,strlen (XATTR_SMACK_SUFFIX )) ==0 )return 0 ; if (strcmp(name, XATTR_NAME_SMACK) == 0 ||
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 93/1518 drm: Remove unused header in drm_dumb_buffers.c
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yicong Hui <[email protected]>
[ Upstream commit 38b4ce17ef3421fb0e5e6dbdab1974282bde1165 ]
Remove the header #include "drm_internal.h" from drm_dumb_buffers.c, which is included but not used.
Header was introduced in commit 47f10854ca89 ("drm: Don't export the drm_gem_dumb_destroy() function") when moving functions, but was not removed in commit 96a7b60f6ddb ("drm: remove dumb_destroy callback") when the drm_gem_dumb_destroy function was removed.
Compiles successfully with DRM enabled, pass kunit tests and IGT-tests in a vng virtual machine.
--- drivers/gpu/drm/drm_dumb_buffers.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_dumb_buffers.c +0 -1
@@ -29,7 +29,6 @@#include <drm/drm_mode.h> #include "drm_crtc_internal.h" -#include "drm_internal.h" /** * DOC: overview
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 94/1518 drm: lcdif: Wait for vblank before disabling DMA
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Kocialkowski <[email protected]>
[ Upstream commit 351af554edd994898db12217c3be39979e168d35 ]
It is necessary to wait for the full frame to finish streaming through the DMA engine before we can safely disable it by removing the DISP_PARA_DISP_ON bit. Disabling it in-flight can leave the hardware confused and unable to resume streaming for the next frame.
This causes the FIFO underrun and empty status bits to be set and a single solid color to be shown on the display, coming from one of the pixels of the previous frame. The issue occurs sporadically when a new mode is set, which triggers the crtc disable and enable paths.
Setting the shadow load bit and waiting for it to be cleared by the DMA engine allows waiting for completion.
The NXP BSP driver addresses this issue with a hardcoded 25 ms sleep.
--- drivers/gpu/drm/mxsfb/lcdif_kms.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/mxsfb/lcdif_kms.c +12 -3
@@ -373,14 +373,23 @@ static void lcdif_disable_controller(struct lcdif_drm_private *lcdif)int ret; reg =readl (lcdif->base +LCDC_V8_CTRLDESCL0_5 ); +/* Disable the layer for DMA. */ reg &= ~CTRLDESCL0_5_EN ; +/* +* It is necessary to wait for the full frame to finish streaming +* through the DMA engine before we can safely disable it by removing +* the DISP_PARA_DISP_ON bit. Disabling it in-flight can leave the +* hardware confused and unable to resume streaming for the next frame. +*/ + reg |=CTRLDESCL0_5_SHADOW_LOAD_EN ;writel (reg, lcdif->base +LCDC_V8_CTRLDESCL0_5 ); +/* Wait for the frame to finish or timeout after 50 ms. */ ret =readl_poll_timeout (lcdif->base +LCDC_V8_CTRLDESCL0_5 , - reg, !(reg &CTRLDESCL0_5_EN ), -0 ,36000 );/* Wait ~2 frame times max */ + reg, !(reg &CTRLDESCL0_5_SHADOW_LOAD_EN ), +200 ,50000 );if (ret) -drm_err (lcdif->drm,"Failed to disable controller!\n" ); +drm_err (lcdif->drm,"Timed out waiting for final vblank!\n" ); reg =readl (lcdif->base +LCDC_V8_DISP_PARA ); reg &= ~DISP_PARA_DISP_ON ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 95/1518 drm/bridge: synopsys: dw-dp: Support unregistering the AUX channel
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit ed04e8e2307f35b3d8d49a554faf5e72d3d224e6 ]
The DisplayPort AUX channel gets initialized and registered during dw_dp_bind(), but it is never unregistered, which may lead to resource leaks and/or use-after-free.
Add the missing dw_dp_unbind() function to allow the users of the library to handle the required cleanup, i.e. unregister the AUX adapter.
--- drivers/gpu/drm/bridge/synopsys/dw-dp.c | 6 ++++++ include/drm/bridge/dw_dp.h | 1 + 2 files changed, 7 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-dp.c +6 -0
@@ -2098,6 +2098,12 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder, }EXPORT_SYMBOL_GPL (dw_dp_bind); +void dw_dp_unbind (struct dw_dp *dp) +{ +drm_dp_aux_unregister (&dp->aux); +} +EXPORT_SYMBOL_GPL (dw_dp_unbind); +MODULE_AUTHOR ("Andy Yan <[email protected]>" );MODULE_DESCRIPTION ("DW DP Core Library" );MODULE_LICENSE ("GPL" );
include/drm/bridge/dw_dp.h +1 -0
@@ -17,4 +17,5 @@ struct dw_dp_plat_data {struct dw_dp *dw_dp_bind (struct device *dev,struct drm_encoder *encoder,const struct dw_dp_plat_data *plat_data); +void dw_dp_unbind (struct dw_dp *dp);#endif /* __DW_DP__ */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 96/1518 drm/bridge: synopsys: dw-dp: Set pixel mode by platform data
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 77ae37018a2705f5abe8cc428e3496651258901d ]
In the implementation and integration of the SoC, the DW DisplayPort hardware block can be configured to work in single, dual, quad pixel mode on differnt platforms, so make the pixel mode set by plat_data to support the upcoming rk3576 variant.
Stable-dep-of: cc6d7aca2f37 ("drm/rockchip: dw_dp: Release core resources")
--- drivers/gpu/drm/bridge/synopsys/dw-dp.c | 8 +------- drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 19 +++++++++++++++---- include/drm/bridge/dw_dp.h | 7 +++++++ 3 files changed, 23 insertions(+), 11 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-dp.c +1 -7
@@ -352,12 +352,6 @@ enum { DW_DP_YCBCR420_16BIT, }; -enum { -DW_DP_MP_SINGLE_PIXEL , -DW_DP_MP_DUAL_PIXEL , -DW_DP_MP_QUAD_PIXEL , -}; -enum {DW_DP_SDP_VERTICAL_INTERVAL =BIT (0 ),DW_DP_SDP_HORIZONTAL_INTERVAL =BIT (1 ),
@@ -1984,7 +1978,7 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,return ERR_CAST (dp); dp->dev = dev; - dp->pixel_mode =DW_DP_MP_QUAD_PIXEL ; + dp->pixel_mode = plat_data->pixel_mode; dp->plat_data.max_link_rate = plat_data->max_link_rate; bridge = &dp->bridge;
drivers/gpu/drm/rockchip/dw_dp-rockchip.c +15 -4
@@ -76,7 +76,7 @@ static const struct drm_encoder_helper_funcs dw_dp_encoder_helper_funcs = {static int dw_dp_rockchip_bind (struct device *dev,struct device *master,void *data) {struct platform_device *pdev =to_platform_device (dev); -struct dw_dp_plat_data plat_data; +const struct dw_dp_plat_data *plat_data;struct drm_device *drm_dev = data;struct rockchip_dw_dp *dp;struct drm_encoder *encoder;
@@ -90,7 +90,10 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void * dp->dev = dev;platform_set_drvdata (pdev, dp); - plat_data.max_link_rate =810000 ; + plat_data =of_device_get_match_data (dev); +if (!plat_data) +return -ENODEV ; + encoder = &dp->encoder.encoder; encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dev->of_node);rockchip_drm_encoder_set_crtc_endpoint_id (&dp->encoder, dev->of_node,0 ,0 );
@@ -100,7 +103,7 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void *return ret;drm_encoder_helper_add (encoder, &dw_dp_encoder_helper_funcs); - dp->base =dw_dp_bind (dev, encoder, &plat_data); + dp->base =dw_dp_bind (dev, encoder, plat_data);if (IS_ERR (dp->base)) { ret =PTR_ERR (dp->base);return ret;
@@ -133,8 +136,16 @@ static void dw_dp_remove(struct platform_device *pdev)component_del (&pdev->dev, &dw_dp_rockchip_component_ops); } +static const struct dw_dp_plat_data rk3588_dp_plat_data = { + .max_link_rate =810000 , + .pixel_mode =DW_DP_MP_QUAD_PIXEL , +}; +static const struct of_device_id dw_dp_of_match[] = { - { .compatible ="rockchip,rk3588-dp" , }, + { + .compatible ="rockchip,rk3588-dp" , + .data = &rk3588_dp_plat_data, + }, {} };MODULE_DEVICE_TABLE (of, dw_dp_of_match);
include/drm/bridge/dw_dp.h +7 -0
@@ -11,8 +11,15 @@struct drm_encoder ;struct dw_dp ; +enum { +DW_DP_MP_SINGLE_PIXEL , +DW_DP_MP_DUAL_PIXEL , +DW_DP_MP_QUAD_PIXEL , +}; +struct dw_dp_plat_data {u32 max_link_rate; +u8 pixel_mode; }; struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 97/1518 drm/rockchip: dw_dp: Simplify error handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 26cb3e26efa7cc84289966cab871889f6ca93616 ]
Make the code a bit more compact by getting rid of the superfluous assignments around PTR_ERR().
While at it, also drop dev assignment in dw_dp_probe().
Stable-dep-of: cc6d7aca2f37 ("drm/rockchip: dw_dp: Release core resources")
--- drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/gpu/drm/rockchip/dw_dp-rockchip.c +7 -14
@@ -104,20 +104,15 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void *drm_encoder_helper_add (encoder, &dw_dp_encoder_helper_funcs); dp->base =dw_dp_bind (dev, encoder, plat_data); -if (IS_ERR (dp->base)) { - ret =PTR_ERR (dp->base); -return ret; - } +if (IS_ERR (dp->base)) +return PTR_ERR (dp->base); connector =drm_bridge_connector_init (drm_dev, encoder); -if (IS_ERR (connector)) { - ret =PTR_ERR (connector); -return dev_err_probe (dev, ret,"Failed to init bridge connector" ); - } +if (IS_ERR (connector)) +return dev_err_probe (dev,PTR_ERR (connector), +"Failed to init bridge connector" ); -drm_connector_attach_encoder (connector, encoder); - -return 0 ; +return drm_connector_attach_encoder (connector, encoder); }static const struct component_ops dw_dp_rockchip_component_ops = {
@@ -126,9 +121,7 @@ static const struct component_ops dw_dp_rockchip_component_ops = {static int dw_dp_probe (struct platform_device *pdev) { -struct device *dev = &pdev->dev; - -return component_add (dev, &dw_dp_rockchip_component_ops); +return component_add (&pdev->dev, &dw_dp_rockchip_component_ops); }static void dw_dp_remove (struct platform_device *pdev)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 98/1518 drm/rockchip: dw_dp: Add missing newline in dev_err_probe() message
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 0a01412178047bf3ff351c7e75d373e411072a87 ]
Add the missing trailing newline to dev_err_probe() call in dw_dp_rockchip_bind().
Stable-dep-of: cc6d7aca2f37 ("drm/rockchip: dw_dp: Release core resources")
--- drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/dw_dp-rockchip.c +1 -1
@@ -110,7 +110,7 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void * connector =drm_bridge_connector_init (drm_dev, encoder);if (IS_ERR (connector))return dev_err_probe (dev,PTR_ERR (connector), -"Failed to init bridge connector" ); +"Failed to init bridge connector\n" );return drm_connector_attach_encoder (connector, encoder); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 99/1518 drm/rockchip: dw_dp: Release core resources
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit cc6d7aca2f37a1525a94ef97eb3ce361732c876c ]
Core resources such as the DisplayPort AUX channel get initialized and registered during dw_dp_bind(), but are never unregistered, which may lead to memory leaks and/or use-after-free:
[ 224.661371] BUG: KASAN: slab-use-after-free in device_is_dependent+0xe0/0x2b0 [ 224.662015] Read of size 8 at addr ffff00011aee8550 by task modprobe/658 [ 224.662612] [ 224.662752] CPU: 7 UID: 0 PID: 658 Comm: modprobe Not tainted 7.0.0-rc2-next-20260305 #14 PREEMPT [ 224.662759] Hardware name: Radxa ROCK 5B (DT) [ 224.662762] Call trace: [ 224.662764] show_stack+0x20/0x38 (C) [ 224.662772] dump_stack_lvl+0x6c/0x98 [ 224.662777] print_report+0x160/0x4b8 [ 224.662783] kasan_report+0xb4/0xe0 [ 224.662790] __asan_report_load8_noabort+0x20/0x30 [ 224.662796] device_is_dependent+0xe0/0x2b0 [ 224.662802] device_is_dependent+0x108/0x2b0 [ 224.662808] device_link_add+0x1f8/0x10b0 [ 224.662813] devm_of_phy_get_by_index+0x120/0x200 [ 224.662819] dw_dp_bind+0x34c/0xb10 [dw_dp] [ 224.662830] dw_dp_rockchip_bind+0x194/0x250 [rockchipdrm] [ 224.662864] component_bind_all+0x3a8/0x720 [ 224.662869] rockchip_drm_bind+0x120/0x390 [rockchipdrm] [ 224.662899] try_to_bring_up_aggregate_device+0x76c/0x838 [ 224.662904] component_master_add_with_match+0x1f4/0x230 [ 224.662909] rockchip_drm_platform_probe+0x420/0x538 [rockchipdrm] [ 224.662939] platform_probe+0xe8/0x168 [ 224.662945] really_probe+0x340/0x828 [ 224.662950] __driver_probe_device+0x2e0/0x350 [ 224.662954] driver_probe_device+0x80/0x140 [ 224.662959] __driver_attach+0x398/0x460 [ 224.662964] bus_for_each_dev+0xe0/0x198 [ 224.662968] driver_attach+0x50/0x68 [ 224.662972] bus_add_driver+0x2a0/0x4c0 [ 224.662977] driver_register+0x294/0x360 [ 224.662982] __platform_driver_register+0x7c/0x98 [ 224.662987] rockchip_drm_init+0xc4/0xff8 [rockchipdrm]
Since a previous commit exported dw_dp_unbind() function in DW DP core library to take care of the necessary cleanup, use this in the component's unbind() callback, as well as in its bind() error path.
--- drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/rockchip/dw_dp-rockchip.c +12 -1
@@ -108,15 +108,26 @@ static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void *return PTR_ERR (dp->base); connector =drm_bridge_connector_init (drm_dev, encoder); -if (IS_ERR (connector)) +if (IS_ERR (connector)) { +dw_dp_unbind (dp->base);return dev_err_probe (dev,PTR_ERR (connector),"Failed to init bridge connector\n" ); + }return drm_connector_attach_encoder (connector, encoder); } +static void dw_dp_rockchip_unbind (struct device *dev,struct device *master, +void *data) +{ +struct rockchip_dw_dp *dp =dev_get_drvdata (dev); + +dw_dp_unbind (dp->base); +} +static const struct component_ops dw_dp_rockchip_component_ops = { .bind = dw_dp_rockchip_bind, + .unbind = dw_dp_rockchip_unbind, };static int dw_dp_probe (struct platform_device *pdev)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 100/1518 drm/rockchip: vop2: Fix wrong wait target in layer cfg done check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 9f5670802df085ad343146561e69bac43e9905d2 ]
rk3568_vop2_setup_layer_mixer() waits for the previous Video Port (VP) layer configuration to take effect before writing a new one to the shared RK3568_OVL_LAYER_SEL shadow register. However, it passes vop2->old_layer_sel to rk3568_vop2_wait_for_layer_cfg_done() as the expected value, which at that point already contains the new VP layer.
This causes the wait to poll for a value that has not been written to the shadow register yet, resulting in spurious timeouts when two non-blocking atomic commits race:
rockchip-drm display-subsystem: [drm] *ERROR* wait layer cfg done timeout [...]
Pass the local old_layer_sel instead, which still holds the value captured from vop2->old_layer_sel before it was overwritten, i.e. the previous VP target that the hardware is expected to latch.
--- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +1 -1
@@ -2307,7 +2307,7 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp)* Changes of other VPs' overlays have not taken effect */ if (cfg_done) -rk3568_vop2_wait_for_layer_cfg_done (vop2, vop2->old_layer_sel); +rk3568_vop2_wait_for_layer_cfg_done (vop2, old_layer_sel); }vop2_writel (vop2,RK3568_OVL_LAYER_SEL , layer_sel);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 101/1518 drm/rockchip: vop2: Wait for layer cfg done before switching LAYERSEL_REGDONE_SEL
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit d1ad644e572c0647ad8428439eafea0aacfccf9e ]
LAYERSEL_REGDONE_SEL mask of RK3568_OVL_CTRL register controls which Video Port (VP) vsync latches the shared RK3568_OVL_{LAYER|PORT}_SEL shadow registers into the active configuration.
rk3568_vop2_setup_layer_mixer() overwrites LAYERSEL_REGDONE_SEL to the current VP ID before waiting for the previous VP layer configuration to take effect. As a consequence, the previous VP vsync can no longer trigger the latch, so the wait polls a value that might never appear.
Move the layer cfg done wait before the RK3568_OVL_CTRL write so the previous VP vsync can still commit the pending configuration.
--- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +10 -9
@@ -2289,15 +2289,6 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp)* lead to the configuration of the previous VP being take effect along with the VSYNC * of the new VP. */ -if (layer_sel != old_layer_sel || port_sel != old_port_sel) - ovl_ctrl |=FIELD_PREP (RK3568_OVL_CTRL__LAYERSEL_REGDONE_SEL , vp->id); -vop2_writel (vop2,RK3568_OVL_CTRL , ovl_ctrl); - -if (port_sel != old_port_sel) { -vop2_writel (vop2,RK3568_OVL_PORT_SEL , port_sel); -vop2_cfg_done (vp); -rk3568_vop2_wait_for_port_mux_done (vop2); - }if (layer_sel != old_layer_sel && atv_layer_sel != old_layer_sel) { cfg_done =vop2_readl (vop2,RK3568_REG_CFG_DONE );
@@ -2310,6 +2301,16 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp)rk3568_vop2_wait_for_layer_cfg_done (vop2, old_layer_sel); } +if (layer_sel != old_layer_sel || port_sel != old_port_sel) + ovl_ctrl |=FIELD_PREP (RK3568_OVL_CTRL__LAYERSEL_REGDONE_SEL , vp->id); +vop2_writel (vop2,RK3568_OVL_CTRL , ovl_ctrl); + +if (port_sel != old_port_sel) { +vop2_writel (vop2,RK3568_OVL_PORT_SEL , port_sel); +vop2_cfg_done (vp); +rk3568_vop2_wait_for_port_mux_done (vop2); + } +vop2_writel (vop2,RK3568_OVL_LAYER_SEL , layer_sel);mutex_unlock (&vop2->ovl_lock); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 102/1518 drm/rockchip: analogix_dp: Enable hclk for RK3588
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit 104f20616d72825fdcf56cfdc5f89f4e96fd8dbe ]
Acquire and enable the HCLK_VO1 bus clock explicitly for RK3588 eDP controller to guarantee register and datapath access.
The clock was previously enabled implicitly via rockchip,vo-grf phandle reference, which relies on side effect and is fragile.
Fetch optional "hclk" clock in driver to align with updated device tree binding and keep consistent with hardware clock dependency.
--- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +6 -0
@@ -328,6 +328,7 @@ static int rockchip_dp_of_probe(struct rockchip_dp_device *dp) {struct device *dev = dp->dev;struct device_node *np = dev->of_node; +struct clk *clk; dp->grf =syscon_regmap_lookup_by_phandle (np,"rockchip,grf" );if (IS_ERR (dp->grf)) {
@@ -351,6 +352,11 @@ static int rockchip_dp_of_probe(struct rockchip_dp_device *dp)return PTR_ERR (dp->pclk); } + clk =devm_clk_get_optional_enabled (dev,"hclk" ); +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk), +"failed to get hclk property\n" ); + dp->rst =devm_reset_control_get (dev,"dp" );if (IS_ERR (dp->rst)) {DRM_DEV_ERROR (dev,"failed to get dp reset control\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 103/1518 drm/rockchip: analogix_dp: Fix OF node reference leak via auto cleanup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit 87e060521371257ddbb77964b66e60d80afcc7b2 ]
Sashiko reported a reference leak in rockchip_dp_drm_encoder_enable(), the of_get_child_by_name() function does not call of_node_put() in a symmetrical way [1].
Fix the device node reference leak by using __free(device_node) to automatically manage of_node_put() for all device nodes.
--- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +10 -6
@@ -8,6 +8,7 @@* Jeff Chen <[email protected]> */ +#include <linux/cleanup.h> #include <linux/component.h> #include <linux/mfd/syscon.h> #include <linux/of.h>
@@ -223,7 +224,6 @@ static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder,struct drm_crtc *crtc;struct drm_crtc_state *old_crtc_state;struct of_endpoint endpoint; -struct device_node *remote_port, *remote_port_parent;char name[32 ];u32 port_id;int ret;
@@ -247,18 +247,22 @@ static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder,if (ret <0 )return ; - remote_port_parent =of_graph_get_remote_port_parent (endpoint.local_node); + struct device_node *remote_port_parent __free(device_node) = +of_graph_get_remote_port_parent (endpoint.local_node);if (remote_port_parent) { -if (of_get_child_by_name (remote_port_parent,"ports" )) { - remote_port =of_graph_get_remote_port (endpoint.local_node); + struct device_node *ports __free(device_node) = +of_get_child_by_name (remote_port_parent,"ports" ); + +if (ports) { + struct device_node *remote_port __free(device_node) = +of_graph_get_remote_port (endpoint.local_node); +of_property_read_u32 (remote_port,"reg" , &port_id); -of_node_put (remote_port);sprintf (name,"%s vp%d" , remote_port_parent->full_name, port_id); }else {sprintf (name,"%s %s" , remote_port_parent->full_name, endpoint.id ?"vopl" :"vopb" ); } -of_node_put (remote_port_parent);DRM_DEV_DEBUG (dp->dev,"vop %s output to dp\n" , (ret) ?"LIT" :"BIG" ); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 104/1518 drm/bridge: display-connector: dont autoenable HPD IRQ
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 8e9c475060bff87077cfa3bd42011edcb7fb3b0d ]
If HPD IRQ is enabled in the display_connector's probe, it can be triggered too early, before the DRM connector is completely setup. Use the enable_hpd / disable_hpd callbacks to control enablement of the HPD IRQ.
--- drivers/gpu/drm/bridge/display-connector.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/gpu/drm/bridge/display-connector.c +17 -0
@@ -94,6 +94,20 @@ display_connector_bridge_detect(struct drm_bridge *bridge, struct drm_connectorreturn display_connector_detect (bridge); } +static void display_connector_hpd_enable (struct drm_bridge *bridge) +{ +struct display_connector *conn =to_display_connector (bridge); + +enable_irq (conn->hpd_irq); +} + +static void display_connector_hpd_disable (struct drm_bridge *bridge) +{ +struct display_connector *conn =to_display_connector (bridge); + +disable_irq (conn->hpd_irq); +} +static const struct drm_edid *display_connector_edid_read (struct drm_bridge *bridge,struct drm_connector *connector) {
@@ -186,6 +200,8 @@ static const struct drm_bridge_funcs display_connector_bridge_funcs = { .attach = display_connector_attach, .destroy = display_connector_destroy, .detect = display_connector_bridge_detect, + .hpd_enable = display_connector_hpd_enable, + .hpd_disable = display_connector_hpd_disable, .edid_read = display_connector_edid_read, .atomic_get_output_bus_fmts = display_connector_get_output_bus_fmts, .atomic_get_input_bus_fmts = display_connector_get_input_bus_fmts,
@@ -315,6 +331,7 @@ static int display_connector_probe(struct platform_device *pdev)NULL , display_connector_hpd_irq,IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING | +IRQF_NO_AUTOEN |IRQF_ONESHOT , "HPD", conn);if (ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 105/1518 drm/bridge: display-connector: trigger initial HPD event for DP
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 60dc0946bbad3eef8bc66a5a8b09b98dbc6e09c0 ]
If the DisplayPort drivers use display-connector for the HPD detection, the internal HPD state machine might be not active and thus the hardware might be not able to handle cable detection correctly. Instead it will depend on the external HPD notifications to set the cable state, bypassing the internal HPD state machine (for example this is the case for the msm DP driver).
However if the cable has been plugged before the HPD IRQ has been enabled, there will be no HPD event coming. The drivers might fail detection in such a case. Trigger the HPD notification after enabling the HPD IRQ, propagating the cable insertion state.
Note, this issue only affects drivers which set OP_HPD but not OP_DETECT (like dp-connector). Here DP differs from HDMI. For HDMI there is no additional state or extra "bridge with no sinks plugged" cases. The HPD pin state is equal to the display plugged state. Nor do we have an AUX bus with timeouts, etc.
--- drivers/gpu/drm/bridge/display-connector.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/bridge/display-connector.c +19 -0
@@ -12,6 +12,7 @@#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> +#include <linux/workqueue.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h>
@@ -25,6 +26,8 @@ struct display_connector {struct regulator *supply;struct gpio_desc *ddc_en; + +struct work_struct hpd_work; }; static inline struct display_connector *
@@ -99,15 +102,29 @@ static void display_connector_hpd_enable(struct drm_bridge *bridge)struct display_connector *conn =to_display_connector (bridge);enable_irq (conn->hpd_irq); + +if (conn->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) +schedule_work (&conn->hpd_work); }static void display_connector_hpd_disable (struct drm_bridge *bridge) {struct display_connector *conn =to_display_connector (bridge); +if (conn->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) +cancel_work_sync (&conn->hpd_work); +disable_irq (conn->hpd_irq); } +static void display_connector_hpd_work (struct work_struct *work) +{ + struct display_connector *conn = container_of(work, struct display_connector, hpd_work); +struct drm_bridge *bridge = &conn->bridge; + +drm_bridge_hpd_notify (bridge,display_connector_detect (bridge)); +} +static const struct drm_edid *display_connector_edid_read (struct drm_bridge *bridge,struct drm_connector *connector) {
@@ -403,6 +420,8 @@ static int display_connector_probe(struct platform_device *pdev) conn->bridge.ops |=DRM_BRIDGE_OP_DETECT ;if (conn->hpd_irq >=0 ) conn->bridge.ops |=DRM_BRIDGE_OP_HPD ; +if (conn->hpd_irq >=0 && type == DRM_MODE_CONNECTOR_DisplayPort) +INIT_WORK (&conn->hpd_work, display_connector_hpd_work); dev_dbg(&pdev->dev, "Found %s display connector '%s' %s DDC bus and %s HPD GPIO (ops 0x%x)\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 106/1518 drm/v3d: Clear queue->active_job when v3d_fence_create() fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maíra Canal <[email protected]>
[ Upstream commit 25a1669907512e927fab9ad4d4fb74ff57f63cd9 ]
The run_job() callbacks for BIN, RENDER, TFU and CSD assign the incoming job to queue->active_job before calling v3d_fence_create(). If v3d_fence_create() fails, the callback returns NULL without clearing active_job, leaving a dangling pointer.
Create a failure path in all run_job() callbacks that clears the active job before returning NULL. The BIN path takes queue->queue_lock around the clear as it races against v3d_overflow_mem_work(); RENDER, TFU and CSD paths have no concurrent reader, so the clear is lock-free.
--- drivers/gpu/drm/v3d/v3d_sched.c | 60 +++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 26 deletions(-)
drivers/gpu/drm/v3d/v3d_sched.c +34 -26
@@ -214,15 +214,11 @@ static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job)struct v3d_dev *v3d = job->base.v3d;struct v3d_queue_state *queue = &v3d->queue[V3D_BIN ];struct drm_device *dev = &v3d->drm; -struct dma_fence *fence; +struct dma_fence *fence =NULL ;unsigned long irqflags; -if (unlikely (job->base.base.s_fence->finished.error)) { -spin_lock_irqsave (&queue->queue_lock, irqflags); - queue->active_job =NULL ; -spin_unlock_irqrestore (&queue->queue_lock, irqflags); -return NULL ; - } +if (unlikely (job->base.base.s_fence->finished.error)) + goto out_clean_job;/* Lock required around bin_job update vs * v3d_overflow_mem_work().
@@ -239,7 +235,7 @@ static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job) fence =v3d_fence_create (v3d,V3D_BIN );if (IS_ERR (fence)) -return NULL ; + goto out_clean_job;if (job->base.irq_fence)dma_fence_put (job->base.irq_fence);
@@ -267,6 +263,12 @@ static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job)V3D_CORE_WRITE (0 ,V3D_CLE_CT0QEA , job->end);return fence; + +out_clean_job: +spin_lock_irqsave (&queue->queue_lock, irqflags); + queue->active_job =NULL ; +spin_unlock_irqrestore (&queue->queue_lock, irqflags); +return fence; }static struct dma_fence *v3d_render_job_run (struct drm_sched_job *sched_job)
@@ -274,12 +276,10 @@ static struct dma_fence *v3d_render_job_run(struct drm_sched_job *sched_job)struct v3d_render_job *job =to_render_job (sched_job);struct v3d_dev *v3d = job->base.v3d;struct drm_device *dev = &v3d->drm; -struct dma_fence *fence; +struct dma_fence *fence =NULL ; -if (unlikely (job->base.base.s_fence->finished.error)) { - v3d->queue[V3D_RENDER ].active_job =NULL ; -return NULL ; - } +if (unlikely (job->base.base.s_fence->finished.error)) + goto out_clean_job; v3d->queue[V3D_RENDER ].active_job = &job->base;
@@ -293,7 +293,7 @@ static struct dma_fence *v3d_render_job_run(struct drm_sched_job *sched_job) fence =v3d_fence_create (v3d,V3D_RENDER );if (IS_ERR (fence)) -return NULL ; + goto out_clean_job;if (job->base.irq_fence)dma_fence_put (job->base.irq_fence);
@@ -314,6 +314,10 @@ static struct dma_fence *v3d_render_job_run(struct drm_sched_job *sched_job)V3D_CORE_WRITE (0 ,V3D_CLE_CT1QEA , job->end);return fence; + +out_clean_job: + v3d->queue[V3D_RENDER ].active_job =NULL ; +return fence; } static struct dma_fence *
@@ -322,18 +326,16 @@ v3d_tfu_job_run(struct drm_sched_job *sched_job)struct v3d_tfu_job *job =to_tfu_job (sched_job);struct v3d_dev *v3d = job->base.v3d;struct drm_device *dev = &v3d->drm; -struct dma_fence *fence; +struct dma_fence *fence =NULL ; -if (unlikely (job->base.base.s_fence->finished.error)) { - v3d->queue[V3D_TFU ].active_job =NULL ; -return NULL ; - } +if (unlikely (job->base.base.s_fence->finished.error)) + goto out_clean_job; v3d->queue[V3D_TFU ].active_job = &job->base; fence =v3d_fence_create (v3d,V3D_TFU );if (IS_ERR (fence)) -return NULL ; + goto out_clean_job;if (job->base.irq_fence)dma_fence_put (job->base.irq_fence);
@@ -361,6 +363,10 @@ v3d_tfu_job_run(struct drm_sched_job *sched_job)V3D_WRITE (V3D_TFU_ICFG (v3d->ver), job->args.icfg |V3D_TFU_ICFG_IOC );return fence; + +out_clean_job: + v3d->queue[V3D_TFU ].active_job =NULL ; +return fence; } static struct dma_fence *
@@ -369,13 +375,11 @@ v3d_csd_job_run(struct drm_sched_job *sched_job)struct v3d_csd_job *job =to_csd_job (sched_job);struct v3d_dev *v3d = job->base.v3d;struct drm_device *dev = &v3d->drm; -struct dma_fence *fence; +struct dma_fence *fence =NULL ;int i, csd_cfg0_reg; -if (unlikely (job->base.base.s_fence->finished.error)) { - v3d->queue[V3D_CSD ].active_job =NULL ; -return NULL ; - } +if (unlikely (job->base.base.s_fence->finished.error)) + goto out_clean_job;/* The HW interprets a workgroup size of 0 as 65536; however, the * user-space driver exposes a maximum of 65535. Therefore, a 0 in
@@ -393,7 +397,7 @@ v3d_csd_job_run(struct drm_sched_job *sched_job) fence =v3d_fence_create (v3d,V3D_CSD );if (IS_ERR (fence)) -return NULL ; + goto out_clean_job;if (job->base.irq_fence)dma_fence_put (job->base.irq_fence);
@@ -420,6 +424,10 @@ v3d_csd_job_run(struct drm_sched_job *sched_job)V3D_CORE_WRITE (0 , csd_cfg0_reg, job->args.cfg[0 ]);return fence; + +out_clean_job: + v3d->queue[V3D_CSD ].active_job =NULL ; +return fence; } static void
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 107/1518 drm/rockchip: vop2: Add RK3576 to the RG swap special case
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit ae4a4e69389d576941522c3c2e01a2254fd00d10 ]
Much like RK3588, RK3576 requires an RG swap to be performed for YUV444 8-bit and YUV444 10-bit bus formats.
Add its version to the already existing check for RK3588, so that YUV444 output is correct on this platform.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +2 -1
@@ -336,7 +336,8 @@ static bool vop2_output_uv_swap(u32 bus_format, u32 output_mode)static bool vop2_output_rg_swap (struct vop2 *vop2,u32 bus_format) { -if (vop2->version ==VOP_VERSION_RK3588 ) { +if (vop2->version ==VOP_VERSION_RK3588 || + vop2->version ==VOP_VERSION_RK3576 ) {if (bus_format ==MEDIA_BUS_FMT_YUV8_1X24 || bus_format ==MEDIA_BUS_FMT_YUV10_1X30 )return true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 108/1518 drm/rockchip: vop2: Recognise 10-bit YUV422 as YUV format
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit c1bfe8dac0a79d47eed313b9bcaa2658898684ec ]
The Rockchip VOP2 video output driver has a "is_yuv_output" function, which returns true when a given bus format is a YUV format, and false otherwise.
This switch statement is lacking the bus format used for YUV422 10-bit.
Add the two component orderings of the YUV422 10-bit bus formats to the switch statement.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +2 -0
@@ -351,6 +351,8 @@ static bool is_yuv_output(u32 bus_format)switch (bus_format) {case MEDIA_BUS_FMT_YUV8_1X24 :case MEDIA_BUS_FMT_YUV10_1X30 : +case MEDIA_BUS_FMT_YUYV10_1X20 : +case MEDIA_BUS_FMT_UYVY10_1X20 :case MEDIA_BUS_FMT_UYYVYY8_0_5X24 :case MEDIA_BUS_FMT_UYYVYY10_0_5X30 :case MEDIA_BUS_FMT_YUYV8_2X8 :
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 109/1518 drm/bridge: cdns-dsi: Return an error pointer on allocation failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
[ Upstream commit 79ac5c68f1a49a9fdec596ee47577d5a1d52738f ]
The drm_bridge_funcs.atomic_reset documentation states that the hook must return either a valid drm_bridge_state object or an ERR_PTR().
The cdns_dsi_bridge_atomic_reset() callback returns NULL when the allocation of its state fails, violating this contract.
Return ERR_PTR(-ENOMEM) instead.
--- drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +1 -1
@@ -1015,7 +1015,7 @@ cdns_dsi_bridge_atomic_reset(struct drm_bridge *bridge) dsi_state =kzalloc (sizeof (*dsi_state),GFP_KERNEL );if (!dsi_state) -return NULL ; +return ERR_PTR (-ENOMEM );memset (dsi_state,0 ,sizeof (*dsi_state)); dsi_state->base.bridge = bridge;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 110/1518 drm/bridge: cdns-mhdp8546: Return an error pointer on allocation failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
[ Upstream commit 30ac1d403438a6c6039f0af5bb2df3d021f96036 ]
The drm_bridge_funcs.atomic_reset documentation states that the hook must return either a valid drm_bridge_state object or an ERR_PTR().
The cdns_mhdp_bridge_atomic_reset() callback returns NULL when the allocation of its state fails, violating this contract.
Return ERR_PTR(-ENOMEM) instead.
--- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +1 -1
@@ -2088,7 +2088,7 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge) cdns_mhdp_state =kzalloc (sizeof (*cdns_mhdp_state),GFP_KERNEL );if (!cdns_mhdp_state) -return NULL ; +return ERR_PTR (-ENOMEM );__drm_atomic_helper_bridge_reset (bridge, &cdns_mhdp_state->base);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 111/1518 smack: fix incorrect task context in smack_msg_queue_msgrcv
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Andreev <[email protected]>
[ Upstream commit fba3d32825f4bbc8e20f0cdc3b14df57965b8fe5 ]
The smack_msg_queue_msgrcv() function incorrectly checks the permissions of the 'current' task instead of the 'target' task.
In the msgsnd() syscall path, if a receiver is already waiting, the pipelined_send() optimization is used to push the message directly to the receiver task:
ipc/msg.c`pipelined_send():
` smp_store_release(&msr->r_msg, msg)In this case, the 'sender' (current) task performs the check on behalf of the 'receiver' task (msr->r_tsk, passed as the 'target' parameter):
ipc/msg.c`pipelined_send():
` security_msg_queue_msgrcv(,, target := msr->r_tsk,,)
However, smack_msg_queue_msgrcv() ignores the 'target' and checks 'current':
smack_msg_queue_msgrcv(…)
` smk_curacc_msq(isp, MAY_READWRITE); // current task
'current' MAY satisfy smack_msg_queue_msgrcv r/w requirement, but 'target' (the receiver task) might NOT;
as a result, an unauthorized receiver gets the message, violating MAC policy.
Test:
1) create a sysv message queue with label “foo”
2) echo "bar foo r" >/smack/load2
3) msgrcv(,,,0,MSG_NOERROR) in "bar"-labeled task. The task is waiting for the messages ...
4) msgsnd() from a "foo"-labeled task:
"bar"-labeled task gets the message.
This patch fixes the issue by checking permission on the 'target' task instead of 'current'.
(2008-02-04, Casey Schaufler)
--- security/smack/smack_lsm.c | 65 +++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 18 deletions(-)
security/smack/smack_lsm.c +47 -18
@@ -130,12 +130,13 @@ static int smk_bu_note(char *note, struct smack_known *sskp,#define smk_bu_note (note, sskp, oskp, mode,RC ) (RC)#endif -#ifdef CONFIG_SECURITY_SMACK_BRINGUP -static int smk_bu_current (char *note,struct smack_known *oskp, -int mode,int rc) +static int +smk_bu_tsk_to_obj (struct task_struct *tsk,const struct task_smack *tsp, +char *note,struct smack_known *oskp,int mode,int rc) { -struct task_smack *tsp =smack_cred (current_cred ()); +#ifdef CONFIG_SECURITY_SMACK_BRINGUP char acc[SMK_NUM_ACCESS_TYPE +1 ]; +char comm[TASK_COMM_LEN ];if (rc <=0 )return rc;
@@ -143,14 +144,22 @@ static int smk_bu_current(char *note, struct smack_known *oskp, rc =0 ;smk_bu_mode (mode, acc); +pr_info ("Smack %s: (%s %s %s) %s %s\n" , smk_bu_mess[rc], - tsp->smk_task->smk_known, oskp->smk_known, - acc, current->comm, note); +smk_of_task (tsp)->smk_known, oskp->smk_known, + acc,get_task_comm (comm, tsk), note);return 0 ; -}#else -#define smk_bu_current (note, oskp, mode,RC ) (RC) +return rc;#endif +} + +static int smk_bu_current (char *note,struct smack_known *oskp, +int mode,int rc) +{ +return smk_bu_tsk_to_obj (current,smack_cred (current_cred ()), + note, oskp, mode, rc); +}#ifdef CONFIG_SECURITY_SMACK_BRINGUP static int smk_bu_task (struct task_struct *otp,int mode,int rc)
@@ -3353,14 +3362,20 @@ static int smack_sem_semop(struct kern_ipc_perm *isp, struct sembuf *sops, }/** -* smk_curacc_msq : helper to check if current has access on msq -* @isp : the msq +* smk_tskacc_msq : helper to check if tsk has access on msq +* @tsk: the task that requests access +* @isp : the sysv msg queue permissions * @access : access requested * -* return 0 if current has access, error otherwise +* return 0 if tsk has access, error otherwise */ -static int smk_curacc_msq (struct kern_ipc_perm *isp,int access) +static int +smk_tskacc_msq (struct task_struct *tsk,struct kern_ipc_perm *isp,int access) { +const bool tsk_is_current = (tsk == current); +const struct cred *const tsk_cred = + (tsk_is_current ?current_cred () :get_task_cred (tsk)); +struct task_smack *const tsp =smack_cred (tsk_cred);struct smack_known *msp =smack_of_ipc (isp);struct smk_audit_info ad;int rc;
@@ -3369,11 +3384,25 @@ static int smk_curacc_msq(struct kern_ipc_perm *isp, int access)smk_ad_init (&ad, __func__,LSM_AUDIT_DATA_IPC ); ad.a.u.ipc_id = isp->id;#endif - rc =smk_curacc (msp, access, &ad); - rc =smk_bu_current ("msq" , msp, access, rc); + rc =smk_tskacc (tsp, msp, access, &ad); + rc =smk_bu_tsk_to_obj (tsk, tsp,"msq" , msp, access, rc); +if (!tsk_is_current) +put_cred (tsk_cred);return rc; } +/** +* smk_curacc_msq : helper to check if current has access on msq +* @isp : the sysv msg queue permissions +* @access : access requested +* +* return 0 if current has access, error otherwise +*/ +static int smk_curacc_msq (struct kern_ipc_perm *isp,int access) +{ +return smk_tskacc_msq (current, isp, access); +} +/** * smack_msg_queue_associate - Smack access check for msg_queue * @isp: the object
@@ -3441,21 +3470,21 @@ static int smack_msg_queue_msgsnd(struct kern_ipc_perm *isp, struct msg_msg *msg }/** -* smack_msg_queue_msgrcv - Smack access check for msg_queue +* smack_msg_queue_msgrcv - check it target has r/w access to msg_queue * @isp: the object * @msg: unused -* @target: unused +* @target: the task that msgrcv() from the queue * @type: unused * @mode: unused * -* Returns 0 if current has read and write access, error code otherwise +* Returns 0 if target has read and write access, error code otherwise */ static int smack_msg_queue_msgrcv (struct kern_ipc_perm *isp,struct msg_msg *msg,struct task_struct *target,long type,int mode) { -return smk_curacc_msq (isp,MAY_READWRITE ); +return smk_tskacc_msq (target, isp,MAY_READWRITE ); }/**
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 112/1518 smack: simplify write handlers of sysfs entries
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit b78fede1c69a090d377bf80417ce1f7f7f314534 ]
Use the convenient 'kstrto{u,s}32_from_user()' to simplify write handlers of /smack/{doi,direct,mapped,logging,ptrace} sysfs entries.
Stable-dep-of: 577dc3b6a8cf ("smack: deduplicate smackfs/{direct,mapped} file_operations")
--- security/smack/smackfs.c | 81 +++++++++++----------------------------- 1 file changed, 22 insertions(+), 59 deletions(-)
security/smack/smackfs.c +22 -59
@@ -1598,24 +1598,17 @@ static ssize_t smk_read_doi(struct file *filp, char __user *buf,static ssize_t smk_write_doi (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { -char temp[80 ]; -unsigned long u; +int ret; +u32 u;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; -if (count >=sizeof (temp) || count ==0 ) -return -EINVAL ; - -if (copy_from_user (temp, buf, count) !=0 ) -return -EFAULT ; - - temp[count] ='\0' ; + ret =kstrtou32_from_user (buf, count,10 , &u); +if (unlikely (ret)) +return ret; -if (kstrtoul (temp,10 , &u)) -return -EINVAL ; - -if (u ==CIPSO_V4_DOI_UNKNOWN || u >U32_MAX ) +if (u ==CIPSO_V4_DOI_UNKNOWN )return -EINVAL ;return smk_cipso_doi (u,GFP_KERNEL ) ? : count;
@@ -1664,22 +1657,14 @@ static ssize_t smk_write_direct(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct smack_known *skp; -char temp[80 ]; -int i; +int i, ret;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; -if (count >=sizeof (temp) || count ==0 ) -return -EINVAL ; - -if (copy_from_user (temp, buf, count) !=0 ) -return -EFAULT ; - - temp[count] ='\0' ; - -if (sscanf (temp,"%d" , &i) !=1 ) -return -EINVAL ; + ret =kstrtos32_from_user (buf, count,10 , &i); +if (unlikely (ret)) +return ret;/* * Don't do anything if the value hasn't actually changed.
@@ -1742,22 +1727,14 @@ static ssize_t smk_write_mapped(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct smack_known *skp; -char temp[80 ]; -int i; +int i, ret;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; -if (count >=sizeof (temp) || count ==0 ) -return -EINVAL ; - -if (copy_from_user (temp, buf, count) !=0 ) -return -EFAULT ; - - temp[count] ='\0' ; - -if (sscanf (temp,"%d" , &i) !=1 ) -return -EINVAL ; + ret =kstrtos32_from_user (buf, count,10 , &i); +if (unlikely (ret)) +return ret;/* * Don't do anything if the value hasn't actually changed.
@@ -2179,22 +2156,15 @@ static ssize_t smk_read_logging(struct file *filp, char __user *buf,static ssize_t smk_write_logging (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { -char temp[32 ]; -int i; +int i, ret;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; -if (count >=sizeof (temp) || count ==0 ) -return -EINVAL ; - -if (copy_from_user (temp, buf, count) !=0 ) -return -EFAULT ; + ret =kstrtos32_from_user (buf, count,10 , &i); +if (unlikely (ret)) +return ret; - temp[count] ='\0' ; - -if (sscanf (temp,"%d" , &i) !=1 ) -return -EINVAL ;if (i <0 || i >3 )return -EINVAL ; log_policy = i;
@@ -2838,22 +2808,15 @@ static ssize_t smk_read_ptrace(struct file *filp, char __user *buf,static ssize_t smk_write_ptrace (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { -char temp[32 ]; -int i; +int i, ret;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; -if (*ppos !=0 || count >=sizeof (temp) || count ==0 ) -return -EINVAL ; - -if (copy_from_user (temp, buf, count) !=0 ) -return -EFAULT ; + ret =kstrtos32_from_user (buf, count,10 , &i); +if (unlikely (ret)) +return ret; - temp[count] ='\0' ; - -if (sscanf (temp,"%d" , &i) !=1 ) -return -EINVAL ;if (i <SMACK_PTRACE_DEFAULT || i >SMACK_PTRACE_MAX )return -EINVAL ; smack_ptrace_rule = i;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 113/1518 smack: deduplicate smackfs/{direct,mapped} file_operations
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Andreev <[email protected]>
[ Upstream commit 577dc3b6a8cf200e6e27b2d9967cac14a1fed2f3 ]
The file_operations for smackfs/direct and smackfs/mapped are identical up to a textual replacement of "direct" with "mapped"
This patch combines two instances of file_operations into one, handling both files.
--- security/smack/smack.h | 5 +- security/smack/smackfs.c | 133 ++++++++++++--------------------------- 2 files changed, 42 insertions(+), 96 deletions(-)
security/smack/smack.h +3 -2
@@ -303,8 +303,9 @@ int smack_populate_secattr(struct smack_known *skp);* Shared data. */ extern int smack_enabled__initdata ; -extern int smack_cipso_direct; -extern int smack_cipso_mapped; +extern int smack_cipso_auto_level[2 ]; +#define smack_cipso_direct (+smack_cipso_auto_level[0]) +#define smack_cipso_mapped (+smack_cipso_auto_level[1])extern struct smack_known *smack_net_ambient;extern struct smack_known *smack_syslog_label;#ifdef CONFIG_SECURITY_SMACK_BRINGUP
security/smack/smackfs.c +39 -94
206 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 114/1518 smack: restrict smackfs/{direct,mapped} values to 0-255
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Andreev <[email protected]>
[ Upstream commit a7c44fd9f80e37763acf9cd3c87a58058d206427 ]
Both smackfs/direct and smackfs/mapped incorrectly accept the full range of integer values. For example:
# cd /sys/fs/smackfs/
# cat direct ; echo
250 # cat cipso2
@ 250/2
_ 250/2,4,5,6,7,8
* 250/3,5,7
^ 250/2,4,5,6,7
? 250/3,4,5,6,7,8 # echo -1234 >direct ; cat direct ; echo
-1234
# cat cipso2
@ -1234/2
_ -1234/2,4,5,6,7,8
* -1234/3,5,7
^ -1234/2,4,5,6,7
? -1234/3,4,5,6,7,8
#I noticed two things regarding this:
1) sensitivity levels are truncated to 8 bits when labeling outgoing packets (0x2e = 46 for the -1234 example above)
2) the reverse process fails: incoming packets with sensitivity level 46 do not match these smackfs/cipso2 entries.
Even observation (1) on its own warrants a fix.
This patch restricts smackfs/direct and smackfs/mapped accepted values to the 0-255 range.
--- security/smack/smack.h | 2 +- security/smack/smackfs.c | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-)
security/smack/smack.h +1 -1
@@ -303,7 +303,7 @@ int smack_populate_secattr(struct smack_known *skp);* Shared data. */ extern int smack_enabled__initdata ; -extern int smack_cipso_auto_level[2 ]; +extern u8 smack_cipso_auto_level[2 ];#define smack_cipso_direct (+smack_cipso_auto_level[0])#define smack_cipso_mapped (+smack_cipso_auto_level[1])extern struct smack_known *smack_net_ambient;
security/smack/smackfs.c +14 -12
@@ -94,7 +94,7 @@ struct smack_known *smack_net_ambient;* secid is contained directly in the category set. * It can be reset via smackfs/mapped */ -int smack_cipso_auto_level[2 ] = { +u8 smack_cipso_auto_level[2 ] = {SMACK_CIPSO_DIRECT_DEFAULT ,SMACK_CIPSO_MAPPED_DEFAULT , };
@@ -1641,17 +1641,15 @@ static const struct file_operations smk_doi_ops = {static ssize_t smk_read_cipso_auto_level (struct file *filp,char __user *buf,size_t count,loff_t *ppos) { -char temp[80 ]; -ssize_t rc; +char temp[sizeof "255" ]; +int n;if (*ppos !=0 )return 0 ; -sprintf (temp,"%d" , smack_cipso_auto_level[ -smk_cipso_auto_level_idx (filp)]); - rc =simple_read_from_buffer (buf, count, ppos, temp,strlen (temp)); - -return rc; + n =sprintf (temp,"%u" , (unsigned int )smack_cipso_auto_level[ +smk_cipso_auto_level_idx (filp)]); +return simple_read_from_buffer (buf, count, ppos, temp, n); }/**
@@ -1667,13 +1665,16 @@ static ssize_t smk_write_cipso_auto_level(struct file *filp, const char __user *buf, size_t count, loff_t *ppos) { - struct smack_known *skp; -int i, ret, idx, old_lvl; + int ret, idx; +u8 i, old_lvl;if (!smack_privileged (CAP_MAC_ADMIN ))return -EPERM ; - - ret =kstrtos32_from_user (buf, count,10 , &i); +/* +* draft-ietf-cipso-ipsecurity-01 (CIPSO 2.2), 3.4.2.4: +* "Sensitivity Level is 1 octet in length. Its value is from 0 to 255" +*/ + ret =kstrtou8_from_user (buf, count,10 , &i);if (unlikely (ret))return ret;
@@ -1686,6 +1687,7 @@ smk_write_cipso_auto_level(struct file *filp, const char __user *buf, old_lvl = smack_cipso_auto_level[idx];if (old_lvl != i) { +struct smack_known *skp;mutex_lock (&smack_known_lock);list_for_each_entry_rcu (skp, &smack_known_list, list) if (skp->smk_netlabel.attr.mls.lvl ==
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 115/1518 sched_ext/scx_flatcg: Fix cvtime_delta race and add hweight scaling to bypass charging
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wanwu Li <[email protected]>
[ Upstream commit a5cc43414b38decd50bdd447e558358a6fbd5864 ]
1. cgrp_cap_budget() used __sync_fetch_and_sub(&cgc->cvtime_delta, cgc->cvtime_delta) to atomically read and clear cvtime_delta. However, this is not a true atomic read-clear operation: the second argument (cgc->cvtime_delta) is evaluated as a normal read before the atomic fetch_and_sub executes. If a concurrent __sync_fetch_and_add() happens between the read and the sub, the added value gets included in the returned delta AND remains in cvtime_delta, causing double charging.
Example:
CPU 0 runs cgrp_cap_budget(), CPU 1 runs fcg_stopping(). Assume cvtime_delta = 100 initially.
T1 CPU 0: sub_val = cvtime_delta = 100 cvtime_delta = 100
T2 CPU 1: __sync_fetch_and_add(&cvtime_delta, 10) cvtime_delta = 110
T3 CPU 0: __sync_fetch_and_sub(&cvtime_delta, sub_val) cvtime_delta = 10
returns old=110 delta = 110 (includes the 10 from CPU 1), but cvtime_delta = 10 (the 10 also remains). The 10 is charged twice: once in delta (applied to cgv_node->cvtime) and once in the residual cvtime_delta (fetched again next time).
Fix by using __sync_fetch_and_and(&cgc->cvtime_delta, 0). Disassembly comparison:
(1) delta = __sync_fetch_and_sub(&cgc->cvtime_delta, cgc->cvtime_delta); 228: (79) r7 = *(u64 *)(r9 +40)
229: (87) r7 = -r7
230: (db) r7 = atomic64_fetch_add((u64 *)(r9 +40), r7) //r9 may be changed
(2) delta = __sync_fetch_and_and(&cgc->cvtime_delta, 0); 228: (b7) r8 = 0 229: (db) r8 = atomic64_xchg((u64 *)(r9 +40), r8)
2. The bypass charging path in fcg_stopping() charges raw execution time to cvtime_delta without scaling by the inverse of the cgroup hweight. Since cvtime_delta is eventually applied to cgv_node->cvtime which is in vtime space (weight-scaled), the bypass path should also scale by FCG_HWEIGHT_ONE / hweight to match the units used by the dispatch path.
--- tools/sched_ext/scx_flatcg.bpf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/sched_ext/scx_flatcg.bpf.c +3 -2
@@ -256,7 +256,7 @@ static void cgrp_cap_budget(struct cgv_node *cgv_node, struct fcg_cgrp_ctx *cgc)* and thus can't be updated and repositioned. Instead, we collect the * vtime deltas separately and apply it asynchronously here. */ - delta =__sync_fetch_and_sub (&cgc->cvtime_delta, cgc->cvtime_delta); + delta =__sync_fetch_and_and (&cgc->cvtime_delta,0 ); cvtime = cgv_node->cvtime + delta;/*
@@ -568,7 +568,8 @@ void BPF_STRUCT_OPS(fcg_stopping, struct task_struct *p, bool runnable) cgc =find_cgrp_ctx (cgrp);if (cgc) {__sync_fetch_and_add (&cgc->cvtime_delta, - p->se.sum_exec_runtime - taskc->bypassed_at); + (p->se.sum_exec_runtime - taskc->bypassed_at) * +FCG_HWEIGHT_ONE / (cgc->hweight ?:1 )); taskc->bypassed_at =0 ; }bpf_cgroup_release (cgrp);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 116/1518 x86/cfi: Use symmetric SYM_START and SYM_END in __CFI_TYPE()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Remus <[email protected]>
[ Upstream commit 0cfdf974f133e0ff17ed80e7895adbe7889d9522 ]
Commit
ccace936eec7 ("x86: Add types to indirectly called assembly functions")
introduced a x86-specific implementation of __CFI_TYPE() using an asymmetric combination of SYM_START() and SYM_FUNC_END() to add a symbol to the KCFI type identifier that precedes a function.
This asymmetric combination is an issue if SYM_FUNC_END() ever gets extended in a way that requires it to be used symmetrically with SYM_FUNC_START*(). For instance to emit DWARF CFI directives that denote the start/end of a function. [1]
Use SYM_END() with SYM_T_FUNC instead. No functional change, as the generic implementation of SYM_FUNC_END(name) expands into SYM_END(name, SYM_T_FUNC).
--- arch/x86/include/asm/linkage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/linkage.h +1 -1
@@ -103,7 +103,7 @@ .byte 0xb8 ASM_NL \ .long __kcfi_typeid_##name ASM_NL \ CFI_POST_PADDING \ - SYM_FUNC_END(__cfi_##name) + SYM_END(__cfi_##name, SYM_T_FUNC)/* UML needs to be able to override memcpy() and friends for KASAN. */ #ifdef CONFIG_UML
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 117/1518 platform/chrome: cros_ec_typec: Reject out-of-bounds PD cap count
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maoyi Xie <[email protected]>
[ Upstream commit a0a8cd9fc9c48b95095bcec4b146f7a99486f58e ]
cros_typec_register_partner_pdos() copies the partner PDOs from the EC TYPEC_STATUS response into the fixed caps_desc.pdo[PDO_MAX_OBJECTS] array.
memcpy(caps_desc.pdo, resp->source_cap_pdos, sizeof(u32) * resp->source_cap_count); ... memcpy(caps_desc.pdo, resp->sink_cap_pdos, sizeof(u32) * resp->sink_cap_count);
PDO_MAX_OBJECTS is 7. source_cap_count and sink_cap_count are u8 fields from the EC. The only check is that they are not both zero. If either is larger than 7, the memcpy writes past the end of the array on the stack. A count of 255 overflows it by about 1 KB. The EC source arrays are only seven entries wide. A larger count reads past them too.
The ChromeOS EC firmware caps these counts today, so a compliant setup does not hit this. The kernel should still validate these values rather than trust them.
Validate the counts in cros_typec_register_partner_pdos() next to the memcpy. Skip the PDO registration if either count is above PDO_MAX_OBJECTS. The rest of cros_typec_handle_status() still runs so events are handled and cleared.
--- drivers/platform/chrome/cros_ec_typec.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/chrome/cros_ec_typec.c +6 -0
@@ -1118,6 +1118,12 @@ static void cros_typec_register_partner_pdos(struct cros_typec_data *typec,if (!resp->source_cap_count && !resp->sink_cap_count)return ; +if (resp->source_cap_count >PDO_MAX_OBJECTS || + resp->sink_cap_count >PDO_MAX_OBJECTS ) { +dev_warn (typec->dev,"Invalid PDO count from EC, port: %d\n" , port_num); +return ; + } + port->partner_pd =typec_partner_usb_power_delivery_register (port->partner, &desc);if (IS_ERR (port->partner_pd)) {dev_warn (typec->dev,"Failed to register partner PD device, port: %d\n" , port_num);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 118/1518 selftests: proc: include fcntl.h in proc-pidns
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amin Vakil <[email protected]>
[ Upstream commit 879b3353d04d043a9e01525c520d9b81339421b2 ]
proc-pidns.c uses open() and O_* flags, but does not include <fcntl.h>. This breaks the proc selftests build with errors such as:
error: implicit declaration of function 'open'
error: 'O_WRONLY' undeclared
error: 'O_CREAT' undeclared
error: 'O_RDONLY' undeclared
Include <fcntl.h> to provide the declaration and flag definitions.
Tested with:
make -C tools/testing/selftests TARGETS=proc
--- tools/testing/selftests/proc/proc-pidns.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/proc/proc-pidns.c +1 -0
@@ -6,6 +6,7 @@#include <assert.h> #include <errno.h> +#include <fcntl.h> #include <sched.h> #include <stdbool.h> #include <stdlib.h>
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 119/1518 HID: core: quiesce input in hid_hw_stop() to prevent use-after-free
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Weber <[email protected]>
[ Upstream commit a4bc41504690b7d7064931909874f5b98cd148b6 ]
A driver's probe calls hid_device_io_start() to enable input delivery, then fails at a later initialization step and unwinds via hid_hw_stop(). The unwind frees struct hidraw via hidraw_disconnect() while in-flight HID reports may still be running on another CPU, dereferencing the freed object through hidraw_report_event(). syzbot reports the resulting use-after-free for the corsair-psu HID driver.
Edward Adam Davis posted a per-driver fix for corsair-psu that adds an explicit hid_device_io_stop() before hid_hw_stop() in the probe error path ("hwmon: prevent packets from going to driver for probe", 2026-04-28). Auditing the tree shows 15 drivers call hid_device_io_start(); 7 also call hid_device_io_stop() and 8 do not:
drivers calling hid_device_io_start() without a matching hid_device_io_stop() before hid_hw_stop():
drivers/hwmon/corsair-psu.c (fix posted by Edward)
drivers/hwmon/corsair-cpro.c drivers/hwmon/nzxt-kraken3.c drivers/hwmon/nzxt-smart2.c drivers/hwmon/gigabyte_waterforce.c drivers/hid/hid-logitech-dj.c drivers/hid/hid-nintendo.c drivers/hid/hid-mcp2221.c
Roughly half of all callers of the API are exposed. Centralize the quiesce in hid_hw_stop() so callers do not have to remember the matching stop: if a driver has left hdev->io_started true on entry, call hid_device_io_stop() before hid_disconnect().
For the 7 drivers that already call hid_device_io_stop() correctly, hdev->io_started is false on entry, the guard short-circuits, and behavior is unchanged.
No Fixes: tag because the affected drivers gained their hid_device_io_start() calls independently over years; the bug is a class-wide API misuse rather than a regression from one commit.
--- drivers/hid/hid-core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hid/hid-core.c +7 -0
@@ -2450,9 +2450,16 @@ EXPORT_SYMBOL_GPL(hid_hw_start);* * This is usually called from remove function or from probe when something * failed and hid_hw_start was called already. +* +* If the caller enabled HID input via hid_device_io_start() and is unwinding +* without an explicit hid_device_io_stop(), quiesce input first so that +* in-flight reports cannot reach handlers (e.g. hidraw_report_event) whose +* backing objects hid_disconnect() is about to free. */ void hid_hw_stop (struct hid_device *hdev) { +if (hdev->io_started) +hid_device_io_stop (hdev);hid_disconnect (hdev); hdev->ll_driver->stop (hdev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 120/1518 HID: nintendo: Fix imu_timestamp_us double increment per report
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christos Maragkos <[email protected]>
[ Upstream commit 1f9b25d3fb65b9384dec16d9db13a3e71abd9145 ]
Previously, the imu_timestamp_us variable was incremented twice per report, causing it to advance by two times the desired amount.
This resulted in incorrect jumps in IMU timestamps reported using MSC_TIMESTAMP, so userspace applications saw corrupted timing on functions such as gyroscope-based aim and motion controls.
This is fixed by removing the redundant increment at the start of the report handling so the remaining can account for the full report interval.
--- drivers/hid/hid-nintendo.c | 1 - 1 file changed, 1 deletion(-)
drivers/hid/hid-nintendo.c +0 -1
@@ -1453,7 +1453,6 @@ static void joycon_parse_imu_report(struct joycon_ctlr *ctlr, dropped_threshold = ctlr->imu_avg_delta_ms *3 /2 ; dropped_pkts = (delta -min (delta, dropped_threshold)) / ctlr->imu_avg_delta_ms; - ctlr->imu_timestamp_us +=1000 * ctlr->imu_avg_delta_ms;if (dropped_pkts >JC_IMU_DROPPED_PKT_WARNING ) { hid_warn_ratelimited(ctlr->hdev, "compensating for %u dropped IMU reports\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 121/1518 HID: roccat: bound device-supplied profile index
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit 43fae42628a8c10fa8981773d7ec9f1a367821a7 ]
kone_keep_values_up_to_date() and kone_profile_activated() use an 8-bit, device-supplied profile value as an index into the 5-element kone->profiles[] array without a range check. A malicious USB device claiming the Roccat Kone id can send a switch-profile event (or a startup_profile read at probe) with an out-of-range value and make the driver read out of bounds; the result is exposed via the actual_dpi sysfs attribute.
Reject out-of-range indices in both paths.
This was found with static analysis and confirmed with the KUnit test added in the following patch (KASAN: slab-out-of-bounds).
--- drivers/hid/hid-roccat-kone.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hid/hid-roccat-kone.c +6 -2
@@ -36,6 +36,8 @@ static uint profile_numbers[5] = {0, 1, 2, 3, 4};static void kone_profile_activated (struct kone_device *kone,uint new_profile) { +if (new_profile <1 || new_profile >ARRAY_SIZE (kone->profiles)) + new_profile =1 ; kone->actual_profile = new_profile; kone->actual_dpi = kone->profiles[new_profile -1 ].startup_dpi; }
@@ -793,8 +795,10 @@ static void kone_keep_values_up_to_date(struct kone_device *kone, {switch (event->event) {case kone_mouse_event_switch_profile: - kone->actual_dpi = kone->profiles[event->value -1 ]. - startup_dpi; +if (event->value >=1 && + event->value <=ARRAY_SIZE (kone->profiles)) + kone->actual_dpi = + kone->profiles[event->value -1 ].startup_dpi; fallthrough;case kone_mouse_event_osd_profile: kone->actual_profile = event->value;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 122/1518 soc: samsung: exynos-pmu: fix of_node refcount leak in exynos_get_pmu_regmap()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weigang He <[email protected]>
[ Upstream commit fa476d53edd24e8105faace04e881b9c4179738f ]
exynos_get_pmu_regmap() obtains a device_node via of_find_matching_node() and passes it to exynos_get_pmu_regmap_by_phandle(np, NULL). With propname == NULL the callee uses np directly and does not drop a reference, so the reference taken by of_find_matching_node() is leaked on every call -- including on each -EPROBE_DEFER retry of the only in-tree caller, exynos_retention_init() in the Exynos pinctrl driver.
Annotate np with the __free(device_node) cleanup attribute so the reference is released when the function returns.
Found by static analysis tool CodeQL.
--- drivers/soc/samsung/exynos-pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/samsung/exynos-pmu.c +2 -2
@@ -300,8 +300,8 @@ static const struct mfd_cell exynos_pmu_devs[] = {*/ struct regmap *exynos_get_pmu_regmap (void ) { -struct device_node *np =of_find_matching_node (NULL , - exynos_pmu_of_device_ids); + struct device_node *np __free(device_node) = +of_find_matching_node (NULL , exynos_pmu_of_device_ids);if (np)return exynos_get_pmu_regmap_by_phandle (np,NULL );return ERR_PTR (-ENODEV );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 123/1518 media: cec-pin: Fix event FIFO ordering
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit a1d83d1b810665bd53ce8a7b7867e054d68676c7 ]
cec_pin_update() fills work_pin_events[] and work_pin_ts[], then increments work_pin_num_events. cec_pin_thread_func() uses that counter to decide when to read the FIFO entries.
Do not let the counter update be observed without the event update. Also do not let a freed slot be reused before the thread has finished reading it. Use release operations when publishing an entry and releasing a slot, and acquire operations when consuming those counter updates.
Leave the other work_pin_num_events users as they do not participate in this FIFO publication path.
--- drivers/media/cec/core/cec-pin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/cec/core/cec-pin.c +4 -4
@@ -115,7 +115,7 @@ static void cec_pin_update(struct cec_pin *pin, bool v, bool force)return ; pin->adap->cec_pin_is_high = v; -if (atomic_read (&pin->work_pin_num_events) <CEC_NUM_PIN_EVENTS ) { +if (atomic_read_acquire (&pin->work_pin_num_events) <CEC_NUM_PIN_EVENTS ) {u8 ev = v;if (pin->work_pin_events_dropped) {
@@ -126,7 +126,7 @@ static void cec_pin_update(struct cec_pin *pin, bool v, bool force) pin->work_pin_ts[pin->work_pin_events_wr] =ktime_get (); pin->work_pin_events_wr = (pin->work_pin_events_wr +1 ) %CEC_NUM_PIN_EVENTS ; -atomic_inc (&pin->work_pin_num_events); +atomic_inc_return_release (&pin->work_pin_num_events); }else { pin->work_pin_events_dropped = true; pin->work_pin_events_dropped_cnt++;
@@ -1101,7 +1101,7 @@ static int cec_pin_thread_func(void *_adap) pin->work_tx_ts); } -while (atomic_read (&pin->work_pin_num_events)) { +while (atomic_read_acquire (&pin->work_pin_num_events)) {unsigned int idx = pin->work_pin_events_rd;u8 v = pin->work_pin_events[idx];
@@ -1110,7 +1110,7 @@ static int cec_pin_thread_func(void *_adap) v &CEC_PIN_EVENT_FL_DROPPED , pin->work_pin_ts[idx]); pin->work_pin_events_rd = (idx +1 ) %CEC_NUM_PIN_EVENTS ; -atomic_dec (&pin->work_pin_num_events); +atomic_dec_return_release (&pin->work_pin_num_events); } switch (atomic_xchg(&pin->work_irq_change,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 124/1518 cxl/mbox: Clamp mailbox output allocation to the payload size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Cheng <[email protected]>
[ Upstream commit 8a13db9f899d149c3aab24abcb668121cfda5a4f ]
CXL_MEM_SEND_COMMAND bounds the user's in.size to the mailbox payload size but leaves out.size unbounded, then cxl_mbox_cmd_ctor() calls kvzalloc(out.size). A large out.size drives a huge allocation, above INT_MAX it WARNs and taints, and with panic_on_warn=1 it panics.
The transport __cxl_pci_mbox_send_cmd() already clamps the response copy to min(out.size, payload_size, device len), so the output buffer is never written beyond payload_size. Clamp the allocation to payload_size too, matching the RAW path.
--- drivers/cxl/core/mbox.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/cxl/core/mbox.c +1 -5
@@ -379,11 +379,7 @@ static int cxl_mbox_cmd_ctor(struct cxl_mbox_cmd *mbox_cmd, } } -/* Prepare to handle a full payload for variable sized output */ -if (out_size ==CXL_VARIABLE_PAYLOAD ) - mbox_cmd->size_out = cxl_mbox->payload_size; -else - mbox_cmd->size_out = out_size; + mbox_cmd->size_out =min_t (size_t, out_size, cxl_mbox->payload_size);if (mbox_cmd->size_out) { mbox_cmd->payload_out =kvzalloc (mbox_cmd->size_out,GFP_KERNEL );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 125/1518 cxl/pci: Remove incorrect mbox.valid check in cxl_pci_type3_init_mailbox()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Hou <[email protected]>
[ Upstream commit d79b81893d0cc93737e811a465b9ef9a00156fd5 ]
The driver's design intent is that missing or malformed component registers should not prevent mailbox initialization. cxl_pci_probe() already reflects this: the CXL_REGLOC_RBI_COMPONENT setup path only emits a dev_warn() and continues when component registers are absent, rather than returning an error.
The check 'if (!cxlds->reg_map.device_map.mbox.valid)' violates this intent and is also technically incorrect for two reasons:
1. Wrong struct: the MEMDEV register block is enumerated into a local variable 'map', not into 'cxlds->reg_map'. The device_map.mbox.valid field inside cxlds->reg_map is never written by the MEMDEV probe and will always read as zero regardless of actual hardware capability.
2. Already validated: cxl_pci_setup_regs(CXL_REGLOC_RBI_MEMDEV) calls cxl_probe_regs() which explicitly checks mbox.valid and returns -ENXIO if the mailbox is absent. If that check passes, the mailbox is guaranteed to be present by the time cxl_pci_type3_init_mailbox() is called.
The value that the check actually reads is component_map.ras.valid, which aliases device_map.mbox.valid in the union. This is populated by the COMPONENT probe, not the MEMDEV probe. On devices where the component register BAR does not implement a CXL Component Capability Array (e.g. certain DCD devices), cxl_probe_component_regs() returns early leaving ras.valid=false. Through the union, this makes mbox.valid read as false, causing cxl_pci_type3_init_mailbox() to return -ENODEV (-19) even though the mailbox hardware is fully functional.
Remove the check. Mailbox presence has already been validated by cxl_pci_setup_regs(CXL_REGLOC_RBI_MEMDEV). The presence or absence of component registers is irrelevant to mailbox initialization.
--- drivers/cxl/pci.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/cxl/pci.c +0 -6
@@ -807,12 +807,6 @@ static int cxl_pci_type3_init_mailbox(struct cxl_dev_state *cxlds) {int rc; -/* -* Fail the init if there's no mailbox. For a type3 this is out of spec. -*/ -if (!cxlds->reg_map.device_map.mbox.valid) -return -ENODEV ; - rc =cxl_mailbox_init (&cxlds->cxl_mbox, cxlds->dev);if (rc)return rc;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 126/1518 clk: versaclock7: Fix APLL clock leak on probe failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit e25d8d35e8cbc1a4c04a8b86eed6aa7229f6449e ]
vc7_probe() registers the APLL with clk_register_fixed_rate(), which is not devm-managed and must be explicitly unregistered on probe failure.
Most later errors already unwind through err_clk, but a failure from vc7_get_bank_clk() in the output registration loop returned directly. That skipped clk_unregister_fixed_rate() and leaked the APLL clock.
Route that error through the existing err_clk label so the fixed-rate clock is released consistently with the other probe failure paths.
This issue was identified during our ongoing static-analysis research while reviewing kernel code.
--- drivers/clk/clk-versaclock7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-versaclock7.c +1 -1
@@ -1197,7 +1197,7 @@ static int vc7_probe(struct i2c_client *client)if (ret) {dev_err_probe (&client->dev, ret,"unable to register output %d\n" , i); -return ret; + goto err_clk; }switch (bank_src_map.type) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 127/1518 clk: moxart: remove unused variables, fix refcount leak
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander A. Klimov <[email protected]>
[ Upstream commit 9f275f2ee9ca60ea4c092bdc0195987945ad8ad8 ]
Not only these error checks are redundand,
those of_clk_get() return values weren't cleaned up via clk_put().
--- drivers/clk/clk-moxart.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/clk/clk-moxart.c +0 -14
@@ -17,7 +17,6 @@ static void __init moxart_of_pll_clk_init(struct device_node *node) {void __iomem *base;struct clk_hw *hw; -struct clk *ref_clk;unsigned int mul;const char *name = node->name;const char *parent_name;
@@ -34,12 +33,6 @@ static void __init moxart_of_pll_clk_init(struct device_node *node) mul =readl (base +0x30 ) >>3 &0x3f ;iounmap (base); - ref_clk =of_clk_get (node,0 ); -if (IS_ERR (ref_clk)) { -pr_err ("%pOF: of_clk_get failed\n" , node); -return ; - } - hw =clk_hw_register_fixed_factor (NULL , name, parent_name,0 , mul,1 );if (IS_ERR (hw)) {pr_err ("%pOF: failed to register clock\n" , node);
@@ -56,7 +49,6 @@ static void __init moxart_of_apb_clk_init(struct device_node *node) {void __iomem *base;struct clk_hw *hw; -struct clk *pll_clk;unsigned int div, val;unsigned int div_idx[] = {2 ,3 ,4 ,6 ,8 };const char *name = node->name;
@@ -78,12 +70,6 @@ static void __init moxart_of_apb_clk_init(struct device_node *node) val =0 ; div = div_idx[val] *2 ; - pll_clk =of_clk_get (node,0 ); -if (IS_ERR (pll_clk)) { -pr_err ("%pOF: of_clk_get failed\n" , node); -return ; - } - hw =clk_hw_register_fixed_factor (NULL , name, parent_name,0 ,1 , div);if (IS_ERR (hw)) {pr_err ("%pOF: failed to register clock\n" , node);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 128/1518 clk: nuvoton: ma35d1: fix ignored div_u64 return values in PLL freq calculation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joey Lu <[email protected]>
[ Upstream commit b3a2223a7805c7e6759a32a5d6ca574ad07e2710 ]
div_u64() does not modify its argument in place; the return value must be assigned. Both ma35d1_calc_smic_pll_freq() and ma35d1_calc_pll_freq() called div_u64() and discarded the result, leaving pll_freq holding the undivided product and thus returning a frequency orders of magnitude too high.
--- drivers/clk/nuvoton/clk-ma35d1-pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/nuvoton/clk-ma35d1-pll.c +2 -2
@@ -92,7 +92,7 @@ static unsigned long ma35d1_calc_smic_pll_freq(u32 pll0_ctl0, p =FIELD_GET (SPLL0_CTL0_OUTDIV , pll0_ctl0); outdiv =1 << p; pll_freq = (u64 )parent_rate * n; -div_u64 (pll_freq, m * outdiv); + pll_freq =div_u64 (pll_freq, m * outdiv);return pll_freq; }
@@ -110,7 +110,7 @@ static unsigned long ma35d1_calc_pll_freq(u8 mode, u32 *reg_ctl, unsigned long pif (mode ==PLL_MODE_INT ) { pll_freq = (u64 )parent_rate * n; -div_u64 (pll_freq, m * p); + pll_freq =div_u64 (pll_freq, m * p); }else { x =FIELD_GET (PLL_CTL1_FRAC , reg_ctl[1 ]);/* 2 decimal places floating to integer (ex. 1.23 to 123) */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 129/1518 clk: nuvoton: ma35d1: fix PLL_CTL1_FRAC bit field width and fractional calc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joey Lu <[email protected]>
[ Upstream commit 26de5aed72d80bd8aec2583134aca3597c64fda9 ]
PLL_CTL1_FRAC was defined as GENMASK(31, 24), covering only 8 bits. The hardware fractional field occupies bits [31:8] (24 bits), so the mask must be GENMASK(31, 8).
The previous fractional-mode calculation used FIELD_MAX(PLL_CTL1_FRAC) as the denominator to obtain 2 decimal places. With the corrected 24-bit mask the old divisor is wrong; replace the arithmetic with a proper 24-bit fixed-point rounding to 3 decimal places using the kernel's DIV_ROUND_CLOSEST_ULL helper:
n_frac = n * 1000 + DIV_ROUND_CLOSEST_ULL(x * 1000, 1 << 24)
--- drivers/clk/nuvoton/clk-ma35d1-pll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/nuvoton/clk-ma35d1-pll.c +4 -4
@@ -48,7 +48,7 @@#define PLL_CTL1_PD BIT(0)#define PLL_CTL1_BP BIT(1)#define PLL_CTL1_OUTDIV GENMASK(6, 4) -#define PLL_CTL1_FRAC GENMASK(31, 24) +#define PLL_CTL1_FRAC GENMASK(31, 8)#define PLL_CTL2_SLOPE GENMASK(23, 0)#define INDIV_MIN 1
@@ -113,9 +113,9 @@ static unsigned long ma35d1_calc_pll_freq(u8 mode, u32 *reg_ctl, unsigned long p pll_freq =div_u64 (pll_freq, m * p); }else { x =FIELD_GET (PLL_CTL1_FRAC , reg_ctl[1 ]); -/* 2 decimal places floating to integer (ex. 1.23 to 123) */ - n = n *100 + ((x *100 ) /FIELD_MAX (PLL_CTL1_FRAC )); - pll_freq =div_u64 (parent_rate * n,100 * m * p); +/* convert 24-bit fraction to 3 decimal digits, rounding to closest */ + n = n *1000 +DIV_ROUND_CLOSEST_ULL ((u64 )x *1000 ,1ULL <<24 ); + pll_freq =div_u64 ((u64 )parent_rate * n,1000 * m * p); }return pll_freq; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 130/1518 clk: nuvoton: ma35d1: fix ma35d1_clk_pll_determine_rate logic
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joey Lu <[email protected]>
[ Upstream commit e1311954cb600d5f95cd9e2fe9a7376edc2ac3c5 ]
ma35d1_clk_pll_determine_rate() called ma35d1_pll_find_closest() unconditionally before the switch statement, and then every case branch overwrote pll_freq by reading the current hardware registers. For CAPLL and DDRPLL this means find_closest() ran unnecessarily (and incorrectly, since those PLLs are read-only) and its result was silently discarded.
Fix by moving the find_closest() call inside the APLL/EPLL/VPLL branch where it belongs. Group CAPLL and DDRPLL together as read-only PLLs that simply report their current rate; handle them with an explicit if/else to keep the CAPLL (SMIC design) and DDRPLL (standard design) paths distinct.
--- drivers/clk/nuvoton/clk-ma35d1-pll.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/clk/nuvoton/clk-ma35d1-pll.c +13 -13
@@ -255,32 +255,32 @@ static int ma35d1_clk_pll_determine_rate(struct clk_hw *hw,if (req->best_parent_rate <PLL_FREF_MIN_FREQ || req->best_parent_rate >PLL_FREF_MAX_FREQ )return -EINVAL ; - ret =ma35d1_pll_find_closest (pll, req->rate, req->best_parent_rate, - reg_ctl, &pll_freq); -if (ret <0 ) -return ret; -switch (pll->id) {case CAPLL : +case DDRPLL : +/* Read-only PLLs: return current rate */ reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); - pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], req->best_parent_rate); +if (pll->id ==CAPLL ) { + pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], req->best_parent_rate); + }else { + reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); + pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, req->best_parent_rate); + } req->rate = pll_freq; -return 0 ; -case DDRPLL :case APLL :case EPLL :case VPLL : - reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); - reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); - pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, req->best_parent_rate); +/* Configurable PLLs: find closest achievable rate */ + ret =ma35d1_pll_find_closest (pll, req->rate, req->best_parent_rate, + reg_ctl, &pll_freq); +if (ret <0 ) +return ret; req->rate = pll_freq; -return 0 ; } req->rate =0 ; -return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 131/1518 clk: stm32: add missing bitfield.h header
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit 0bf68e8dcb843f094ed73c2c54e9fe58a7a4f774 ]
It seems some ARM header includes this and the build passes there, but nowhere else. Note that the driver has COMPILE_TEST in depends.
--- drivers/clk/stm32/clk-stm32mp21.c | 1 + drivers/clk/stm32/clk-stm32mp25.c | 1 + 2 files changed, 2 insertions(+)
drivers/clk/stm32/clk-stm32mp21.c +1 -0
@@ -4,6 +4,7 @@* Author: Gabriel Fernandez <[email protected]> for STMicroelectronics. */ +#include <linux/bitfield.h> #include <linux/bus/stm32_firewall_device.h> #include <linux/clk-provider.h> #include <linux/io.h>
drivers/clk/stm32/clk-stm32mp25.c +1 -0
@@ -4,6 +4,7 @@* Author: Gabriel Fernandez <[email protected]> for STMicroelectronics. */ +#include <linux/bitfield.h> #include <linux/bus/stm32_firewall_device.h> #include <linux/clk-provider.h> #include <linux/io.h>
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 132/1518 ASoC: rt700-sdw: always drain jack work on remove
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Runyu Xiao <[email protected]>
[ Upstream commit 612ccf42acd14bb2685fa60c3495ca13e63e8989 ]
rt700_sdw_remove() drains jack_detect_work and jack_btn_check_work only when rt700->hw_init is true. That state bit is cleared by rt700_update_status() when the SoundWire slave becomes UNATTACHED, but a jack work item can already have been queued by rt700_interrupt_callback() or rt700_jack_init() while the device was initialized.
Do not use hw_init as the remove-time guard for draining these work objects. The delayed works are initialized during rt700_init(), so remove can cancel them unconditionally and pair the object lifetime with the codec-private data lifetime instead of a mutable hardware state bit.
This issue was found by our static analysis tool and then confirmed by manual review of the SoundWire status, interrupt and remove paths. The remove path should drain work based on whether the work object exists, not on a runtime hardware state bit that can change after the work was queued.
A QEMU PoC queued jack_detect_work, simulated SDW_SLAVE_UNATTACHED, and then entered remove. DEBUG_OBJECTS reported an active timer/work object associated with the rt700 jack work path after remove skipped the cancel.
This is sent as an RFC because the practical trigger depends on SoundWire core remove ordering after an UNATTACHED status update. If remove cannot run after hw_init has been cleared while jack work is still pending, this is a defensive lifecycle cleanup rather than a reachable race on current systems.
--- sound/soc/codecs/rt700-sdw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/rt700-sdw.c +2 -4
@@ -459,10 +459,8 @@ static int rt700_sdw_remove(struct sdw_slave *slave) {struct rt700_priv *rt700 =dev_get_drvdata (&slave->dev); -if (rt700->hw_init) { -cancel_delayed_work_sync (&rt700->jack_detect_work); -cancel_delayed_work_sync (&rt700->jack_btn_check_work); - } +cancel_delayed_work_sync (&rt700->jack_detect_work); +cancel_delayed_work_sync (&rt700->jack_btn_check_work);pm_runtime_disable (&slave->dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 133/1518 ASoC: fsl_audmix: rework runtime PM handling in probe
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit 3359ba93d01a23b2e4249e9e44ccfe48eb9c5d71 ]
After pm_runtime_enable() the AUDMIX block is powered off and stays suspended until the first runtime resume. Register writes issued between probe() and the first resume (e.g. from DAPM or ALSA control paths) target unpowered hardware and cause a system hang.
Fix this by calling pm_runtime_resume_and_get() immediately after pm_runtime_enable() to power the hardware up and enable its clocks. Release the reference afterwards with pm_runtime_put() to allow the runtime PM framework to suspend the device and switch the regmap to cache-only mode when idle.
When CONFIG_PM is disabled or runtime PM is not enabled, pm_runtime_* calls are stubs that do not power up the hardware. Handle this case explicitly by calling fsl_audmix_runtime_resume() directly so the hardware is always initialised and its clocks are enabled, ensuring register accesses succeed regardless of PM configuration.
--- sound/soc/fsl/fsl_audmix.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl_audmix.c +22 -2
@@ -454,6 +454,9 @@ static const struct of_device_id fsl_audmix_ids[] = { };MODULE_DEVICE_TABLE (of, fsl_audmix_ids); +static int fsl_audmix_runtime_resume (struct device *dev); +static int fsl_audmix_runtime_suspend (struct device *dev); +static int fsl_audmix_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -485,13 +488,25 @@ static int fsl_audmix_probe(struct platform_device *pdev)spin_lock_init (&priv->lock);platform_set_drvdata (pdev, priv);pm_runtime_enable (dev); +if (!pm_runtime_enabled (dev)) { + ret =fsl_audmix_runtime_resume (dev); +if (ret) + goto err_disable_pm; + } + + ret =pm_runtime_resume_and_get (dev); +if (ret <0 ) + goto err_pm_get_sync; + +/* To enable regmap cache only when runtime PM enabled */ +pm_runtime_put (dev); ret =devm_snd_soc_register_component (dev, &fsl_audmix_component, fsl_audmix_dai,ARRAY_SIZE (fsl_audmix_dai));if (ret) {dev_err (dev,"failed to register ASoC DAI\n" ); - goto err_disable_pm; + goto err_pm_get_sync; }/*
@@ -503,12 +518,15 @@ static int fsl_audmix_probe(struct platform_device *pdev)if (IS_ERR (priv->pdev)) { ret =PTR_ERR (priv->pdev);dev_err (dev,"failed to register platform: %d\n" , ret); - goto err_disable_pm; + goto err_pm_get_sync; } }return 0 ; +err_pm_get_sync: +if (!pm_runtime_status_suspended (dev)) +fsl_audmix_runtime_suspend (dev); err_disable_pm:pm_runtime_disable (dev);return ret;
@@ -519,6 +537,8 @@ static void fsl_audmix_remove(struct platform_device *pdev)struct fsl_audmix *priv =dev_get_drvdata (&pdev->dev);pm_runtime_disable (&pdev->dev); +if (!pm_runtime_status_suspended (&pdev->dev)) +fsl_audmix_runtime_suspend (&pdev->dev);if (priv->pdev)platform_device_unregister (priv->pdev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 134/1518 clk: hisilicon: reset: Use devm_kzalloc to initialize hisi_reset_controller
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Min zhang <[email protected]>
[ Upstream commit a8036f4591542de4b38ec81d3e2ba47bc0b2652b ]
Using devm_kmalloc() does not zero-initialize the allocated structure. Uninitialized members in struct hisi_reset_controller may contain garbage data, which can cause reset_controller_register() to fail unexpectedly.
Replace devm_kmalloc() with devm_kzalloc() to ensure all structure fields are properly zero-initialized.
--- drivers/clk/hisilicon/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/hisilicon/reset.c +1 -1
@@ -91,7 +91,7 @@ struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev) {struct hisi_reset_controller *rstc; - rstc =devm_kmalloc (&pdev->dev,sizeof (*rstc),GFP_KERNEL ); + rstc =devm_kzalloc (&pdev->dev,sizeof (*rstc),GFP_KERNEL );if (!rstc)return NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 135/1518 ARM: imx: fix device_node refcount leak in imx_src_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weigang He <[email protected]>
[ Upstream commit 936407c3563ac745cbbb9953c0cf2472128a22f4 ]
imx_src_init() obtains a device_node reference via of_find_compatible_node() matching "fsl,imx51-src" and uses it only to call of_iomap(). It never releases that reference: on the success path the function returns at the end without of_node_put(np), leaking one device_node refcount on every boot of an i.MX5/6 platform.
Release the reference right after of_iomap(). of_iomap() maps the node's registers but does not retain a reference to the device_node, so the node can be put once the mapping is done. The early return on a NULL np needs no put.
Found by static analysis tool CodeQL.
--- arch/arm/mach-imx/src.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-imx/src.c +1 -0
@@ -171,6 +171,7 @@ void __init imx_src_init(void)if (!np)return ; src_base =of_iomap (np,0 ); +of_node_put (np);WARN_ON (!src_base);/*
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 136/1518 ARM: imx: fix device_node refcount leaks in imx7_src_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weigang He <[email protected]>
[ Upstream commit 3de939b2ac843d56d88e2ab1e1b1f667cba9e1d4 ]
imx7_src_init() obtains two device_node references via of_find_compatible_node() - one for "fsl,imx7d-src" and one for "fsl,imx7d-gpc" - reusing the same np variable, but never calls of_node_put() on either. On every i.MX7D boot up to two device_node refcounts are leaked:
- The "fsl,imx7d-src" node is leaked both when of_iomap() fails (the early return after the mapping) and when it succeeds, because np is then overwritten by the second of_find_compatible_node() call without releasing the prior reference.
- The "fsl,imx7d-gpc" node is leaked on every path leaving the function after it is acquired.
Release each reference immediately after of_iomap() consumes the node. of_iomap() maps the node's registers but does not retain a reference to the device_node, so it is safe to put the node once mapped; this also drops the first reference before np is reused for the second lookup.
Found by static analysis tool CodeQL.
--- arch/arm/mach-imx/src.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-imx/src.c +2 -0
@@ -196,6 +196,7 @@ void __init imx7_src_init(void)return ; src_base =of_iomap (np,0 ); +of_node_put (np);if (!src_base)return ;
@@ -204,6 +205,7 @@ void __init imx7_src_init(void)return ; gpc_base =of_iomap (np,0 ); +of_node_put (np);if (!gpc_base)return ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 137/1518 arm64: dts: imx93-kontron: set memory node to 0x80000000/1GiB
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frieder Schrempf <[email protected]>
[ Upstream commit 9c269fe7eae8cb60d8d6c326dd8955818722fae9 ]
The start address of the DRAM area is 0x80000000. The minimal size of the DDR on the SoM is 1 GiB.
--- arch/arm64/boot/dts/freescale/imx93-kontron-osm-s.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx93-kontron-osm-s.dtsi +2 -2
@@ -15,9 +15,9 @@ aliases { rtc1 = &bbnsm_rtc; }; - memory@40000000 { + memory@80000000 { device_type = "memory"; - reg = <0x0 0x40000000 0 0x80000000>; + reg = <0x0 0x80000000 0 0x40000000>; }; chosen {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 138/1518 clk: imx: scu: drop redundant init.ops variable assignment
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit 5f2db1ce201216e81333ecc2ab51494410b2fe0d ]
The init.ops is assigned a default value, however right below it is an if, else if, and else where all of them also assign a value to init.ops. Drop the redundant init.ops assignment at the top.
--- drivers/clk/imx/clk-scu.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/imx/clk-scu.c +0 -1
@@ -465,7 +465,6 @@ struct clk_hw *__imx_clk_scu(struct device *dev, const char *name, clk->clk_type = clk_type; init.name = name; - init.ops = &clk_scu_ops;if (rsrc_id ==IMX_SC_R_A35 || rsrc_id ==IMX_SC_R_A53 || rsrc_id ==IMX_SC_R_A72 ) init.ops = &clk_scu_cpu_ops;else if (rsrc_id ==IMX_SC_R_PI_0_PLL )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 139/1518 drm/lima: call drm_mm_init() with a valid allocation range
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henrik Grimler <[email protected]>
[ Upstream commit 3b3bce4a692ac60d9f4a341e6b597dd1fd0a28f9 ]
lima_vm_create() is currently run before va_start and va_end are set up, meaning they are both 0. lima_vm_create() runs drm_mm_init() with them as arguments for the allocator, and if DRM_DEBUG_MM is enabled the DRM_MM_BUG_ON check in drm_mm_init then fires, as seen here on exynos4412-odroid-u2:
[ 1.736297] ------------[ cut here ]------------ [ 1.740370] kernel BUG at drivers/gpu/drm/drm_mm.c:931! [ 1.745574] Internal error: Oops - BUG: 0 [#1] SMP ARM [ 1.750697] Modules linked in: [ 1.753734] CPU: 0 UID: 0 PID: 41 Comm: kworker/u16:1 Not tainted 7.0.10-postmarketos-exynos4 #11 PREEMPT [ 1.763372] Hardware name: Samsung Exynos (Flattened Device Tree) [ 1.769446] Workqueue: events_unbound deferred_probe_work_func [ 1.775261] PC is at drm_mm_init+0x9c/0xa4 [ 1.779339] LR is at lima_vm_create+0x144/0x17c
[ ... ]
Fix the issue by moving the lima_vm_create() call after va_start and va_end are set up.
--- drivers/gpu/drm/lima/lima_device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/lima/lima_device.c +6 -6
@@ -368,12 +368,6 @@ int lima_device_init(struct lima_device *ldev)if (err) goto err_out0; - ldev->empty_vm =lima_vm_create (ldev); -if (!ldev->empty_vm) { - err = -ENOMEM ; - goto err_out1; - } - ldev->va_start =0 ;if (ldev->id == lima_gpu_mali450) { ldev->va_end =LIMA_VA_RESERVE_START ;
@@ -387,6 +381,12 @@ int lima_device_init(struct lima_device *ldev) }else ldev->va_end =LIMA_VA_RESERVE_END ; + ldev->empty_vm =lima_vm_create (ldev); +if (!ldev->empty_vm) { + err = -ENOMEM ; + goto err_out1; + } + ldev->iomem =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (ldev->iomem)) {dev_err (ldev->dev,"fail to ioremap iomem\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 140/1518 mm/mm_init: fix incorrect node_spanned_pages
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Yang <[email protected]>
[ Upstream commit 7783dcd79ae9c4aa48bc47bd4275772445dc4b2a ]
Current node_spanned_pages is got as a summation of all zone's spanned page in calculate_node_totalpages(). Generally this is good, but if we use kernelcore=mirror, it is would be wrong.
Without kernelcore=mirror:
The test machine has below memory layout:
memory[0x0] [0x0000000000001000-0x000000000009efff], 0x000000000009e000 bytes on node 0 flags: 0x0
memory[0x1] [0x0000000000100000-0x00000000bffdefff], 0x00000000bfedf000 bytes on node 0 flags: 0x0
memory[0x2] [0x0000000100000000-0x00000001bfffffff], 0x00000000c0000000 bytes on node 0 flags: 0x0
And the Zone range is:
DMA [mem 0x0000000000001000-0x0000000000ffffff]
DMA32 [mem 0x0000000001000000-0x00000000ffffffff]
Normal [mem 0x0000000100000000-0x00000001bfffffff]
Then we see, with spanned_pages printed:
On node 0 spanned_pages: 1835007 totalpages: 1572733With kernelcore=mirror:
The test machine has below memory layout:
memory[0x0] [0x0000000000001000-0x000000000009efff], 0x000000000009e000 bytes on node 0 flags: 0x2
memory[0x1] [0x0000000000100000-0x00000000bffdefff], 0x00000000bfedf000 bytes on node 0 flags: 0x2
memory[0x2] [0x0000000100000000-0x000000013fffffff], 0x0000000040000000 bytes on node 0 flags: 0x2
memory[0x3] [0x0000000140000000-0x00000001bfffffff], 0x0000000080000000 bytes on node 0 flags: 0x0
And the Zone range is:
DMA [mem 0x0000000000001000-0x0000000000ffffff]
DMA32 [mem 0x0000000001000000-0x00000000ffffffff]
Normal [mem 0x0000000100000000-0x00000001bfffffff]
Device empty
Movable zone start for each node
Node 0: 0x0000000140000000
Then we see, with spanned_pages printed:
On node 0 spanned_pages: 2359295 totalpages: 1572733The total range of memory on node 0 doesn't change, but the spanned_pages becomes much larger.
The reason is when kernelcore=mirror is specified, the range of Zone Normal and Zone Movable would overlap. So the overlapped range would be calculated twice.
A wrong node_spanned_pages would effect defer_init(), since each zone_end_pfn is less than pgdat_end_pfn().
As we already passed in node_start_pfn and node_end_pfn, fix this by get it from (node_start_pfn - node_end_pfn) directly.
--- mm/mm_init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
mm/mm_init.c +2 -3
@@ -1351,7 +1351,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat,unsigned long node_start_pfn, unsigned long node_end_pfn) { - unsigned long realtotalpages = 0, totalpages = 0; + unsigned long realtotalpages = 0;enum zone_type i;for (i =0 ; i <MAX_NR_ZONES ; i++) {
@@ -1381,11 +1381,10 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, zone->present_early_pages = real_size;#endif - totalpages += spanned; realtotalpages += real_size; } - pgdat->node_spanned_pages = totalpages; + pgdat->node_spanned_pages = node_end_pfn - node_start_pfn; pgdat->node_present_pages = realtotalpages;pr_debug ("On node %d totalpages: %lu\n" , pgdat->node_id, realtotalpages); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 141/1518 sched/fair: Fix overflow in update_tg_cfs_runnable()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen, Yu C <[email protected]>
[ Upstream commit 4f166adb5cb0525d9e32d45729fd8f28c80acbee ]
A divide-by-zero crash is observed when running hackbench:
[14697.488452] CPU: 112 UID: 0 PID: 124791 Comm: hackbench Not tainted 7.1.0-rc2+ [14697.492627] RIP: 0010:propagate_entity_load_avg+0x35f/0x3e0 [14697.506799] <TASK> [14697.507411] __dequeue_task+0x2b4/0xc70 [14697.508677] dequeue_task_fair+0x36/0x370 [14697.509047] dequeue_task+0x101/0x2f0 [14697.509426] __schedule+0x1b1/0x1a00 [14697.510868] anon_pipe_read+0x3da/0x450 [14697.511400] vfs_read+0x361/0x390 [14697.512053] __x64_sys_read+0x19/0x30
The divide-by-zero happens here:
if (scale_load_down(gcfs_rq->load.weight)) {
load_sum = div_u64(gcfs_rq->avg.load_sum,
scale_load_down(gcfs_rq->load.weight));
}gcfs_rq->load.weight is an insane large value and is truncated to the lower 32 bits by div_u64, which happen to be 0.
Using AI for investigation, the cause is a u32 overflow in update_tg_cfs_runnable(), and flat pickup became a victim when using tg_tasks():
u32 new_sum, divider;
...
new_sum = se->avg.runnable_avg * divider; <-- boom
The following sequence shows how this triggers the crash:
propagate_entity_load_avg()
update_tg_cfs_runnable() # u32 overflow corrupts runnable_sum
__update_load_avg_cfs_rq()
___update_load_avg() # computes insane runnable_avg
update_tg_load_avg() # propagates to tg->runnable_avg
update_cfs_group()
calc_concur_shares()
tg_tasks() # long-to-int truncation, negative nr
reweight_entity() # corrupted se->load.weight
update_load_add() # corrupted cfs_rq->load.weight propagate_entity_load_avg()
update_tg_cfs_load()
div_u64() # divide-by-zero
Fix by widening new_sum from u32 to u64 (no need to force tg_tasks() to return unsigned long after this fix)
--- kernel/sched/fair.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/fair.c +3 -2
@@ -4463,7 +4463,8 @@ static inline void update_tg_cfs_runnable(struct cfs_rq *cfs_rq, struct sched_entity *se, struct cfs_rq *gcfs_rq) { long delta_sum, delta_avg = gcfs_rq->avg.runnable_avg - se->avg.runnable_avg; -u32 new_sum, divider; +u64 new_sum; +u32 divider;/* Nothing to update */ if (!delta_avg)
@@ -4477,7 +4478,7 @@ update_tg_cfs_runnable(struct cfs_rq *cfs_rq, struct sched_entity *se, struct cf/* Set new sched_entity's runnable */ se->avg.runnable_avg = gcfs_rq->avg.runnable_avg; - new_sum = se->avg.runnable_avg * divider; + new_sum = (u64 )se->avg.runnable_avg * divider; delta_sum = (long )new_sum - (long )se->avg.runnable_sum; se->avg.runnable_sum = new_sum;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 142/1518 perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zide Chen <[email protected]>
[ Upstream commit 3012af7df3430788eddd30b3c6654d0a0a5f06c6 ]
uncore_event_cpu_online() returns -ENOMEM early when both the MSR and MMIO box allocations fail. This also aborts PCI uncore setup, even though PCI PMUs are independent of the MSR/MMIO paths.
Remove the early return so PCI uncore setup always runs regardless of whether MSR or MMIO box allocation succeeds.
--- arch/x86/events/intel/uncore.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/events/intel/uncore.c +0 -2
@@ -1613,8 +1613,6 @@ static int uncore_event_cpu_online(unsigned int cpu) die =topology_logical_die_id (cpu); msr_ret =uncore_box_ref (uncore_msr_uncores, die, cpu); mmio_ret =uncore_box_ref (uncore_mmio_uncores, die, cpu); -if (msr_ret && mmio_ret) -return -ENOMEM ;/* * Check if there is an online cpu in the package
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 143/1518 pinctrl: bcm2835: Dont remove an unregistered GPIO chip
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel McCarthy <[email protected]>
[ Upstream commit 32711f77db0641e57fd96fdc013bf1286b9f2514 ]
If the devm_pinctrl_register() function fails, bcm2835_pinctrl_probe() calls gpiochip_remove() before gpiochip_add_data() has registered the GPIO chip.
This means that upon failure the gpio_chip.gpiodev
is NULL resulting in a null pointer dereference
inside the gpiochip_remove() function.
Remove the unnecessary function call to gpiochip_remove(). No GPIO cleanup is required because the GPIO chip has not yet been registered. Without this change there is potential for a kernel panic upon registration failure
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 1 - 1 file changed, 1 deletion(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +0 -1
@@ -1351,7 +1351,6 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) pc->pctl_desc = *pdata->pctl_desc; pc->pctl_dev =devm_pinctrl_register (dev, &pc->pctl_desc, pc);if (IS_ERR (pc->pctl_dev)) { -gpiochip_remove (&pc->gpio_chip);return PTR_ERR (pc->pctl_dev); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 144/1518 riscv: kexec_file: Fix crashk_low_res not exclude bug
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjie Ruan <[email protected]>
[ Upstream commit 5fc6e7d45373571d03cd04fd4c6069c0a97fa75a ]
As done in commit 944a45abfabc ("arm64: kdump: Reimplement crashkernel=X") and commit 4831be702b95 ("arm64/kexec: Fix missing extra range for crashkres_low.") for arm64, while implementing crashkernel=X,[high,low], riscv should have excluded the "crashk_low_res" reserved ranges from the crash kernel memory to prevent them from being exported through /proc/vmcore, and the exclusion would need an extra crash_mem range.
Just simply tested on qemu with crashkernel=4G with kexec in [1] mentioned in [2]. And the second kernel can be started normally.
# dmesg | grep crash [ 0.000000] crashkernel low memory reserved: 0xf8000000 - 0x100000000 (128 MB) [ 0.000000] crashkernel reserved: 0x000000017fe00000 - 0x000000027fe00000 (4096 MB)
[1]: https://github.com/chenjh005/kexec-tools/tree/build-test-riscv-v2
[2]: https://lore.kernel.org/all/[email protected]/
--- arch/riscv/kernel/machine_kexec_file.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/riscv/kernel/machine_kexec_file.c +11 -3
@@ -61,7 +61,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)unsigned int nr_ranges;int ret; - nr_ranges =1 ;/* For exclusion of crashkernel region */ + nr_ranges =2 ;/* For exclusion of crashkernel region */ walk_system_ram_res (0 ,-1 , &nr_ranges, get_nr_ram_ranges_callback); cmem =kmalloc (struct_size (cmem, ranges, nr_ranges),GFP_KERNEL );
@@ -76,8 +76,16 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)/* Exclude crashkernel region */ ret =crash_exclude_mem_range (cmem, crashk_res.start, crashk_res.end); -if (!ret) - ret =crash_prepare_elf64_headers (cmem, true, addr, sz); +if (ret) + goto out; + +if (crashk_low_res.end) { + ret =crash_exclude_mem_range (cmem, crashk_low_res.start, crashk_low_res.end); +if (ret) + goto out; + } + + ret =crash_prepare_elf64_headers (cmem, true, addr, sz); out:kfree (cmem);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 145/1518 media: keymaps: Remove obsolete RC_MAP_RC5_TV keymap define
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
[ Upstream commit 5370facb7b4461166a4610d456fefeb92ef50a82 ]
Since commit 206241069ecf ("[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap"), the rc-rc5-tv keymap is no longer in the tree.
--- include/media/rc-map.h | 1 - 1 file changed, 1 deletion(-)
include/media/rc-map.h +0 -1
@@ -309,7 +309,6 @@ struct rc_map *rc_map_get(const char *name);#define RC_MAP_PROTEUS_2309 "rc-proteus-2309"#define RC_MAP_PURPLETV "rc-purpletv"#define RC_MAP_PV951 "rc-pv951" -#define RC_MAP_RC5_TV "rc-rc5-tv"#define RC_MAP_RC6_MCE "rc-rc6-mce"#define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys"#define RC_MAP_REDDO "rc-reddo"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 146/1518 media: keymaps: Remove obsolete RC_MAP_HAUPPAUGE_NEW keymap define
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
[ Upstream commit 6e5deb2923b0d1b73c77a1a77c30b0da43d9e022 ]
Since commit af86ce79f020 ("[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map"), the RC_MAP_HAUPPAUGE_NEW define is no longer used.
--- include/media/rc-map.h | 1 - 1 file changed, 1 deletion(-)
include/media/rc-map.h +0 -1
@@ -262,7 +262,6 @@ struct rc_map *rc_map_get(const char *name);#define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce"#define RC_MAP_GOTVIEW7135 "rc-gotview7135"#define RC_MAP_HAUPPAUGE "rc-hauppauge" -#define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge"#define RC_MAP_HISI_POPLAR "rc-hisi-poplar"#define RC_MAP_HISI_TV_DEMO "rc-hisi-tv-demo"#define RC_MAP_IMON_MCE "rc-imon-mce"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 147/1518 wifi: ath12k: correct monitor destination ring size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit 913998f903fb1432c0046c33003db38a9e8bedb1 ]
The default memory profile configures rxdma_monitor_dst_ring_size as 8092, which is a typo. The intended value is 8192, consistent with all other ring sizes in the table being powers of two.
Correct the monitor destination ring size to 8192.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/core.c +1 -1
@@ -46,7 +46,7 @@ ath12k_mem_profile_based_param ath12k_mem_profile_based_param[] = { .dp_params = { .tx_comp_ring_size = 32768, .rxdma_monitor_buf_ring_size = 4096, - .rxdma_monitor_dst_ring_size = 8092, + .rxdma_monitor_dst_ring_size = 8192, .num_pool_tx_desc = 32768, .rx_desc_count = 12288, },
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 148/1518 perf test: Drain pipe after child finishes to avoid losing output
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 744af598719776b2ca8b0f5388b51d2493cc94b7 ]
When running tests in parallel, the parent process reads output from the child's pipe. However, it might exit the loop as soon as the child is detected as finished, potentially missing data that arrived in the pipe just after the last poll or before the loop terminated.
Address this by draining the pipe after the main loop in finish_test.
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/perf/tests/builtin-test.c +10 -0
@@ -476,6 +476,16 @@ static void finish_test(struct child_test **child_tests, int running_test, int cif (err_done) err_done =check_if_command_finished (&child_test->process); } +/* Drain any remaining data from the pipe. */ +if (err >0 ) { +char buf[512 ]; +ssize_t len; + +while ((len =read (err, buf,sizeof (buf) -1 )) >0 ) { + buf[len] ='\0' ; +strbuf_addstr (&err_output, buf); + } + }if (perf_use_color_default && last_running !=-1 ) {/* Erase "Running (.. active)" line printed before poll/sleep. */ fprintf (debug_file (),PERF_COLOR_DELETE_LINE );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 149/1518 perf test: Refactor parallel poll loop to drain all pipes simultaneously
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit f35450738e789b80b540f41487b9053defd0bb8d ]
When running tests in parallel with verbose output (-v), child processes write to pipes. If a test produces significant output (e.g. Granite Rapids metric parsing printing hundreds of lines), it fills the 64KB pipe buffer and blocks.
Previously, the parent harness (finish_test) only polled the pipe of the current test waiting to be printed. Other children blocked indefinitely until the parent reached them, severely sequentializing execution.
Address this by implementing finish_tests_parallel() to poll and drain output pipes from all running children simultaneously into per-child buffers, employing safe strbuf_addstr string operations alongside thorough variable orderings for strict ISO C90 compliance. Reaping occurs out of order as children finish, while final result printing remains strictly in order.
This drops parallel verbose execution time for the PMU events suite from ~35 seconds down to ~5.9 seconds.
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 267 +++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 8 deletions(-)
tools/perf/tests/builtin-test.c +259 -8
@@ -295,6 +295,9 @@ struct child_test {struct test_suite *test;int suite_num;int test_case_num; +struct strbuf err_output; +int result; +bool done; };static jmp_buf run_test_jmp_buf;
@@ -349,6 +352,11 @@ static int run_test_child(struct child_process *process)#define TEST_RUNNING -3 +static struct pollfd *global_pfds; +static size_t *global_pfd_indices; + +static int strbuf_addstr_safe (struct strbuf *sb,const char *s); +static int print_test_result (struct test_suite *t,int curr_suite,int curr_test_case,int result,int width,int running) {
@@ -415,7 +423,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int c* Busy loop reading from the child's stdout/stderr that are set to be * non-blocking until EOF. */ -if (err >0 ) +if (err >=0 )fcntl (err,F_SETFL ,O_NONBLOCK );if (verbose >1 ) {if (test_suite__num_test_cases (t) >1 )
@@ -469,7 +477,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int cif (len >0 ) { err_done = false; buf[len] ='\0' ; -strbuf_addstr (&err_output, buf); +strbuf_addstr_safe (&err_output, buf); } } }
@@ -477,13 +485,13 @@ static void finish_test(struct child_test **child_tests, int running_test, int c err_done =check_if_command_finished (&child_test->process); }/* Drain any remaining data from the pipe. */ -if (err >0 ) { +if (err >=0 ) {char buf[512 ];ssize_t len;while ((len =read (err, buf,sizeof (buf) -1 )) >0 ) { buf[len] ='\0' ; -strbuf_addstr (&err_output, buf); +strbuf_addstr_safe (&err_output, buf); } }if (perf_use_color_default && last_running !=-1 ) {
@@ -492,16 +500,253 @@ static void finish_test(struct child_test **child_tests, int running_test, int c }/* Clean up child process. */ ret =finish_command (&child_test->process); + child_test->process.pid =0 ; +if (child_test->err_output.len >0 ) { +struct strbuf merged =STRBUF_INIT ; + +if (child_test->err_output.buf) +strbuf_addstr_safe (&merged, child_test->err_output.buf); +if (err_output.buf) +strbuf_addstr_safe (&merged, err_output.buf); +strbuf_release (&err_output); + err_output = merged; + }if (verbose >1 || (verbose ==1 && ret ==TEST_FAIL ))fprintf (stderr,"%s" , err_output.buf);strbuf_release (&err_output); +strbuf_release (&child_test->err_output);print_test_result (t, curr_suite, curr_test_case, ret, width,/*running=*/ 0 );if (err >0 )close (err);zfree (&child_tests[running_test]); } +static int strbuf_addstr_safe (struct strbuf *sb,const char *s) +{ +sigset_t set, oldset; +int ret; + +sigemptyset (&set); +sigaddset (&set,SIGINT ); +sigaddset (&set,SIGTERM ); +pthread_sigmask (SIG_BLOCK , &set, &oldset); + ret =strbuf_addstr (sb, s); +pthread_sigmask (SIG_SETMASK , &oldset,NULL ); +return ret; +} + +static void drain_child_process_err (struct child_test *child) +{ +char buf[512 ]; +ssize_t len; + +while ((len =read (child->process.err, buf,sizeof (buf) -1 )) >0 ) { + buf[len] ='\0' ; +strbuf_addstr_safe (&child->err_output, buf); + } +} + +static void handle_child_pipe_activity (struct child_test *child,short revents) +{ +if (!revents) +return ; + +drain_child_process_err (child); +/* +* If the child closed its end of the pipe (EOF) or encountered +* an error, close the file descriptor immediately and set it +* to -1. This removes it from the pfds array for subsequent +* iterations, preventing a tight CPU busy-loop while waiting +* for the process itself to exit. +*/ +if (revents & (POLLHUP |POLLERR |POLLNVAL )) { +close (child->process.err); + child->process.err =-1 ; + } +} + +static int finish_tests_parallel (struct child_test **child_tests,size_t num_tests,int width) +{ +size_t next_to_print =0 ; +struct pollfd *pfds; +size_t *pfd_indices; +size_t num_pfds =0 ; +int last_running =-1 ; +size_t i; +int last_suite_printed =-1 ; +sigset_t set, oldset; + +sigemptyset (&set); +sigaddset (&set,SIGINT ); +sigaddset (&set,SIGTERM ); + +pthread_sigmask (SIG_BLOCK , &set, &oldset); + global_pfds =calloc (num_tests,sizeof (*pfds)); + global_pfd_indices =calloc (num_tests,sizeof (*pfd_indices)); + pfds = global_pfds; + pfd_indices = global_pfd_indices; +if (!pfds || !pfd_indices) { +free (pfds); +free (pfd_indices); + global_pfds =NULL ; + global_pfd_indices =NULL ; +pthread_sigmask (SIG_SETMASK , &oldset,NULL ); +return -ENOMEM ; + } +pthread_sigmask (SIG_SETMASK , &oldset,NULL ); + +for (i =0 ; i < num_tests; i++) { +struct child_test *child = child_tests[i]; + +if (!child) +continue ; +strbuf_init (&child->err_output,0 ); +if (child->process.err >=0 ) +fcntl (child->process.err,F_SETFL ,O_NONBLOCK ); + } + +while (next_to_print < num_tests) { +size_t running_count =0 ; +size_t p; + +while (next_to_print < num_tests && + (!child_tests[next_to_print] || child_tests[next_to_print]->done)) + next_to_print++; + +if (next_to_print >= num_tests) +break ; + + num_pfds =0 ; + +for (i = next_to_print; i < num_tests; i++) { +struct child_test *child = child_tests[i]; + +if (!child || child->done) +continue ; + +if (!check_if_command_finished (&child->process)) + running_count++; + +if (child->process.err >=0 ) { + pfds[num_pfds].fd = child->process.err; + pfds[num_pfds].events =POLLIN |POLLERR |POLLHUP |POLLNVAL ; + pfd_indices[num_pfds] = i; + num_pfds++; + } + } + +if (perf_use_color_default && running_count != (size_t )last_running) { +struct child_test *next_child = child_tests[next_to_print]; + +if (last_running !=-1 ) +fprintf (debug_file (),PERF_COLOR_DELETE_LINE ); + +if (next_child) { +if (test_suite__num_test_cases (next_child->test) >1 && + last_suite_printed != next_child->suite_num) { +pr_info ("%3d: %-*s:\n" , next_child->suite_num +1 , width, +test_description (next_child->test,-1 )); + last_suite_printed = next_child->suite_num; + } +print_test_result (next_child->test, next_child->suite_num, + next_child->test_case_num,TEST_RUNNING , width, + running_count); + } + last_running = running_count; + } + +if (num_pfds ==0 ) { +if (running_count >0 ) +usleep (10 *1000 ); + }else { +int pret =poll (pfds, num_pfds,100 ); + +if (pret >0 ) { +for (p =0 ; p < num_pfds; p++) { +size_t idx = pfd_indices[p]; + +handle_child_pipe_activity (child_tests[idx], + pfds[p].revents); + } + } + } + +for (i = next_to_print; i < num_tests; i++) { +struct child_test *child = child_tests[i]; + +if (!child || child->done) +continue ; + +if (check_if_command_finished (&child->process)) { +if (child->process.err >=0 ) { +drain_child_process_err (child); +close (child->process.err); + child->process.err =-1 ; + } + child->result =finish_command (&child->process); + child->process.pid =0 ; + child->done = true; + } + } + +while (next_to_print < num_tests) { +struct child_test *child = child_tests[next_to_print]; + +if (!child) { + next_to_print++; +continue ; + } +if (!child->done) +break ; + +if (perf_use_color_default && last_running !=-1 ) { +fprintf (debug_file (),PERF_COLOR_DELETE_LINE ); + last_running =-1 ; + } + +if (test_suite__num_test_cases (child->test) >1 && + last_suite_printed != child->suite_num) { +pr_info ("%3d: %-*s:\n" , child->suite_num +1 , width, +test_description (child->test,-1 )); + last_suite_printed = child->suite_num; + } + +if (verbose >1 ) { +if (test_suite__num_test_cases (child->test) >1 ) { +pr_info ("%3d.%1d: %s:\n" , child->suite_num +1 , + child->test_case_num +1 , +test_description (child->test, + child->test_case_num)); + }else { +pr_info ("%3d: %s:\n" , child->suite_num +1 , +test_description (child->test,-1 )); + } + } + +if (verbose >1 || (verbose ==1 && child->result ==TEST_FAIL )) +fprintf (stderr,"%s" , child->err_output.buf); + +print_test_result (child->test, child->suite_num, child->test_case_num, + child->result, width,0 ); +pthread_sigmask (SIG_BLOCK , &set, &oldset); +strbuf_release (&child->err_output); + child_tests[next_to_print] =NULL ; +zfree (&child); +pthread_sigmask (SIG_SETMASK , &oldset,NULL ); + next_to_print++; + } + } + +pthread_sigmask (SIG_BLOCK , &set, &oldset); +free (global_pfds); +free (global_pfd_indices); + global_pfds =NULL ; + global_pfd_indices =NULL ; +pthread_sigmask (SIG_SETMASK , &oldset,NULL ); +return 0 ; +} +static int start_test (struct test_suite *test,int curr_suite,int curr_test_case,struct child_test **child,int width,int pass) {
@@ -535,13 +780,14 @@ static int start_test(struct test_suite *test, int curr_suite, int curr_test_cas (*child)->test_case_num = curr_test_case; (*child)->process.pid =-1 ; (*child)->process.no_stdin =1 ; + (*child)->process.in =-1 ; + (*child)->process.out =-1 ; + (*child)->process.err =-1 ;if (verbose <=0 ) { (*child)->process.no_stdout =1 ; (*child)->process.no_stderr =1 ; }else { (*child)->process.stdout_to_stderr =1 ; - (*child)->process.out =-1 ; - (*child)->process.err =-1 ; } (*child)->process.no_exec_cmd = run_test_child;if (sequential || pass ==2 ) {
@@ -664,8 +910,9 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[], }if (!sequential) {/* Parallel mode starts tests but doesn't finish them. Do that now. */ -for (size_t x =0 ; x < num_tests; x++) -finish_test (child_tests, x, num_tests, width); + err =finish_tests_parallel (child_tests, num_tests, width); +if (err) + goto err_out; } } err_out:
@@ -676,6 +923,10 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],for (size_t x =0 ; x < num_tests; x++)finish_test (child_tests, x, num_tests, width); } +free (global_pfds); +free (global_pfd_indices); + global_pfds =NULL ; + global_pfd_indices =NULL ;free (child_tests);return err; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 150/1518 perf test: Show snippet failure output for verbose=1
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit b5a4a361f5cfb8f6f6f0a59536fd5fad11ed9f5f ]
Currently, when running tests in verbose mode (-v), if a test case fails, the entire raw standard error buffer is dumped to stderr via fprintf(stderr, "%s", child->err_output.buf). For tests that generate massive amounts of debugging or logging output before dying, this results in multi-page terminal dumps where highly critical diagnostic keywords (error, fail, segv) are easily lost.
Implement a smart, bounded snippet string processor to improve failure triaging:
1. Introduce a configurable quota limit static unsigned int failure_snippet_lines = 10; accessible via a new command-line option --failure-snippet-lines <N>.
2. Parse the raw error buffer dynamically into lines and run a three-pass extraction algorithm:
- Pass 0: Always select the very first line of the log as an initial outline marker.
- Pass 1: Scan forward from the top of the log to pick up to N lines that contain case-insensitive failure keywords (error, fail, segv, abort) to isolate the root cause. Automatically pull in the immediate subsequent line as highly-prioritized context. Allow adjacent matching lines to overlap without dropping context by evaluating keywords for all lines (e.g. when "Failed to report" is followed by "Error:").
- Pass 2: If quota remains, scan backward from the absolute tail of the log to capture trailing crash or abort context.
3. Output the selected lines in their original chronological order, inserting a clear ... separator between non-contiguous line jumps.
4. Wrap matched failure keywords dynamically in bold red (PERF_COLOR_RED) to immediately draw the eye to failures.
5. Invoke the smart processor purely when verbose == 1 && ret == TEST_FAIL in both finish_test and finish_tests_parallel, leaving raw full-output dumping completely untouched when running highly verbose (-vv).
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 203 +++++++++++++++++++++++++++++++- 1 file changed, 200 insertions(+), 3 deletions(-)
tools/perf/tests/builtin-test.c +200 -3
@@ -48,6 +48,8 @@ static bool dont_fork;static bool sequential;/* Number of times each test is run. */ static unsigned int runs_per_test =1 ; +/* Number of lines to include in failure snippet. */ +static unsigned int failure_snippet_lines =10 ;const char *dso_to_test;const char *test_objdump_path ="objdump" ;
@@ -337,7 +339,7 @@ static int run_test_child(struct child_process *process)for (size_t i =0 ; i <ARRAY_SIZE (signals); i++)signal (signals[i], child_test_sig_handler); -pr_debug ("--- start ---\n" ); +pr_debug ("---- start ----\n" );pr_debug ("test child forked, pid %d\n" ,getpid ()); err =test_function (child->test, child->test_case_num)(child->test, child->test_case_num);pr_debug ("---- end(%d) ----\n" , err);
@@ -393,6 +395,195 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_testreturn 0 ; } +static const char *const fail_keywords[] = { +"error" ,"fail" ,"segv" ,"abort" , +"signal" ,"fatal" ,"panic" ,"corrupt" ,NULL +}; + +static const char *find_next_keyword (const char *str,size_t max_len,size_t *kw_len) +{ +const char *best =NULL ; +size_t best_len =0 ; +int k; + +for (k =0 ; fail_keywords[k]; k++) { +const char *s = str; +size_t len =strlen (fail_keywords[k]); + +while ((size_t )(s - str) + len <= max_len) { +size_t i; + +if (best && s >= best) +break ; + +for (i =0 ; i < len; i++) { +if (tolower (s[i]) != fail_keywords[k][i]) +break ; + } +if (i == len) { +if (!best || s < best) { + best = s; + best_len = len; + } +break ; + } + s++; + } + } +if (best) { + *kw_len = best_len; +return best; + } +return NULL ; +} + +static void print_line_highlighted (FILE *fp,const char *line,size_t len) +{ +const char *s = line; + +while (len >0 ) { +size_t kw_len =0 ; +const char *match =find_next_keyword (s, len, &kw_len); + +if (!match) { +fwrite (s,1 , len, fp); +break ; + } +if (match > s) +fwrite (s,1 , match - s, fp); +if (perf_use_color_default) +fprintf (fp,"%s" ,PERF_COLOR_RED ); +fwrite (match,1 , kw_len, fp); +if (perf_use_color_default) +fprintf (fp,"%s" ,PERF_COLOR_RESET ); + + len -= (match + kw_len) - s; + s = match + kw_len; + } +} + + +static void print_test_failure_snippet (FILE *fp,const char *buf) +{ +size_t num_lines =0 ; +size_t max_lines =128 ; +const char **lines =calloc (max_lines,sizeof (const char *)); +size_t *line_lens =calloc (max_lines,sizeof (size_t )); +const char *s = buf; +size_t i; +unsigned int picked_count =0 ; +bool *pick; +int last_printed =-1 ; + +if (!lines || !line_lens) { +free (lines);free (line_lens); +fprintf (fp,"%s" , buf); +return ; + } + +while (*s) { +const char *eol =strchr (s,'\n' ); +size_t len; + +if (eol) + len = eol - s +1 ; +else + len =strlen (s); + +if (num_lines == max_lines) { +const char **new_lines; +size_t *new_lens; + + max_lines *=2 ; + new_lines =realloc (lines, max_lines *sizeof (const char *)); +if (!new_lines) { +free (lines);free (line_lens); +fprintf (fp,"%s" , buf); +return ; + } + lines = new_lines; + + new_lens =realloc (line_lens, max_lines *sizeof (size_t )); +if (!new_lens) { +free (lines);free (line_lens); +fprintf (fp,"%s" , buf); +return ; + } + line_lens = new_lens; + } + lines[num_lines] = s; + line_lens[num_lines] = len; + num_lines++; + s += len; + } + +if (num_lines <= failure_snippet_lines) { +for (i =0 ; i < num_lines; i++) +print_line_highlighted (fp, lines[i], line_lens[i]); +free (lines);free (line_lens); +return ; + } + + pick =calloc (num_lines,sizeof (bool )); +if (!pick) { +for (i =0 ; i < num_lines; i++) +print_line_highlighted (fp, lines[i], line_lens[i]); +free (lines);free (line_lens); +return ; + } + +/* Pass 0: Always pick the very first line */ +if (num_lines >0 && picked_count < failure_snippet_lines) { + pick[0 ] = true; + picked_count++; + } + +/* Pass 1: Pick lines with failure keywords from start (Highest Priority) */ +for (i =0 ; i < num_lines && picked_count < failure_snippet_lines; i++) { +size_t dummy; + +if (find_next_keyword (lines[i], line_lens[i], &dummy)) { +if (!pick[i]) { + pick[i] = true; + picked_count++; + } +/* Prioritize getting the immediate next line for context */ +if (i +1 < num_lines && !pick[i +1 ] && + picked_count < failure_snippet_lines) { + pick[i +1 ] = true; + picked_count++; + } + } + } + +/* Pass 2: Fill remaining quota from the end backwards */ + i = num_lines; +while (i >0 && picked_count < failure_snippet_lines) { + i--; +if (!pick[i]) { + pick[i] = true; + picked_count++; + } + } + +for (i =0 ; i < num_lines; i++) { +if (!pick[i]) +continue ; +if (last_printed !=-1 && (int )i > last_printed +1 ) { +if (perf_use_color_default) +fprintf (fp,"%s...%s\n" ,PERF_COLOR_BLUE ,PERF_COLOR_RESET ); +else +fprintf (fp,"...\n" ); + } +print_line_highlighted (fp, lines[i], line_lens[i]); + last_printed = i; + } + +free (pick); +free (lines); +free (line_lens); +} +static void finish_test (struct child_test **child_tests,int running_test,int child_test_num,int width) {
@@ -511,8 +702,10 @@ static void finish_test(struct child_test **child_tests, int running_test, int cstrbuf_release (&err_output); err_output = merged; } -if (verbose >1 || (verbose ==1 && ret ==TEST_FAIL )) +if (verbose >1 )fprintf (stderr,"%s" , err_output.buf); +else if (verbose ==1 && ret ==TEST_FAIL ) +print_test_failure_snippet (stderr, err_output.buf);strbuf_release (&err_output);strbuf_release (&child_test->err_output);
@@ -724,8 +917,10 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes } } -if (verbose >1 || (verbose ==1 && child->result ==TEST_FAIL )) +if (verbose >1 )fprintf (stderr,"%s" , child->err_output.buf); +else if (verbose ==1 && child->result ==TEST_FAIL ) +print_test_failure_snippet (stderr, child->err_output.buf);print_test_result (child->test, child->suite_num, child->test_case_num, child->result, width,0 );
@@ -1057,6 +1252,8 @@ int cmd_test(int argc, const char **argv)OPT_STRING (0 ,"dso" , &dso_to_test,"dso" ,"dso to test" ),OPT_STRING (0 ,"objdump" , &test_objdump_path,"path" ,"objdump binary to use for disassembly and annotations" ), +OPT_UINTEGER (0 ,"failure-snippet-lines" , &failure_snippet_lines, +"Number of lines to include in failure snippet, default 10" ), OPT_END() };const char *const test_subcommands[] = {"list" ,NULL };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 151/1518 perf test: Add summary reporting
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 33f20342ba525ef75fd9734db71e9823fe65e769 ]
Currently, when running test suites (perf test), users must scroll through hundreds of lines of console output to manually tally the number of passed, skipped, or failed test cases.
Introduce an automated, global execution summary printed at the absolute tail of the test run:
1. Track counts mid-flight inside the print_test_result() accumulator, clearly separating pass counts into standalone main tests vs. individual subtests (where num_test_cases > 1).
2. Accumulate the precise descriptions of all failed test cases directly into a global string buffer, formatted with their suite indices (e.g., 3.1: Parse event definition strings) for effortless cross-referencing.
3. Define a summary printer function print_tests_summary() that emits a colored outline of the final pass, skip, and fail totals, followed by the explicit list of failed tests.
4. Invoke the summary printer right before freeing the test array at the absolute tail of __cmd_test(), guaranteeing that the summary is successfully printed even if an internal emergency signal cleanup occurs or if the user interrupts the run early.
Example output:
``` $ sudo perf test -v 1: vmlinux symtab matches kallsyms : Skip 2: Detect openat syscall event : Ok 3: Detect openat syscall event on all cpus : Ok ... 163: perf trace summary : Ok === Test Summary === Passed main tests : 123 Passed subtests : 145 Skipped tests : 22 Failed tests : 6 List of failed tests: 92: perf kvm tests 95: kernel lock contention analysis test 120: perf metrics value validation 124: Check branch stack sampling 143: perftool-testsuite_probe 158: test Intel TPEBS counting mode ```
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 89 +++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 3 deletions(-)
tools/perf/tests/builtin-test.c +86 -3
@@ -356,8 +356,14 @@ static int run_test_child(struct child_process *process)static struct pollfd *global_pfds;static size_t *global_pfd_indices; +static unsigned int summary_tests_passed; +static unsigned int summary_subtests_passed; +static unsigned int summary_tests_skipped; +static unsigned int summary_tests_failed; +static struct strbuf summary_failed_tests_buf =STRBUF_INIT ;static int strbuf_addstr_safe (struct strbuf *sb,const char *s); +static int __printf(2, 3) strbuf_addf_safe(struct strbuf *sb, const char *fmt, ...); static int print_test_result(struct test_suite *t, int curr_suite, int curr_test_case, int result, int width, int running)
@@ -375,11 +381,16 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_testcolor_fprintf (stderr,PERF_COLOR_YELLOW ," Running (%d active)\n" , running);break ;case TEST_OK : +if (test_suite__num_test_cases (t) >1 ) + summary_subtests_passed++; +else + summary_tests_passed++;pr_info (" Ok\n" );break ;case TEST_SKIP : {const char *reason =skip_reason (t, curr_test_case); + summary_tests_skipped++;if (reason)color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip (%s)\n" , reason);else
@@ -388,6 +399,15 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_testbreak ;case TEST_FAIL :default : + summary_tests_failed++; +if (test_suite__num_test_cases (t) >1 ) +strbuf_addf_safe (&summary_failed_tests_buf," %3d.%1d: %s\n" , + curr_suite +1 , curr_test_case +1 , +test_description (t, curr_test_case)); +else +strbuf_addf_safe (&summary_failed_tests_buf," %3d: %s\n" , + curr_suite +1 , +test_description (t, curr_test_case));color_fprintf (stderr,PERF_COLOR_RED ," FAILED!\n" );break ; }
@@ -729,6 +749,47 @@ static int strbuf_addstr_safe(struct strbuf *sb, const char *s)return ret; } +static int __printf(2, 3) strbuf_addf_safe(struct strbuf *sb, const char *fmt, ...) +{ +char buf[1024 ]; +va_list ap; +int len; +sigset_t set, oldset; +int ret; + +sigemptyset (&set); +sigaddset (&set,SIGINT ); +sigaddset (&set,SIGTERM ); +sigprocmask (SIG_BLOCK , &set, &oldset); + +va_start (ap, fmt); + len =vsnprintf (buf,sizeof (buf), fmt, ap); +va_end (ap); + +if (len <0 ) { +sigprocmask (SIG_SETMASK , &oldset,NULL ); +return len; + } +if ((size_t )len >=sizeof (buf)) { +char *dynamic_buf =malloc (len +1 ); + +if (!dynamic_buf) { +sigprocmask (SIG_SETMASK , &oldset,NULL ); +return -ENOMEM ; + } +va_start (ap, fmt); +vsnprintf (dynamic_buf, len +1 , fmt, ap); +va_end (ap); + ret =strbuf_addstr (sb, dynamic_buf); +free (dynamic_buf); + }else { + ret =strbuf_addstr (sb, buf); + } + +sigprocmask (SIG_SETMASK , &oldset,NULL ); +return ret; +} +static void drain_child_process_err (struct child_test *child) {char buf[512 ];
@@ -1006,6 +1067,23 @@ static void cmd_test_sig_handler(int sig)siglongjmp (cmd_test_jmp_buf, sig); } +static void print_tests_summary (void ) +{ +pr_info ("\n=== Test Summary ===\n" ); +pr_info ("Passed main tests : %u\n" , summary_tests_passed); +pr_info ("Passed subtests : %u\n" , summary_subtests_passed); +pr_info ("Skipped tests : %u\n" , summary_tests_skipped); +if (summary_tests_failed >0 ) { +color_fprintf (stderr,PERF_COLOR_RED ,"Failed tests : %u\n" , + summary_tests_failed); +pr_info ("List of failed tests:\n" ); +pr_info ("%s" , summary_failed_tests_buf.buf); + }else { +color_fprintf (stderr,PERF_COLOR_GREEN ,"Failed tests : 0\n" ); + } +strbuf_release (&summary_failed_tests_buf); +} +static int __cmd_test (struct test_suite **suites,int argc,const char *argv[],struct intlist *skiplist) {
@@ -1083,9 +1161,13 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[], }if (intlist__find (skiplist, curr_suite +1 )) { -pr_info ("%3d: %-*s:" , curr_suite +1 , width, -test_description (*t,-1 )); -color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip (user override)\n" ); +if (pass ==1 ) { +pr_info ("%3d: %-*s:" , curr_suite +1 , width, +test_description (*t,-1 )); +color_fprintf (stderr,PERF_COLOR_YELLOW , +" Skip (user override)\n" ); + summary_tests_skipped++; + }continue ; }
@@ -1118,6 +1200,7 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],for (size_t x =0 ; x < num_tests; x++)finish_test (child_tests, x, num_tests, width); } +print_tests_summary ();free (global_pfds);free (global_pfd_indices); global_pfds =NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 152/1518 perf test: Fix subtest status alignment for multi-digit indexes
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 94ac3ce427c8f80d699909c85a7cb70a589c562d ]
When running perf test, the status column (: Ok) became misaligned when subtest indexes reached 2 or 3 digits (e.g. 9.100 vs 9.9 vs 10.1). This occurred because the subtest description field width (subw) was statically fixed to width - 2, assuming all subtest index prefixes were exactly 7 characters wide.
Dynamically calculate subw based on the exact character length of the test suite and subtest index prefix. This ensures the status column is perfectly aligned vertically across all test outputs regardless of subtest index digit count.
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/tests/builtin-test.c +5 -3
@@ -369,10 +369,12 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_test int result, int width, int running) { if (test_suite__num_test_cases(t) > 1) { - int subw = width > 2 ? width - 2 : width; + char prefix[32]; +int len =snprintf (prefix,sizeof (prefix),"%3d.%1d:" , + curr_suite +1 , curr_test_case +1 ); +int subw = len >=4 ? width +4 - len : width; -pr_info ("%3d.%1d: %-*s:" , curr_suite +1 , curr_test_case +1 , subw, -test_description (t, curr_test_case)); +pr_info ("%s %-*s:" , prefix, subw,test_description (t, curr_test_case)); } elsepr_info ("%3d: %-*s:" , curr_suite +1 , width,test_description (t, curr_test_case));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 153/1518 perf test: Add -j/--junit option for JUnit XML test reports
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit e2c545737bf4387d1217d3608274823421e1dbf2 ]
Add a -j/--junit command line option to generate standard JUnit XML format test reports. The generated file defaults to 'test.xml' if no filename is specified, but allows users to override the path (e.g. -jmytest.xml).
The XML report captures individual test suite and subtest execution latency, alongside XML-escaped failure logs and skip reasons, while preserving the full multi-process concurrency speed of parallel test execution.
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 148 ++++++++++++++++++++++++++++++-- 1 file changed, 142 insertions(+), 6 deletions(-)
tools/perf/tests/builtin-test.c +142 -6
@@ -19,6 +19,7 @@#include <dirent.h> #include <sys/wait.h> #include <sys/stat.h> +#include <sys/time.h> #include "builtin.h" #include "config.h" #include "hist.h"
@@ -39,6 +40,9 @@#include "tests-scripts.h" +static const char *junit_filename; +static struct strbuf junit_xml_buf =STRBUF_INIT ; +/* * Command line option to not fork the test running in the same process and * making them easier to debug.
@@ -300,6 +304,8 @@ struct child_test {struct strbuf err_output;int result;bool done; +struct timespec start_time; +struct timespec end_time; };static jmp_buf run_test_jmp_buf;
@@ -365,8 +371,34 @@ static struct strbuf summary_failed_tests_buf = STRBUF_INIT;static int strbuf_addstr_safe (struct strbuf *sb,const char *s); static int __printf(2, 3) strbuf_addf_safe(struct strbuf *sb, const char *fmt, ...); +static char *xml_escape(const char *str) +{ +struct strbuf buf =STRBUF_INIT ; +const char *p; +char *res; + +if (!str) +return strdup ("" ); + +for (p = str; *p; p++) { +if (*p =='&' ) +strbuf_addstr (&buf,"&" ); +else if (*p =='<' ) +strbuf_addstr (&buf,"<" ); +else if (*p =='>' ) +strbuf_addstr (&buf,">" ); +else if (*p =='"' ) +strbuf_addstr (&buf,""" ); +else if ((unsigned char )*p >=32 || *p =='\n' || *p =='\t' ) +strbuf_addch (&buf, *p); + } + res =strbuf_detach (&buf,NULL ); +return res ? res :strdup ("" ); +} +static int print_test_result (struct test_suite *t,int curr_suite,int curr_test_case, - int result, int width, int running) +int result,int width,int running, +const char *err_output,double elapsed) {if (test_suite__num_test_cases (t) >1 ) {char prefix[32 ];
@@ -414,6 +446,34 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_testbreak ; } +if (junit_filename && result !=TEST_RUNNING ) { +const char *classname = t->desc; +const char *testname =test_description (t, curr_test_case); +char *escaped_err =xml_escape (err_output); +char *escaped_class =xml_escape (classname); +char *escaped_test =xml_escape (testname); + +strbuf_addf (&junit_xml_buf, +" <testcase classname=\"%s\" name=\"%s\" time=\"%.2f\">\n" , + escaped_class, escaped_test, elapsed); +if (result !=TEST_OK && result !=TEST_SKIP ) { +strbuf_addf (&junit_xml_buf, +" <failure message=\"FAILED\">\n%s\n </failure>\n" , + escaped_err); + }else if (result ==TEST_SKIP ) { +const char *reason =skip_reason (t, curr_test_case); +char *escaped_reason =xml_escape (reason ? reason :"Skip" ); + +strbuf_addf (&junit_xml_buf," <skipped message=\"%s\"/>\n" , + escaped_reason); +free (escaped_reason); + } +strbuf_addstr (&junit_xml_buf," </testcase>\n" ); +free (escaped_err); +free (escaped_class); +free (escaped_test); + } +return 0 ; }
@@ -616,6 +676,8 @@ static void finish_test(struct child_test **child_tests, int running_test, int cstruct strbuf err_output =STRBUF_INIT ;int last_running =-1 ;int ret; +struct timespec end_time; +double elapsed;if (child_test ==NULL ) {/* Test wasn't started. */
@@ -669,7 +731,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int cfprintf (debug_file (),PERF_COLOR_DELETE_LINE ); }print_test_result (t, curr_suite, curr_test_case,TEST_RUNNING , - width, running); + width, running,NULL ,0.0 ); last_running = running; } }
@@ -729,9 +791,14 @@ static void finish_test(struct child_test **child_tests, int running_test, int celse if (verbose ==1 && ret ==TEST_FAIL )print_test_failure_snippet (stderr, err_output.buf); +clock_gettime (CLOCK_MONOTONIC , &end_time); + elapsed = (end_time.tv_sec - child_test->start_time.tv_sec) + + (end_time.tv_nsec - child_test->start_time.tv_nsec) /1000000000.0 ; + +print_test_result (t, curr_suite, curr_test_case, ret, width,/*running=*/ 0 , + err_output.buf, elapsed);strbuf_release (&err_output);strbuf_release (&child_test->err_output); -print_test_result (t, curr_suite, curr_test_case, ret, width,/*running=*/ 0 );if (err >0 )close (err);zfree (&child_tests[running_test]);
@@ -907,7 +974,7 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes }print_test_result (next_child->test, next_child->suite_num, next_child->test_case_num,TEST_RUNNING , width, - running_count); + running_count,NULL ,0.0 ); } last_running = running_count; }
@@ -942,12 +1009,14 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes } child->result =finish_command (&child->process); child->process.pid =0 ; +clock_gettime (CLOCK_MONOTONIC , &child->end_time); child->done = true; } }while (next_to_print < num_tests) {struct child_test *child = child_tests[next_to_print]; +double elapsed;if (!child) { next_to_print++;
@@ -985,8 +1054,12 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_teselse if (verbose ==1 && child->result ==TEST_FAIL )print_test_failure_snippet (stderr, child->err_output.buf); + elapsed = (child->end_time.tv_sec - child->start_time.tv_sec) + + (child->end_time.tv_nsec - + child->start_time.tv_nsec) /1000000000.0 ; +print_test_result (child->test, child->suite_num, child->test_case_num, - child->result, width,0 ); + child->result, width,0 , child->err_output.buf, elapsed);pthread_sigmask (SIG_BLOCK , &set, &oldset);strbuf_release (&child->err_output); child_tests[next_to_print] =NULL ;
@@ -1013,11 +1086,18 @@ static int start_test(struct test_suite *test, int curr_suite, int curr_test_cas *child =NULL ;if (dont_fork) {if (pass ==1 ) { +struct timespec start_time, end_time; +double elapsed; + +clock_gettime (CLOCK_MONOTONIC , &start_time);pr_debug ("--- start ---\n" ); err =test_function (test, curr_test_case)(test, curr_test_case);pr_debug ("---- end ----\n" ); +clock_gettime (CLOCK_MONOTONIC , &end_time); + elapsed = (end_time.tv_sec - start_time.tv_sec) + + (end_time.tv_nsec - start_time.tv_nsec) /1000000000.0 ;print_test_result (test, curr_suite, curr_test_case, err, width, -/*running=*/ 0 ); +/*running=*/ 0 ,NULL , elapsed); }return 0 ; }
@@ -1083,6 +1163,41 @@ static void print_tests_summary(void) }else {color_fprintf (stderr,PERF_COLOR_GREEN ,"Failed tests : 0\n" ); } + +if (junit_filename) { +int fd; +FILE *fp; + + fd =open (junit_filename,O_CREAT |O_TRUNC |O_WRONLY |O_NOFOLLOW ,0644 ); +if (fd >=0 ) { + fp =fdopen (fd,"w" ); +if (fp) { +unsigned int total = summary_tests_passed + + summary_subtests_passed + + summary_tests_skipped + + summary_tests_failed; +fprintf (fp,"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" ); +fprintf (fp,"<testsuites>\n" ); +fprintf (fp, +" <testsuite name=\"perf-tests\" tests=\"%u\" failures=\"%u\" skipped=\"%u\">\n" , + total, summary_tests_failed, + summary_tests_skipped); +fprintf (fp,"%s" , junit_xml_buf.buf); +fprintf (fp," </testsuite>\n" ); +fprintf (fp,"</testsuites>\n" ); +fclose (fp); +pr_info ("Wrote junit XML output to %s\n" , junit_filename); + }else { +close (fd); +pr_err ("Failed to associate stream with fd for %s: %s\n" , + junit_filename,strerror (errno)); + } + }else { +pr_err ("Failed to open %s for writing junit XML output: %s\n" , + junit_filename,strerror (errno)); + } + } +strbuf_release (&junit_xml_buf);strbuf_release (&summary_failed_tests_buf); }
@@ -1169,6 +1284,25 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip (user override)\n" ); summary_tests_skipped++; +if (junit_filename) { +char *escaped_class = +xml_escape ((const char *) +test_description (*t,-1 )); +char *escaped_test =xml_escape ("override" ); +char *escaped_reason = +xml_escape ("user override" ); + +strbuf_addf (&junit_xml_buf, +" <testcase classname=\"%s\" name=\"%s\" time=\"0.000\">\n" , + escaped_class, escaped_test); +strbuf_addf (&junit_xml_buf, +" <skipped message=\"%s\"/>\n" , + escaped_reason); +strbuf_addstr (&junit_xml_buf," </testcase>\n" ); +free (escaped_reason); +free (escaped_test); +free (escaped_class); + } }continue ; }
@@ -1339,6 +1473,8 @@ int cmd_test(int argc, const char **argv) "objdump binary to use for disassembly and annotations"),OPT_UINTEGER (0 ,"failure-snippet-lines" , &failure_snippet_lines,"Number of lines to include in failure snippet, default 10" ), +OPT_STRING_OPTARG ('j' ,"junit" , &junit_filename,"file" , +"Generate junit XML output, default test.xml" ,"test.xml" ), OPT_END() };const char *const test_subcommands[] = {"list" ,NULL };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 154/1518 perf test: Truncate printed test descriptions dynamically to avoid terminal wrapping
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 9e3fcab6fbecebbcffeafeb5db612a57688cb7f4 ]
When test descriptions are extremely long (e.g., the truncated perf.data graceful handling test is 103 characters long), they wrap across terminal boundaries.
Because the ANSI escape code to delete the line (PERF_COLOR_DELETE_LINE) only clears a single terminal line, visual wrapping leaves orphan wrapped lines on the screen, which results in the test description being printed multiple times.
Resolve this by checking the terminal width (get_term_dimensions) and dynamically truncating the printed test description to fit within the available columns, leaving safety space for the prefix index and status suffix.
Also, remove the width padding from the test suite headers which do not display inline status messages. This prevents their trailing colons from wrapping onto new lines on standard width terminals.
Finally, avoid GCC 16's -Wformat-truncation warnings by delegating the description padding to pr_info's %-*s format specifier instead of padding within a temporary buffer, and clamp the truncation limit to the temporary buffer's size.
JUnit XML output and the failure summary report still print the full, untruncated test descriptions.
Stable-dep-of: 32e6312f7e39 ("perf test: Truncate test description to fit terminal width")
--- tools/perf/tests/builtin-test.c | 66 +++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 7 deletions(-)
tools/perf/tests/builtin-test.c +59 -7
@@ -20,6 +20,8 @@#include <sys/wait.h> #include <sys/stat.h> #include <sys/time.h> +#include <sys/ioctl.h> +#include "util/term.h" #include "builtin.h" #include "config.h" #include "hist.h"
@@ -396,19 +398,69 @@ static char *xml_escape(const char *str)return res ? res :strdup ("" ); } +static const char *format_test_description (const char *desc,int max_desc_width, +char *buf,size_t buf_sz) +{ +int len =strlen (desc); + +/* +* Clamp to buf_sz to prevent GCC format-truncation warnings +* when terminal width is very large. +*/ +if (max_desc_width >= (int )buf_sz) + max_desc_width = buf_sz -1 ; + +if (len > max_desc_width) { +snprintf (buf, buf_sz,"%.*s..." , max_desc_width -3 , desc); +return buf; + } +return desc; +} +static int print_test_result (struct test_suite *t,int curr_suite,int curr_test_case,int result,int width,int running,const char *err_output,double elapsed) { +char desc_buf[256 ]; +const char *desc =test_description (t, curr_test_case); +struct winsize ws; +int max_desc_area_width; +int target_desc_area_width; +int desc_padding; + +get_term_dimensions (&ws); +/* +* Total terminal columns minus space for status e.g. " Running (12 active)" +* which is 20 chars, plus a margin of 3 chars = 23 chars. +*/ + max_desc_area_width = ws.ws_col -23 ; +if (max_desc_area_width <40 ) + max_desc_area_width =40 ; + +/* Standard test has prefix "%3d: " which is 5 chars */ + target_desc_area_width = width +5 ; +if (target_desc_area_width > max_desc_area_width) + target_desc_area_width = max_desc_area_width; +if (test_suite__num_test_cases (t) >1 ) {char prefix[32 ];int len =snprintf (prefix,sizeof (prefix),"%3d.%1d:" , curr_suite +1 , curr_test_case +1 ); -int subw = len >=4 ? width +4 - len : width; -pr_info ("%s %-*s:" , prefix, subw,test_description (t, curr_test_case)); - }else -pr_info ("%3d: %-*s:" , curr_suite +1 , width,test_description (t, curr_test_case)); + desc_padding = target_desc_area_width - (len +1 ); +if (desc_padding <20 ) + desc_padding =20 ; + + desc =format_test_description (desc, desc_padding, desc_buf,sizeof (desc_buf)); +pr_info ("%s %-*s:" , prefix, desc_padding, desc); + }else { + desc_padding = target_desc_area_width -5 ; +if (desc_padding <20 ) + desc_padding =20 ; + + desc =format_test_description (desc, desc_padding, desc_buf,sizeof (desc_buf)); +pr_info ("%3d: %-*s:" , curr_suite +1 , desc_padding, desc); + }switch (result) {case TEST_RUNNING :
@@ -692,7 +744,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int c* sub test names. */ if (test_suite__num_test_cases (t) >1 && curr_test_case ==0 ) -pr_info ("%3d: %-*s:\n" , curr_suite +1 , width,test_description (t,-1 )); +pr_info ("%3d: %s:\n" , curr_suite +1 ,test_description (t,-1 ));/* * Busy loop reading from the child's stdout/stderr that are set to be
@@ -968,7 +1020,7 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tesif (next_child) {if (test_suite__num_test_cases (next_child->test) >1 && last_suite_printed != next_child->suite_num) { -pr_info ("%3d: %-*s:\n" , next_child->suite_num +1 , width, +pr_info ("%3d: %s:\n" , next_child->suite_num +1 ,test_description (next_child->test,-1 )); last_suite_printed = next_child->suite_num; }
@@ -1032,7 +1084,7 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tesif (test_suite__num_test_cases (child->test) >1 && last_suite_printed != child->suite_num) { -pr_info ("%3d: %-*s:\n" , child->suite_num +1 , width, +pr_info ("%3d: %s:\n" , child->suite_num +1 ,test_description (child->test,-1 )); last_suite_printed = child->suite_num; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 155/1518 perf test: Truncate test description to fit terminal width
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 32e6312f7e397bf0b731b43a6504966398af0788 ]
The parallel test harness uses the carriage return delete escape sequence PERF_COLOR_DELETE_LINE ("\033[A\33[2K\r") to erase and update the "Running (X active)" progress lines.
However, if a test description is longer than the terminal width, the line wraps around. When this happens, the cursor up escape sequence \033[A only moves the cursor to the last wrapped row, leaving the top half of the description printed on the previous line. This leads to name duplication and output corruption spilling over multiple rows on consoles narrower than the maximum description length (e.g., 101 columns wide).
Fix this by dynamically querying the terminal width using get_term_dimensions and truncating the printed test descriptions using the %-*.*s printf format. We reserve 35 characters for prefix, status, and spacing metrics to guarantee the progress line never wraps.
--- tools/perf/tests/builtin-test.c | 163 +++++++++++++++++--------------- 1 file changed, 89 insertions(+), 74 deletions(-)
tools/perf/tests/builtin-test.c +89 -74
@@ -10,37 +10,40 @@#ifdef HAVE_BACKTRACE_SUPPORT #include <execinfo.h> #endif -#include <poll.h> -#include <unistd.h> #include <setjmp.h> -#include <string.h> #include <stdlib.h> -#include <sys/types.h> +#include <string.h> +#include <dirent.h> -#include <sys/wait.h> +#include "util/term.h" +#include <linux/kernel.h> +#include <linux/string.h> +#include <linux/zalloc.h> +#include <poll.h> +#include <sys/ioctl.h> #include <sys/stat.h> #include <sys/time.h> -#include <sys/ioctl.h> -#include "util/term.h" +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> + +#include <subcmd/exec-cmd.h> +#include <subcmd/parse-options.h> +#include <subcmd/run-command.h> +#include "builtin.h" +#include "color.h" #include "config.h" +#include "debug.h" #include "hist.h" #include "intlist.h" -#include "tests.h" -#include "debug.h" -#include "color.h" -#include <subcmd/parse-options.h> -#include <subcmd/run-command.h> #include "string2.h" #include "symbol.h" +#include "tests-scripts.h" +#include "tests.h" #include "util/rlimit.h" #include "util/strbuf.h" -#include <linux/kernel.h> -#include <linux/string.h> -#include <subcmd/exec-cmd.h> -#include <linux/zalloc.h> - -#include "tests-scripts.h" +#include "util/term.h" static const char *junit_filename;static struct strbuf junit_xml_buf =STRBUF_INIT ;
@@ -398,73 +401,73 @@ static char *xml_escape(const char *str)return res ? res :strdup ("" ); } -static const char *format_test_description (const char *desc,int max_desc_width, -char *buf,size_t buf_sz) +static int get_term_width (void ) { -int len =strlen (desc); +struct winsize ws; +int cols =80 ; +int term_width;/* -* Clamp to buf_sz to prevent GCC format-truncation warnings -* when terminal width is very large. +* If output is redirected to a file or piped, we don't need to wrap +* or truncate at all. Use a massive virtually infinite terminal width +* so descriptions are printed in full. */ -if (max_desc_width >= (int )buf_sz) - max_desc_width = buf_sz -1 ; +if (!isatty (fileno (debug_file ()))) +return 10000 ; -if (len > max_desc_width) { -snprintf (buf, buf_sz,"%.*s..." , max_desc_width -3 , desc); -return buf; - } -return desc; +get_term_dimensions (&ws); +if (ws.ws_col >0 ) + cols = ws.ws_col; + +/* +* Limit description width to fit on a single line. We subtract 35 +* columns of headroom to allocate space for: +* - The suite index prefix: e.g. " 10.100:" (8 characters) plus 1 space separator. +* - The trailing colon (1 character) and space before status (1 character). +* - The longest status results: e.g. "Skip (some metrics failed)" (26 characters) +* or "Running (XX active)" (20 characters). +* +* A minimum description width of 10 is enforced to ensure names are +* legible even on very narrow consoles. +*/ + term_width = cols -35 ; +if (term_width <10 ) + term_width =10 ; + +return term_width; +} + +static int get_max_desc_width (int width) +{ +int term_width =get_term_width (); + +return width > term_width ? term_width : width; }static int print_test_result (struct test_suite *t,int curr_suite,int curr_test_case,int result,int width,int running,const char *err_output,double elapsed) { -char desc_buf[256 ]; -const char *desc =test_description (t, curr_test_case); -struct winsize ws; -int max_desc_area_width; -int target_desc_area_width; -int desc_padding; - -get_term_dimensions (&ws); -/* -* Total terminal columns minus space for status e.g. " Running (12 active)" -* which is 20 chars, plus a margin of 3 chars = 23 chars. -*/ - max_desc_area_width = ws.ws_col -23 ; -if (max_desc_area_width <40 ) - max_desc_area_width =40 ; - -/* Standard test has prefix "%3d: " which is 5 chars */ - target_desc_area_width = width +5 ; -if (target_desc_area_width > max_desc_area_width) - target_desc_area_width = max_desc_area_width; +int pad_width =get_max_desc_width (width); +int term_width =get_term_width ();if (test_suite__num_test_cases (t) >1 ) {char prefix[32 ];int len =snprintf (prefix,sizeof (prefix),"%3d.%1d:" , curr_suite +1 , curr_test_case +1 ); +int pad = len >=4 ? pad_width +4 - len : pad_width; +int trunc = len >=4 ? term_width +4 - len : term_width; - desc_padding = target_desc_area_width - (len +1 ); -if (desc_padding <20 ) - desc_padding =20 ; - - desc =format_test_description (desc, desc_padding, desc_buf,sizeof (desc_buf)); -pr_info ("%s %-*s:" , prefix, desc_padding, desc); +pr_info ("%s %-*.*s:" , prefix, pad, trunc, +test_description (t, curr_test_case)); }else { - desc_padding = target_desc_area_width -5 ; -if (desc_padding <20 ) - desc_padding =20 ; - - desc =format_test_description (desc, desc_padding, desc_buf,sizeof (desc_buf)); -pr_info ("%3d: %-*s:" , curr_suite +1 , desc_padding, desc); +pr_info ("%3d: %-*.*s:" , curr_suite +1 , pad_width, term_width, +test_description (t, curr_test_case)); }switch (result) {case TEST_RUNNING : -color_fprintf (stderr,PERF_COLOR_YELLOW ," Running (%d active)\n" , running); +color_fprintf (debug_file (),PERF_COLOR_YELLOW ," Running (%d active)\n" , running);break ;case TEST_OK :if (test_suite__num_test_cases (t) >1 )
@@ -478,9 +481,9 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_test summary_tests_skipped++;if (reason) -color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip (%s)\n" , reason); +color_fprintf (debug_file (),PERF_COLOR_YELLOW ," Skip (%s)\n" , reason);else -color_fprintf (stderr,PERF_COLOR_YELLOW ," Skip\n" ); +color_fprintf (debug_file (),PERF_COLOR_YELLOW ," Skip\n" ); }break ;case TEST_FAIL :
@@ -494,7 +497,7 @@ static int print_test_result(struct test_suite *t, int curr_suite, int curr_teststrbuf_addf_safe (&summary_failed_tests_buf," %3d: %s\n" , curr_suite +1 ,test_description (t, curr_test_case)); -color_fprintf (stderr,PERF_COLOR_RED ," FAILED!\n" ); +color_fprintf (debug_file (),PERF_COLOR_RED ," FAILED!\n" );break ; }
@@ -730,6 +733,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int cint ret;struct timespec end_time;double elapsed; + width =get_max_desc_width (width);if (child_test ==NULL ) {/* Test wasn't started. */
@@ -744,7 +748,8 @@ static void finish_test(struct child_test **child_tests, int running_test, int c* sub test names. */ if (test_suite__num_test_cases (t) >1 && curr_test_case ==0 ) -pr_info ("%3d: %s:\n" , curr_suite +1 ,test_description (t,-1 )); +pr_info ("%3d: %-*.*s:\n" , curr_suite +1 , width, width, +test_description (t,-1 ));/* * Busy loop reading from the child's stdout/stderr that are set to be
@@ -952,6 +957,8 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tesint last_suite_printed =-1 ;sigset_t set, oldset; + width =get_max_desc_width (width); +sigemptyset (&set);sigaddset (&set,SIGINT );sigaddset (&set,SIGTERM );
@@ -1020,8 +1027,11 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tesif (next_child) {if (test_suite__num_test_cases (next_child->test) >1 && last_suite_printed != next_child->suite_num) { -pr_info ("%3d: %s:\n" , next_child->suite_num +1 , -test_description (next_child->test,-1 )); +pr_info ("%3d: %-*.*s:\n" , + next_child->suite_num +1 , + width, width, +test_description ( + next_child->test,-1 )); last_suite_printed = next_child->suite_num; } print_test_result(next_child->test, next_child->suite_num,
@@ -1084,7 +1094,8 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tesif (test_suite__num_test_cases (child->test) >1 && last_suite_printed != child->suite_num) { -pr_info ("%3d: %s:\n" , child->suite_num +1 , +pr_info ("%3d: %-*.*s:\n" , child->suite_num +1 , + width, width,test_description (child->test,-1 )); last_suite_printed = child->suite_num; }
@@ -1208,12 +1219,12 @@ static void print_tests_summary(void)pr_info ("Passed subtests : %u\n" , summary_subtests_passed);pr_info ("Skipped tests : %u\n" , summary_tests_skipped);if (summary_tests_failed >0 ) { -color_fprintf (stderr,PERF_COLOR_RED ,"Failed tests : %u\n" , +color_fprintf (debug_file (),PERF_COLOR_RED ,"Failed tests : %u\n" , summary_tests_failed);pr_info ("List of failed tests:\n" );pr_info ("%s" , summary_failed_tests_buf.buf); }else { -color_fprintf (stderr,PERF_COLOR_GREEN ,"Failed tests : 0\n" ); +color_fprintf (debug_file (),PERF_COLOR_GREEN ,"Failed tests : 0\n" ); }if (junit_filename) {
@@ -1331,9 +1342,13 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[],if (intlist__find (skiplist, curr_suite +1 )) {if (pass ==1 ) { -pr_info ("%3d: %-*s:" , curr_suite +1 , width, +int pad_width =get_max_desc_width (width); +int term_width =get_term_width (); + +pr_info ("%3d: %-*.*s:" , curr_suite +1 , + pad_width, term_width,test_description (*t,-1 )); -color_fprintf (stderr,PERF_COLOR_YELLOW , +color_fprintf (debug_file (),PERF_COLOR_YELLOW ," Skip (user override)\n" ); summary_tests_skipped++;if (junit_filename) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 156/1518 perf test metrics: Update all metrics for possibly failing default metrics
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 91c1949d768520d9befa7761eb97c3826997da25 ]
Default metrics may use unsupported events and be ignored. These metrics shouldn't cause metric testing to fail.
Stable-dep-of: 8953bfd8820b ("perf tests: Skip metrics validation if system-wide recording lacks permission")
--- tools/perf/tests/shell/stat_all_metrics.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/shell/stat_all_metrics.sh +6 -1
@@ -25,8 +25,13 @@ for m in $(perf list --raw-dump metrics); do # No error result and metric shown. continue fi - if [[ "$result" =~ "Cannot resolve IDs for" ]] + if [[ "$result" =~ "Cannot resolve IDs for" || "$result" =~ "No supported events found" ]] then + if [[ "$m" == @(l1_prefetch_miss_rate|stalled_cycles_per_instruction) ]] + then + # Default metrics that may use unsupported events. + continue + fi echo "Metric contains missing events" echo $result err=1 # Fail
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 157/1518 perf test all metrics: Fully ignore Default metric failures
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 41b67ab3d2f5be9d0b6e5ba9cbec97c820fc50e8 ]
Determine if a metric is default from perf list --raw-dump $m eg:
``` $ perf list --raw-dump l1_prefetch_miss_rate Default4 l1_prefetch_miss_rate ```
If a metric has "not supported" or "no supported events" then ignore these failures for default metrics. Tidy up the skip/fail messages in the output to make them easier to spot/read.
``` $ perf list -vv "all metrics" ... Testing llc_miss_rate [Ignored llc_miss_rate] failed but as a Default metric this can be expected Error: No supported events found. The LLC-loads event is not supported. ... ```
Stable-dep-of: 8953bfd8820b ("perf tests: Skip metrics validation if system-wide recording lacks permission")
--- tools/perf/tests/shell/stat_all_metrics.sh | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-)
tools/perf/tests/shell/stat_all_metrics.sh +17 -10
@@ -27,19 +27,20 @@ for m in $(perf list --raw-dump metrics); do fi if [[ "$result" =~ "Cannot resolve IDs for" || "$result" =~ "No supported events found" ]] then - if [[ "$m" == @(l1_prefetch_miss_rate|stalled_cycles_per_instruction) ]] + if [[ $(perf list --raw-dump $m) == "Default"* ]] then - # Default metrics that may use unsupported events. + echo "[Ignored $m] failed but as a Default metric this can be expected" + echo $result continue fi - echo "Metric contains missing events" + echo "[Failed $m] Metric contains missing events" echo $result err=1 # Fail continue elif [[ "$result" =~ \ "Access to performance monitoring and observability operations is limited" ]] then - echo "Permission failure" + echo "[Skipped $m] Permission failure" echo $result if [[ $err -eq 0 ]] then
@@ -48,7 +49,7 @@ for m in $(perf list --raw-dump metrics); do continue elif [[ "$result" =~ "in per-thread mode, enable system wide" ]] then - echo "Permissions - need system wide mode" + echo "[Skipped $m] Permissions - need system wide mode" echo $result if [[ $err -eq 0 ]] then
@@ -57,7 +58,13 @@ for m in $(perf list --raw-dump metrics); do continue elif [[ "$result" =~ "<not supported>" ]] then - echo "Not supported events" + if [[ $(perf list --raw-dump $m) == "Default"* ]] + then + echo "[Ignored $m] failed but as a Default metric this can be expected" + echo $result + continue + fi + echo "[Skipped $m] Not supported events" echo $result if [[ $err -eq 0 ]] then
@@ -66,7 +73,7 @@ for m in $(perf list --raw-dump metrics); do continue elif [[ "$result" =~ "<not counted>" ]] then - echo "Not counted events" + echo "[Skipped $m] Not counted events" echo $result if [[ $err -eq 0 ]] then
@@ -75,7 +82,7 @@ for m in $(perf list --raw-dump metrics); do continue elif [[ "$result" =~ "FP_ARITH" || "$result" =~ "AMX" ]] then - echo "FP issues" + echo "[Skipped $m] FP issues" echo $result if [[ $err -eq 0 ]] then
@@ -84,7 +91,7 @@ for m in $(perf list --raw-dump metrics); do continue elif [[ "$result" =~ "PMM" ]] then - echo "Optane memory issues" + echo "[Skipped $m] Optane memory issues" echo $result if [[ $err -eq 0 ]] then
@@ -101,7 +108,7 @@ for m in $(perf list --raw-dump metrics); do # No error result and metric shown. continue fi - echo "Metric '$m' has non-zero error '$result_err' or not printed in:" + echo "[Failed $m] has non-zero error '$result_err' or not printed in:" echo "$result" err=1 done
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 158/1518 perf test: Do not skip when some metrics tests succeeded
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 1c89bc1b95fa9058f3e7cd37f1142939261417d5 ]
I think the return value of SKIP (2) should be used when it skipped the entire test suite rather than a few of them. While the FAIL should be reserved if any of test failed.
$ perf test -vv 110 110: perf all metrics test: --- start --- test child forked, pid 2496399 Testing tma_core_bound Testing tma_info_core_ilp Testing tma_info_memory_l2mpki Testing tma_memory_bound Testing tma_bottleneck_irregular_overhead Testing tma_bottleneck_mispredictions Testing tma_info_bad_spec_branch_misprediction_cost Testing tma_info_bad_spec_ipmisp_cond_ntaken Testing tma_info_bad_spec_ipmisp_cond_taken Testing tma_info_bad_spec_ipmisp_indirect Testing tma_info_bad_spec_ipmisp_ret Testing tma_info_bad_spec_ipmispredict Testing tma_info_branches_callret Testing tma_info_branches_cond_nt Testing tma_info_branches_cond_tk Testing tma_info_branches_jump Testing tma_info_branches_other_branches Testing tma_branch_mispredicts Testing tma_clears_resteers Testing tma_machine_clears Testing tma_mispredicts_resteers Testing tma_bottleneck_big_code Testing tma_icache_misses Testing tma_itlb_misses Testing tma_unknown_branches Testing tma_info_bad_spec_spec_clears_ratio Testing tma_other_mispredicts Testing tma_branch_instructions Testing tma_info_frontend_tbpc Testing tma_info_inst_mix_bptkbranch Testing tma_info_inst_mix_ipbranch Testing tma_info_inst_mix_ipcall Testing tma_info_inst_mix_iptb Testing tma_info_system_ipfarbranch Testing tma_info_thread_uptb Testing tma_bottleneck_branching_overhead Testing tma_nop_instructions Testing tma_bottleneck_compute_bound_est Testing tma_divider Testing tma_ports_utilized_3m Testing tma_bottleneck_instruction_fetch_bw Testing tma_frontend_bound Testing tma_assists Testing tma_other_nukes Testing tma_serializing_operation Testing tma_bottleneck_data_cache_memory_bandwidth Testing tma_fb_full Testing tma_mem_bandwidth Testing tma_sq_full Testing tma_bottleneck_data_cache_memory_latency Testing tma_l1_latency_dependency Testing tma_l2_bound Testing tma_l3_hit_latency Testing tma_mem_latency Testing tma_store_latency Testing tma_bottleneck_memory_synchronization Testing tma_contested_accesses Testing tma_data_sharing Testing tma_false_sharing Testing tma_bottleneck_memory_data_tlbs Testing tma_dtlb_load Testing tma_dtlb_store Testing tma_backend_bound Testing tma_bottleneck_other_bottlenecks Testing tma_bottleneck_useful_work Testing tma_retiring Testing tma_info_memory_fb_hpki Testing tma_info_memory_l1mpki Testing tma_info_memory_l1mpki_load Testing tma_info_memory_l2hpki_all Testing tma_info_memory_l2hpki_load Testing tma_info_memory_l2mpki_all Testing tma_info_memory_l2mpki_load Testing tma_l1_bound Testing tma_l3_bound Testing tma_info_memory_l2mpki_rfo Testing tma_fp_scalar Testing tma_fp_vector Testing tma_fp_vector_128b Testing tma_fp_vector_256b Testing tma_fp_vector_512b Testing tma_port_0 Testing tma_x87_use Testing tma_info_botlnk_l0_core_bound_likely Testing tma_info_core_fp_arith_utilization Testing tma_info_pipeline_execute Testing tma_info_system_gflops Testing tma_info_thread_execute_per_issue Testing tma_dsb Testing tma_info_botlnk_l2_dsb_bandwidth Testing tma_info_frontend_dsb_coverage Testing tma_decoder0_alone Testing tma_dsb_switches Testing tma_info_botlnk_l2_dsb_misses Testing tma_info_frontend_dsb_switch_cost Testing tma_info_frontend_ipdsb_miss_ret Testing tma_mite Testing tma_mite_4wide Testing CPUs_utilized Testing backend_cycles_idle [Ignored backend_cycles_idle] failed but as a Default metric this can be expected Performance counter stats for 'perf test -w noploop': <not counted> cpu-cycles:u <not supported> stalled-cycles-backend:u 1.014051473 seconds time elapsed 1.005718000 seconds user 0.008013000 seconds sys Testing branch_frequency Testing branch_miss_rate Testing cs_per_second Testing cycles_frequency Testing frontend_cycles_idle [Ignored frontend_cycles_idle] failed but as a Default metric this can be expected Performance counter stats for 'perf test -w noploop': <not counted> cpu-cycles:u <not supported> stalled-cycles-frontend:u 1.012813656 seconds time elapsed 1.004603000 seconds user 0.008004000 seconds sys Testing insn_per_cycle Testing migrations_per_second Testing page_faults_per_second Testing stalled_cycles_per_instruction [Ignored stalled_cycles_per_instruction] failed but as a Default metric this can be expected Error: No supported events found. The stalled-cycles-backend:u event is not supported. Testing tma_bad_speculation Testing l1d_miss_rate Testing llc_miss_rate Testing dtlb_miss_rate Testing itlb_miss_rate [Ignored itlb_miss_rate] failed but as a Default metric this can be expected Performance counter stats for 'perf test -w noploop': <not supported> iTLB-loads:u 3,097 iTLB-load-misses:u 1.012766732 seconds time elapsed 1.004318000 seconds user 0.008002000 seconds sys Testing l1i_miss_rate [Ignored l1i_miss_rate] failed but as a Default metric this can be expected Performance counter stats for 'perf test -w noploop': <not counted> L1-icache-load-misses:u <not supported> L1-icache-loads:u 1.013606395 seconds time elapsed 1.001371000 seconds user 0.011968000 seconds sys Testing l1_prefetch_miss_rate [Ignored l1_prefetch_miss_rate] failed but as a Default metric this can be expected Error: No supported events found. The L1-dcache-prefetches:u event is not supported. Testing tma_info_botlnk_l2_ic_misses Testing tma_info_frontend_fetch_upc Testing tma_info_frontend_icache_miss_latency Testing tma_info_frontend_ipunknown_branch Testing tma_info_frontend_lsd_coverage Testing tma_info_memory_tlb_code_stlb_mpki Testing tma_info_pipeline_fetch_dsb Testing tma_info_pipeline_fetch_lsd Testing tma_info_pipeline_fetch_mite Testing tma_info_pipeline_fetch_ms Testing tma_fetch_bandwidth Testing tma_lsd Testing tma_branch_resteers Testing tma_code_l2_hit Testing tma_code_l2_miss Testing tma_code_stlb_hit Testing tma_code_stlb_miss Testing tma_code_stlb_miss_2m Testing tma_code_stlb_miss_4k Testing tma_lcp Testing tma_ms_switches Testing tma_info_core_flopc Testing tma_info_inst_mix_iparith Testing tma_info_inst_mix_iparith_avx128 Testing tma_info_inst_mix_iparith_avx256 Testing tma_info_inst_mix_iparith_avx512 Testing tma_info_inst_mix_iparith_scalar_dp Testing tma_info_inst_mix_iparith_scalar_sp Testing tma_info_inst_mix_ipflop Testing tma_info_inst_mix_ippause Testing tma_fetch_latency Testing tma_fp_arith Testing tma_fp_assists Testing tma_info_system_cpu_utilization Testing tma_info_system_dram_bw_use [Skipped tma_info_system_dram_bw_use] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> UNC_ARB_TRK_REQUESTS.ALL:u <not supported> UNC_ARB_COH_TRK_REQUESTS.ALL:u 1,013,554,749 duration_time 1.013527265 seconds time elapsed 1.005417000 seconds user 0.008011000 seconds sys Testing tma_info_frontend_l2mpki_code Testing tma_info_frontend_l2mpki_code_all Testing tma_info_inst_mix_ipload Testing tma_info_inst_mix_ipstore Testing tma_info_memory_latency_load_l2_miss_latency Testing tma_lock_latency Testing tma_info_memory_core_l1d_cache_fill_bw_2t Testing tma_info_memory_core_l2_cache_fill_bw_2t Testing tma_info_memory_core_l3_cache_access_bw_2t Testing tma_info_memory_core_l3_cache_fill_bw_2t Testing tma_info_memory_l1d_cache_fill_bw Testing tma_info_memory_l2_cache_fill_bw Testing tma_info_memory_l3_cache_access_bw Testing tma_info_memory_l3_cache_fill_bw Testing tma_info_memory_l3mpki Testing tma_info_memory_load_miss_real_latency Testing tma_info_memory_mix_bus_lock_pki Testing tma_info_memory_mix_uc_load_pki Testing tma_info_memory_mlp Testing tma_info_memory_tlb_load_stlb_mpki Testing tma_info_memory_tlb_page_walks_utilization Testing tma_info_memory_tlb_store_stlb_mpki Testing tma_info_system_mem_parallel_reads [Skipped tma_info_system_mem_parallel_reads] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> UNC_ARB_DAT_OCCUPANCY.RD:u <not counted> UNC_ARB_DAT_OCCUPANCY.RD/cmask=1/ 1.013354884 seconds time elapsed 1.009239000 seconds user 0.004004000 seconds sys Testing tma_info_system_mem_read_latency [Skipped tma_info_system_mem_read_latency] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> UNC_ARB_DAT_OCCUPANCY.RD:u <not counted> UNC_ARB_TRK_OCCUPANCY.RD <not counted> UNC_ARB_TRK_REQUESTS.RD 1.012882143 seconds time elapsed 1.004600000 seconds user 0.008036000 seconds sys Testing tma_info_thread_cpi Testing tma_streaming_stores Testing tma_dram_bound Testing tma_store_bound Testing tma_l2_hit_latency Testing tma_load_stlb_hit Testing tma_load_stlb_miss Testing tma_load_stlb_miss_1g Testing tma_load_stlb_miss_2m Testing tma_load_stlb_miss_4k Testing tma_store_stlb_hit Testing tma_store_stlb_miss Testing tma_store_stlb_miss_1g Testing tma_store_stlb_miss_2m Testing tma_store_stlb_miss_4k Testing tma_info_memory_latency_data_l2_mlp Testing tma_info_memory_latency_load_l2_mlp Testing tma_info_pipeline_ipassist Testing tma_microcode_sequencer Testing tma_ms Testing tma_info_system_kernel_cpi [Failed tma_info_system_kernel_cpi] Metric contains missing events Error: No supported events found. Access to performance monitoring and observability operations is limited. Consider adjusting /proc/sys/kernel/perf_event_paranoid setting to open access to performance monitoring and observability operations for processes without CAP_PERFMON, CAP_SYS_PTRACE or CAP_SYS_ADMIN Linux capability. More information can be found at 'Perf events and tool security' document: https://www.kernel.org/doc/html/latest/admin-guide/perf-security.html perf_event_paranoid setting is 2: -1: Allow use of (almost) all events by all users Ignore mlock limit after perf_event_mlock_kb without CAP_IPC_LOCK >= 0: Disallow raw and ftrace function tracepoint access >= 1: Disallow CPU event access >= 2: Disallow kernel profiling To make the adjusted perf_event_paranoid setting permanent preserve it in /etc/sysctl.conf (e.g. kernel.perf_event_paranoid = <setting>) Testing tma_info_system_kernel_utilization [Failed tma_info_system_kernel_utilization] Metric contains missing events Error: No supported events found. Access to performance monitoring and observability operations is limited. Consider adjusting /proc/sys/kernel/perf_event_paranoid setting to open access to performance monitoring and observability operations for processes without CAP_PERFMON, CAP_SYS_PTRACE or CAP_SYS_ADMIN Linux capability. More information can be found at 'Perf events and tool security' document: https://www.kernel.org/doc/html/latest/admin-guide/perf-security.html perf_event_paranoid setting is 2: -1: Allow use of (almost) all events by all users Ignore mlock limit after perf_event_mlock_kb without CAP_IPC_LOCK >= 0: Disallow raw and ftrace function tracepoint access >= 1: Disallow CPU event access >= 2: Disallow kernel profiling To make the adjusted perf_event_paranoid setting permanent preserve it in /etc/sysctl.conf (e.g. kernel.perf_event_paranoid = <setting>) Testing tma_info_pipeline_retire Testing tma_info_thread_clks Testing tma_info_thread_uoppi Testing tma_memory_operations Testing tma_other_light_ops Testing tma_ports_utilization Testing tma_ports_utilized_0 Testing tma_ports_utilized_1 Testing tma_ports_utilized_2 Testing C10_Pkg_Residency [Failed C10_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c10-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c10-residency/u) in per-thread mode, enable system wide with '-a'. Testing C2_Pkg_Residency [Failed C2_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c2-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c2-residency/u) in per-thread mode, enable system wide with '-a'. Testing C3_Pkg_Residency [Failed C3_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { msr/tsc/, cstate_pkg/c3-residency/ } Error: No supported events found. Invalid event (msr/tsc/u) in per-thread mode, enable system wide with '-a'. Testing C6_Core_Residency [Failed C6_Core_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_core/c6-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_core/c6-residency/u) in per-thread mode, enable system wide with '-a'. Testing C6_Pkg_Residency [Failed C6_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c6-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c6-residency/u) in per-thread mode, enable system wide with '-a'. Testing C7_Core_Residency [Failed C7_Core_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_core/c7-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_core/c7-residency/u) in per-thread mode, enable system wide with '-a'. Testing C7_Pkg_Residency [Failed C7_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c7-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c7-residency/u) in per-thread mode, enable system wide with '-a'. Testing C8_Pkg_Residency [Failed C8_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c8-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c8-residency/u) in per-thread mode, enable system wide with '-a'. Testing C9_Pkg_Residency [Failed C9_Pkg_Residency] Metric contains missing events WARNING: grouped events cpus do not match. Events with CPUs not matching the leader will be removed from the group. anon group { cstate_pkg/c9-residency/, msr/tsc/ } Error: No supported events found. Invalid event (cstate_pkg/c9-residency/u) in per-thread mode, enable system wide with '-a'. Testing tma_info_core_epc Testing tma_info_system_core_frequency Testing tma_info_system_power [Skipped tma_info_system_power] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> Joules power/energy-pkg/u 1,013,238,256 duration_time 1.013223072 seconds time elapsed 0.995924000 seconds user 0.011903000 seconds sys Testing tma_info_system_power_license0_utilization Testing tma_info_system_power_license1_utilization Testing tma_info_system_power_license2_utilization Testing tma_info_system_turbo_utilization Testing tma_info_inst_mix_ipswpf Testing tma_info_memory_prefetches_useless_hwpf Testing tma_info_core_coreipc Testing tma_info_thread_ipc Testing tma_heavy_operations Testing tma_light_operations Testing tma_info_core_core_clks Testing tma_info_system_smt_2t_utilization Testing tma_info_thread_slots_utilization Testing UNCORE_FREQ [Skipped UNCORE_FREQ] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> UNC_CLOCK.SOCKET:u 1,015,993,466 duration_time 1.015949387 seconds time elapsed 1.007676000 seconds user 0.008029000 seconds sys Testing tma_info_system_socket_clks [Failed tma_info_system_socket_clks] Metric contains missing events Error: No supported events found. Invalid event (UNC_CLOCK.SOCKET:u) in per-thread mode, enable system wide with '-a'. Testing tma_info_inst_mix_instructions Testing tma_info_system_cpus_utilized Testing tma_info_system_mux Testing tma_info_system_time Testing tma_info_thread_slots Testing tma_few_uops_instructions Testing tma_4k_aliasing Testing tma_cisc Testing tma_fp_divider Testing tma_int_divider Testing tma_slow_pause Testing tma_split_loads Testing tma_split_stores Testing tma_store_fwd_blk Testing tma_alu_op_utilization Testing tma_load_op_utilization Testing tma_mixing_vectors Testing tma_store_op_utilization Testing tma_port_1 Testing tma_port_5 Testing tma_port_6 Testing smi_cycles [Skipped smi_cycles] Not supported events Performance counter stats for 'perf test -w noploop': <not supported> msr/smi/u <not supported> msr/aperf/u 3,965,789,327 cycles:u 1.012779591 seconds time elapsed 1.004579000 seconds user 0.007972000 seconds sys Testing smi_num [Failed smi_num] Metric contains missing events Error: No supported events found. Invalid event (msr/smi/u) in per-thread mode, enable system wide with '-a'. Testing tsx_aborted_cycles Testing tsx_cycles_per_elision Testing tsx_cycles_per_transaction Testing tsx_transactional_cycles ---- end(-1) ---- 110: perf all metrics test : FAILED!
Stable-dep-of: 8953bfd8820b ("perf tests: Skip metrics validation if system-wide recording lacks permission")
--- tools/perf/tests/shell/stat_all_metrics.sh | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-)
tools/perf/tests/shell/stat_all_metrics.sh +22 -7
@@ -15,7 +15,8 @@ then test_prog="perf test -w noploop" fi -err=0 +skip=0 +err=3 for m in $(perf list --raw-dump metrics); do echo "Testing $m" result=$(perf stat -M "$m" $system_wide_flag -- $test_prog 2>&1)
@@ -23,6 +24,10 @@ for m in $(perf list --raw-dump metrics); do if [[ $result_err -eq 0 && "$result" =~ ${m:0:50} ]] then # No error result and metric shown. + if [[ "$err" -ne 1 ]] + then + err=0 + fi continue fi if [[ "$result" =~ "Cannot resolve IDs for" || "$result" =~ "No supported events found" ]]
@@ -44,7 +49,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue elif [[ "$result" =~ "in per-thread mode, enable system wide" ]]
@@ -53,7 +58,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue elif [[ "$result" =~ "<not supported>" ]]
@@ -68,7 +73,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue elif [[ "$result" =~ "<not counted>" ]]
@@ -77,7 +82,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue elif [[ "$result" =~ "FP_ARITH" || "$result" =~ "AMX" ]]
@@ -86,7 +91,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue elif [[ "$result" =~ "PMM" ]]
@@ -95,7 +100,7 @@ for m in $(perf list --raw-dump metrics); do echo $result if [[ $err -eq 0 ]] then - err=2 # Skip + skip=1 fi continue fi
@@ -106,6 +111,10 @@ for m in $(perf list --raw-dump metrics); do if [[ $result_err -eq 0 && "$result" =~ ${m:0:50} ]] then # No error result and metric shown. + if [[ "$err" -ne 1 ]] + then + err=0 + fi continue fi echo "[Failed $m] has non-zero error '$result_err' or not printed in:"
@@ -113,4 +122,10 @@ for m in $(perf list --raw-dump metrics); do err=1 done +# return SKIP only if no success returned +if [[ "$err" -eq 3 && "$skip" -eq 1 ]] +then + err=2 +fi + exit "$err"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 159/1518 perf tests: Skip metrics validation if system-wide recording lacks permission
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 8953bfd8820b6525032023fda3a420098c1823ae ]
The metrics value validation test requires system-wide recording (-a), which can fail on systems without root permissions or where paranoid levels restrict tracing. Add a check to skip the test if -a is not supported.
Also fix false negatives during validation by updating parse error string patterns and resolving issues in metric list generation.
--- .../tests/shell/lib/perf_metric_validation.py | 11 ++- tools/perf/tests/shell/stat_all_metrics.sh | 75 ++++++++++++------- tools/perf/tests/shell/stat_metrics_values.sh | 7 ++ 3 files changed, 60 insertions(+), 33 deletions(-)
tools/perf/tests/shell/lib/perf_metric_validation.py +7 -4
@@ -383,10 +383,13 @@ class Validator: wl = workload.split() command.extend(wl) print(" ".join(command)) - cmd = subprocess.run(command, stderr=subprocess.PIPE, encoding='utf-8') - data = [x+'}' for x in cmd.stderr.split('}\n') if x] - if data[0][0] != '{': - data[0] = data[0][data[0].find('{'):] + cmd = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf-8') + lines = cmd.stderr.splitlines() + cmd.stdout.splitlines() + data = [] + for line in lines: + line = line.strip() + if line.startswith('{') and line.endswith('}'): + data.append(line) return data def collect_perf(self, workload: str):
tools/perf/tests/shell/stat_all_metrics.sh +46 -29
110 lines not on this page · raw message
tools/perf/tests/shell/stat_metrics_values.sh +7 -0
@@ -8,6 +8,13 @@ shelldir=$(dirname "$0") grep -q GenuineIntel /proc/cpuinfo || { echo Skipping non-Intel; exit 2; } +# Skip if no permission to record system-wide events +if ! perf stat -a -e instructions sleep 0.01 >/dev/null 2>&1; then + echo "Skipping: no permission to record system-wide events (-a)" + exit 2 +fi + + pythonvalidator=$(dirname $0)/lib/perf_metric_validation.py rulefile=$(dirname $0)/lib/perf_metric_validation_rules.json tmpdir=$(mktemp -d /tmp/__perf_test.program.XXXXX)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 160/1518 perf test kvm: Add some basic perf kvm test coverage
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit b58261584d2f6b5241ac1693026242ef2f2148b4 ]
Setup qemu with KVM then run kvm stat and some host recording/reporting/build-id tests.
Stable-dep-of: 509a2b9a6e14 ("perf tests: Fix flakiness in trace record and replay test")
--- tools/perf/tests/shell/kvm.sh | 154 ++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100755 tools/perf/tests/shell/kvm.sh
tools/perf/tests/shell/kvm.sh new file +154 -0
@@ -0,0 +1,154 @@ +#!/bin/bash +# perf kvm tests +# SPDX-License-Identifier: GPL-2.0 + +set -e + +err=0 +perfdata=$(mktemp /tmp/__perf_kvm_test.perf.data.XXXXX) +qemu_pid_file=$(mktemp /tmp/__perf_kvm_test.qemu.pid.XXXXX) + +cleanup() { + rm -f "${perfdata}" + if [ -f "${qemu_pid_file}" ]; then + if [ -s "${qemu_pid_file}" ]; then + qemu_pid=$(cat "${qemu_pid_file}") + if [ -n "${qemu_pid}" ]; then + kill "${qemu_pid}" 2>/dev/null || true + fi + fi + rm -f "${qemu_pid_file}" + fi + trap - EXIT TERM INT +} + +trap_cleanup() { + echo "Unexpected signal in ${FUNCNAME[1]}" + cleanup + exit 1 +} +trap trap_cleanup EXIT TERM INT + +skip() { + echo "Skip: $1" + cleanup + exit 2 +} + +test_kvm_stat() { + echo "Testing perf kvm stat" + + echo "Recording kvm events for pid ${qemu_pid}..." + if ! perf kvm stat record -p "${qemu_pid}" -o "${perfdata}" sleep 1; then + echo "Failed to record kvm events" + err=1 + return + fi + + echo "Reporting kvm events..." + if ! perf kvm -i "${perfdata}" stat report 2>&1 | grep -q "VM-EXIT"; then + echo "Failed to find VM-EXIT in report" + perf kvm -i "${perfdata}" stat report 2>&1 + err=1 + return + fi + + echo "perf kvm stat test [Success]" +} + +test_kvm_record_report() { + echo "Testing perf kvm record/report" + + echo "Recording kvm profile for pid ${qemu_pid}..." + # Use --host to avoid needing guest symbols/mounts for this simple test + # We just want to verify the command runs and produces data + # We run in background and kill it because 'perf kvm record' appends options + # after the command, which breaks 'sleep' (e.g. it gets '-e cycles'). + perf kvm --host record -p "${qemu_pid}" -o "${perfdata}" & + rec_pid=$! + sleep 1 + kill -INT "${rec_pid}" + wait "${rec_pid}" || true + + echo "Reporting kvm profile..." + # Check for some standard output from report + if ! perf kvm -i "${perfdata}" report --stdio 2>&1 | grep -q "Event count"; then + echo "Failed to report kvm profile" + perf kvm -i "${perfdata}" report --stdio 2>&1 + err=1 + return + fi + + echo "perf kvm record/report test [Success]" +} + +test_kvm_buildid_list() { + echo "Testing perf kvm buildid-list" + + # We reuse the perf.data from the previous record test + if ! perf kvm --host -i "${perfdata}" buildid-list 2>&1 | grep -q "."; then + echo "Failed to list buildids" + perf kvm --host -i "${perfdata}" buildid-list 2>&1 + err=1 + return + fi + + echo "perf kvm buildid-list test [Success]" +} + +setup_qemu() { + # Find qemu + if [ "$(uname -m)" = "x86_64" ]; then + qemu="qemu-system-x86_64" + elif [ "$(uname -m)" = "aarch64" ]; then + qemu="qemu-system-aarch64" + elif [ "$(uname -m)" = "s390x" ]; then + qemu="qemu-system-s390x" + elif [ "$(uname -m)" = "ppc64le" ]; then + qemu="qemu-system-ppc64" + else + qemu="qemu-system-$(uname -m)" + fi + + if ! which -s "$qemu"; then + skip "$qemu not found" + fi + + if [ ! -r /dev/kvm ] || [ ! -w /dev/kvm ]; then + skip "/dev/kvm not accessible" + fi + + if ! perf kvm stat record -a sleep 0.01 >/dev/null 2>&1; then + skip "No permission to record kvm events" + fi + + echo "Starting $qemu..." + # Start qemu in background, detached, with pidfile + # We use -display none -daemonize and a monitor to keep it alive/controllable if needed + # We don't need a real kernel, just KVM active. + if ! $qemu -enable-kvm -display none -daemonize -pidfile "${qemu_pid_file}" -monitor none; then + echo "Failed to start qemu" + err=1 + return + fi + + # Wait a bit for qemu to start + sleep 1 + qemu_pid=$(cat "${qemu_pid_file}") + + if ! kill -0 "${qemu_pid}" 2>/dev/null; then + echo "Qemu process failed to stay alive" + err=1 + return + fi +} + +setup_qemu +if [ $err -eq 0 ]; then + test_kvm_stat + test_kvm_record_report + test_kvm_buildid_list +fi + +cleanup +exit $err
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 161/1518 perf tests: Add robust record retry helper and use subsecond workloads
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 74dba58222f0d34cf8bd3eba1a6926e9654d4b6b ]
Introduce perf_record_with_retry and perf_record_cleanup in a shared library tests/shell/lib/perf_record.sh to prevent record test failures caused by transient recording or workload delays.
Update record.sh, record_lbr.sh, pipe_test.sh, kvm.sh, and stat_all_pfm.sh to use this robust record retry logic. These tests now start with very short durations (e.g. 0.01 seconds) and scale up if the initial recording failed to capture samples, significantly improving test execution speed on success while remaining resilient to slow systems.
Stable-dep-of: 509a2b9a6e14 ("perf tests: Fix flakiness in trace record and replay test")
--- tools/perf/tests/shell/kvm.sh | 61 +++++--- tools/perf/tests/shell/lib/perf_record.sh | 53 +++++++ tools/perf/tests/shell/pipe_test.sh | 4 +- tools/perf/tests/shell/record.sh | 173 +++++++++++----------- tools/perf/tests/shell/record_lbr.sh | 50 +++++-- 5 files changed, 214 insertions(+), 127 deletions(-) create mode 100644 tools/perf/tests/shell/lib/perf_record.sh
tools/perf/tests/shell/kvm.sh +38 -23
@@ -38,17 +38,28 @@ skip() { test_kvm_stat() { echo "Testing perf kvm stat" - echo "Recording kvm events for pid ${qemu_pid}..." - if ! perf kvm stat record -p "${qemu_pid}" -o "${perfdata}" sleep 1; then - echo "Failed to record kvm events" - err=1 - return - fi + local duration + local success=false + for duration in 1 2 4 8; do + echo "Recording kvm events for pid ${qemu_pid} (duration ${duration}s)..." + rm -f "${perfdata}" "${perfdata}".old + if ! perf kvm stat record -p "${qemu_pid}" -o "${perfdata}" \ + sleep ${duration} >/dev/null 2>&1; then + echo "perf kvm stat record failed, retrying..." + continue + fi + + if [ -e "${perfdata}" ] && \ + perf kvm -i "${perfdata}" stat report 2>&1 | grep -q "VM-EXIT"; then + success=true + break + fi + echo "No VM-EXIT events found, retrying..." + done - echo "Reporting kvm events..." - if ! perf kvm -i "${perfdata}" stat report 2>&1 | grep -q "VM-EXIT"; then + if [ "$success" = false ]; then echo "Failed to find VM-EXIT in report" - perf kvm -i "${perfdata}" stat report 2>&1 + perf kvm -i "${perfdata}" stat report 2>&1 || true err=1 return fi
@@ -59,22 +70,26 @@ test_kvm_stat() { test_kvm_record_report() { echo "Testing perf kvm record/report" - echo "Recording kvm profile for pid ${qemu_pid}..." - # Use --host to avoid needing guest symbols/mounts for this simple test - # We just want to verify the command runs and produces data - # We run in background and kill it because 'perf kvm record' appends options - # after the command, which breaks 'sleep' (e.g. it gets '-e cycles'). - perf kvm --host record -p "${qemu_pid}" -o "${perfdata}" & - rec_pid=$! - sleep 1 - kill -INT "${rec_pid}" - wait "${rec_pid}" || true + local duration + local success=false + for duration in 1 2 4 8; do + echo "Recording kvm profile for pid ${qemu_pid} (duration ${duration}s)..." + rm -f "${perfdata}" "${perfdata}".old + + perf kvm --host record -p "${qemu_pid}" -o "${perfdata}" \ + -e cpu-clock sleep ${duration} + + if [ -e "${perfdata}" ] && \ + perf kvm -i "${perfdata}" report --stdio 2>&1 | grep -q "Event count"; then + success=true + break + fi + echo "No samples or report failed, retrying..." + done - echo "Reporting kvm profile..." - # Check for some standard output from report - if ! perf kvm -i "${perfdata}" report --stdio 2>&1 | grep -q "Event count"; then + if [ "$success" = false ]; then echo "Failed to report kvm profile" - perf kvm -i "${perfdata}" report --stdio 2>&1 + perf kvm -i "${perfdata}" report --stdio 2>&1 || true err=1 return fi
tools/perf/tests/shell/lib/perf_record.sh new file +53 -0
53 lines not on this page · raw message
tools/perf/tests/shell/pipe_test.sh +2 -2
@@ -12,8 +12,8 @@ skip_test_missing_symbol ${sym} data=$(mktemp /tmp/perf.data.XXXXXX) data2=$(mktemp /tmp/perf.data2.XXXXXX) -prog="perf test -w noploop" -[ "$(uname -m)" = "s390x" ] && prog="$prog 3" +prog="perf test -w noploop 0.1" +[ "$(uname -m)" = "s390x" ] && prog="perf test -w noploop 3" err=0 set -e
tools/perf/tests/shell/record.sh +87 -86
274 lines not on this page · raw message
tools/perf/tests/shell/record_lbr.sh +34 -16
102 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 162/1518 perf tests: Fix flakiness in trace record and replay test
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 509a2b9a6e142697dd5f34cdd802e5b86eababa1 ]
The perf trace record and replay test fails intermittently on slow or virtualized hosts because the default recording workload (sleep 1) occasionally completes without scheduling the target nanosleep or clock_nanosleep system calls inside the recorded sample window, resulting in the error: Failed: cannot find *nanosleep syscall.
Generalize the perf_record_with_retry helper in tests/shell/lib/perf_record.sh to support a custom record command prefix via the PERF_RECORD_CMD environment variable (defaulting to "perf record").
Update trace_record_replay.sh to use this robust retry loop running with PERF_RECORD_CMD="perf trace record" and a base workload of sleep. The test will automatically retry with scaled sleep durations (from 0.01s up to 2.0s) until the required nanosleep event is successfully captured.
--- tools/perf/tests/shell/lib/perf_record.sh | 7 +++- tools/perf/tests/shell/trace_record_replay.sh | 38 +++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-)
tools/perf/tests/shell/lib/perf_record.sh +6 -1
@@ -24,9 +24,14 @@ perf_record_with_retry() { local duration local first_run=true local ret=1 + local cmd_prefix="perf record" + if [ -n "${PERF_RECORD_CMD}" ]; then + cmd_prefix="${PERF_RECORD_CMD}" + fi + for duration in 0.01 0.1 0.3 1.0 2.0; do rm -f "${perfdata}".old - perf record "$@" -o "${perfdata}" ${testprog_base} ${duration} > "$logfile" 2>&1 + ${cmd_prefix} "$@" -o "${perfdata}" ${testprog_base} ${duration} > "$logfile" 2>&1 local record_exit=$? if [ "$first_run" = true ] && [ $record_exit -ne 0 ]; then
tools/perf/tests/shell/trace_record_replay.sh +34 -4
@@ -6,16 +6,46 @@ # shellcheck source=lib/probe.sh . "$(dirname $0)"/lib/probe.sh +# shellcheck source=lib/perf_record.sh +. "$(dirname $0)"/lib/perf_record.sh skip_if_no_perf_trace || exit 2 [ "$(id -u)" = 0 ] || exit 2 file=$(mktemp /tmp/temporary_file.XXXXX) +err=0 -perf trace record -o ${file} sleep 1 || exit 1 -if ! perf trace -i ${file} 2>&1 | grep nanosleep; then - echo "Failed: cannot find *nanosleep syscall" +cleanup() { + rm -f ${file} + perf_record_cleanup + trap - EXIT INT TERM +} + +trap_cleanup() { + echo "Unexpected signal in ${FUNCNAME[1]}" + cleanup + exit 1 +} +trap trap_cleanup EXIT INT TERM + +check_nanosleep() { + perf trace -i "${file}" 2>&1 | grep -q nanosleep +} + +PERF_RECORD_CMD="perf trace record" perf_record_with_retry "${file}" "check_nanosleep" "sleep" +err=$? + +if [ $err -ne 0 ]; then + if [ $err -eq 2 ]; then + logfile="${PERF_RECORD_LOGS[${#PERF_RECORD_LOGS[@]}-1]}" + echo "perf trace record failed. Log output:" + cat "$logfile" + else + echo "Failed: cannot find *nanosleep syscall" + fi + cleanup exit 1 fi -rm -f ${file} +cleanup +exit 0
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 163/1518 perf test: Fix perf stat --bpf-counters on hybrid machines
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit d9db9c8db56c3e378aa5c91637664f77ca5a6f72 ]
The test constantly fails on my Intel hybrid machine. The issue was it has two events in the output even if I only gave it one event.
$ perf stat -e instructions -- perf test -w sqrtloop
Performance counter stats for 'perf test -w sqrtloop':
910,856,421 cpu_atom/instructions/ (28.05%)
14,852,865,997 cpu_core/instructions/ (96.79%) 1.014313341 seconds time elapsed
1.004114000 seconds user
0.008174000 seconds sysLet's modify the awk script to add the values for each line and print the total. The variable 'i' has a number of input lines that have valid output and variable 'c' has the sum of actual counter values. That way it should work on any platforms.
Stable-dep-of: b02027776ac5 ("perf tests: Fix flakiness in BPF counters test on hybrid systems")
--- tools/perf/tests/shell/stat_bpf_counters.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tools/perf/tests/shell/stat_bpf_counters.sh +16 -4
@@ -41,8 +41,14 @@ check_counts() test_bpf_counters() { printf "Testing --bpf-counters " - base_instructions=$(perf stat --no-big-num -e instructions -- $workload 2>&1 | awk '/instructions/ {print $1}') - bpf_instructions=$(perf stat --no-big-num --bpf-counters -e instructions -- $workload 2>&1 | awk '/instructions/ {print $1}') + base_instructions=$(perf stat --no-big-num -e instructions -- $workload 2>&1 | \ + awk -v i=0 -v c=0 '/instructions/ { \ + if ($1 != "<not") { i++; c += $1 } \ + } END { if (i > 0) printf "%.0f", c; else print "<not" }') + bpf_instructions=$(perf stat --no-big-num --bpf-counters -e instructions -- $workload 2>&1 | \ + awk -v i=0 -v c=0 '/instructions/ { \ + if ($1 != "<not") { i++; c += $1 } \ + } END { if (i > 0) printf "%.0f", c; else print "<not" }') check_counts $base_instructions $bpf_instructions compare_number $base_instructions $bpf_instructions echo "[Success]"
@@ -52,8 +58,14 @@ test_bpf_modifier() { printf "Testing bpf event modifier " stat_output=$(perf stat --no-big-num -e instructions/name=base_instructions/,instructions/name=bpf_instructions/b -- $workload 2>&1) - base_instructions=$(echo "$stat_output"| awk '/base_instructions/ {print $1}') - bpf_instructions=$(echo "$stat_output"| awk '/bpf_instructions/ {print $1}') + base_instructions=$(echo "$stat_output"| \ + awk -v i=0 -v c=0 '/base_instructions/ { \ + if ($1 != "<not") { i++; c += $1 } \ + } END { if (i > 0) printf "%.0f", c; else print "<not" }') + bpf_instructions=$(echo "$stat_output"| \ + awk -v i=0 -v c=0 '/bpf_instructions/ { \ + if ($1 != "<not") { i++; c += $1 } \ + } END { if (i > 0) printf "%.0f", c; else print "<not" }') check_counts $base_instructions $bpf_instructions compare_number $base_instructions $bpf_instructions echo "[Success]"
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 164/1518 perf tests: Fix flakiness in BPF counters test on hybrid systems
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit b02027776ac5bf737f1b76f3759f405e376097e5 ]
The perf stat --bpf-counters test fails intermittently on hybrid architectures or systems with dynamic frequency scaling (DVFS). This happens because the test workload (sqrtloop) runs for a fixed 1-second duration, and the CPU frequency can scale dynamically between idle and maximum frequency. As the first run runs on a cold CPU and the second run runs on a warmed-up CPU (or vice versa), the number of instructions executed in 1 second differs by up to 2.2x, violating the comparison tolerance.
Also, when running as root, BPF tracepoints and scheduling programs trigger frequently. Since standard perf stat -e instructions measures both user and kernel space instructions, it counts BPF helper and program execution overheads, whereas the BPF counters themselves do not self- measure. This introduces a large kernel-space instruction count discrepancy between standard and BPF counters.
Fix these issues by:
1. Switching the workload to a strictly deterministic, iteration-based
workload: awk 'BEGIN { for (i=0; i<10000000; i++) sum+=i }'. We pin
the
workload to a single random allowed CPU using taskset -c $CPU via a
bash array.
2. Restricting the counted event to user-space only (instructions:u or /u).
3. Tightening the comparison tolerance from 20% to 15%.
These modifications isolate the measurements to user-space instructions of the deterministic loop, which executes a virtually identical number of instructions on both runs (with less than 0.001% variation), eliminating Dynamic Frequency Scaling (DVFS), kernel scheduling noise, and BPF helper self-measurement overheads.
--- tools/perf/tests/shell/stat_bpf_counters.sh | 28 +++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-)
tools/perf/tests/shell/stat_bpf_counters.sh +18 -10
@@ -4,21 +4,26 @@ set -e -workload="perf test -w sqrtloop" +# Get the first allowed CPU +CPU=$(taskset -c -p $$ | awk -F': ' '{print $2}' | awk -F'[,-]' '{print $1}') +if [ -z "$CPU" ]; then + CPU=0 +fi +workload=(taskset -c "$CPU" awk 'BEGIN { for (i=0; i<10000000; i++) sum+=i }') -# check whether $2 is within +/- 20% of $1 +# check whether $2 is within +/- 15% of $1 compare_number() { first_num=$1 second_num=$2 - # upper bound is first_num * 120% - upper=$(expr $first_num + $first_num / 5 ) - # lower bound is first_num * 80% - lower=$(expr $first_num - $first_num / 5 ) + # upper bound is first_num * 115% + upper=$(expr $first_num + $first_num / 20 \* 3 ) + # lower bound is first_num * 85% + lower=$(expr $first_num - $first_num / 20 \* 3 ) if [ $second_num -gt $upper ] || [ $second_num -lt $lower ]; then - echo "The difference between $first_num and $second_num are greater than 20%." + echo "The difference between $first_num and $second_num are greater than 15%." exit 1 fi }
@@ -41,11 +46,12 @@ check_counts() test_bpf_counters() { printf "Testing --bpf-counters " - base_instructions=$(perf stat --no-big-num -e instructions -- $workload 2>&1 | \ + base_instructions=$(perf stat --no-big-num -e instructions:u -- "${workload[@]}" 2>&1 | \ awk -v i=0 -v c=0 '/instructions/ { \ if ($1 != "<not") { i++; c += $1 } \ } END { if (i > 0) printf "%.0f", c; else print "<not" }') - bpf_instructions=$(perf stat --no-big-num --bpf-counters -e instructions -- $workload 2>&1 | \ + bpf_instructions=$(perf stat --no-big-num --bpf-counters -e instructions:u \ + -- "${workload[@]}" 2>&1 | \ awk -v i=0 -v c=0 '/instructions/ { \ if ($1 != "<not") { i++; c += $1 } \ } END { if (i > 0) printf "%.0f", c; else print "<not" }')
@@ -57,7 +63,9 @@ test_bpf_counters() test_bpf_modifier() { printf "Testing bpf event modifier " - stat_output=$(perf stat --no-big-num -e instructions/name=base_instructions/,instructions/name=bpf_instructions/b -- $workload 2>&1) + stat_output=$(perf stat --no-big-num \ + -e instructions/name=base_instructions/u,instructions/name=bpf_instructions/bu \ + -- "${workload[@]}" 2>&1) base_instructions=$(echo "$stat_output"| \ awk -v i=0 -v c=0 '/base_instructions/ { \ if ($1 != "<not") { i++; c += $1 } \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 165/1518 perf test: Fixes for check branch stack sampling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 86d1095fdb7017a93e9d7be875775f7e5aa5c2f5 ]
When filtering branch stack samples on user events they sample in user land but may have come from the kernel. Aarch64 avoids leaking the kernel address for kaslr reasons but other platforms, for now, don't. Be more permissive in allowing kernel addresses in the source of user branch stacks.
When filtering branch stack samples on kernel events they sample in kernel land but may have come from user land. Avoid the target being a user address but allow the source to be in user land. Aarch64 may not leak the user land addresses (making them 0) but other platforms do. As the kernel address sampling implies privelege, just allow this.
Increase the duration of the system call sampling test to make the likelihood of sampling a system call higher (increased from 1000 to 8000 loops - a number found through experimentation on an Intel Tigerlake laptop), also make the period of the event a prime number.
Put unneeded perf record output into a temporary file so that the test output isn't cluttered. More clearly state which test is running and the pass, fail or skipped result of the test.
These changes make the test on an Intel tigerlake laptop reliably pass rather than reliably fail.
Stable-dep-of: 344d3aec164d ("perf tests: Fix flakiness in branch stack sampling tests")
--- tools/perf/tests/shell/test_brstack.sh | 146 ++++++++++++++++--------- 1 file changed, 96 insertions(+), 50 deletions(-)
tools/perf/tests/shell/test_brstack.sh +96 -50
@@ -38,9 +38,13 @@ is_arm64() { [ "$(uname -m)" = "aarch64" ]; } +has_kaslr_bug() { + [ "$(uname -m)" != "aarch64" ]; +} + check_branches() { if ! tr -s ' ' '\n' < "$TMPDIR/perf.script" | grep -E -m1 -q "$1"; then - echo "Branches missing $1" + echo "ERROR: Branches missing $1" err=1 fi }
@@ -48,6 +52,8 @@ check_branches() { test_user_branches() { echo "Testing user branch stack sampling" + start_err=$err + err=0 perf record -o "$TMPDIR/perf.data" --branch-filter any,save_type,u -- ${TESTPROG} > "$TMPDIR/record.txt" 2>&1 perf script -i "$TMPDIR/perf.data" --fields brstacksym > "$TMPDIR/perf.script"
@@ -73,59 +79,88 @@ test_user_branches() { perf script -i "$TMPDIR/perf.data" --fields brstack | \ tr ' ' '\n' > "$TMPDIR/perf.script" - # There should be no kernel addresses with the u option, in either - # source or target addresses. - if grep -E -m1 "0x[89a-f][0-9a-f]{15}" $TMPDIR/perf.script; then - echo "ERROR: Kernel address found in user mode" + # There should be no kernel addresses in the target with the u option. + local regex="0x[89a-f][0-9a-f]{15}" + if has_kaslr_bug; then + # If the system has a kaslr bug that may leak kernel addresses + # in the source of something like an ERET/SYSRET. Make the regex + # more specific and just check the target address is in user + # code. + regex="^0x[0-9a-f]{0,16}/0x[89a-f][0-9a-f]{15}/" + fi + if grep -q -E -m1 "$regex" $TMPDIR/perf.script; then + echo "Testing user branch stack sampling [Failed kernel address found in user mode]" err=1 fi # some branch types are still not being tested: # IND COND_CALL COND_RET SYSRET SERROR NO_TX + if [ $err -eq 0 ]; then + echo "Testing user branch stack sampling [Passed]" + err=$start_err + else + echo "Testing user branch stack sampling [Failed]" + fi } test_trap_eret_branches() { echo "Testing trap & eret branches" + if ! is_arm64; then - echo "skip: not arm64" + echo "Testing trap & eret branches [Skipped not arm64]" + return + fi + start_err=$err + err=0 + perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u,k -- \ + perf test -w traploop 1000 > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstacksym | \ + tr ' ' '\n' > $TMPDIR/perf.script + + # BRBINF<n>.TYPE == TRAP are mapped to PERF_BR_IRQ by the BRBE driver + check_branches "^trap_bench\+[^ ]+/[^ ]/IRQ/" + check_branches "^[^ ]+/trap_bench\+[^ ]+/ERET/" + if [ $err -eq 0 ]; then + echo "Testing trap & eret branches [Passed]" + err=$start_err else - perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u,k -- \ - perf test -w traploop 1000 - perf script -i $TMPDIR/perf.data --fields brstacksym | \ - tr ' ' '\n' > $TMPDIR/perf.script - - # BRBINF<n>.TYPE == TRAP are mapped to PERF_BR_IRQ by the BRBE driver - check_branches "^trap_bench\+[^ ]+/[^ ]/IRQ/" - check_branches "^[^ ]+/trap_bench\+[^ ]+/ERET/" + echo "Testing trap & eret branches [Failed]" fi } test_kernel_branches() { - echo "Testing that k option only includes kernel source addresses" + echo "Testing kernel branch sampling" - if ! perf record --branch-filter any,k -o- -- true > /dev/null; then - echo "skip: not enough privileges" + if ! perf record --branch-filter any,k -o- -- true > "$TMPDIR/record.txt" 2>&1; then + echo "Testing that k option [Skipped not enough privileges]" + return + fi + start_err=$err + err=0 + perf record -o $TMPDIR/perf.data --branch-filter any,k -- \ + perf bench syscall basic --loop 1000 > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstack | \ + tr ' ' '\n' > $TMPDIR/perf.script + + # Example of branch entries: + # "0xffffffff93bda241/0xffffffff93bda20f/M/-/-/..." + # Source addresses come first in user or kernel code. Next is the target + # address that must be in the kernel. + + # Look for source addresses with top bit set + if ! grep -q -E -m1 "^0x[89a-f][0-9a-f]{15}" $TMPDIR/perf.script; then + echo "Testing kernel branch sampling [Failed kernel branches missing]" + err=1 + fi + # Look for no target addresses without top bit set + if grep -q -E -m1 "^0x[0-9a-f]{0,16}/0x[0-7][0-9a-f]{1,15}/" $TMPDIR/perf.script; then + echo "Testing kernel branch sampling [Failed user branches found]" + err=1 + fi + if [ $err -eq 0 ]; then + echo "Testing kernel branch sampling [Passed]" + err=$start_err else - perf record -o $TMPDIR/perf.data --branch-filter any,k -- \ - perf bench syscall basic --loop 1000 - perf script -i $TMPDIR/perf.data --fields brstack | \ - tr ' ' '\n' > $TMPDIR/perf.script - - # Example of branch entries: - # "0xffffffff93bda241/0xffffffff93bda20f/M/-/-/..." - # Source addresses come first and target address can be either - # userspace or kernel even with k option, as long as the source - # is in kernel. - - #Look for source addresses with top bit set - if ! grep -E -m1 "^0x[89a-f][0-9a-f]{15}" $TMPDIR/perf.script; then - echo "ERROR: Kernel branches missing" - err=1 - fi - # Look for no source addresses without top bit set - if grep -E -m1 "^0x[0-7][0-9a-f]{0,15}" $TMPDIR/perf.script; then - echo "ERROR: User branches found with kernel filter" - err=1 - fi + echo "Testing kernel branch sampling [Failed]" fi }
@@ -136,14 +171,15 @@ test_filter() { test_filter_expect=$2 echo "Testing branch stack filtering permutation ($test_filter_filter,$test_filter_expect)" - perf record -o "$TMPDIR/perf.data" --branch-filter "$test_filter_filter,save_type,u" -- ${TESTPROG} > "$TMPDIR/record.txt" 2>&1 + perf record -o "$TMPDIR/perf.data" --branch-filter "$test_filter_filter,save_type,u" -- \ + ${TESTPROG} > "$TMPDIR/record.txt" 2>&1 perf script -i "$TMPDIR/perf.data" --fields brstack > "$TMPDIR/perf.script" # fail if we find any branch type that doesn't match any of the expected ones # also consider UNKNOWN branch types (-) if [ ! -s "$TMPDIR/perf.script" ] then - echo "Empty script output" + echo "Testing branch stack filtering [Failed empty script output]" err=1 return fi
@@ -154,26 +190,36 @@ test_filter() { > "$TMPDIR/perf.script-filtered" || true if [ -s "$TMPDIR/perf.script-filtered" ] then - echo "Unexpected branch filter in script output" + echo "Testing branch stack filtering [Failed unexpected branch filter]" cat "$TMPDIR/perf.script" err=1 return fi + echo "Testing branch stack filtering [Passed]" } test_syscall() { echo "Testing syscalls" # skip if perf doesn't have enough privileges - if ! perf record --branch-filter any,k -o- -- true > /dev/null; then - echo "skip: not enough privileges" + if ! perf record --branch-filter any,k -o- -- true > "$TMPDIR/record.txt" 2>&1; then + echo "Testing syscalls [Skipped: not enough privileges]" + return + fi + start_err=$err + err=0 + perf record -o $TMPDIR/perf.data --branch-filter \ + any_call,save_type,u,k -c 10007 -- \ + perf bench syscall basic --loop 8000 > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstacksym | \ + tr ' ' '\n' > $TMPDIR/perf.script + + check_branches "getppid[^ ]*/SYSCALL/" + + if [ $err -eq 0 ]; then + echo "Testing syscalls [Passed]" + err=$start_err else - perf record -o $TMPDIR/perf.data --branch-filter \ - any_call,save_type,u,k -c 10000 -- \ - perf bench syscall basic --loop 1000 - perf script -i $TMPDIR/perf.data --fields brstacksym | \ - tr ' ' '\n' > $TMPDIR/perf.script - - check_branches "getppid[^ ]*/SYSCALL/" + echo "Testing syscalls [Failed]" fi } set -e
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 166/1518 perf tests: Fix flakiness in branch stack sampling tests
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 344d3aec164dba83a5520f23a0d46e13e904a205 ]
The branch stack sampling test (test 130) runs short iteration-based workloads to verify syscall, kernel, and trap branch stack sampling. Specifically, test_syscall() and test_kernel_branches() run perf bench syscall basic with loop counts of 8000 and 1000, and test_trap_eret_branches() runs traploop with 1000 iterations.
Because these loop limits are extremely small, the total benchmark runtimes last only a few milliseconds (or less). Under high load, virtualization, or coarse sampling conditions, PMU cycle sampling fails to capture enough samples inside the brief benchmark loops. This leads to false negatives where the script output lacks the expected syscall, kernel, or trap branch entries (e.g. "ERROR: Branches missing getppid[^ ]*/SYSCALL/").
Fix this by increasing the workload loop counts to 100,000 across all three test sections. Running 100,000 loops still finishes virtually instantaneously (less than 0.1 seconds), but generates enough iterations to guarantee robust branch stack capture.
--- tools/perf/tests/shell/test_brstack.sh | 107 +++++++++++++++---------- 1 file changed, 66 insertions(+), 41 deletions(-)
tools/perf/tests/shell/test_brstack.sh +66 -41
@@ -110,20 +110,29 @@ test_trap_eret_branches() { return fi start_err=$err - err=0 - perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u,k -- \ - perf test -w traploop 1000 > "$TMPDIR/record.txt" 2>&1 - perf script -i $TMPDIR/perf.data --fields brstacksym | \ - tr ' ' '\n' > $TMPDIR/perf.script - - # BRBINF<n>.TYPE == TRAP are mapped to PERF_BR_IRQ by the BRBE driver - check_branches "^trap_bench\+[^ ]+/[^ ]/IRQ/" - check_branches "^[^ ]+/trap_bench\+[^ ]+/ERET/" - if [ $err -eq 0 ]; then + local ret=1 + for loops in 1000 10000 100000; do + err=0 + perf record -o $TMPDIR/perf.data --branch-filter any,save_type,u,k -- \ + perf test -w traploop $loops > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstacksym | \ + tr ' ' '\n' > $TMPDIR/perf.script + + # BRBINF<n>.TYPE == TRAP are mapped to PERF_BR_IRQ by the BRBE driver + check_branches "^trap_bench\+[^ ]+/[^ ]/IRQ/" + check_branches "^[^ ]+/trap_bench\+[^ ]+/ERET/" + if [ $err -eq 0 ]; then + ret=0 + break + fi + done + + if [ $ret -eq 0 ]; then echo "Testing trap & eret branches [Passed]" err=$start_err else echo "Testing trap & eret branches [Failed]" + err=1 fi }
@@ -135,32 +144,40 @@ test_kernel_branches() { return fi start_err=$err - err=0 - perf record -o $TMPDIR/perf.data --branch-filter any,k -- \ - perf bench syscall basic --loop 1000 > "$TMPDIR/record.txt" 2>&1 - perf script -i $TMPDIR/perf.data --fields brstack | \ - tr ' ' '\n' > $TMPDIR/perf.script - - # Example of branch entries: - # "0xffffffff93bda241/0xffffffff93bda20f/M/-/-/..." - # Source addresses come first in user or kernel code. Next is the target - # address that must be in the kernel. - - # Look for source addresses with top bit set - if ! grep -q -E -m1 "^0x[89a-f][0-9a-f]{15}" $TMPDIR/perf.script; then - echo "Testing kernel branch sampling [Failed kernel branches missing]" - err=1 - fi - # Look for no target addresses without top bit set - if grep -q -E -m1 "^0x[0-9a-f]{0,16}/0x[0-7][0-9a-f]{1,15}/" $TMPDIR/perf.script; then - echo "Testing kernel branch sampling [Failed user branches found]" - err=1 - fi - if [ $err -eq 0 ]; then + local ret=1 + for loops in 1000 10000 100000; do + err=0 + perf record -o $TMPDIR/perf.data --branch-filter any,k -- \ + perf bench syscall basic --loop $loops > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstack | \ + tr ' ' '\n' > $TMPDIR/perf.script + + # Example of branch entries: + # "0xffffffff93bda241/0xffffffff93bda20f/M/-/-/..." + # Source addresses come first in user or kernel code. Next is the target + # address that must be in the kernel. + + # Look for source addresses with top bit set + if ! grep -q -E -m1 "^0x[89a-f][0-9a-f]{15}" $TMPDIR/perf.script; then + err=1 + fi + # Look for no target addresses without top bit set + if grep -q -E -m1 "^0x[0-9a-f]{0,16}/0x[0-7][0-9a-f]{1,15}/" \ + $TMPDIR/perf.script; then + err=1 + fi + if [ $err -eq 0 ]; then + ret=0 + break + fi + done + + if [ $ret -eq 0 ]; then echo "Testing kernel branch sampling [Passed]" err=$start_err else echo "Testing kernel branch sampling [Failed]" + err=1 fi }
@@ -206,20 +223,28 @@ test_syscall() { return fi start_err=$err - err=0 - perf record -o $TMPDIR/perf.data --branch-filter \ - any_call,save_type,u,k -c 10007 -- \ - perf bench syscall basic --loop 8000 > "$TMPDIR/record.txt" 2>&1 - perf script -i $TMPDIR/perf.data --fields brstacksym | \ - tr ' ' '\n' > $TMPDIR/perf.script - - check_branches "getppid[^ ]*/SYSCALL/" + local ret=1 + for loops in 8000 30000 100000; do + err=0 + perf record -o $TMPDIR/perf.data --branch-filter \ + any_call,save_type,u,k -c 10007 -- \ + perf bench syscall basic --loop $loops > "$TMPDIR/record.txt" 2>&1 + perf script -i $TMPDIR/perf.data --fields brstacksym | \ + tr ' ' '\n' > $TMPDIR/perf.script + + check_branches "getppid[^ ]*/SYSCALL/" + if [ $err -eq 0 ]; then + ret=0 + break + fi + done - if [ $err -eq 0 ]; then + if [ $ret -eq 0 ]; then echo "Testing syscalls [Passed]" err=$start_err else echo "Testing syscalls [Failed]" + err=1 fi } set -e
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 167/1518 regulator: tps6594: Fix device node reference leaks in multiphase loop
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uday Khare <[email protected]>
[ Upstream commit 7fd28093b3effc4f92566466df364622830ec608 ]
In tps6594_regulator_probe(), the multi-phase configuration loop calls of_find_node_by_name() to find buck nodes by name, and of_get_parent() twice to navigate to the PMIC parent node. None of the acquired node references (np, intermediate parent, np_pmic_parent) are ever released via of_node_put(), causing a reference leak on every loop iteration.
Additionally, of_find_node_by_name() can return NULL, but the result was immediately passed to of_node_full_name() and of_get_parent() without a NULL check, which could lead to a NULL pointer dereference.
Fix this by:
- Adding a NULL check for np after of_find_node_by_name()
- Storing the intermediate parent node in a local variable np_parent
- Calling of_node_put() on np, np_parent and np_pmic_parent at the end of each loop iteration
--- drivers/regulator/tps6594-regulator.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/regulator/tps6594-regulator.c +15 -4
@@ -669,13 +669,20 @@ static int tps6594_regulator_probe(struct platform_device *pdev)* buck_configured to avoid creating bucks for every buck in multiphase */ for (multi =0 ; multi < desc->num_multi_phase_regs; multi++) { +struct device_node *np_parent; + multi_regs = &desc->multi_phase_regs[multi]; np =of_find_node_by_name (tps->dev->of_node, multi_regs->supply_name); - npname =of_node_full_name (np); - np_pmic_parent =of_get_parent (of_get_parent (np)); -if (of_node_cmp (of_node_full_name (np_pmic_parent), tps->dev->of_node->full_name)) +if (!np)continue ; -if (strcmp (npname, multi_regs->supply_name) ==0 ) { + + npname =of_node_full_name (np); + np_parent =of_get_parent (np); + np_pmic_parent =of_get_parent (np_parent); + +if (np_pmic_parent && + !of_node_cmp (of_node_full_name (np_pmic_parent), tps->dev->of_node->full_name) && +strcmp (npname, multi_regs->supply_name) ==0 ) {switch (multi) {case MULTI_BUCK12 : buck_multi[0 ] = true;
@@ -706,6 +713,10 @@ static int tps6594_regulator_probe(struct platform_device *pdev)break ; } } + +of_node_put (np_pmic_parent); +of_node_put (np_parent); +of_node_put (np); } reg_irq_nb = desc->num_irq_types * (desc->num_buck_regs + desc->num_ldo_regs);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 168/1518 drm/amdgpu/pm/powerplay: bounds-check voltage index in SMU7 lookup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asad Kamal <[email protected]>
[ Upstream commit 3a8a05477cda6c8293e2b629495b42981dcaba32 ]
vddInd and vddcInd fields from VBIOS-parsed tables are used to index into voltage lookup tables without a bounds check. Return -EINVAL when any index is out of range.
--- .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +24 -0
@@ -2216,12 +2216,24 @@ static int smu7_patch_voltage_dependency_tables_with_lookup_table(if (data->vdd_gfx_control ==SMU7_VOLTAGE_CONTROL_BY_SVID2 ) {for (entry_id =0 ; entry_id < sclk_table->count; ++entry_id) { voltage_id = sclk_table->entries[entry_id].vddInd; +if (voltage_id >= table_info->vddgfx_lookup_table->count) { +pr_err ("amdgpu: sclk[%u] vddgfx index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddgfx_lookup_table->count); +return -EINVAL ; + } sclk_table->entries[entry_id].vddgfx = table_info->vddgfx_lookup_table->entries[voltage_id].us_vdd; } }else {for (entry_id =0 ; entry_id < sclk_table->count; ++entry_id) { voltage_id = sclk_table->entries[entry_id].vddInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: sclk[%u] vddc index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } sclk_table->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; }
@@ -2229,12 +2241,24 @@ static int smu7_patch_voltage_dependency_tables_with_lookup_table(for (entry_id =0 ; entry_id < mclk_table->count; ++entry_id) { voltage_id = mclk_table->entries[entry_id].vddInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: mclk[%u] vddc index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } mclk_table->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; }for (entry_id =0 ; entry_id < mm_table->count; ++entry_id) { voltage_id = mm_table->entries[entry_id].vddcInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: mm[%u] vddc index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } mm_table->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 169/1518 drm/amdgpu/pm/powerplay: bounds-check voltage index in Vega10 lookup
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asad Kamal <[email protected]>
[ Upstream commit 6fa33f594e46e775a94097f71b486d7b006b6917 ]
vddInd, vddciInd and mvddInd from VBIOS-parsed tables index into vddc, vddci and vddmem lookup tables without bounds checks across nine sites. Return -EINVAL when any index is out of range.
--- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +34 -1
@@ -685,10 +685,18 @@ static int vega10_patch_voltage_dependency_tables_with_lookup_table(case 3 : vdt = table_info->vdd_dep_on_pixclk;break ;case 4 : vdt = table_info->vdd_dep_on_dispclk;break ;case 5 : vdt = table_info->vdd_dep_on_phyclk;break ; +default : +continue ; }for (entry_id =0 ; entry_id < vdt->count; entry_id++) { voltage_id = vdt->entries[entry_id].vddInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: clk_dep[%u][%u] vddc index %u out of bounds (%u)\n" , + i, entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } vdt->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; }
@@ -696,23 +704,48 @@ static int vega10_patch_voltage_dependency_tables_with_lookup_table(for (entry_id =0 ; entry_id < mm_table->count; ++entry_id) { voltage_id = mm_table->entries[entry_id].vddcInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: mm[%u] vddc index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } mm_table->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; }for (entry_id =0 ; entry_id < mclk_table->count; ++entry_id) { voltage_id = mclk_table->entries[entry_id].vddInd; +if (voltage_id >= table_info->vddc_lookup_table->count) { +pr_err ("amdgpu: mclk[%u] vddc index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddc_lookup_table->count); +return -EINVAL ; + } mclk_table->entries[entry_id].vddc = table_info->vddc_lookup_table->entries[voltage_id].us_vdd; + voltage_id = mclk_table->entries[entry_id].vddciInd; +if (voltage_id >= table_info->vddci_lookup_table->count) { +pr_err ("amdgpu: mclk[%u] vddci index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddci_lookup_table->count); +return -EINVAL ; + } mclk_table->entries[entry_id].vddci = table_info->vddci_lookup_table->entries[voltage_id].us_vdd; + voltage_id = mclk_table->entries[entry_id].mvddInd; +if (voltage_id >= table_info->vddmem_lookup_table->count) { +pr_err ("amdgpu: mclk[%u] vddmem index %u out of bounds (%u)\n" , + entry_id, voltage_id, + table_info->vddmem_lookup_table->count); +return -EINVAL ; + } mclk_table->entries[entry_id].mvdd = table_info->vddmem_lookup_table->entries[voltage_id].us_vdd; } -return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 170/1518 tools/bpf/bpftool: Reset vmlinux BTF after map commands
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yichong Chen <[email protected]>
[ Upstream commit 66d7e39e49b0dd57610c9b63afc65b4d5690983b ]
get_map_kv_btf() caches the vmlinux BTF object when a map uses btf_vmlinux_value_type_id. map dump released that object when the command completed, but left the global pointer stale.
The same cached object can also be returned to print_key_value(), which freed it directly. That leaves btf_vmlinux dangling before the command cleanup path runs.
Use free_map_kv_btf() for per-entry cleanup, and reset the cached btf_vmlinux pointer when the map command releases the object. This keeps batch mode from reusing a freed BTF object.
--- tools/bpf/bpftool/map.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/bpf/bpftool/map.c +9 -3
@@ -790,6 +790,12 @@ static int maps_have_btf(int *fds, int nb_fds)static struct btf *btf_vmlinux; +static void free_btf_vmlinux (void ) +{ +btf__free (btf_vmlinux); + btf_vmlinux =NULL ; +} +static int get_map_kv_btf (const struct bpf_map_info *info,struct btf **btf) {int err =0 ;
@@ -958,7 +964,7 @@ static int do_dump(int argc, char **argv)close (fds[i]); exit_free:free (fds); -btf__free (btf_vmlinux); +free_btf_vmlinux ();return err; }
@@ -1049,7 +1055,7 @@ static void print_key_value(struct bpf_map_info *info, void *key, btf_wtr =get_btf_writer ();if (!btf_wtr) {p_info ("failed to create json writer for btf. falling back to plain output" ); -btf__free (btf); +free_map_kv_btf (btf); btf =NULL ;print_entry_plain (info, key, value); }else {
@@ -1065,7 +1071,7 @@ static void print_key_value(struct bpf_map_info *info, void *key, }else {print_entry_plain (info, key, value); } -btf__free (btf); +free_map_kv_btf (btf); }static int do_lookup (int argc,char **argv)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 171/1518 tools/bpf/bpftool: Reset vmlinux BTF after struct_ops commands
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yichong Chen <[email protected]>
[ Upstream commit f7f540e19751face50c68bb9ce58460fcb46c293 ]
struct_ops frees the global btf_vmlinux object.
In batch mode, a later struct_ops command can reuse stale state.
Reset the BTF pointer and cached map info state.
--- tools/bpf/bpftool/struct_ops.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/bpf/bpftool/struct_ops.c +4 -0
@@ -643,6 +643,10 @@ int do_struct_ops(int argc, char **argv) err =cmd_select (cmds, argc, argv, do_help);btf__free (btf_vmlinux); + btf_vmlinux =NULL ; + map_info_type =NULL ; + map_info_alloc_len =0 ; + map_info_type_id =0 ;return err; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 172/1518 bpf: Copy per-CPU map value padding in copy_map_value_long()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Hwang <[email protected]>
[ Upstream commit 7cf9cd98cf6f0df3befc167ca6b54c07014d71de ]
In kernel, per-CPU map elements are stored with round_up(map->value_size, 8) bytes. On UAPI lookup paths, it copies the rounded size for each CPU into a temporary buffer.
However, copy_map_value_long() passes 'map->value_size' to bpf_obj_memcpy(). When the map has special fields, bpf_obj_memcpy() copies around those fields with memcpy(), and does not copy the tail padding between 'map->value_size' and round_up(map->value_size, 8).
The temporary UAPI lookup buffers are allocated without __GFP_ZERO. As a result, when the per-CPU map's value size is not equal to round_up(map->value_size, 8), UAPI LOOKUP_ELEM and its variants can return stale heap contents from that padding to user space. The same issue applies to bpf_iter for per-CPU maps.
Pass round_up(map->value_size, 8) to bpf_obj_memcpy() from copy_map_value_long(), so per-CPU maps both with and without special fields copy the entire per-CPU slot. Remove the now redundant round_up() from bpf_obj_memcpy()'s long_memcpy path.
--- include/linux/bpf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/bpf.h +2 -2
@@ -536,7 +536,7 @@ static inline void bpf_obj_memcpy(struct btf_record *rec,if (IS_ERR_OR_NULL (rec)) {if (long_memcpy) -bpf_long_memcpy (dst, src,round_up (size,8 )); +bpf_long_memcpy (dst, src, size);else memcpy (dst, src, size);return ;
@@ -559,7 +559,7 @@ static inline void copy_map_value(struct bpf_map *map, void *dst, void *src)static inline void copy_map_value_long (struct bpf_map *map,void *dst,void *src) { -bpf_obj_memcpy (map->record, dst, src, map->value_size, true); +bpf_obj_memcpy (map->record, dst, src,round_up (map->value_size,8 ), true); }static inline void bpf_obj_swap_uptrs (const struct btf_record *rec,void *dst,void *src)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 173/1518 selftests/bpf: Systematically add SO_REUSEADDR in start_server_addr
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré (eBPF Foundation) <[email protected]>
[ Upstream commit 38e36514fcb01ff1cce84cd77a93906f233a4cb8 ]
Some tests have to stop/start a server multiple time with the same listening address. Doing so without SO_REUSADDR leads to failures due to the socket still being in TIME_WAIT right after the first instance stop/before the second instance start. Instead of letting each test manually set SO_REUSEADDR on their servers, it can be done automatically by start_server_addr for all tests (and without any major downside).
Enforce SO_REUSEADDR in start_server_addr for all tests.
Stable-dep-of: b4b8b334f6b5 ("selftests/bpf: Mask socket type flags in mptcpify prog")
--- tools/testing/selftests/bpf/network_helpers.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/network_helpers.c +7 -1
@@ -97,7 +97,7 @@ int settimeo(int fd, int timeout_ms)int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t addrlen,const struct network_helper_opts *opts) { -int fd; +int on =1 , fd;if (!opts) opts = &default_opts;
@@ -111,6 +111,12 @@ int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t aif (settimeo (fd, opts->timeout_ms)) goto error_close; +if (type ==SOCK_STREAM && +setsockopt (fd,SOL_SOCKET ,SO_REUSEADDR , &on,sizeof (on))) { +log_err ("Failed to enable SO_REUSEADDR" ); + goto error_close; + } +if (opts->post_socket_cb && opts->post_socket_cb (fd, opts->cb_opts)) {log_err ("Failed to call post_socket_cb" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 174/1518 selftests/bpf: Mask socket type flags in mptcpify prog
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guillaume Maudoux <[email protected]>
[ Upstream commit b4b8b334f6b535a86ab83f18d3d241fe01270bc3 ]
The mptcpify BPF prog upgrades eligible TCP sockets to MPTCP, but only when the socket type is exactly SOCK_STREAM. Its update_socket_protocol() hook runs on the raw type from userspace, before the socket core masks it with SOCK_TYPE_MASK, so the type may still carry SOCK_CLOEXEC or SOCK_NONBLOCK in its upper bits and the equality check fails.
As a result, a socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0) -- what common libraries do by default -- is silently left as plain TCP. This was hit in practice with curl. Since mptcpify.c is referenced as example code for enabling MPTCP transparently, the same mistake is likely to be copied into real deployments where it fails the same way and is hard to diagnose.
Mask the type before comparing, mirroring the socket core. Extend the test to also create the server with SOCK_CLOEXEC set; the same masking is applied to start_server_addr() so a flagged type still listens.
--- tools/testing/selftests/bpf/network_helpers.c | 4 ++-- tools/testing/selftests/bpf/network_helpers.h | 5 +++++ tools/testing/selftests/bpf/prog_tests/mptcp.c | 13 ++++++++++--- tools/testing/selftests/bpf/progs/bpf_tracing_net.h | 3 +++ tools/testing/selftests/bpf/progs/mptcpify.c | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +2 -2
@@ -111,7 +111,7 @@ int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t aif (settimeo (fd, opts->timeout_ms)) goto error_close; -if (type ==SOCK_STREAM && +if ((type &SOCK_TYPE_MASK ) ==SOCK_STREAM &&setsockopt (fd,SOL_SOCKET ,SO_REUSEADDR , &on,sizeof (on))) {log_err ("Failed to enable SO_REUSEADDR" ); goto error_close;
@@ -128,7 +128,7 @@ int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t a goto error_close; } -if (type ==SOCK_STREAM ) { +if ((type &SOCK_TYPE_MASK ) ==SOCK_STREAM ) {if (listen (fd, opts->backlog ?MAX (opts->backlog,0 ) :1 ) <0 ) {log_err ("Failed to listed on socket" ); goto error_close;
tools/testing/selftests/bpf/network_helpers.h +5 -0
@@ -25,6 +25,11 @@ typedef __u16 __sum16;#define VIP_NUM 5#define MAGIC_BYTES 123 +/* include/linux/net.h */ +#ifndef SOCK_TYPE_MASK +#define SOCK_TYPE_MASK 0xf +#endif +struct network_helper_opts {int timeout_ms;int proto;
tools/testing/selftests/bpf/prog_tests/mptcp.c +10 -3
@@ -264,7 +264,7 @@ static int verify_mptcpify(int server_fd, int client_fd)return err; } -static int run_mptcpify (int cgroup_fd) +static int run_mptcpify (int cgroup_fd,int type) {int server_fd, client_fd, err =0 ;struct mptcpify *mptcpify_skel;
@@ -280,7 +280,7 @@ static int run_mptcpify(int cgroup_fd) goto out;/* without MPTCP */ - server_fd =start_server (AF_INET ,SOCK_STREAM ,NULL ,0 ,0 ); + server_fd =start_server (AF_INET , type,NULL ,0 ,0 );if (!ASSERT_GE (server_fd,0 ,"start_server" )) { err = -EIO ; goto out;
@@ -317,7 +317,14 @@ static void test_mptcpify(void)if (!ASSERT_OK_PTR (netns,"netns_new" )) goto fail; -ASSERT_OK (run_mptcpify (cgroup_fd),"run_mptcpify" ); +ASSERT_OK (run_mptcpify (cgroup_fd,SOCK_STREAM ),"run_mptcpify" ); +/* userspace sets flags such as SOCK_CLOEXEC together with the type; +* the BPF prog must still upgrade the socket to MPTCP. See +* update_socket_protocol() in net/socket.c, which runs before the +* type is masked with SOCK_TYPE_MASK. +*/ +ASSERT_OK (run_mptcpify (cgroup_fd,SOCK_STREAM |SOCK_CLOEXEC ), +"run_mptcpify_cloexec" ); fail:netns_free (netns);
tools/testing/selftests/bpf/progs/bpf_tracing_net.h +3 -0
@@ -8,6 +8,9 @@#define AF_INET 2#define AF_INET6 10 +/* include/linux/net.h */ +#define SOCK_TYPE_MASK 0xf +#define SOL_SOCKET 1#define SO_REUSEADDR 2#define SO_SNDBUF 7
tools/testing/selftests/bpf/progs/mptcpify.c +1 -1
@@ -15,7 +15,7 @@ int BPF_PROG(mptcpify, int family, int type, int protocol)return protocol;if ((family ==AF_INET || family ==AF_INET6 ) && - type ==SOCK_STREAM && + (type &SOCK_TYPE_MASK ) ==SOCK_STREAM && (!protocol || protocol ==IPPROTO_TCP )) {return IPPROTO_MPTCP ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 175/1518 bpf,lsm: Drop bpf_prog_free from sleepable_lsm_hooks
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sechang Lim <[email protected]>
[ Upstream commit 2ce3f548cfc6a1fe4c53479cf8a21931cdfd51d8 ]
__bpf_prog_put_rcu() is the call_rcu() callback for non-sleepable programs. security_bpf_prog_free() called from there fires bpf_prog_free in softirq; if a sleepable LSM prog is attached to that hook, might_fault() BUGs:
BUG: sleeping function called from invalid context in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 5038 preempt_count: 101, expected: 0 Call Trace: <IRQ> __bpf_prog_enter_sleepable+0x1cd/0x320 kernel/bpf/trampoline.c:1255 bpf_trampoline_6442549705+0x53/0xd7 security_bpf_prog_free+0xde/0x130 security/security.c:5465 __bpf_prog_put_rcu+0xab/0xd0 kernel/bpf/syscall.c:2365 rcu_do_batch kernel/rcu/tree.c:2617 [inline] handle_softirqs+0x236/0x800 kernel/softirq.c:622 </IRQ>
The call_rcu/call_rcu_tasks_trace split reflects the freed program's sleepability, not that of any attached observer.
security_bpf_prog_free() also frees prog->aux->security, which has to stay after the grace period, so drop bpf_prog_free from sleepable_lsm_hooks rather than move the call. Non-sleepable observers still run there.
--- kernel/bpf/bpf_lsm.c | 1 - 1 file changed, 1 deletion(-)
kernel/bpf/bpf_lsm.c +0 -1
@@ -293,7 +293,6 @@ BTF_ID(func, bpf_lsm_bpf_map_create) BTF_ID(func, bpf_lsm_bpf_map_free) BTF_ID(func, bpf_lsm_bpf_prog) BTF_ID(func, bpf_lsm_bpf_prog_load) -BTF_ID(func, bpf_lsm_bpf_prog_free) BTF_ID(func, bpf_lsm_bpf_token_create) BTF_ID(func, bpf_lsm_bpf_token_free)BTF_ID (func, bpf_lsm_bpf_token_cmd)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 176/1518 mm: convert memory block states (MEM_*) macros to enum
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Israel Batista <[email protected]>
[ Upstream commit 1a4f70f6851a1916c4f0e52731c7ecfe99bf36e6 ]
Patch series "mm: Convert memory block states (MEM_*) macros to enums", v2.
The MEM_* constants indicating the state of a memory block are currently defined as macros, meaning their definitions will be omitted from the debuginfo on most kernel builds. This makes it harder for debuggers to correctly map the block state at runtime, which can be quite useful when analysing errors related to memory hot plugging and unplugging with tools such as drgn.
Converting the constants to an enum ensures the correct information is emitted by the compiler and available for the debugger, without needing to hard-code them into the debugger and track their changes.
This patch series aims to replace the current macros with a newly created enum named memory_block_state, while also taking advantage of the compile time guarantees that we get when using enums.
The first patch does the conversion of the macros to an enum, while the 2nd and 3rd patches use this enum to clean up some type declarations and make sure that only valid values are used.
This patch (of 3):
Converting the MEM_* constants from macros to an enum ensures that their values will be correctly emitted in the debug symbols, making it easier to trace the meaning of each value when debugging with tools such as drgn, without the need to hard-code the values.
Since the values are mutually exclusive and they are not exposed directly to userspace, I also dropped the misleading pattern (1<<X) that made it look like they were combinable flags.
Stable-dep-of: 2ebce860bdd7 ("mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug")
--- include/linux/memory.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
include/linux/memory.h +12 -10
@@ -64,6 +64,18 @@ struct memory_group { }; }; +enum memory_block_state { +/* These states are exposed to userspace as text strings in sysfs */ +MEM_ONLINE ,/* exposed to userspace */ +MEM_GOING_OFFLINE ,/* exposed to userspace */ +MEM_OFFLINE ,/* exposed to userspace */ +MEM_GOING_ONLINE , +MEM_CANCEL_ONLINE , +MEM_CANCEL_OFFLINE , +MEM_PREPARE_ONLINE , +MEM_FINISH_OFFLINE , +}; +struct memory_block {unsigned long start_section_nr;unsigned long state;/* serialized by the dev->lock */
@@ -89,16 +101,6 @@ int arch_get_memory_phys_device(unsigned long start_pfn);unsigned long memory_block_size_bytes (void );int set_memory_block_size_order (unsigned int order); -/* These states are exposed to userspace as text strings in sysfs */ -#define MEM_ONLINE (1<<0)/* exposed to userspace */ -#define MEM_GOING_OFFLINE (1<<1)/* exposed to userspace */ -#define MEM_OFFLINE (1<<2)/* exposed to userspace */ -#define MEM_GOING_ONLINE (1<<3) -#define MEM_CANCEL_ONLINE (1<<4) -#define MEM_CANCEL_OFFLINE (1<<5) -#define MEM_PREPARE_ONLINE (1<<6) -#define MEM_FINISH_OFFLINE (1<<7) -struct memory_notify {/* * The altmap_start_pfn and altmap_nr_pages fields are designated for
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 177/1518 mm: change type of state in struct memory_block
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Israel Batista <[email protected]>
[ Upstream commit 8bc7ba3d265d6ee698de4b1941b7e8f7d91a0562 ]
The state of a memory block should be restricted to values specified in the documentation of the memory hotplug API. However, since the state field in the memory_block struct was defined as an unsigned long, this restriction was not enforced at compile time.
With the introduction of the enum memory_block_state, it is now possible to incorporate the desired semantics in the field declaration and enforce these restrictions at compile time.
Stable-dep-of: 2ebce860bdd7 ("mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug")
--- drivers/base/memory.c | 2 +- include/linux/memory.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/base/memory.c +1 -1
@@ -198,7 +198,7 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr,break ;default :WARN_ON (1 ); -return sysfs_emit (buf,"ERROR-UNKNOWN-%ld\n" , mem->state); +return sysfs_emit (buf,"ERROR-UNKNOWN-%d\n" , mem->state); }return sysfs_emit (buf,"%s\n" , output);
include/linux/memory.h +1 -1
@@ -78,7 +78,7 @@ enum memory_block_state {struct memory_block {unsigned long start_section_nr; -unsigned long state;/* serialized by the dev->lock */ +enum memory_block_state state;/* serialized by the dev->lock */ int online_type;/* for passing data to online routine */ int nid;/* NID for this memory block */ /*
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 178/1518 mm: name the anonymous MMOP enum as enum mmop
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gregory Price <[email protected]>
[ Upstream commit c5c48345135ff04e039377020df23294d59aa59a ]
Give the MMOP enum (MMOP_OFFLINE, MMOP_ONLINE, etc) a proper type name so the compiler can help catch invalid values being assigned to variables of this type.
Leave the existing functions returning int alone to allow for value-or-error pattern to remain unchanged without churn.
mmop_default_online_type is left as int because it uses the -1 sentinal value to signal it hasn't been initialized yet.
Keep the uint8_t buffer in offline_and_remove_memory() as-is for space efficiency, with an explicit cast when we consume the value.
Move the enum definition before the CONFIG_MEMORY_HOTPLUG guard so it is unconditionally available for struct memory_block in memory.h.
No functional change.
Stable-dep-of: 2ebce860bdd7 ("mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug")
--- drivers/base/memory.c | 2 +- include/linux/memory.h | 3 ++- include/linux/memory_hotplug.h | 16 ++++++++-------- mm/memory_hotplug.c | 10 +++++----- 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/base/memory.c +1 -1
@@ -473,7 +473,7 @@ static ssize_t phys_device_show(struct device *dev,static int print_allowed_zone (char *buf,int len,int nid,struct memory_group *group,unsigned long start_pfn,unsigned long nr_pages, -int online_type,struct zone *default_zone) +enum mmop online_type,struct zone *default_zone) {struct zone *zone;
include/linux/memory.h +2 -1
@@ -19,6 +19,7 @@#include <linux/node.h> #include <linux/compiler.h> #include <linux/mutex.h> +#include <linux/memory_hotplug.h> #define MIN_MEMORY_BLOCK_SIZE (1UL << SECTION_SIZE_BITS)
@@ -79,7 +80,7 @@ enum memory_block_state {struct memory_block {unsigned long start_section_nr;enum memory_block_state state;/* serialized by the dev->lock */ -int online_type;/* for passing data to online routine */ +enum mmop online_type;/* for passing data to online routine */ int nid;/* NID for this memory block */ /* * The single zone of this memory block if all PFNs of this memory block
include/linux/memory_hotplug.h +8 -8
@@ -16,11 +16,8 @@ struct resource;struct vmem_altmap ;struct dev_pagemap ; -#ifdef CONFIG_MEMORY_HOTPLUG -struct page *pfn_to_online_page (unsigned long pfn); -/* Types for control the zone type of onlined and offlined memory */ -enum { +enum mmop {/* Offline the memory. */ MMOP_OFFLINE =0 ,/* Online the memory. Zone depends, see default_zone_for_pfn(). */
@@ -31,6 +28,9 @@ enum { MMOP_ONLINE_MOVABLE, }; +#ifdef CONFIG_MEMORY_HOTPLUG +struct page *pfn_to_online_page (unsigned long pfn); +/* Flags for add_memory() and friends to specify memory hotplug details. */ typedef int __bitwise mhp_t ;
@@ -302,8 +302,8 @@ static inline void __remove_memory(u64 start, u64 size) {}#ifdef CONFIG_MEMORY_HOTPLUG /* Default online_type (MMOP_*) when new memory blocks are added. */ -extern int mhp_get_default_online_type (void ); -extern void mhp_set_default_online_type (int online_type); +extern enum mmop mhp_get_default_online_type (void ); +extern void mhp_set_default_online_type (enum mmop online_type);extern void __ref free_area_init_core_hotplug (struct pglist_data *pgdat);extern int __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags);extern int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags);
@@ -326,8 +326,8 @@ extern void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, struct vmem_altmap *altmap);extern struct page *sparse_decode_mem_map (unsigned long coded_mem_map,unsigned long pnum); -extern struct zone *zone_for_pfn_range (int online_type,int nid, -struct memory_group *group,unsigned long start_pfn, +extern struct zone *zone_for_pfn_range (enum mmop online_type, +int nid,struct memory_group *group,unsigned long start_pfn,unsigned long nr_pages);extern int arch_create_linear_mapping (int nid,u64 start,u64 size,struct mhp_params *params);
mm/memory_hotplug.c +5 -5
@@ -221,7 +221,7 @@ void put_online_mems(void)bool movable_node_enabled = false;static int mhp_default_online_type =-1 ; -int mhp_get_default_online_type (void ) +enum mmop mhp_get_default_online_type (void ) {if (mhp_default_online_type >=0 )return mhp_default_online_type;
@@ -240,7 +240,7 @@ int mhp_get_default_online_type(void)return mhp_default_online_type; } -void mhp_set_default_online_type (int online_type) +void mhp_set_default_online_type (enum mmop online_type) { mhp_default_online_type = online_type; }
@@ -1046,7 +1046,7 @@ static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfnreturn movable_node_enabled ? movable_zone : kernel_zone; } -struct zone *zone_for_pfn_range (int online_type,int nid, +struct zone *zone_for_pfn_range (enum mmop online_type,int nid,struct memory_group *group,unsigned long start_pfn,unsigned long nr_pages) {
@@ -2338,7 +2338,7 @@ EXPORT_SYMBOL_GPL(remove_memory);static int try_offline_memory_block (struct memory_block *mem,void *arg) { -uint8_t online_type =MMOP_ONLINE_KERNEL ; +enum mmop online_type =MMOP_ONLINE_KERNEL ;uint8_t **online_types = arg;struct page *page;int rc;
@@ -2371,7 +2371,7 @@ static int try_reonline_memory_block(struct memory_block *mem, void *arg)int rc;if (**online_types !=MMOP_OFFLINE ) { - mem->online_type = **online_types; + mem->online_type = (enum mmop )**online_types; rc =device_online (&mem->dev);if (rc <0 ) pr_warn("%s: Failed to re-online memory: %d",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 179/1518 mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gregory Price <[email protected]>
[ Upstream commit 2ebce860bdd7ae5e13002811bc9bbbf33fcfc221 ]
We miss a failed allocation check for pgdat->per_cpu_nodestats, which results in a NULL deref when we offset into the per-cpu area.
Propagate -ENOMEM up the stack and leave per_cpu_nodestats pointing at boot_nodestats so a later online can retry the allocation.
hotadd_init_pgdat() returns NULL on failure, which __try_online_node() already maps to -ENOMEM.
On failure nothing needs to be unwound:
- the node is never marked online
- per_cpu_nodestats is left pointing at boot_nodestats
- __add_memory_resource() cleans up pending memblock resources
- later online attempts retry the per_cpu_nodestats allocation
--- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 3 ++- mm/mm_init.c | 14 +++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-)
include/linux/memory_hotplug.h +1 -1
@@ -304,7 +304,7 @@ static inline void __remove_memory(u64 start, u64 size) {}/* Default online_type (MMOP_*) when new memory blocks are added. */ extern enum mmop mhp_get_default_online_type (void );extern void mhp_set_default_online_type (enum mmop online_type); -extern void __ref free_area_init_core_hotplug (struct pglist_data *pgdat); +int __ref free_area_init_core_hotplug (struct pglist_data *pgdat);extern int __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags);extern int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags); extern int add_memory_resource(int nid, struct resource *resource,
mm/memory_hotplug.c +2 -1
@@ -1279,7 +1279,8 @@ static pg_data_t *hotadd_init_pgdat(int nid) pgdat =NODE_DATA (nid);/* init node's zones as empty zones, we don't have any present pages.*/ -free_area_init_core_hotplug (pgdat); +if (free_area_init_core_hotplug (pgdat)) +return NULL ;/* * The node we allocated has no zone fallback lists. For avoiding
mm/mm_init.c +11 -3
@@ -1560,7 +1560,7 @@ void __init set_pageblock_order(void)* NOTE: this function is only called during memory hotplug */ #ifdef CONFIG_MEMORY_HOTPLUG -void __ref free_area_init_core_hotplug (struct pglist_data *pgdat) +int __ref free_area_init_core_hotplug (struct pglist_data *pgdat) {int nid = pgdat->node_id;enum zone_type z;
@@ -1568,8 +1568,14 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat)pgdat_init_internals (pgdat); -if (pgdat->per_cpu_nodestats == &boot_nodestats) - pgdat->per_cpu_nodestats = alloc_percpu(struct per_cpu_nodestat); +if (pgdat->per_cpu_nodestats == &boot_nodestats) { +struct per_cpu_nodestat __percpu *p; + + p = alloc_percpu(struct per_cpu_nodestat); +if (!p) +return -ENOMEM ; + pgdat->per_cpu_nodestats = p; + }/* * Reset the nr_zones, order and highest_zoneidx before reuse.
@@ -1607,6 +1613,8 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) zone->present_pages =0 ; zone_init_internals(zone, z, nid, 0); } + +return 0 ; }#endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 180/1518 dmaengine: mediatek: mtk-uart-apdma: Return -ENOMEM on memory allocation failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 467265c750edd7ab43803deeafe7d3120a791d32 ]
If dynamic memory allocation in driver's probe function execution fails, it should be reported to the driver's framework with -ENOMEM error code.
--- drivers/dma/mediatek/mtk-uart-apdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/mediatek/mtk-uart-apdma.c +1 -1
@@ -530,7 +530,7 @@ static int mtk_uart_apdma_probe(struct platform_device *pdev)for (i =0 ; i < mtkd->dma_requests; i++) { c =devm_kzalloc (mtkd->ddev.dev,sizeof (*c),GFP_KERNEL );if (!c) { - rc = -ENODEV ; + rc = -ENOMEM ; goto err_no_dma; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 181/1518 dmaengine: xilinx_dma: Fix channel idle state management in AXIDMA and MCDMA interrupt handlers
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suraj Gupta <[email protected]>
[ Upstream commit 0b6d055edb55ecadadf54e930c2b4fab76fa9a5a ]
Fix a race condition in AXIDMA and MCDMA irq handlers where the channel could be incorrectly marked as idle and attempt spurious transfers when descriptors are still being processed.
The issue occurs when:
1. Multiple descriptors are queued and active.
2. An interrupt fires after completing some descriptors.
3. xilinx_dma_complete_descriptor() moves completed descriptors to done_list.
4. Channel is marked idle and start_transfer() is called even though active_list still contains unprocessed descriptors.
5. This leads to premature transfer attempts and potential descriptor corruption or missed completions.
Only mark the channel as idle and start new transfers when the active list is actually empty, ensuring proper channel state management and avoiding spurious transfer attempts.
--- drivers/dma/xilinx/xilinx_dma.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/dma/xilinx/xilinx_dma.c +8 -4
@@ -1872,8 +1872,10 @@ static irqreturn_t xilinx_mcdma_irq_handler(int irq, void *data)if (status &XILINX_MCDMA_IRQ_IOC_MASK ) {spin_lock (&chan->lock);xilinx_dma_complete_descriptor (chan); - chan->idle = true; - chan->start_transfer (chan); +if (list_empty (&chan->active_list)) { + chan->idle = true; + chan->start_transfer (chan); + }spin_unlock (&chan->lock); }
@@ -1929,8 +1931,10 @@ static irqreturn_t xilinx_dma_irq_handler(int irq, void *data) XILINX_DMA_DMASR_DLY_CNT_IRQ)) {spin_lock (&chan->lock);xilinx_dma_complete_descriptor (chan); - chan->idle = true; - chan->start_transfer (chan); +if (list_empty (&chan->active_list)) { + chan->idle = true; + chan->start_transfer (chan); + }spin_unlock (&chan->lock); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 182/1518 dmaengine: zynqmp_dma: fix race between runtime PM and device removal
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Golla Nagendra <[email protected]>
[ Upstream commit 516ba2d8b7aac4238f9fcbd58579c43c71b9b695 ]
In zynqmp_dma_remove(), runtime PM was disabled only after checking state and doing a manual suspend. This can race with runtime PM in the remove/unbind (rmmod) path.
Disable runtime PM first, then suspend only if the device is not already suspended. To prevent any further runtime PM transitions.
--- drivers/dma/xilinx/zynqmp_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/xilinx/zynqmp_dma.c +2 -2
@@ -1173,9 +1173,9 @@ static void zynqmp_dma_remove(struct platform_device *pdev)dma_async_device_unregister (&zdev->common);zynqmp_dma_chan_remove (zdev->chan); -if (pm_runtime_active (zdev->dev)) -zynqmp_dma_runtime_suspend (zdev->dev);pm_runtime_disable (zdev->dev); +if (!pm_runtime_status_suspended (zdev->dev)) +zynqmp_dma_runtime_suspend (zdev->dev); }static const struct of_device_id zynqmp_dma_of_match[] = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 183/1518 dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Zapolskiy <[email protected]>
[ Upstream commit cbabdd6ce1b313b5877c7fbb2f5e2f7936564d2f ]
Out of memory situation on driver's probe is expected to be reported to the driver's framework with a proper -ENOMEM error code.
--- drivers/dma/hisi_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/hisi_dma.c +1 -1
@@ -983,7 +983,7 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id) hdma_dev =devm_kzalloc (dev,struct_size (hdma_dev, chan, chan_num),GFP_KERNEL );if (!hdma_dev) -return -EINVAL ; +return -ENOMEM ; hdma_dev->base =pcim_iomap_table (pdev)[PCI_BAR_2 ]; hdma_dev->pdev = pdev;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 184/1518 soundwire: qcom: Fix port exhaustion check in stream_alloc_ports
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit 6ccec91c3535b07310e12d32fe9c67ff8d31d965 ]
find_first_zero_bit(mask, n) returns n (not n+1) when all bits are set, so the guard pn > maxport is never true on exhaustion. The driver would silently call set_bit(maxport, port_mask) and assign the out-of-range port instead of returning -EBUSY. Fix the comparison to pn >= maxport.
--- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/qcom.c +1 -1
@@ -1201,7 +1201,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,else pn =find_first_zero_bit (port_mask, maxport); -if (pn > maxport) { +if (pn >= maxport) {dev_err (ctrl->dev,"All ports busy\n" ); ret = -EBUSY ; goto out;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 185/1518 iio: orientation: hid-sensor-rotation: Avoid race between callback setup and device exposure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanjay Chitroda <[email protected]>
[ Upstream commit 0e32649a7cf3cd784862f8dc0c68a5134731bfff ]
The driver currently exposes the IIO device to userspace before completing sensor hub callback registration, and similarly removes callbacks while the device can still be accessed during teardown.
This creates a timing window where userspace may enable the buffer before callbacks are available. In such cases:
- samples can be dropped,
- buffered reads may observe stale or no data.
Reorder probe and remove paths to ensure callbacks are active before device exposure and are removed after device is no longer accessible.
This avoids a race window leading to data loss.
--- drivers/iio/orientation/hid-sensor-rotation.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/iio/orientation/hid-sensor-rotation.c +10 -10
@@ -353,12 +353,6 @@ static int hid_dev_rot_probe(struct platform_device *pdev)return ret; } - ret =iio_device_register (indio_dev); -if (ret) { -dev_err (&pdev->dev,"device register failed\n" ); - goto error_remove_trigger; - } - rot_state->callbacks.send_event = dev_rot_proc_event; rot_state->callbacks.capture_sample = dev_rot_capture_sample; rot_state->callbacks.pdev = pdev;
@@ -366,13 +360,19 @@ static int hid_dev_rot_probe(struct platform_device *pdev) &rot_state->callbacks);if (ret) {dev_err (&pdev->dev,"callback reg failed\n" ); - goto error_iio_unreg; + goto error_remove_trigger; + } + + ret =iio_device_register (indio_dev); +if (ret) { +dev_err (&pdev->dev,"device register failed\n" ); + goto error_remove_callback; }return 0 ; -error_iio_unreg: -iio_device_unregister (indio_dev); +error_remove_callback: +sensor_hub_remove_callback (hsdev, hsdev->usage); error_remove_trigger:hid_sensor_remove_trigger (indio_dev, &rot_state->common_attributes);return ret;
@@ -385,8 +385,8 @@ static void hid_dev_rot_remove(struct platform_device *pdev)struct iio_dev *indio_dev =platform_get_drvdata (pdev);struct dev_rot_state *rot_state =iio_priv (indio_dev); -sensor_hub_remove_callback (hsdev, hsdev->usage);iio_device_unregister (indio_dev); +sensor_hub_remove_callback (hsdev, hsdev->usage);hid_sensor_remove_trigger (indio_dev, &rot_state->common_attributes); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 186/1518 csky: Fix a4/a5 restoration in syscall trace path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hanlin Song <[email protected]>
[ Upstream commit abb81e5ce7d995baa41556b8125fa59e28ba3be8 ]
The syscall trace path reloads syscall arguments from pt_regs before calling the syscall handler. On C-SKY ABIv2, the 5th and 6th syscall arguments are prepared as stack arguments before invoking syscallid.
The current code adjusts sp before loading LSAVE_A4 and LSAVE_A5. Since those offsets are relative to the original pt_regs base, loading them after changing sp fetches the wrong slots. As a result, traced syscalls that use the 5th or 6th argument may receive corrupted arguments.
This is visible with mmap2(), which takes six arguments. A small PTRACE_SYSCALL reproducer opens a file and maps one page with:
mmap(NULL, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0)
Before the fix, the traced child fails the mmap and exits with 12. After the fix, the mapping succeeds and the child exits with 0.
Fix the trace path by loading a4/a5 from pt_regs before changing sp.
Tested on: ck860f, linux-4.19.15, C-SKY abiv2
--- arch/csky/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/csky/kernel/entry.S +3 -3
@@ -93,11 +93,11 @@ csky_syscall_trace: ldw a2, (sp, LSAVE_A2) ldw a3, (sp, LSAVE_A3) #if defined(__CSKYABIV2__) - subi sp, 8 ldw r9, (sp, LSAVE_A4) + ldw r10, (sp, LSAVE_A5) + subi sp, 8 stw r9, (sp, 0x0) - ldw r9, (sp, LSAVE_A5) - stw r9, (sp, 0x4) + stw r10, (sp, 0x4) jsr syscallid /* Do system call */ addi sp, 8 #else
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 187/1518 selftests/rseq: Replace glibc-specific __GNUC_PREREQ with portable check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hisam Mehboob <[email protected]>
[ Upstream commit d7b2769f8dba3e5f40d2a8a11988812d51160b17 ]
Building the rseq selftests against musl libc fails because musl's <features.h> does not provide the glibc-specific __GNUC_PREREQ macro:
error: missing binary operator before token '('
Replace __GNUC_PREREQ(11, 1) with an equivalent check using __GNUC__ and __GNUC_MINOR__ directly. This pattern is portable across all C library implementations and is already used elsewhere in the tools/ tree (e.g., tools/include/linux/string.h).
This also allows removing the #include <features.h>, which was only needed for __GNUC_PREREQ.
--- tools/testing/selftests/rseq/rseq-x86-thread-pointer.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/testing/selftests/rseq/rseq-x86-thread-pointer.h +1 -3
@@ -8,13 +8,11 @@ #ifndef _RSEQ_X86_THREAD_POINTER #define _RSEQ_X86_THREAD_POINTER -#include <features.h> - #ifdef __cplusplus extern "C" { #endif -#if __GNUC_PREREQ (11, 1) +#if __GNUC__ > 11 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1) static inline void *rseq_thread_pointer(void) { return __builtin_thread_pointer();
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 188/1518 platform/chrome: sensorhub: Fix memory overread in ring handler
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tzung-Bi Shih <[email protected]>
[ Upstream commit d1ceb2b2324717fa30b44d56ef0c52813e239569 ]
max_response and sensor_num are read from different EC commands:
- max_response is from cros_ec_get_proto_info().
ec_dev->max_response = info->max_response_packet_size -
sizeof(struct ec_host_response);- sensor_num is from cros_ec_get_sensor_count().
sensor_num = cros_ec_get_sensor_count(ec);
With a malfunctioning EC firmware, it is possible that the msg->insize (i.e., fifo_info_length in the context) could be clamped in cros_ec_cmd_xfer() because msg->insize is greater than max_response.
int fifo_info_length =
sizeof(struct ec_response_motion_sense_fifo_info) + sizeof(u16) * sensorhub->sensor_num;
This means the number of read bytes could be less than expected. As a result, the subsequent memcpy() in cros_ec_sensorhub_ring_handler() overreads the resp->fifo_info buffer.
Check the return value of cros_ec_cmd_xfer_status() and abort if the number of bytes read does not match the expected length.
--- drivers/platform/chrome/cros_ec_sensorhub_ring.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/platform/chrome/cros_ec_sensorhub_ring.c +8 -1
@@ -825,8 +825,15 @@ static void cros_ec_sensorhub_ring_handler(struct cros_ec_sensorhub *sensorhub) sensorhub->msg->outsize =1 ; sensorhub->msg->insize = fifo_info_length; -if (cros_ec_cmd_xfer_status (ec->ec_dev, sensorhub->msg) <0 ) + ret =cros_ec_cmd_xfer_status (ec->ec_dev, sensorhub->msg); +if (ret <0 ) + goto error; +if (ret != fifo_info_length) { +dev_warn_ratelimited (sensorhub->dev, +"Mismatch read length: size %d - expected %d\n" , + ret, fifo_info_length); goto error; + }memcpy (fifo_info, &sensorhub->resp->fifo_info, fifo_info_length);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 189/1518 wifi: rtw89: fill addr cam H2C command by struct
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 239dd70d776cf94f39000740b307c91e4f72d615 ]
The addr cam is used to tell firmware the MAC address and BSSID associated to connected stations. Use struct instead of macros with pointer arithmetic to fill the data.
Stable-dep-of: a8cddb62c573 ("wifi: rtw89: check return values in rtw89_ops_start_ap()")
--- drivers/net/wireless/realtek/rtw89/cam.c | 150 ++++---- drivers/net/wireless/realtek/rtw89/cam.h | 431 +++++------------------ drivers/net/wireless/realtek/rtw89/fw.c | 17 +- 3 files changed, 173 insertions(+), 425 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +73 -77
@@ -760,7 +760,8 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, -struct rtw89_sta_link *rtwsta_link,u8 *cmd) +struct rtw89_sta_link *rtwsta_link, +struct rtw89_h2c_addr_cam *h2c) {struct rtw89_bssid_cam_entry *bssid_cam =rtw89_get_bssid_cam_of (rtwvif_link, rtwsta_link);
@@ -780,20 +781,19 @@ int rtw89_cam_fill_bssid_cam_info(struct rtw89_dev *rtwdev,rcu_read_unlock (); -FWCMD_SET_ADDR_BSSID_IDX (cmd, bssid_cam->bssid_cam_idx); -FWCMD_SET_ADDR_BSSID_OFFSET (cmd, bssid_cam->offset); -FWCMD_SET_ADDR_BSSID_LEN (cmd, bssid_cam->len); -FWCMD_SET_ADDR_BSSID_VALID (cmd, bssid_cam->valid); -FWCMD_SET_ADDR_BSSID_MASK (cmd, bss_mask); -FWCMD_SET_ADDR_BSSID_BB_SEL (cmd, bssid_cam->phy_idx); -FWCMD_SET_ADDR_BSSID_BSS_COLOR (cmd, bss_color); - -FWCMD_SET_ADDR_BSSID_BSSID0 (cmd, bssid_cam->bssid[0 ]); -FWCMD_SET_ADDR_BSSID_BSSID1 (cmd, bssid_cam->bssid[1 ]); -FWCMD_SET_ADDR_BSSID_BSSID2 (cmd, bssid_cam->bssid[2 ]); -FWCMD_SET_ADDR_BSSID_BSSID3 (cmd, bssid_cam->bssid[3 ]); -FWCMD_SET_ADDR_BSSID_BSSID4 (cmd, bssid_cam->bssid[4 ]); -FWCMD_SET_ADDR_BSSID_BSSID5 (cmd, bssid_cam->bssid[5 ]); + h2c->w12 =le32_encode_bits (bssid_cam->bssid_cam_idx,ADDR_CAM_W12_BSSID_IDX ) | +le32_encode_bits (bssid_cam->offset,ADDR_CAM_W12_BSSID_OFFSET ) | +le32_encode_bits (bssid_cam->len,ADDR_CAM_W12_BSSID_LEN ); + h2c->w13 =le32_encode_bits (bssid_cam->valid,ADDR_CAM_W13_BSSID_VALID ) | +le32_encode_bits (bss_mask,ADDR_CAM_W13_BSSID_MASK ) | +le32_encode_bits (bssid_cam->phy_idx,ADDR_CAM_W13_BSSID_BB_SEL ) | +le32_encode_bits (bss_color,ADDR_CAM_W13_BSSID_BSS_COLOR ) | +le32_encode_bits (bssid_cam->bssid[0 ],ADDR_CAM_W13_BSSID_BSSID0 ) | +le32_encode_bits (bssid_cam->bssid[1 ],ADDR_CAM_W13_BSSID_BSSID1 ); + h2c->w14 =le32_encode_bits (bssid_cam->bssid[2 ],ADDR_CAM_W14_BSSID_BSSID2 ) | +le32_encode_bits (bssid_cam->bssid[3 ],ADDR_CAM_W14_BSSID_BSSID3 ) | +le32_encode_bits (bssid_cam->bssid[4 ],ADDR_CAM_W14_BSSID_BSSID4 ) | +le32_encode_bits (bssid_cam->bssid[5 ],ADDR_CAM_W14_BSSID_BSSID5 );return 0 ; }
@@ -813,7 +813,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - u8 *cmd) + struct rtw89_h2c_addr_cam *h2c) { struct ieee80211_vif *vif = rtwvif_link_to_vif(rtwvif_link); struct rtw89_addr_cam_entry *addr_cam =
@@ -845,69 +845,65 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, sma_hash =rtw89_cam_addr_hash (sma_start, sma); tma_hash =rtw89_cam_addr_hash (tma_start, tma); -FWCMD_SET_ADDR_IDX (cmd, addr_cam->addr_cam_idx); -FWCMD_SET_ADDR_OFFSET (cmd, addr_cam->offset); -FWCMD_SET_ADDR_LEN (cmd, addr_cam->len); - -FWCMD_SET_ADDR_VALID (cmd, addr_cam->valid); -FWCMD_SET_ADDR_NET_TYPE (cmd, rtwvif_link->net_type); -FWCMD_SET_ADDR_BCN_HIT_COND (cmd, rtwvif_link->bcn_hit_cond); -FWCMD_SET_ADDR_HIT_RULE (cmd, rtwvif_link->hit_rule); -FWCMD_SET_ADDR_BB_SEL (cmd, rtwvif_link->phy_idx); -FWCMD_SET_ADDR_ADDR_MASK (cmd, addr_cam->addr_mask); -FWCMD_SET_ADDR_MASK_SEL (cmd, addr_cam->mask_sel); -FWCMD_SET_ADDR_SMA_HASH (cmd, sma_hash); -FWCMD_SET_ADDR_TMA_HASH (cmd, tma_hash); - -FWCMD_SET_ADDR_BSSID_CAM_IDX (cmd, addr_cam->bssid_cam_idx); - -FWCMD_SET_ADDR_SMA0 (cmd, sma[0 ]); -FWCMD_SET_ADDR_SMA1 (cmd, sma[1 ]); -FWCMD_SET_ADDR_SMA2 (cmd, sma[2 ]); -FWCMD_SET_ADDR_SMA3 (cmd, sma[3 ]); -FWCMD_SET_ADDR_SMA4 (cmd, sma[4 ]); -FWCMD_SET_ADDR_SMA5 (cmd, sma[5 ]); - -FWCMD_SET_ADDR_TMA0 (cmd, tma[0 ]); -FWCMD_SET_ADDR_TMA1 (cmd, tma[1 ]); -FWCMD_SET_ADDR_TMA2 (cmd, tma[2 ]); -FWCMD_SET_ADDR_TMA3 (cmd, tma[3 ]); -FWCMD_SET_ADDR_TMA4 (cmd, tma[4 ]); -FWCMD_SET_ADDR_TMA5 (cmd, tma[5 ]); - -FWCMD_SET_ADDR_PORT_INT (cmd, rtwvif_link->port); -FWCMD_SET_ADDR_TSF_SYNC (cmd, rtwvif_link->port); -FWCMD_SET_ADDR_TF_TRS (cmd, rtwvif_link->trigger); -FWCMD_SET_ADDR_LSIG_TXOP (cmd, rtwvif_link->lsig_txop); -FWCMD_SET_ADDR_TGT_IND (cmd, rtwvif_link->tgt_ind); -FWCMD_SET_ADDR_FRM_TGT_IND (cmd, rtwvif_link->frm_tgt_ind); -FWCMD_SET_ADDR_MACID (cmd, rtwsta_link ? rtwsta_link->mac_id : - rtwvif_link->mac_id); + h2c->w1 =le32_encode_bits (addr_cam->addr_cam_idx,ADDR_CAM_W1_IDX ) | +le32_encode_bits (addr_cam->offset,ADDR_CAM_W1_OFFSET ) | +le32_encode_bits (addr_cam->len,ADDR_CAM_W1_LEN ); + h2c->w2 =le32_encode_bits (addr_cam->valid,ADDR_CAM_W2_VALID ) | +le32_encode_bits (rtwvif_link->net_type,ADDR_CAM_W2_NET_TYPE ) | +le32_encode_bits (rtwvif_link->bcn_hit_cond,ADDR_CAM_W2_BCN_HIT_COND ) | +le32_encode_bits (rtwvif_link->hit_rule,ADDR_CAM_W2_HIT_RULE ) | +le32_encode_bits (rtwvif_link->phy_idx,ADDR_CAM_W2_BB_SEL ) | +le32_encode_bits (addr_cam->addr_mask,ADDR_CAM_W2_ADDR_MASK ) | +le32_encode_bits (addr_cam->mask_sel,ADDR_CAM_W2_MASK_SEL ) | +le32_encode_bits (sma_hash,ADDR_CAM_W2_SMA_HASH ) | +le32_encode_bits (tma_hash,ADDR_CAM_W2_TMA_HASH ); + h2c->w3 =le32_encode_bits (addr_cam->bssid_cam_idx,ADDR_CAM_W3_BSSID_CAM_IDX ); + h2c->w4 =le32_encode_bits (sma[0 ],ADDR_CAM_W4_SMA0 ) | +le32_encode_bits (sma[1 ],ADDR_CAM_W4_SMA1 ) | +le32_encode_bits (sma[2 ],ADDR_CAM_W4_SMA2 ) | +le32_encode_bits (sma[3 ],ADDR_CAM_W4_SMA3 ); + h2c->w5 =le32_encode_bits (sma[4 ],ADDR_CAM_W5_SMA4 ) | +le32_encode_bits (sma[5 ],ADDR_CAM_W5_SMA5 ) | +le32_encode_bits (tma[0 ],ADDR_CAM_W5_TMA0 ) | +le32_encode_bits (tma[1 ],ADDR_CAM_W5_TMA1 ); + h2c->w6 =le32_encode_bits (tma[2 ],ADDR_CAM_W6_TMA2 ) | +le32_encode_bits (tma[3 ],ADDR_CAM_W6_TMA3 ) | +le32_encode_bits (tma[4 ],ADDR_CAM_W6_TMA4 ) | +le32_encode_bits (tma[5 ],ADDR_CAM_W6_TMA5 ); + h2c->w8 =le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_PORT_INT ) | +le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_TSF_SYNC ) | +le32_encode_bits (rtwvif_link->trigger,ADDR_CAM_W8_TF_TRS ) | +le32_encode_bits (rtwvif_link->lsig_txop,ADDR_CAM_W8_LSIG_TXOP ) | +le32_encode_bits (rtwvif_link->tgt_ind,ADDR_CAM_W8_TGT_IND ) | +le32_encode_bits (rtwvif_link->frm_tgt_ind,ADDR_CAM_W8_FRM_TGT_IND ) | +le32_encode_bits (rtwsta_link ? rtwsta_link->mac_id : + rtwvif_link->mac_id,ADDR_CAM_W8_MACID ); +if (rtwvif_link->net_type ==RTW89_NET_TYPE_INFRA ) -FWCMD_SET_ADDR_AID12 (cmd, vif->cfg.aid &0xfff ); + h2c->w9 =le32_encode_bits (vif->cfg.aid &0xfff ,ADDR_CAM_W9_AID12 );else if (rtwvif_link->net_type ==RTW89_NET_TYPE_AP_MODE ) -FWCMD_SET_ADDR_AID12 (cmd, sta ? sta->aid &0xfff :0 ); -FWCMD_SET_ADDR_WOL_PATTERN (cmd, rtwvif_link->wowlan_pattern); -FWCMD_SET_ADDR_WOL_UC (cmd, rtwvif_link->wowlan_uc); -FWCMD_SET_ADDR_WOL_MAGIC (cmd, rtwvif_link->wowlan_magic); -FWCMD_SET_ADDR_WAPI (cmd, addr_cam->wapi); -FWCMD_SET_ADDR_SEC_ENT_MODE (cmd, addr_cam->sec_ent_mode); -FWCMD_SET_ADDR_SEC_ENT0_KEYID (cmd, addr_cam->sec_ent_keyid[0 ]); -FWCMD_SET_ADDR_SEC_ENT1_KEYID (cmd, addr_cam->sec_ent_keyid[1 ]); -FWCMD_SET_ADDR_SEC_ENT2_KEYID (cmd, addr_cam->sec_ent_keyid[2 ]); -FWCMD_SET_ADDR_SEC_ENT3_KEYID (cmd, addr_cam->sec_ent_keyid[3 ]); -FWCMD_SET_ADDR_SEC_ENT4_KEYID (cmd, addr_cam->sec_ent_keyid[4 ]); -FWCMD_SET_ADDR_SEC_ENT5_KEYID (cmd, addr_cam->sec_ent_keyid[5 ]); -FWCMD_SET_ADDR_SEC_ENT6_KEYID (cmd, addr_cam->sec_ent_keyid[6 ]); - -FWCMD_SET_ADDR_SEC_ENT_VALID (cmd, addr_cam->sec_cam_map[0 ] &0xff ); -FWCMD_SET_ADDR_SEC_ENT0 (cmd, addr_cam->sec_ent[0 ]); -FWCMD_SET_ADDR_SEC_ENT1 (cmd, addr_cam->sec_ent[1 ]); -FWCMD_SET_ADDR_SEC_ENT2 (cmd, addr_cam->sec_ent[2 ]); -FWCMD_SET_ADDR_SEC_ENT3 (cmd, addr_cam->sec_ent[3 ]); -FWCMD_SET_ADDR_SEC_ENT4 (cmd, addr_cam->sec_ent[4 ]); -FWCMD_SET_ADDR_SEC_ENT5 (cmd, addr_cam->sec_ent[5 ]); -FWCMD_SET_ADDR_SEC_ENT6 (cmd, addr_cam->sec_ent[6 ]); + h2c->w9 =le32_encode_bits (sta ? sta->aid &0xfff :0 ,ADDR_CAM_W9_AID12 ); + + h2c->w9 |=le32_encode_bits (rtwvif_link->wowlan_pattern,ADDR_CAM_W9_WOL_PATTERN ) | +le32_encode_bits (rtwvif_link->wowlan_uc,ADDR_CAM_W9_WOL_UC ) | +le32_encode_bits (rtwvif_link->wowlan_magic,ADDR_CAM_W9_WOL_MAGIC ) | +le32_encode_bits (addr_cam->wapi,ADDR_CAM_W9_WAPI ) | +le32_encode_bits (addr_cam->sec_ent_mode,ADDR_CAM_W9_SEC_ENT_MODE ) | +le32_encode_bits (addr_cam->sec_ent_keyid[0 ],ADDR_CAM_W9_SEC_ENT0_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[1 ],ADDR_CAM_W9_SEC_ENT1_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[2 ],ADDR_CAM_W9_SEC_ENT2_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[3 ],ADDR_CAM_W9_SEC_ENT3_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[4 ],ADDR_CAM_W9_SEC_ENT4_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[5 ],ADDR_CAM_W9_SEC_ENT5_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[6 ],ADDR_CAM_W9_SEC_ENT6_KEYID ); + h2c->w10 =le32_encode_bits (addr_cam->sec_cam_map[0 ] &0xff ,ADDR_CAM_W10_SEC_ENT_VALID ) | +le32_encode_bits (addr_cam->sec_ent[0 ],ADDR_CAM_W10_SEC_ENT0 ) | +le32_encode_bits (addr_cam->sec_ent[1 ],ADDR_CAM_W10_SEC_ENT1 ) | +le32_encode_bits (addr_cam->sec_ent[2 ],ADDR_CAM_W10_SEC_ENT2 ); + h2c->w11 =le32_encode_bits (addr_cam->sec_ent[3 ],ADDR_CAM_W11_SEC_ENT3 ) | +le32_encode_bits (addr_cam->sec_ent[4 ],ADDR_CAM_W11_SEC_ENT4 ) | +le32_encode_bits (addr_cam->sec_ent[5 ],ADDR_CAM_W11_SEC_ENT5 ) | +le32_encode_bits (addr_cam->sec_ent[6 ],ADDR_CAM_W11_SEC_ENT6 );rcu_read_unlock (); }
drivers/net/wireless/realtek/rtw89/cam.h +90 -341
451 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +10 -7
@@ -2110,28 +2110,31 @@ void rtw89_fw_log_dump(struct rtw89_dev *rtwdev, u8 *buf, u32 len) } -#define H2C_CAM_LEN 60int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr) { +struct rtw89_h2c_addr_cam *h2c; +u32 len =sizeof (*h2c);struct sk_buff *skb;int ret; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_CAM_LEN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );return -ENOMEM ; } -skb_put (skb,H2C_CAM_LEN ); -rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, scan_mac_addr, - skb->data); -rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, skb->data); +skb_put (skb, len); + h2c = (struct rtw89_h2c_addr_cam *)skb->data; + +rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, + scan_mac_addr, h2c); +rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c);rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_MAC ,H2C_CL_MAC_ADDR_CAM_UPDATE ,H2C_FUNC_MAC_ADDR_CAM_UPD ,0 ,1 , -H2C_CAM_LEN ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 190/1518 wifi: rtw89: update format of addr cam H2C command
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chih-Kang Chang <[email protected]>
[ Upstream commit 9dab26b9fa457ee538be650ca0bddf352c059e79 ]
The addr cam H2C command is to tell firmware the addr related info. For RTL8922D and RTL8922A after firmware version 0.35.84.0, the addr cam must be updated with update mode to avoid clearing previously set fields. Update it accordingly.
Stable-dep-of: a8cddb62c573 ("wifi: rtw89: check return values in rtw89_ops_start_ap()")
--- drivers/net/wireless/realtek/rtw89/cam.c | 10 ++++--- drivers/net/wireless/realtek/rtw89/cam.h | 12 ++++++--- drivers/net/wireless/realtek/rtw89/core.c | 12 ++++++--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 26 ++++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 3 ++- drivers/net/wireless/realtek/rtw89/mac.c | 4 +-- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +-- drivers/net/wireless/realtek/rtw89/wow.c | 6 +++-- 9 files changed, 56 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +6 -4
@@ -236,7 +236,8 @@ static int __rtw89_cam_detach_sec_cam(struct rtw89_dev *rtwdev,if (ret)rtw89_err (rtwdev,"failed to update dctl cam del key: %d\n" , ret); - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret)rtw89_err (rtwdev,"failed to update cam del key: %d\n" , ret); }
@@ -276,7 +277,8 @@ static int __rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, ret);return ret; } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret) {rtw89_err (rtwdev,"failed to update addr cam sec entry: %d\n" , ret);
@@ -761,7 +763,7 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link, -struct rtw89_h2c_addr_cam *h2c) +struct rtw89_h2c_addr_cam_v0 *h2c) {struct rtw89_bssid_cam_entry *bssid_cam =rtw89_get_bssid_cam_of (rtwvif_link, rtwsta_link);
@@ -813,7 +815,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - struct rtw89_h2c_addr_cam *h2c) + struct rtw89_h2c_addr_cam_v0 *h2c) { struct ieee80211_vif *vif = rtwvif_link_to_vif(rtwvif_link); struct rtw89_addr_cam_entry *addr_cam =
drivers/net/wireless/realtek/rtw89/cam.h +9 -3
@@ -12,7 +12,7 @@#define RTW89_BSSID_MATCH_ALL GENMASK(5, 0)#define RTW89_BSSID_MATCH_5_BYTES GENMASK(4, 0) -struct rtw89_h2c_addr_cam { +struct rtw89_h2c_addr_cam_v0 {__le32 w0;__le32 w1;__le32 w2;
@@ -30,6 +30,11 @@ struct rtw89_h2c_addr_cam {__le32 w14; } __packed; +struct rtw89_h2c_addr_cam { +struct rtw89_h2c_addr_cam_v0 v0; +__le32 w15; +} __packed; +#define ADDR_CAM_W1_IDX GENMASK(7, 0)#define ADDR_CAM_W1_OFFSET GENMASK(15, 8)#define ADDR_CAM_W1_LEN GENMASK(23, 16)
@@ -98,6 +103,7 @@ struct rtw89_h2c_addr_cam {#define ADDR_CAM_W14_BSSID_BSSID3 GENMASK(15, 8)#define ADDR_CAM_W14_BSSID_BSSID4 GENMASK(23, 16)#define ADDR_CAM_W14_BSSID_BSSID5 GENMASK(31, 24) +#define ADDR_CAM_W15_UPD_MODE GENMASK(2, 0)struct rtw89_h2c_dctlinfo_ud_v1 {__le32 c0;
@@ -302,7 +308,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - struct rtw89_h2c_addr_cam *h2c); + struct rtw89_h2c_addr_cam_v0 *h2c); void rtw89_cam_fill_dctl_sec_cam_info_v1(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link,
@@ -314,7 +320,7 @@ void rtw89_cam_fill_dctl_sec_cam_info_v2(struct rtw89_dev *rtwdev,int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link, -struct rtw89_h2c_addr_cam *h2c); +struct rtw89_h2c_addr_cam_v0 *h2c); int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
drivers/net/wireless/realtek/rtw89/core.c +8 -4
@@ -4703,7 +4703,8 @@ int rtw89_core_sta_link_disconnect(struct rtw89_dev *rtwdev, }/* update cam aid mac_id net_type */ - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_CON_DISCONN );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -4777,7 +4778,8 @@ int rtw89_core_sta_link_assoc(struct rtw89_dev *rtwdev, }/* update cam aid mac_id net_type */ - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_CON_DISCONN );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -5895,7 +5897,8 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvrtw89_phy_config_edcca (rtwdev, bb, true);rtw89_tas_scan (rtwdev, true); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr, +RTW89_ROLE_INFO_CHANGE ); } void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,
@@ -5915,7 +5918,8 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rcu_read_unlock (); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL , +RTW89_ROLE_INFO_CHANGE );rtw89_chip_rfk_scan (rtwdev, rtwvif_link, false);rtw89_btc_ntfy_scan_finish (rtwdev, rtwvif_link->phy_idx);
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4640,6 +4640,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_RFK_NTFY_MCC_V0 ,RTW89_FW_FEATURE_LPS_DACK_BY_C2H_REG ,RTW89_FW_FEATURE_BEACON_TRACKING , + RTW89_FW_FEATURE_ADDR_CAM_V0, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +22 -4
@@ -870,6 +870,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,76 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,79 ,0 ,CRASH_TRIGGER_TYPE_1 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,80 ,0 ,BEACON_TRACKING ), + __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 84, 0, ADDR_CAM_V0), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -2111,25 +2112,42 @@ void rtw89_fw_log_dump(struct rtw89_dev *rtwdev, u8 *buf, u32 len) }int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, -struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr) +struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr, +enum rtw89_upd_mode upd_mode) { +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_h2c_addr_cam_v0 *h2c_v0;struct rtw89_h2c_addr_cam *h2c;u32 len =sizeof (*h2c);struct sk_buff *skb; +u8 ver =U8_MAX ;int ret; +if (RTW89_CHK_FW_FEATURE (ADDR_CAM_V0 , &rtwdev->fw) || + chip->chip_gen ==RTW89_CHIP_AX ) { + len =sizeof (*h2c_v0); + ver =0 ; + } + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );return -ENOMEM ; }skb_put (skb, len); - h2c = (struct rtw89_h2c_addr_cam *)skb->data; + h2c_v0 = (struct rtw89_h2c_addr_cam_v0 *)skb->data;rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, - scan_mac_addr, h2c); -rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c); + scan_mac_addr, h2c_v0); +rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c_v0); +if (ver ==0 ) + goto hdr; + + h2c = (struct rtw89_h2c_addr_cam *)skb->data; + h2c->w15 =le32_encode_bits (upd_mode,ADDR_CAM_W15_UPD_MODE ); + +hdr: rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_MAC, H2C_CL_MAC_ADDR_CAM_UPDATE,
drivers/net/wireless/realtek/rtw89/fw.h +2 -1
@@ -4827,7 +4827,8 @@ int rtw89_fw_h2c_tbtt_tuning(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, u32 offset);int rtw89_fw_h2c_pwr_lvl (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link);int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *vif, -struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr); +struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr, +enum rtw89_upd_mode upd_mode);int rtw89_fw_h2c_dctl_sec_cam_v1 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link);
drivers/net/wireless/realtek/rtw89/mac.c +2 -2
@@ -4786,7 +4786,7 @@ int rtw89_mac_vif_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lif (ret)return ret; - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_CREATE );if (ret)return ret;
@@ -4811,7 +4811,7 @@ int rtw89_mac_vif_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvifrtw89_cam_deinit (rtwdev, rtwvif_link); - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_REMOVE );if (ret)return ret;
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -745,7 +745,7 @@ static void rtw89_ops_link_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BSSID ) {ether_addr_copy (rtwvif_link->bssid, conf->bssid);rtw89_cam_bssid_changed (rtwdev, rtwvif_link); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_INFO_CHANGE );WRITE_ONCE (rtwvif_link->sync_bcn_tsf,0 ); }
@@ -804,7 +804,7 @@ static int rtw89_ops_start_ap(struct ieee80211_hw *hw,rtw89_chip_h2c_assoc_cmac_tbl (rtwdev, rtwvif_link,NULL );rtw89_fw_h2c_role_maintain (rtwdev, rtwvif_link,NULL ,RTW89_ROLE_TYPE_CHANGE );rtw89_fw_h2c_join_info (rtwdev, rtwvif_link,NULL , true); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_TYPE_CHANGE );rtw89_chip_rfk_channel (rtwdev, rtwvif_link);if (RTW89_CHK_FW_FEATURE (NOTIFY_AP_INFO , &rtwdev->fw)) {
drivers/net/wireless/realtek/rtw89/wow.c +4 -2
@@ -1225,7 +1225,8 @@ static int rtw89_wow_cfg_wake(struct rtw89_dev *rtwdev, bool wow) } } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -1322,7 +1323,8 @@ static int rtw89_wow_swap_fw(struct rtw89_dev *rtwdev, bool wow)return ret; } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_FW_RESTORE );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 191/1518 wifi: rtw89: check return values in rtw89_ops_start_ap()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Morgun <[email protected]>
[ Upstream commit a8cddb62c573f28eef5f887a8f3156e8ee22776a ]
Several functions called in rtw89_ops_start_ap() may fail to allocate skb or fail to send H2C command to firmware, returning -ENOMEM or an error code. Their return values are ignored, so subsequent commands are executed with incorrect state.
Check the return values and propagate errors.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +30 -5
@@ -800,11 +800,36 @@ static int rtw89_ops_start_ap(struct ieee80211_hw *hw,ether_addr_copy (rtwvif_link->bssid, link_conf->bssid);rtw89_cam_bssid_changed (rtwdev, rtwvif_link); -rtw89_mac_port_update (rtwdev, rtwvif_link); -rtw89_chip_h2c_assoc_cmac_tbl (rtwdev, rtwvif_link,NULL ); -rtw89_fw_h2c_role_maintain (rtwdev, rtwvif_link,NULL ,RTW89_ROLE_TYPE_CHANGE ); -rtw89_fw_h2c_join_info (rtwdev, rtwvif_link,NULL , true); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_TYPE_CHANGE ); + ret =rtw89_mac_port_update (rtwdev, rtwvif_link); +if (ret) { +rtw89_warn (rtwdev,"failed to update mac port\n" ); +return ret; + } + + ret =rtw89_chip_h2c_assoc_cmac_tbl (rtwdev, rtwvif_link,NULL ); +if (ret) { +rtw89_warn (rtwdev,"failed to send h2c cmac table\n" ); +return ret; + } + + ret =rtw89_fw_h2c_role_maintain (rtwdev, rtwvif_link,NULL ,RTW89_ROLE_TYPE_CHANGE ); +if (ret) { +rtw89_warn (rtwdev,"failed to send h2c role info\n" ); +return ret; + } + + ret =rtw89_fw_h2c_join_info (rtwdev, rtwvif_link,NULL , true); +if (ret) { +rtw89_warn (rtwdev,"failed to send h2c join info\n" ); +return ret; + } + + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_TYPE_CHANGE ); +if (ret) { +rtw89_warn (rtwdev,"failed to send h2c cam\n" ); +return ret; + } +rtw89_chip_rfk_channel (rtwdev, rtwvif_link);if (RTW89_CHK_FW_FEATURE (NOTIFY_AP_INFO , &rtwdev->fw)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 192/1518 wifi: rtw89: fix HE extended capability length check
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 2aba608a86e9b099c9af2ea70b620552dee2b628 ]
rtw89_mac_check_he_obss_narrow_bw_ru_iter() reads extended capability byte 10, but rejects only datalen values below 10. Byte 10 requires at least 11 bytes.
Require datalen >= 11 before reading data[10].
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -4885,7 +4885,7 @@ static void rtw89_mac_check_he_obss_narrow_bw_ru_iter(struct wiphy *wiphy, elem =cfg80211_find_elem (WLAN_EID_EXT_CAPABILITY , ies->data, ies->len); -if (!elem || elem->datalen <10 || +if (!elem || elem->datalen <11 || !(elem->data[10 ] &WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT )) *tolerated = false;rcu_read_unlock ();
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 193/1518 fanotify: initialize permission event watchdog state
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xuanqiang Luo <[email protected]>
[ Upstream commit a3aa899823dda059ab88a58254f9a605e03ec275 ]
fanotify permission events are allocated with kmem_cache_alloc(), but fanotify_alloc_perm_event() does not initialize watchdog_cnt.
The watchdog reads watchdog_cnt after the event is moved to access_list. A stale value can make it warn too early or skip the warning.
Initialize watchdog_cnt when allocating a permission event.
--- fs/notify/fanotify/fanotify.c | 1 + 1 file changed, 1 insertion(+)
fs/notify/fanotify/fanotify.c +1 -0
@@ -601,6 +601,7 @@ static struct fanotify_event *fanotify_alloc_perm_event(const void *data, pevent->hdr.pad =0 ; pevent->hdr.len =0 ; pevent->state =FAN_EVENT_INIT ; + pevent->watchdog_cnt =0 ; pevent->path = *path; pevent->pos = range ? range->pos :FANOTIFY_NO_RANGE ; pevent->count = range ? range->count :0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 194/1518 tools/nolibc: mark arg1 operand in __nolibc_syscall0() as write-only
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit a3b2181459a2c74c03ddbad585f884eefc8ff8ff ]
__nolibc_syscall0() does not set the arg1 variable before passing it to the asm block. This uninitialized variable read is undefined behavior. Clang can miscompile this.
Mark the asm operand as write-only to fix this.
--- tools/include/nolibc/arch-sparc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/nolibc/arch-sparc.h +1 -1
@@ -45,7 +45,7 @@ \ __asm__ volatile ( \ _NOLIBC_SYSCALL \ - : "+r"(_arg1) \ + : "=r"(_arg1) \ : "r"(_num) \: " memory", " cc" \ ); \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 195/1518 perf cs-etm: Fix thread leaks on trace queue init failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit 50cd0d54f1f6dd9b3de7c0ad101bd41d06206ace ]
cs_etm__init_traceid_queue() allocates the frontend and decode threads, if a later allocation fails, the error path does not drop thread reference that was already acquired.
Release both thread pointers with thread__zput() on the error path, so does not leak thread references or leave stale pointers behind.
--- tools/perf/util/cs-etm.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/util/cs-etm.c +4 -0
@@ -645,6 +645,8 @@ static int cs_etm__init_traceid_queue(struct cs_etm_queue *etmq, queue->tid); tidq->decode_thread =machine__findnew_thread (&etm->session->machines.host,-1 , queue->tid); +if (!tidq->frontend_thread || !tidq->decode_thread) + goto out; tidq->packet =zalloc (sizeof (struct cs_etm_packet ));if (!tidq->packet)
@@ -679,6 +681,8 @@ static int cs_etm__init_traceid_queue(struct cs_etm_queue *etmq,zfree (&tidq->prev_packet);zfree (&tidq->packet); out: +thread__zput (tidq->frontend_thread); +thread__zput (tidq->decode_thread);return rc; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 196/1518 perf/x86/amd/uncore: Add group validation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit edda9051e267b7390c7ce24b1b71434414ad156e ]
The amd_uncore driver currently does not validate event groups and allows creation of groups with more events than the number of available hardware counters. Because of this, pmu->event_init() succeeds but counter assignment fails later in pmu->add() which returns -EBUSY once all counters are exhausted.
Address this by introducing group validation in the pmu->event_init() path. Since the uncore PMUs have no per-event constraints and all counters of a PMU are interchangeable, validation is reduced to just counting the group members that target a PMU and ensuring that they fit within the available set of counters.
--- arch/x86/events/amd/uncore.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/x86/events/amd/uncore.c +31 -0
@@ -264,6 +264,29 @@ static void amd_uncore_del(struct perf_event *event, int flags) hwc->idx =-1 ; } +static bool amd_uncore_group_valid (struct perf_event *event) +{ +struct amd_uncore_pmu *pmu =event_to_amd_uncore_pmu (event); +struct perf_event *leader = event->group_leader; +struct perf_event *sibling; +int counters =0 ; + +if (leader->pmu == event->pmu) + counters++; + +for_each_sibling_event (sibling, leader) { +if (sibling->pmu == event->pmu && + sibling->state >PERF_EVENT_STATE_OFF ) + counters++; + } + +/* +* When pmu->event_init() is called, the event is yet to be linked to +* its leader's sibling list, so it is counted separately +*/ +return (counters +1 ) <= pmu->num_counters; +} +static int amd_uncore_event_init (struct perf_event *event) {struct amd_uncore_pmu *pmu;
@@ -281,6 +304,14 @@ static int amd_uncore_event_init(struct perf_event *event)if (!ctx)return -ENODEV ; +/* +* Ensure that all events in a group can be scheduled together so that +* a failure can be reported at perf_event_open() time rather than +* silently at pmu->add() time when no free counter is found +*/ +if (event->group_leader != event && !amd_uncore_group_valid (event)) +return -EINVAL ; +/* * NB and Last level cache counters (MSRs) are shared across all cores * that share the same NB / Last level cache. On family 16h and below,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 197/1518 perf vendor events amd: Update Zen 5 core events
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit 047979af3bf6a118066c81099162d518de63abb1 ]
Update definitions for the following events.
* PMCx00A - Add missing unit masks
* PMCx00B - Add missing unit masks and fix descriptions
* PMCx00C - Add missing unit masks
* PMCx00D - Add missing unit masks
* PMCx025 - Add missing unit masks and fix descriptions
--- .../arch/x86/amdzen5/floating-point.json | 130 +++++++++++++++--- .../arch/x86/amdzen5/load-store.json | 8 +- 2 files changed, 120 insertions(+), 18 deletions(-)
tools/perf/pmu-events/arch/x86/amdzen5/floating-point.json +113 -17
@@ -179,6 +179,30 @@ "BriefDescription": "Retired scalar floating-point blend ops.", "UMask": "0x09" }, + { + "EventName": "fp_ops_retired_by_type.scalar_mov", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point MOV ops.", + "UMask": "0x0a" + }, + { + "EventName": "fp_ops_retired_by_type.scalar_shuffle", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point shuffle ops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", + "UMask": "0x0b" + }, + { + "EventName": "fp_ops_retired_by_type.scalar_bfloat", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point bfloat ops.", + "UMask": "0x0c" + }, + { + "EventName": "fp_ops_retired_by_type.scalar_logical", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point logical ops.", + "UMask": "0x0d" + }, { "EventName": "fp_ops_retired_by_type.scalar_other", "EventCode": "0x0a",
@@ -245,12 +269,24 @@ "BriefDescription": "Retired vector floating-point blend ops.", "UMask": "0x90" }, + { + "EventName": "fp_ops_retired_by_type.vector_mov", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point MOV ops.", + "UMask": "0xa0" + }, { "EventName": "fp_ops_retired_by_type.vector_shuffle", "EventCode": "0x0a", "BriefDescription": "Retired vector floating-point shuffle ops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", "UMask": "0xb0" }, + { + "EventName": "fp_ops_retired_by_type.vector_bfloat", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point bfloat ops.", + "UMask": "0xc0" + }, { "EventName": "fp_ops_retired_by_type.vector_logical", "EventCode": "0x0a",
@@ -278,7 +314,7 @@ { "EventName": "sse_avx_ops_retired.mmx_add", "EventCode": "0x0b", - "BriefDescription": "Retired MMX integer add.", + "BriefDescription": "Retired MMX integer add ops.", "UMask": "0x01" }, {
@@ -299,16 +335,34 @@ "BriefDescription": "Retired MMX integer multiply-accumulate ops.", "UMask": "0x04" }, + { + "EventName": "sse_avx_ops_retired.mmx_aes", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer AES ops.", + "UMask": "0x05" + }, + { + "EventName": "sse_avx_ops_retired.mmx_sha", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer SHA ops.", + "UMask": "0x06" + }, { "EventName": "sse_avx_ops_retired.mmx_cmp", "EventCode": "0x0b", "BriefDescription": "Retired MMX integer compare ops.", "UMask": "0x07" }, + { + "EventName": "sse_avx_ops_retired.mmx_cvt", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer convert or pack ops.", + "UMask": "0x08" + }, { "EventName": "sse_avx_ops_retired.mmx_shift", "EventCode": "0x0b", - "BriefDescription": "Retired MMX integer shift ops.", + "BriefDescription": "Retired MMX integer shift or rotate ops.", "UMask": "0x09" }, {
@@ -324,9 +378,9 @@ "UMask": "0x0b" }, { - "EventName": "sse_avx_ops_retired.mmx_pack", + "EventName": "sse_avx_ops_retired.mmx_vnni", "EventCode": "0x0b", - "BriefDescription": "Retired MMX integer pack ops.", + "BriefDescription": "Retired MMX integer VNNI ops.", "UMask": "0x0c" }, {
@@ -390,15 +444,15 @@ "UMask": "0x70" }, { - "EventName": "sse_avx_ops_retired.sse_avx_clm", + "EventName": "sse_avx_ops_retired.sse_avx_cvt", "EventCode": "0x0b", - "BriefDescription": "Retired SSE and AVX integer CLM ops.", + "BriefDescription": "Retired SSE and AVX integer convert or pack ops.", "UMask": "0x80" }, { "EventName": "sse_avx_ops_retired.sse_avx_shift", "EventCode": "0x0b", - "BriefDescription": "Retired SSE and AVX integer shift ops.", + "BriefDescription": "Retired SSE and AVX integer shift or rotate ops.", "UMask": "0x90" }, {
@@ -414,9 +468,9 @@ "UMask": "0xb0" }, { - "EventName": "sse_avx_ops_retired.sse_avx_pack", + "EventName": "sse_avx_ops_retired.sse_avx_vnni", "EventCode": "0x0b", - "BriefDescription": "Retired SSE and AVX integer pack ops.", + "BriefDescription": "Retired SSE and AVX integer VNNI ops.", "UMask": "0xc0" }, {
@@ -497,12 +551,24 @@ "BriefDescription": "Retired 128-bit packed floating-point blend ops.", "UMask": "0x09" }, + { + "EventName": "fp_pack_ops_retired.fp128_mov", + "EventCode": "0x0c", + "BriefDescription": "Retired 128-bit packed floating-point MOV ops.", + "UMask": "0x0a" + }, { "EventName": "fp_pack_ops_retired.fp128_shuffle", "EventCode": "0x0c", "BriefDescription": "Retired 128-bit packed floating-point shuffle ops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", "UMask": "0x0b" }, + { + "EventName": "fp_pack_ops_retired.fp128_bfloat", + "EventCode": "0x0c", + "BriefDescription": "Retired 128-bit packed floating-point bfloat ops.", + "UMask": "0x0c" + }, { "EventName": "fp_pack_ops_retired.fp128_logical", "EventCode": "0x0c",
@@ -575,12 +641,24 @@ "BriefDescription": "Retired 256-bit packed floating-point blend ops.", "UMask": "0x90" }, + { + "EventName": "fp_pack_ops_retired.fp256_mov", + "EventCode": "0x0c", + "BriefDescription": "Retired 256-bit packed floating-point MOV ops.", + "UMask": "0xa0" + }, { "EventName": "fp_pack_ops_retired.fp256_shuffle", "EventCode": "0x0c", "BriefDescription": "Retired 256-bit packed floating-point shuffle ops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", "UMask": "0xb0" }, + { + "EventName": "fp_pack_ops_retired.fp256_bfloat", + "EventCode": "0x0c", + "BriefDescription": "Retired 256-bit packed floating-point bfloat ops.", + "UMask": "0xc0" + }, { "EventName": "fp_pack_ops_retired.fp256_logical", "EventCode": "0x0c",
@@ -648,15 +726,15 @@ "UMask": "0x07" }, { - "EventName": "packed_int_op_type.int128_clm", + "EventName": "packed_int_op_type.int128_cvt", "EventCode": "0x0d", - "BriefDescription": "Retired 128-bit packed integer CLM ops.", + "BriefDescription": "Retired 128-bit packed integer convert or pack ops.", "UMask": "0x08" }, { "EventName": "packed_int_op_type.int128_shift", "EventCode": "0x0d", - "BriefDescription": "Retired 128-bit packed integer shift ops.", + "BriefDescription": "Retired 128-bit packed integer shift or rotate ops.", "UMask": "0x09" }, {
@@ -672,9 +750,9 @@ "UMask": "0x0b" }, { - "EventName": "packed_int_op_type.int128_pack", + "EventName": "packed_int_op_type.int128_vnni", "EventCode": "0x0d", - "BriefDescription": "Retired 128-bit packed integer pack ops.", + "BriefDescription": "Retired 128-bit packed integer VNNI ops.", "UMask": "0x0c" }, {
@@ -719,16 +797,34 @@ "BriefDescription": "Retired 256-bit packed integer multiply-accumulate ops.", "UMask": "0x40" }, + { + "EventName": "packed_int_op_type.int256_aes", + "EventCode": "0x0d", + "BriefDescription": "Retired 256-bit packed integer AES ops.", + "UMask": "0x50" + }, + { + "EventName": "packed_int_op_type.int256_sha", + "EventCode": "0x0d", + "BriefDescription": "Retired 256-bit packed integer SHA ops.", + "UMask": "0x60" + }, { "EventName": "packed_int_op_type.int256_cmp", "EventCode": "0x0d", "BriefDescription": "Retired 256-bit packed integer compare ops.", "UMask": "0x70" }, + { + "EventName": "packed_int_op_type.int256_cvt", + "EventCode": "0x0d", + "BriefDescription": "Retired 256-bit packed integer convert or pack ops.", + "UMask": "0x80" + }, { "EventName": "packed_int_op_type.int256_shift", "EventCode": "0x0d", - "BriefDescription": "Retired 256-bit packed integer shift ops.", + "BriefDescription": "Retired 256-bit packed integer shift or rotate ops.", "UMask": "0x90" }, {
@@ -744,9 +840,9 @@ "UMask": "0xb0" }, { - "EventName": "packed_int_op_type.int256_pack", + "EventName": "packed_int_op_type.int256_vnni", "EventCode": "0x0d", - "BriefDescription": "Retired 256-bit packed integer pack ops.", + "BriefDescription": "Retired 256-bit packed integer VNNI ops.", "UMask": "0xc0" }, {
tools/perf/pmu-events/arch/x86/amdzen5/load-store.json +7 -1
@@ -8,9 +8,15 @@ { "EventName": "ls_locks.bus_lock", "EventCode": "0x25", - "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "BriefDescription": "Retired lock instructions which caused a bus lock.", "UMask": "0x01" }, + { + "EventName": "ls_locks.all", + "EventCode": "0x25", + "BriefDescription": "Retired lock instructions of all types.", + "UMask": "0x1f" + }, { "EventName": "ls_ret_cl_flush", "EventCode": "0x26",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 198/1518 hwrng: core - fix rng list on registration error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manos Pitsidianakis <[email protected]>
[ Upstream commit 3a5834db2b1ce25649f330e78efe1ccde78967fd ]
hwrng_register(rng) does the following:
1. Checks if rng has name and read methods set
2. Checks if the name already exists
3. Adds rng to global rng_list
4. May try to set rng to current_rng
If step 4 fails, it returns an error. However, it does not remove the rng from rng_list, causing a dangling reference which can result in use-after-free if the caller frees rng, since registration failed.
Add a list_del_init() cleanup step.
--- drivers/char/hw_random/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/char/hw_random/core.c +3 -1
@@ -604,11 +604,13 @@ int hwrng_register(struct hwrng *rng)*/ err =set_current_rng (rng);if (err) - goto out_unlock; + goto out_list_del; } }mutex_unlock (&rng_mutex);return 0 ; +out_list_del: +list_del_init (&rng->list); out_unlock:mutex_unlock (&rng_mutex); out:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 199/1518 crypto: qat - cancel work on re-enable SR-IOV timeout
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
[ Upstream commit 455b0f3ac9e254edab9f5a873d337abe5e6e3604 ]
The QAT reset worker queues SR-IOV reenable work using a work_struct and completion embedded in an on-stack adf_sriov_dev_data. If the completion wait times out, the reset worker can return while device_sriov_wq still holds or executes the stack-backed work item.
Cancel the work on the device_sriov_wq on timeout before the stack frame unwinds.
--- drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/intel/qat/qat_common/adf_aer.c +2 -0
@@ -190,6 +190,8 @@ static void adf_device_reset_worker(struct work_struct *work)queue_work (device_sriov_wq, &sriov_data.sriov_work);if (wait_for_completion_timeout (&sriov_data.compl, wait_jiffies))adf_pf2vf_notify_restarted (accel_dev); +else +cancel_work_sync (&sriov_data.sriov_work);adf_dev_restarted_notify (accel_dev);clear_bit (ADF_STATUS_RESTARTING , &accel_dev->status);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 200/1518 crypto: qat - clear AES key schedule from stack
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
[ Upstream commit d41a9fcfb7f9ee36e4a4aaf5e7996bca6be1e7a9 ]
qat_alg_xts_reverse_key() expands the forward XTS AES key on the stack. That schedule contains key material and can remain in the stack frame.
Clear the temporary crypto_aes_ctx with memzero_explicit() after the copy.
--- drivers/crypto/intel/qat/qat_common/qat_algs.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/intel/qat/qat_common/qat_algs.c +1 -0
@@ -405,6 +405,7 @@ static void qat_alg_xts_reverse_key(const u8 *key_forward, unsigned int keylen,memcpy (key_reverse +AES_BLOCK_SIZE , key -AES_BLOCK_SIZE ,AES_BLOCK_SIZE ); } +memzero_explicit (&aes_expanded,sizeof (aes_expanded)); } static void qat_alg_skcipher_init_dec(struct qat_alg_skcipher_ctx *ctx,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 201/1518 crypto: atmel-ecc - reject hardware ECDH without a public key
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit f240f9b588f4e2de89822adebf560a96b5d263ed ]
The hardware ECDH path in atmel_ecdh_compute_shared_secret() uses the private key stored in the device. However, the public key is cached only after atmel_ecdh_set_secret() successfully generated that private key for the current tfm.
atmel_ecdh_generate_public_key() already rejects requests when no public key is cached. Add the same check to atmel_ecdh_compute_shared_secret() to prevent the device from using a private key that was not generated for the current tfm.
--- drivers/crypto/atmel-ecc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/crypto/atmel-ecc.c +3 -0
@@ -165,6 +165,9 @@ static int atmel_ecdh_compute_shared_secret(struct kpp_request *req)return crypto_kpp_compute_shared_secret (req); } +if (!ctx->public_key) +return -EINVAL ; +/* A P-256 public key must contain two 32-byte coordinates */ if (req->src_len !=ATMEL_ECC_PUBKEY_SIZE )return -EINVAL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 202/1518 crypto: atmel-sha204a - fix heap info leak on I2C transfer failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lothar Rubusch <[email protected]>
[ Upstream commit 72bbf11ba14bd7d5fbf31a1ec42fff608b657f74 ]
The nonblocking RNG path allocates a work_data structure to track the state of an in-flight asynchronous I2C request. This pointer is stored in rng->priv and later consumed by the read path once the transaction completes.
If the underlying I2C transfer fails, the completion callback is invoked with a non-zero status. In this case, the allocated work_data is not usable for producing RNG output and must not remain associated with the hwrng state.
Previously, the failure path only logged a warning but left the pointer state uncleared, which can result in subsequent read attempts observing stale state and interpreting it as valid completion data.
Fix this by freeing the pending work_data. The I2C transaction reports an error. This ensures that failed requests do not leave residual state behind that could be interpreted as valid RNG data on later reads. Clearing rng->priv is done at the subsequent call to nonblocking read.
--- drivers/crypto/atmel-sha204a.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/crypto/atmel-sha204a.c +5 -1
@@ -31,10 +31,14 @@ static void atmel_sha204a_rng_done(struct atmel_i2c_work_data *work_data,struct atmel_i2c_client_priv *i2c_priv = work_data->ctx;struct hwrng *rng = areq; -if (status) +if (status) {dev_warn_ratelimited (&i2c_priv->client->dev,"i2c transaction failed (%d)\n" , status); +kfree (work_data); +atomic_dec (&i2c_priv->tfm_count); +return ; + } rng->priv = (unsigned long )work_data;atomic_dec (&i2c_priv->tfm_count);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 203/1518 crypto: sa2ul - stop probe if context pool creation fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit d03f980a25853f6a380895119a572a3bb1194e8d ]
sa_ul_probe() calls sa_init_mem() to create the DMA pool used for security context buffers, but ignores its return value. If pool creation fails, probe still continues with DMA setup, algorithm registration and child population even though later request setup depends on that pool.
Stop probing when sa_init_mem() fails, and route that failure to the PM cleanup path without attempting to destroy an uncreated DMA pool.
--- drivers/crypto/sa2ul.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/crypto/sa2ul.c +5 -1
@@ -2395,7 +2395,10 @@ static int sa_ul_probe(struct platform_device *pdev)return ret; } -sa_init_mem (dev_data); + ret =sa_init_mem (dev_data); +if (ret) + goto disable_pm; + ret =sa_dma_init (dev_data);if (ret) goto destroy_dma_pool;
@@ -2430,6 +2433,7 @@ static int sa_ul_probe(struct platform_device *pdev) destroy_dma_pool:dma_pool_destroy (dev_data->sc_pool); +disable_pm:pm_runtime_put_sync (dev);pm_runtime_disable (dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 204/1518 hwrng: xilinx-trng - propagate timeout before any data is read
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit ba088974419326daf46c5dc03e2cf6ab6ab701f7 ]
xtrng_readblock32() polls for 16-byte chunks but returns the number of bytes read even when the first poll times out. Its caller then treats a zero return as a short successful read, and partial reads for full 32-byte blocks can make the tail copy use a fixed block offset rather than the amount already produced.
Return the poll error when no data has been read, preserve partial positive returns after some data is available, stop the generator on all collection exits, and append tail bytes at the current output count.
--- drivers/crypto/xilinx/xilinx-trng.c | 32 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/crypto/xilinx/xilinx-trng.c +24 -8
@@ -91,8 +91,8 @@ static void xtrng_softreset(struct xilinx_rng *rng)xtrng_readwrite32 (rng->rng_base +TRNG_CTRL_OFFSET ,TRNG_CTRL_PRNGSRST_MASK ,0 ); } -/* Return no. of bytes read */ -static size_t xtrng_readblock32 (void __iomem *rng_base,__be32 *buf,int blocks32,bool wait) +/* Return no. of bytes read or a negative error before any data is read. */ +static int xtrng_readblock32 (void __iomem *rng_base,__be32 *buf,int blocks32,bool wait) {int read =0 , ret;int timeout =1 ;
@@ -107,8 +107,11 @@ static size_t xtrng_readblock32(void __iomem *rng_base, __be32 *buf, int blocks3 ret =readl_poll_timeout (rng_base +TRNG_STATUS_OFFSET , val, (val &TRNG_STATUS_QCNT_MASK ) ==TRNG_STATUS_QCNT_16_BYTES , !!wait, timeout); -if (ret) +if (ret) { +if (!read) +return ret;break ; + }for (idx =0 ; idx <TRNG_READ_4_WORD ; idx++) { *(buf + read) =cpu_to_be32 (ioread32 (rng_base +TRNG_CORE_OUTPUT_OFFSET ));
@@ -123,27 +126,40 @@ static int xtrng_collect_random_data(struct xilinx_rng *rng, u8 *rand_gen_buf, {u8 randbuf[TRNG_SEC_STRENGTH_BYTES ];int byteleft, blocks, count =0 ; +int full_blocks_bytes;int ret; byteleft = no_of_random_bytes & (TRNG_SEC_STRENGTH_BYTES -1 ); blocks = no_of_random_bytes >>TRNG_SEC_STRENGTH_SHIFT ; + full_blocks_bytes = blocks *TRNG_SEC_STRENGTH_BYTES ;xtrng_readwrite32 (rng->rng_base +TRNG_CTRL_OFFSET ,TRNG_CTRL_PRNGSTART_MASK ,TRNG_CTRL_PRNGSTART_MASK );if (blocks) { ret =xtrng_readblock32 (rng->rng_base, (__be32 *)rand_gen_buf, blocks, wait); -if (!ret) -return 0 ; +if (ret <=0 ) { + count = ret; + goto out_stop; + } count += ret; +if (ret < full_blocks_bytes) + goto out_stop; }if (byteleft) { ret =xtrng_readblock32 (rng->rng_base, (__be32 *)randbuf,1 , wait); +if (ret <0 ) { +if (!count) + count = ret; + goto out_stop; + }if (!ret) -return count; -memcpy (rand_gen_buf + (blocks *TRNG_SEC_STRENGTH_BYTES ), randbuf, byteleft); - count += byteleft; + goto out_stop; + ret =min (ret, no_of_random_bytes - count); +memcpy (rand_gen_buf + count, randbuf, ret); + count += ret; } +out_stop:xtrng_readwrite32 (rng->rng_base +TRNG_CTRL_OFFSET ,TRNG_CTRL_PRNGMODE_MASK |TRNG_CTRL_PRNGSTART_MASK ,0U );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 205/1518 crypto: rk3288 - fail ahash requests on HASH idle timeout
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit ae150db7826f21e8d19e54fb6243169628809c4d ]
rk_hash_run() waits for RK_CRYPTO_HASH_STS to become idle after the final DMA transfer, but ignores the poll result. If the hash engine never becomes idle, the driver still reads the digest registers and finalizes the request with the previous success value.
Store the poll result and finalize the request with the timeout error before reading the digest registers.
--- drivers/crypto/rockchip/rk3288_crypto_ahash.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/crypto/rockchip/rk3288_crypto_ahash.c +6 -1
@@ -324,7 +324,12 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)* efficiency, and make it response quickly when dma * complete. */ -readl_poll_timeout (rkc->reg +RK_CRYPTO_HASH_STS , v, v ==0 ,10 ,1000 ); + err =readl_poll_timeout (rkc->reg +RK_CRYPTO_HASH_STS , v, + v ==0 ,10 ,1000 ); +if (err) { +dev_err (rkc->dev,"HASH idle timeout\n" ); + goto theend; + }for (i =0 ; i <crypto_ahash_digestsize (tfm) /4 ; i++) { v =readl (rkc->reg +RK_CRYPTO_HASH_DOUT_0 + i *4 );
Signature · 1 line
2.53.0