6.6.33-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 382/744 selftests: net: bridge: increase IGMP/MLD exclude timeout membership interval
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 06080ea23095afe04a2cb7a8d05fab4311782623 ]
When running the bridge IGMP/MLD selftests on debug kernels we can get spurious errors when setting up the IGMP/MLD exclude timeout tests because the membership interval is just 3 seconds and the setup has 2 seconds of sleep plus various validations, the one second that is left is not enough. Increase the membership interval from 3 to 5 seconds to make room for the setup validation and 2 seconds of sleep.
--- tools/testing/selftests/net/forwarding/bridge_igmp.sh | 6 +++--- tools/testing/selftests/net/forwarding/bridge_mld.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/net/forwarding/bridge_igmp.sh +3 -3
@@ -478,10 +478,10 @@ v3exc_timeout_test() RET=0 local X=("192.0.2.20" "192.0.2.30") - # GMI should be 3 seconds + # GMI should be 5 seconds ip link set dev br0 type bridge mcast_query_interval 100 \ mcast_query_response_interval 100 \ - mcast_membership_interval 300 + mcast_membership_interval 500 v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP ip link set dev br0 type bridge mcast_query_interval 500 \
@@ -489,7 +489,7 @@ v3exc_timeout_test() mcast_membership_interval 1500 $MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2" -q - sleep 3 + sleep 5 bridge -j -d -s mdb show dev br0 \ | jq -e ".[].mdb[] | \ select(.grp == \"$TEST_GROUP\" and \
tools/testing/selftests/net/forwarding/bridge_mld.sh +3 -3
@@ -478,10 +478,10 @@ mldv2exc_timeout_test() RET=0 local X=("2001:db8:1::20" "2001:db8:1::30") - # GMI should be 3 seconds + # GMI should be 5 seconds ip link set dev br0 type bridge mcast_query_interval 100 \ mcast_query_response_interval 100 \ - mcast_membership_interval 300 + mcast_membership_interval 500 mldv2exclude_prepare $h1 ip link set dev br0 type bridge mcast_query_interval 500 \
@@ -489,7 +489,7 @@ mldv2exc_timeout_test() mcast_membership_interval 1500 $MZ $h1 -c 1 $MZPKT_ALLOW2 -q - sleep 3 + sleep 5 bridge -j -d -s mdb show dev br0 \ | jq -e ".[].mdb[] | \ select(.grp == \"$TEST_GROUP\" and \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 383/744 net: bridge: mst: fix vlan use-after-free
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 3a7c1661ae1383364cd6092d851f5e5da64d476b ]
syzbot reported a suspicious rcu usage[1] in bridge's mst code. While fixing it I noticed that nothing prevents a vlan to be freed while walking the list from the same path (br forward delay timer). Fix the rcu usage and also make sure we are not accessing freed memory by making br_mst_vlan_set_state use rcu read lock.
[1]
WARNING: suspicious RCU usage
6.9.0-rc6-syzkaller #0 Not tainted
-----------------------------
net/bridge/br_private.h:1599 suspicious rcu_dereference_protected() usage!
...
stack backtrace: CPU: 1 PID: 8017 Comm: syz-executor.1 Not tainted 6.9.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 lockdep_rcu_suspicious+0x221/0x340 kernel/locking/lockdep.c:6712 nbp_vlan_group net/bridge/br_private.h:1599 [inline] br_mst_set_state+0x1ea/0x650 net/bridge/br_mst.c:105 br_set_state+0x28a/0x7b0 net/bridge/br_stp.c:47 br_forward_delay_timer_expired+0x176/0x440 net/bridge/br_stp_timer.c:88 call_timer_fn+0x18e/0x650 kernel/time/timer.c:1793 expire_timers kernel/time/timer.c:1844 [inline] __run_timers kernel/time/timer.c:2418 [inline] __run_timer_base+0x66a/0x8e0 kernel/time/timer.c:2429 run_timer_base kernel/time/timer.c:2438 [inline] run_timer_softirq+0xb7/0x170 kernel/time/timer.c:2448 __do_softirq+0x2c6/0x980 kernel/softirq.c:554 invoke_softirq kernel/softirq.c:428 [inline] __irq_exit_rcu+0xf2/0x1c0 kernel/softirq.c:633 irq_exit_rcu+0x9/0x30 kernel/softirq.c:645 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1043 [inline] sysvec_apic_timer_interrupt+0xa6/0xc0 arch/x86/kernel/apic/apic.c:1043 </IRQ> <TASK> asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:702 RIP: 0010:lock_acquire+0x264/0x550 kernel/locking/lockdep.c:5758 Code: 2b 00 74 08 4c 89 f7 e8 ba d1 84 00 f6 44 24 61 02 0f 85 85 01 00 00 41 f7 c7 00 02 00 00 74 01 fb 48 c7 44 24 40 0e 36 e0 45 <4b> c7 44 25 00 00 00 00 00 43 c7 44 25 09 00 00 00 00 43 c7 44 25 RSP: 0018:ffffc90013657100 EFLAGS: 00000206 RAX: 0000000000000001 RBX: 1ffff920026cae2c RCX: 0000000000000001 RDX: dffffc0000000000 RSI: ffffffff8bcaca00 RDI: ffffffff8c1eaa60 RBP: ffffc90013657260 R08: ffffffff92efe507 R09: 1ffffffff25dfca0 R10: dffffc0000000000 R11: fffffbfff25dfca1 R12: 1ffff920026cae28 R13: dffffc0000000000 R14: ffffc90013657160 R15: 0000000000000246
--- net/bridge/br_mst.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/bridge/br_mst.c +10 -6
@@ -78,7 +78,7 @@ static void br_mst_vlan_set_state(struct net_bridge_port *p, struct net_bridge_v {struct net_bridge_vlan_group *vg =nbp_vlan_group (p); -if (v->state == state) +if (br_vlan_get_state (v) == state)return ;br_vlan_set_state (v, state);
@@ -100,11 +100,12 @@ int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state, };struct net_bridge_vlan_group *vg;struct net_bridge_vlan *v; -int err; +int err =0 ; +rcu_read_lock (); vg =nbp_vlan_group (p);if (!vg) -return 0 ; + goto out;/* MSTI 0 (CST) state changes are notified via the regular * SWITCHDEV_ATTR_ID_PORT_STP_STATE.
@@ -112,17 +113,20 @@ int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state,if (msti) { err =switchdev_port_attr_set (p->dev, &attr, extack);if (err && err != -EOPNOTSUPP ) -return err; + goto out; } -list_for_each_entry (v, &vg->vlan_list, vlist) { + err =0 ; +list_for_each_entry_rcu (v, &vg->vlan_list, vlist) {if (v->brvlan->msti != msti)continue ;br_mst_vlan_set_state (p, v, state); } -return 0 ; +out: +rcu_read_unlock (); +return err; }static void br_mst_vlan_sync_state (struct net_bridge_vlan *pv,u16 msti)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 384/744 net: qrtr: ns: Fix module refcnt
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Lew <[email protected]>
[ Upstream commit fd76e5ccc48f9f54eb44909dd7c0b924005f1582 ]
The qrtr protocol core logic and the qrtr nameservice are combined into a single module. Neither the core logic or nameservice provide much functionality by themselves; combining the two into a single module also prevents any possible issues that may stem from client modules loading inbetween qrtr and the ns.
Creating a socket takes two references to the module that owns the socket protocol. Since the ns needs to create the control socket, this creates a scenario where there are always two references to the qrtr module. This prevents the execution of 'rmmod' for qrtr.
To resolve this, forcefully put the module refcount for the socket opened by the nameservice.
--- net/qrtr/ns.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
net/qrtr/ns.c +27 -0
@@ -725,6 +725,24 @@ int qrtr_ns_init(void)if (ret <0 ) goto err_wq; +/* As the qrtr ns socket owner and creator is the same module, we have +* to decrease the qrtr module reference count to guarantee that it +* remains zero after the ns socket is created, otherwise, executing +* "rmmod" command is unable to make the qrtr module deleted after the +* qrtr module is inserted successfully. +* +* However, the reference count is increased twice in +* sock_create_kern(): one is to increase the reference count of owner +* of qrtr socket's proto_ops struct; another is to increment the +* reference count of owner of qrtr proto struct. Therefore, we must +* decrement the module reference count twice to ensure that it keeps +* zero after server's listening socket is created. Of course, we +* must bump the module reference count twice as well before the socket +* is closed. +*/ +module_put (qrtr_ns.sock->ops->owner); +module_put (qrtr_ns.sock->sk->sk_prot_creator->owner); +return 0 ; err_wq:
@@ -739,6 +757,15 @@ void qrtr_ns_remove(void) {cancel_work_sync (&qrtr_ns.work);destroy_workqueue (qrtr_ns.workqueue); + +/* sock_release() expects the two references that were put during +* qrtr_ns_init(). This function is only called during module remove, +* so try_stop_module() has already set the refcnt to 0. Use +* __module_get() instead of try_module_get() to successfully take two +* references. +*/ +__module_get (qrtr_ns.sock->ops->owner); +__module_get (qrtr_ns.sock->sk->sk_prot_creator->owner);sock_release (qrtr_ns.sock); }EXPORT_SYMBOL_GPL (qrtr_ns_remove);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 385/744 netrom: fix possible dead-lock in nr_rt_ioctl()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit e03e7f20ebf7e1611d40d1fdc1bde900fd3335f6 ]
syzbot loves netrom, and found a possible deadlock in nr_rt_ioctl [1]
Make sure we always acquire nr_node_list_lock before nr_node_lock(nr_node)
[1]
WARNING: possible circular locking dependency detected 6.9.0-rc7-syzkaller-02147-g654de42f3fc6 #0 Not tainted
------------------------------------------------------
syz-executor350/5129 is trying to acquire lock:
ffff8880186e2070 (&nr_node->node_lock){+...}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:356 [inline] ffff8880186e2070 (&nr_node->node_lock){+...}-{2:2}, at: nr_node_lock include/net/netrom.h:152 [inline] ffff8880186e2070 (&nr_node->node_lock){+...}-{2:2}, at: nr_dec_obs net/netrom/nr_route.c:464 [inline] ffff8880186e2070 (&nr_node->node_lock){+...}-{2:2}, at: nr_rt_ioctl+0x1bb/0x1090 net/netrom/nr_route.c:697
but task is already holding lock:
ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:356 [inline] ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: nr_dec_obs net/netrom/nr_route.c:462 [inline] ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: nr_rt_ioctl+0x10a/0x1090 net/netrom/nr_route.c:697
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (nr_node_list_lock){+...}-{2:2}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock_bh include/linux/spinlock_api_smp.h:126 [inline]
_raw_spin_lock_bh+0x35/0x50 kernel/locking/spinlock.c:178
spin_lock_bh include/linux/spinlock.h:356 [inline]
nr_remove_node net/netrom/nr_route.c:299 [inline]
nr_del_node+0x4b4/0x820 net/netrom/nr_route.c:355
nr_rt_ioctl+0xa95/0x1090 net/netrom/nr_route.c:683
sock_do_ioctl+0x158/0x460 net/socket.c:1222
sock_ioctl+0x629/0x8e0 net/socket.c:1341
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:904 [inline]
__se_sys_ioctl+0xfc/0x170 fs/ioctl.c:890
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f-> #0 (&nr_node->node_lock){+...}-{2:2}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__raw_spin_lock_bh include/linux/spinlock_api_smp.h:126 [inline]
_raw_spin_lock_bh+0x35/0x50 kernel/locking/spinlock.c:178
spin_lock_bh include/linux/spinlock.h:356 [inline]
nr_node_lock include/net/netrom.h:152 [inline]
nr_dec_obs net/netrom/nr_route.c:464 [inline]
nr_rt_ioctl+0x1bb/0x1090 net/netrom/nr_route.c:697
sock_do_ioctl+0x158/0x460 net/socket.c:1222
sock_ioctl+0x629/0x8e0 net/socket.c:1341
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:904 [inline]
__se_sys_ioctl+0xfc/0x170 fs/ioctl.c:890
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7fother info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(nr_node_list_lock);
lock(&nr_node->node_lock);
lock(nr_node_list_lock); lock(&nr_node->node_lock);
*** DEADLOCK ***
1 lock held by syz-executor350/5129:
#0: ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:356 [inline] #0: ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: nr_dec_obs net/netrom/nr_route.c:462 [inline] #0: ffffffff8f7053b8 (nr_node_list_lock){+...}-{2:2}, at: nr_rt_ioctl+0x10a/0x1090 net/netrom/nr_route.c:697
stack backtrace: CPU: 0 PID: 5129 Comm: syz-executor350 Not tainted 6.9.0-rc7-syzkaller-02147-g654de42f3fc6 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 check_noncircular+0x36a/0x4a0 kernel/locking/lockdep.c:2187 check_prev_add kernel/locking/lockdep.c:3134 [inline] check_prevs_add kernel/locking/lockdep.c:3253 [inline] validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869 __lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137 lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754 __raw_spin_lock_bh include/linux/spinlock_api_smp.h:126 [inline] _raw_spin_lock_bh+0x35/0x50 kernel/locking/spinlock.c:178 spin_lock_bh include/linux/spinlock.h:356 [inline] nr_node_lock include/net/netrom.h:152 [inline] nr_dec_obs net/netrom/nr_route.c:464 [inline] nr_rt_ioctl+0x1bb/0x1090 net/netrom/nr_route.c:697 sock_do_ioctl+0x158/0x460 net/socket.c:1222 sock_ioctl+0x629/0x8e0 net/socket.c:1341 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:904 [inline] __se_sys_ioctl+0xfc/0x170 fs/ioctl.c:890 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- net/netrom/nr_route.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
net/netrom/nr_route.c +7 -12
@@ -285,22 +285,14 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic,return 0 ; } -static inline void __nr_remove_node (struct nr_node *nr_node) +static void nr_remove_node_locked (struct nr_node *nr_node) { +lockdep_assert_held (&nr_node_list_lock); +hlist_del_init (&nr_node->node_node);nr_node_put (nr_node); } -#define nr_remove_node_locked (__node) \ - __nr_remove_node(__node) - -static void nr_remove_node (struct nr_node *nr_node) -{ -spin_lock_bh (&nr_node_list_lock); -__nr_remove_node (nr_node); -spin_unlock_bh (&nr_node_list_lock); -} -static inline void __nr_remove_neigh (struct nr_neigh *nr_neigh) {hlist_del_init (&nr_neigh->neigh_node);
@@ -339,6 +331,7 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct nreturn -EINVAL ; } +spin_lock_bh (&nr_node_list_lock);nr_node_lock (nr_node);for (i =0 ; i < nr_node->count; i++) {if (nr_node->routes[i].neighbour == nr_neigh) {
@@ -352,7 +345,7 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n nr_node->count--;if (nr_node->count ==0 ) { -nr_remove_node (nr_node); +nr_remove_node_locked (nr_node); }else {switch (i) {case 0 :
@@ -367,12 +360,14 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct nnr_node_put (nr_node); }nr_node_unlock (nr_node); +spin_unlock_bh (&nr_node_list_lock);return 0 ; } }nr_neigh_put (nr_neigh);nr_node_unlock (nr_node); +spin_unlock_bh (&nr_node_list_lock);nr_node_put (nr_node);return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 386/744 af_packet: do not call packet_read_pending() from tpacket_destruct_skb()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 581073f626e387d3e7eed55c48c8495584ead7ba ]
trafgen performance considerably sank on hosts with many cores after the blamed commit.
packet_read_pending() is very expensive, and calling it in af_packet fast path defeats Daniel intent in commit b013840810c2 ("packet: use percpu mmap tx frame pending refcount")
tpacket_destruct_skb() makes room for one packet, we can immediately wakeup a producer, no need to completely drain the tx ring.
--- net/packet/af_packet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/packet/af_packet.c +1 -2
@@ -2528,8 +2528,7 @@ static void tpacket_destruct_skb(struct sk_buff *skb) ts =__packet_set_timestamp (po, ph, skb);__packet_set_status (po, ph,TP_STATUS_AVAILABLE | ts); -if (!packet_read_pending (&po->tx_ring)) -complete (&po->skb_completion); +complete (&po->skb_completion); }sock_wfree (skb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 387/744 sched/fair: Allow disabling sched_balance_newidle with sched_relax_domain_level
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitalii Bursov <[email protected]>
[ Upstream commit a1fd0b9d751f840df23ef0e75b691fc00cfd4743 ]
Change relax_domain_level checks so that it would be possible to include or exclude all domains from newidle balancing.
This matches the behavior described in the documentation:
-1 no request. use system default or follow request of others. 0 no search. 1 search siblings (hyperthreads in a core).
"2" enables levels 0 and 1, level_max excludes the last (level_max) level, and level_max+1 includes all levels.
--- kernel/cgroup/cpuset.c | 2 +- kernel/sched/topology.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/cgroup/cpuset.c +1 -1
@@ -2229,7 +2229,7 @@ bool current_cpuset_is_being_rebound(void)static int update_relax_domain_level (struct cpuset *cs,s64 val) {#ifdef CONFIG_SMP -if (val <-1 || val >= sched_domain_level_max) +if (val <-1 || val > sched_domain_level_max +1 )return -EINVAL ;#endif
kernel/sched/topology.c +1 -1
@@ -1452,7 +1452,7 @@ static void set_domain_attribute(struct sched_domain *sd, }else request = attr->relax_domain_level; -if (sd->level > request) { +if (sd->level >= request) {/* Turn off idle balance on this domain: */ sd->flags &= ~(SD_BALANCE_WAKE |SD_BALANCE_NEWIDLE ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 388/744 sched/core: Fix incorrect initialization of the burst parameter in cpu_max_write()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cheng Yu <[email protected]>
[ Upstream commit 49217ea147df7647cb89161b805c797487783fc0 ]
In the cgroup v2 CPU subsystem, assuming we have a cgroup named 'test', and we set cpu.max and cpu.max.burst:
# echo 1000000 > /sys/fs/cgroup/test/cpu.max
# echo 1000000 > /sys/fs/cgroup/test/cpu.max.burstthen we check cpu.max and cpu.max.burst:
# cat /sys/fs/cgroup/test/cpu.max
1000000 100000
# cat /sys/fs/cgroup/test/cpu.max.burst
1000000Next we set cpu.max again and check cpu.max and
cpu.max.burst:
# echo 2000000 > /sys/fs/cgroup/test/cpu.max
# cat /sys/fs/cgroup/test/cpu.max
2000000 100000 # cat /sys/fs/cgroup/test/cpu.max.burst
1000... we find that the cpu.max.burst value changed unexpectedly.
In cpu_max_write(), the unit of the burst value returned by tg_get_cfs_burst() is microseconds, while in cpu_max_write(), the burst unit used for calculation should be nanoseconds, which leads to the bug.
To fix it, get the burst value directly from tg->cfs_bandwidth.burst.
--- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/core.c +1 -1
@@ -11429,7 +11429,7 @@ static ssize_t cpu_max_write(struct kernfs_open_file *of, {struct task_group *tg =css_tg (of_css (of));u64 period =tg_get_cfs_period (tg); -u64 burst =tg_get_cfs_burst (tg); +u64 burst = tg->cfs_bandwidth.burst;u64 quota;int ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 389/744 net: wangxun: fix to change Rx features
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiawen Wu <[email protected]>
[ Upstream commit 68067f065ee730c7c67b361c3c81808d25d5a90b ]
Fix the issue where some Rx features cannot be changed.
When using ethtool -K to turn off rx offload, it returns error and displays "Could not change any device features". And netdev->features is not assigned a new value to actually configure the hardware.
--- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/wangxun/libwx/wx_lib.c +3 -1
@@ -2646,12 +2646,14 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features)else wr32m (wx,WX_RDB_RA_CTL ,WX_RDB_RA_CTL_RSS_EN ,0 ); + netdev->features = features; +if (changed & (NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_STAG_RX ))wx_set_rx_mode (netdev); -return 1 ; +return 0 ; }EXPORT_SYMBOL (wx_set_features);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 390/744 perf record: Delete session after stopping sideband thread
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 88ce0106a1f603bf360cb397e8fe293f8298fabb ]
The session has a header in it which contains a perf env with bpf_progs. The bpf_progs are accessed by the sideband thread and so the sideband thread must be stopped before the session is deleted, to avoid a use after free. This error was detected by AddressSanitizer in the following:
==2054673==ERROR: AddressSanitizer: heap-use-after-free on address 0x61d000161e00 at pc 0x55769289de54 bp 0x7f9df36d4ab0 sp 0x7f9df36d4aa8 READ of size 8 at 0x61d000161e00 thread T1
#0 0x55769289de53 in __perf_env__insert_bpf_prog_info util/env.c:42
#1 0x55769289dbb1 in perf_env__insert_bpf_prog_info util/env.c:29
#2 0x557692bbae29 in perf_env__add_bpf_info util/bpf-event.c:483
#3 0x557692bbb01a in bpf_event__sb_cb util/bpf-event.c:512
#4 0x5576928b75f4 in perf_evlist__poll_thread util/sideband_evlist.c:68
#5 0x7f9df96a63eb in start_thread nptl/pthread_create.c:444
#6 0x7f9df9726a4b in clone3 ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 0x61d000161e00 is located 384 bytes inside of 2136-byte region [0x61d000161c80,0x61d0001624d8) freed by thread T0 here:
#0 0x7f9dfa6d7288 in __interceptor_free libsanitizer/asan/asan_malloc_linux.cpp:52
#1 0x557692978d50 in perf_session__delete util/session.c:319
#2 0x557692673959 in __cmd_record tools/perf/builtin-record.c:2884
#3 0x55769267a9f0 in cmd_record tools/perf/builtin-record.c:4259
#4 0x55769286710c in run_builtin tools/perf/perf.c:349
#5 0x557692867678 in handle_internal_command tools/perf/perf.c:402
#6 0x557692867a40 in run_argv tools/perf/perf.c:446
#7 0x557692867fae in main tools/perf/perf.c:562
#8 0x7f9df96456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58--- tools/perf/builtin-record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -2822,10 +2822,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) }#endif zstd_fini (&session->zstd_data); -perf_session__delete (session); -if (!opts->no_bpf_event)evlist__stop_sb_thread (rec->sb_evlist); + +perf_session__delete (session);return status; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 391/744 perf probe: Add missing libgen.h header needed for using basename()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 581037151910126a7934e369e4b6ac70eda9a703 ]
This prototype is obtained indirectly, by luck, from some other header in probe-event.c in most systems, but recently exploded on alpine:edge:
8 13.39 alpine:edge : FAIL gcc version 13.2.1 20240309 (Alpine 13.2.1_git20240309)
util/probe-event.c: In function 'convert_exec_to_group':
util/probe-event.c:225:16: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration]
225 | ptr1 = basename(exec_copy);
| ^~~~~~~~
util/probe-event.c:225:14: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
225 | ptr1 = basename(exec_copy);
| ^
cc1: all warnings being treated as errors
make[3]: *** [/git/perf-6.8.0/tools/build/Makefile.build:158: util] Error 2
Fix it by adding the libgen.h header where basename() is prototyped.
--- tools/perf/util/probe-event.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/probe-event.c +1 -0
@@ -11,6 +11,7 @@#include <sys/stat.h> #include <fcntl.h> #include <errno.h> +#include <libgen.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h>
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 392/744 iio: core: Leave private pointer NULL when no private data supplied
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit f0245ab389330cbc1d187e358a5b890d9f5383db ]
In iio_device_alloc() when size of the private data is 0, the private pointer is calculated to point behind the valid data. Leave it NULL when no private data supplied.
--- drivers/iio/industrialio-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iio/industrialio-core.c +4 -2
@@ -1649,8 +1649,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)return NULL ; indio_dev = &iio_dev_opaque->indio_dev; - indio_dev->priv = (char *)iio_dev_opaque + -ALIGN (sizeof (struct iio_dev_opaque ),IIO_DMA_MINALIGN ); + +if (sizeof_priv) + indio_dev->priv = (char *)iio_dev_opaque + +ALIGN (sizeof (*iio_dev_opaque),IIO_DMA_MINALIGN ); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 393/744 greybus: lights: check return of get_channel_from_mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rui Miguel Silva <[email protected]>
[ Upstream commit a1ba19a1ae7cd1e324685ded4ab563e78fe68648 ]
If channel for the given node is not found we return null from get_channel_from_mode. Make sure we validate the return pointer before using it in two of the missing places.
This was originally reported in [0]:
Found by Linux Verification Center (linuxtesting.org) with SVACE.
[0] https://lore.kernel.org/all/[email protected]
--- drivers/staging/greybus/light.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/greybus/light.c +7 -1
@@ -147,6 +147,9 @@ static int __gb_lights_flash_brightness_set(struct gb_channel *channel) channel =get_channel_from_mode (channel->light,GB_CHANNEL_MODE_TORCH ); +if (!channel) +return -EINVAL ; +/* For not flash we need to convert brightness to intensity */ intensity = channel->intensity_uA.min + (channel->intensity_uA.step * channel->led->brightness);
@@ -549,7 +552,10 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) } channel_flash =get_channel_from_mode (light,GB_CHANNEL_MODE_FLASH ); -WARN_ON (!channel_flash); +if (!channel_flash) { +dev_err (dev,"failed to get flash channel from mode\n" ); +return -EINVAL ; + } fled = &channel_flash->fled;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 394/744 phy: qcom: qmp-combo: fix duplicate return in qmp_v4_configure_dp_phy
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neil Armstrong <[email protected]>
[ Upstream commit e298ae7caafcc429e0fc4b3779f1738c0acc5dac ]
Remove duplicate "return 0" in qmp_v4_configure_dp_phy()
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 -- 1 file changed, 2 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +0 -2
@@ -2334,8 +2334,6 @@ static int qmp_v4_configure_dp_phy(struct qmp_combo *qmp)writel (0x20 , qmp->dp_tx2 + cfg->regs[QPHY_TX_TX_EMP_POST1_LVL ]);return 0 ; - -return 0 ; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 395/744 f2fs: multidev: fix to recognize valid zero block address
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 33e62cd7b4c281cd737c62e5d8c4f0e602a8c5c5 ]
As reported by Yi Zhang in mailing list [1], kernel warning was catched during zbd/010 test as below:
./check zbd/010
zbd/010 (test gap zone support with F2FS) [failed]
runtime ... 3.752s
something found in dmesg:
[ 4378.146781] run blktests zbd/010 at 2024-02-18 11:31:13
[ 4378.192349] null_blk: module loaded
[ 4378.209860] null_blk: disk nullb0 created
[ 4378.413285] scsi_debug:sdebug_driver_probe: scsi_debug: trim
poll_queues to 0. poll_q/nr_hw = (0/1)
[ 4378.422334] scsi host15: scsi_debug: version 0191 [20210520]
dev_size_mb=1024, opts=0x0, submit_queues=1, statistics=0
[ 4378.434922] scsi 15:0:0:0: Direct-Access-ZBC Linux
scsi_debug 0191 PQ: 0 ANSI: 7
[ 4378.443343] scsi 15:0:0:0: Power-on or device reset occurred
[ 4378.449371] sd 15:0:0:0: Attached scsi generic sg5 type 20
[ 4378.449418] sd 15:0:0:0: [sdf] Host-managed zoned block device
...
(See '/mnt/tests/gitlab.com/api/v4/projects/19168116/repository/archive.zip/storage/blktests/blk/blktests/results/nodev/zbd/010.dmesg'WARNING: CPU: 22 PID: 44011 at fs/iomap/iter.c:51 CPU: 22 PID: 44011 Comm: fio Not tainted 6.8.0-rc3+ #1 RIP: 0010:iomap_iter+0x32b/0x350 Call Trace: <TASK> __iomap_dio_rw+0x1df/0x830 f2fs_file_read_iter+0x156/0x3d0 [f2fs] aio_read+0x138/0x210 io_submit_one+0x188/0x8c0 __x64_sys_io_submit+0x8c/0x1a0 do_syscall_64+0x86/0x170 entry_SYSCALL_64_after_hwframe+0x6e/0x76
Shinichiro Kawasaki helps to analyse this issue and proposes a potential fixing patch in [2].
Quoted from reply of Shinichiro Kawasaki:
"I confirmed that the trigger commit is dbf8e63f48af as Yi reported. I took a look in the commit, but it looks fine to me. So I thought the cause is not in the commit diff.
I found the WARN is printed when the f2fs is set up with multiple devices, and read requests are mapped to the very first block of the second device in the direct read path. In this case, f2fs_map_blocks() and f2fs_map_blocks_cached() modify map->m_pblk as the physical block address from each block device. It becomes zero when it is mapped to the first block of the device. However, f2fs_iomap_begin() assumes that map->m_pblk is the physical block address of the whole f2fs, across the all block devices. It compares map->m_pblk against NULL_ADDR == 0, then go into the unexpected branch and sets the invalid iomap->length. The WARN catches the invalid iomap->length.
This WARN is printed even for non-zoned block devices, by following steps.
- Create two (non-zoned) null_blk devices memory backed with 128MB size each:
nullb0 and nullb1.
# mkfs.f2fs /dev/nullb0 -c /dev/nullb1
# mount -t f2fs /dev/nullb0 "${mount_dir}"
# dd if=/dev/zero of="${mount_dir}/test.dat" bs=1M count=192
# dd if="${mount_dir}/test.dat" of=/dev/null bs=1M count=192 iflag=direct..."
So, the root cause of this issue is: when multi-devices feature is on, f2fs_map_blocks() may return zero blkaddr in non-primary device, which is a verified valid block address, however, f2fs_iomap_begin() treats it as an invalid block address, and then it triggers the warning in iomap framework code.
Finally, as discussed, we decide to use a more simple and direct way that checking (map.m_flags & F2FS_MAP_MAPPED) condition instead of (map.m_pblk != NULL_ADDR) to fix this issue.
Thanks a lot for the effort of Yi Zhang and Shinichiro Kawasaki on this issue.
[1] https://lore.kernel.org/linux-f2fs-devel/CAHj4cs-kfojYC9i0G73PRkYzcxCTex=-vugRFeP40g_URGvnfQ@mail.gmail.com/
[2] https://lore.kernel.org/linux-f2fs-devel/gngdj77k4picagsfdtiaa7gpgnup6fsgwzsltx6milmhegmjff@iax2n4wvrqye/
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -4243,7 +4243,7 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,if (WARN_ON_ONCE (map.m_pblk ==COMPRESS_ADDR ))return -EINVAL ; -if (map.m_pblk !=NULL_ADDR ) { +if (map.m_flags &F2FS_MAP_MAPPED ) { iomap->length =blks_to_bytes (inode, map.m_len); iomap->type =IOMAP_MAPPED ; iomap->flags |=IOMAP_F_MERGED ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 396/744 f2fs: fix to wait on page writeback in __clone_blkaddrs()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit d3876e34e7e789e2cbdd782360fef2a777391082 ]
In below race condition, dst page may become writeback status in __clone_blkaddrs(), it needs to wait writeback before update, fix it.
Thread A GC Thread
- f2fs_move_file_range
- filemap_write_and_wait_range(dst)
- gc_data_segment
- f2fs_down_write(dst)
- move_data_page
- set_page_writeback(dst_page)
- f2fs_submit_page_write
- f2fs_up_write(dst)
- f2fs_down_write(dst)
- __exchange_data_block
- __clone_blkaddrs
- f2fs_get_new_data_page
- memcpy_page
--- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/file.c +3 -0
@@ -1305,6 +1305,9 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode,f2fs_put_page (psrc,1 );return PTR_ERR (pdst); } + +f2fs_wait_on_page_writeback (pdst,DATA , true, true); +memcpy_page (pdst,0 , psrc,0 ,PAGE_SIZE );set_page_dirty (pdst);set_page_private_gcing (pdst);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 397/744 fpga: manager: add owner module and take its refcount
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Pagani <[email protected]>
[ Upstream commit 4d4d2d4346857bf778fafaa97d6f76bb1663e3c9 ]
The current implementation of the fpga manager assumes that the low-level module registers a driver for the parent device and uses its owner pointer to take the module's refcount. This approach is problematic since it can lead to a null pointer dereference while attempting to get the manager if the parent device does not have a driver.
To address this problem, add a module owner pointer to the fpga_manager struct and use it to take the module's refcount. Modify the functions for registering the manager to take an additional owner module parameter and rename them to avoid conflicts. Use the old function names for helper macros that automatically set the module that registers the manager as the owner. This ensures compatibility with existing low-level control modules and reduces the chances of registering a manager without setting the owner.
Also, update the documentation to keep it consistent with the new interface for registering an fpga manager.
Other changes: opportunistically move put_device() from __fpga_mgr_get() to fpga_mgr_get() and of_fpga_mgr_get() to improve code clarity since the manager device is taken in these functions.
--- Documentation/driver-api/fpga/fpga-mgr.rst | 34 +++++---- drivers/fpga/fpga-mgr.c | 82 +++++++++++++--------- include/linux/fpga/fpga-mgr.h | 26 +++++-- 3 files changed, 89 insertions(+), 53 deletions(-)
Documentation/driver-api/fpga/fpga-mgr.rst +20 -14
@@ -24,7 +24,8 @@ How to support a new FPGA device -------------------------------- To add another FPGA manager, write a driver that implements a set of ops. The -probe function calls fpga_mgr_register() or fpga_mgr_register_full(), such as:: +probe function calls ``fpga_mgr_register()`` or ``fpga_mgr_register_full()``, +such as:: static const struct fpga_manager_ops socfpga_fpga_ops = { .write_init = socfpga_fpga_ops_configure_init,
@@ -69,10 +70,11 @@ probe function calls fpga_mgr_register() or fpga_mgr_register_full(), such as:: } Alternatively, the probe function could call one of the resource managed -register functions, devm_fpga_mgr_register() or devm_fpga_mgr_register_full(). -When these functions are used, the parameter syntax is the same, but the call -to fpga_mgr_unregister() should be removed. In the above example, the -socfpga_fpga_remove() function would not be required. +register functions, ``devm_fpga_mgr_register()`` or +``devm_fpga_mgr_register_full()``. When these functions are used, the +parameter syntax is the same, but the call to ``fpga_mgr_unregister()`` should be +removed. In the above example, the ``socfpga_fpga_remove()`` function would not be +required. The ops will implement whatever device specific register writes are needed to do the programming sequence for this particular FPGA. These ops return 0 for
@@ -125,15 +127,19 @@ API for implementing a new FPGA Manager driver * struct fpga_manager - the FPGA manager struct * struct fpga_manager_ops - Low level FPGA manager driver ops * struct fpga_manager_info - Parameter structure for fpga_mgr_register_full() -* fpga_mgr_register_full() - Create and register an FPGA manager using the +* __fpga_mgr_register_full() - Create and register an FPGA manager using the fpga_mgr_info structure to provide the full flexibility of options -* fpga_mgr_register() - Create and register an FPGA manager using standard +* __fpga_mgr_register() - Create and register an FPGA manager using standard arguments -* devm_fpga_mgr_register_full() - Resource managed version of - fpga_mgr_register_full() -* devm_fpga_mgr_register() - Resource managed version of fpga_mgr_register() +* __devm_fpga_mgr_register_full() - Resource managed version of + __fpga_mgr_register_full() +* __devm_fpga_mgr_register() - Resource managed version of __fpga_mgr_register() * fpga_mgr_unregister() - Unregister an FPGA manager +Helper macros ``fpga_mgr_register_full()``, ``fpga_mgr_register()``, +``devm_fpga_mgr_register_full()``, and ``devm_fpga_mgr_register()`` are available +to ease the registration. + .. kernel-doc:: include/linux/fpga/fpga-mgr.h :functions: fpga_mgr_states
@@ -147,16 +153,16 @@ API for implementing a new FPGA Manager driver :functions: fpga_manager_info .. kernel-doc:: drivers/fpga/fpga-mgr.c - :functions: fpga_mgr_register_full + :functions: __fpga_mgr_register_full .. kernel-doc:: drivers/fpga/fpga-mgr.c - :functions: fpga_mgr_register + :functions: __fpga_mgr_register .. kernel-doc:: drivers/fpga/fpga-mgr.c - :functions: devm_fpga_mgr_register_full + :functions: __devm_fpga_mgr_register_full .. kernel-doc:: drivers/fpga/fpga-mgr.c - :functions: devm_fpga_mgr_register + :functions: __devm_fpga_mgr_register .. kernel-doc:: drivers/fpga/fpga-mgr.c :functions: fpga_mgr_unregister
drivers/fpga/fpga-mgr.c +49 -33
208 lines not on this page · raw message
include/linux/fpga/fpga-mgr.h +20 -6
@@ -201,6 +201,7 @@ struct fpga_manager_ops {* @state: state of fpga manager * @compat_id: FPGA manager id for compatibility check. * @mops: pointer to struct of fpga manager ops +* @mops_owner: module containing the mops * @priv: low level driver private date */ struct fpga_manager {
@@ -210,6 +211,7 @@ struct fpga_manager {enum fpga_mgr_states state;struct fpga_compat_id *compat_id;const struct fpga_manager_ops *mops; +struct module *mops_owner;void *priv; };
@@ -230,18 +232,30 @@ struct fpga_manager *fpga_mgr_get(struct device *dev);void fpga_mgr_put (struct fpga_manager *mgr); +#define fpga_mgr_register_full (parent, info) \ + __fpga_mgr_register_full(parent, info, THIS_MODULE)struct fpga_manager * -fpga_mgr_register_full (struct device *parent,const struct fpga_manager_info *info); +__fpga_mgr_register_full (struct device *parent,const struct fpga_manager_info *info, +struct module *owner); +#define fpga_mgr_register (parent, name, mops, priv) \ + __fpga_mgr_register(parent, name, mops, priv, THIS_MODULE)struct fpga_manager * -fpga_mgr_register (struct device *parent,const char *name, -const struct fpga_manager_ops *mops,void *priv); +__fpga_mgr_register (struct device *parent,const char *name, +const struct fpga_manager_ops *mops,void *priv,struct module *owner); +void fpga_mgr_unregister (struct fpga_manager *mgr); +#define devm_fpga_mgr_register_full (parent, info) \ + __devm_fpga_mgr_register_full(parent, info, THIS_MODULE)struct fpga_manager * -devm_fpga_mgr_register_full (struct device *parent,const struct fpga_manager_info *info); +__devm_fpga_mgr_register_full (struct device *parent,const struct fpga_manager_info *info, +struct module *owner); +#define devm_fpga_mgr_register (parent, name, mops, priv) \ + __devm_fpga_mgr_register(parent, name, mops, priv, THIS_MODULE)struct fpga_manager * -devm_fpga_mgr_register (struct device *parent,const char *name, -const struct fpga_manager_ops *mops,void *priv); +__devm_fpga_mgr_register (struct device *parent,const char *name, +const struct fpga_manager_ops *mops,void *priv, +struct module *owner);#endif /*_LINUX_FPGA_MGR_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 398/744 fpga: bridge: add owner module and take its refcount
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Pagani <[email protected]>
[ Upstream commit 1da11f822042eb6ef4b6064dc048f157a7852529 ]
The current implementation of the fpga bridge assumes that the low-level module registers a driver for the parent device and uses its owner pointer to take the module's refcount. This approach is problematic since it can lead to a null pointer dereference while attempting to get the bridge if the parent device does not have a driver.
To address this problem, add a module owner pointer to the fpga_bridge struct and use it to take the module's refcount. Modify the function for registering a bridge to take an additional owner module parameter and rename it to avoid conflicts. Use the old function name for a helper macro that automatically sets the module that registers the bridge as the owner. This ensures compatibility with existing low-level control modules and reduces the chances of registering a bridge without setting the owner.
Also, update the documentation to keep it consistent with the new interface for registering an fpga bridge.
Other changes: opportunistically move put_device() from __fpga_bridge_get() to fpga_bridge_get() and of_fpga_bridge_get() to improve code clarity since the bridge device is taken in these functions.
--- Documentation/driver-api/fpga/fpga-bridge.rst | 7 ++- drivers/fpga/fpga-bridge.c | 57 ++++++++++--------- include/linux/fpga/fpga-bridge.h | 10 +++- 3 files changed, 43 insertions(+), 31 deletions(-)
Documentation/driver-api/fpga/fpga-bridge.rst +5 -2
@@ -6,9 +6,12 @@ API to implement a new FPGA bridge * struct fpga_bridge - The FPGA Bridge structure * struct fpga_bridge_ops - Low level Bridge driver ops -* fpga_bridge_register() - Create and register a bridge +* __fpga_bridge_register() - Create and register a bridge * fpga_bridge_unregister() - Unregister a bridge +The helper macro ``fpga_bridge_register()`` automatically sets +the module that registers the FPGA bridge as the owner. + .. kernel-doc:: include/linux/fpga/fpga-bridge.h :functions: fpga_bridge
@@ -16,7 +19,7 @@ API to implement a new FPGA bridge :functions: fpga_bridge_ops .. kernel-doc:: drivers/fpga/fpga-bridge.c - :functions: fpga_bridge_register + :functions: __fpga_bridge_register .. kernel-doc:: drivers/fpga/fpga-bridge.c :functions: fpga_bridge_unregister
drivers/fpga/fpga-bridge.c +31 -26
128 lines not on this page · raw message
include/linux/fpga/fpga-bridge.h +7 -3
@@ -45,6 +45,7 @@ struct fpga_bridge_info {* @dev: FPGA bridge device * @mutex: enforces exclusive reference to bridge * @br_ops: pointer to struct of FPGA bridge ops +* @br_ops_owner: module containing the br_ops * @info: fpga image specific information * @node: FPGA bridge list node * @priv: low level driver private date
@@ -54,6 +55,7 @@ struct fpga_bridge {struct device dev;struct mutex mutex;/* for exclusive reference to bridge */ const struct fpga_bridge_ops *br_ops; +struct module *br_ops_owner;struct fpga_image_info *info;struct list_head node;void *priv;
@@ -79,10 +81,12 @@ int of_fpga_bridge_get_to_list(struct device_node *np,struct fpga_image_info *info, struct list_head *bridge_list); +#define fpga_bridge_register (parent, name, br_ops, priv) \ + __fpga_bridge_register(parent, name, br_ops, priv, THIS_MODULE)struct fpga_bridge * -fpga_bridge_register (struct device *parent,const char *name, -const struct fpga_bridge_ops *br_ops, -void *priv); +__fpga_bridge_register (struct device *parent,const char *name, +const struct fpga_bridge_ops *br_ops,void *priv, +struct module *owner);void fpga_bridge_unregister (struct fpga_bridge *br);#endif /* _LINUX_FPGA_BRIDGE_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 399/744 counter: linux/counter.h: fix Excess kernel-doc description warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 416bdb89605d960405178b9bf04df512d1ace1a3 ]
Remove the @priv: line to prevent the kernel-doc warning:
include/linux/counter.h:400: warning: Excess struct member 'priv' description in 'counter_device'
--- include/linux/counter.h | 1 - 1 file changed, 1 deletion(-)
include/linux/counter.h +0 -1
@@ -359,7 +359,6 @@ struct counter_ops {* @num_counts: number of Counts specified in @counts * @ext: optional array of Counter device extensions * @num_ext: number of Counter device extensions specified in @ext -* @priv: optional private data supplied by driver * @dev: internal device structure * @chrdev: internal character device structure * @events_list: list of current watching Counter events
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 400/744 perf annotate: Get rid of duplicate --group option item
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 374af9f1f06b5e991c810d2e4983d6f58df32136 ]
The options array in cmd_annotate() has duplicate --group options. It only needs one and let's get rid of the other.
$ perf annotate -h 2>&1 | grep group
--group Show event group information together
--group Show event group information together--- tools/perf/builtin-annotate.c | 2 -- 1 file changed, 2 deletions(-)
tools/perf/builtin-annotate.c +0 -2
@@ -589,8 +589,6 @@ int cmd_annotate(int argc, const char **argv) "Enable symbol demangling"),OPT_BOOLEAN (0 ,"demangle-kernel" , &symbol_conf.demangle_kernel,"Enable kernel symbol demangling" ), -OPT_BOOLEAN (0 ,"group" , &symbol_conf.event_group, -"Show event group information together" ),OPT_BOOLEAN (0 ,"show-total-period" , &symbol_conf.show_total_period,"Show a column with the sum of periods" ), OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 401/744 usb: typec: ucsi: always register a link to USB PD device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit c0f66d78f42353d38b9608c05f211cf0773d93ac ]
UCSI driver will attempt to set a USB PD device only if it was able to read PDOs from the firmware. This results in suboptimal behaviour, since the PD device will be created anyway. Move calls to typec_port_set_usb_power_delivery() out of conditional code and call it after reading capabilities.
--- drivers/usb/typec/ucsi/ucsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +2 -2
@@ -1297,7 +1297,6 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con) } con->port_source_caps = pd_cap; -typec_port_set_usb_power_delivery (con->port, con->pd); }memset (&pd_caps,0 ,sizeof (pd_caps));
@@ -1314,9 +1313,10 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con) } con->port_sink_caps = pd_cap; -typec_port_set_usb_power_delivery (con->port, con->pd); } +typec_port_set_usb_power_delivery (con->port, con->pd); +/* Alternate modes */ ret =ucsi_register_altmodes (con,UCSI_RECIPIENT_CON );if (ret) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 402/744 usb: typec: ucsi: simplify partners PD caps registration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 41e1cd1401fcd1f1ae9e47574af2d9fc44a870b3 ]
In a way similar to the previous commit, move typec_partner_set_usb_power_delivery() to be called after reading the PD caps. This also removes calls to usb_power_delivery_unregister_capabilities() from the error path. Keep all capabilities registered until they are cleared by ucsi_unregister_partner_pdos().
--- drivers/usb/typec/ucsi/ucsi.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +1 -13
@@ -694,12 +694,6 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con)return PTR_ERR (cap); con->partner_source_caps = cap; - - ret =typec_partner_set_usb_power_delivery (con->partner, con->partner_pd); -if (ret) { -usb_power_delivery_unregister_capabilities (con->partner_source_caps); -return ret; - } } ret =ucsi_get_pdos (con,TYPEC_SINK ,1 , caps.pdo);
@@ -714,15 +708,9 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con)return PTR_ERR (cap); con->partner_sink_caps = cap; - - ret =typec_partner_set_usb_power_delivery (con->partner, con->partner_pd); -if (ret) { -usb_power_delivery_unregister_capabilities (con->partner_sink_caps); -return ret; - } } -return 0 ; +return typec_partner_set_usb_power_delivery (con->partner, con->partner_pd); }static void ucsi_unregister_partner_pdos (struct ucsi_connector *con)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 403/744 perf stat: Do not fail on metrics on s390 z/VM systems
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richter <[email protected]>
[ Upstream commit c2f3d7dfc7373d53286f2a5c882d3397a5070adc ]
On s390 z/VM virtual machines command 'perf list' also displays metrics:
# perf list | grep -A 20 'Metric Groups:' Metric Groups:
No_group:
cpi
[Cycles per Instruction]
est_cpi
[Estimated Instruction Complexity CPI infinite Level 1]
finite_cpi
[Cycles per Instructions from Finite cache/memory]
l1mp
[Level One Miss per 100 Instructions]
l2p
[Percentage sourced from Level 2 cache]
l3p
[Percentage sourced from Level 3 on same chip cache]
l4lp
[Percentage sourced from Level 4 Local cache on same book]
l4rp
[Percentage sourced from Level 4 Remote cache on different book]
memp
[Percentage sourced from memory]
....
#
The command
# perf stat -M cpi -- true
event syntax error: '{CPU_CYCLES/metric-id=CPU_CYCLES/.....'
\___ Bad event or PMU Unable to find PMU or event on a PMU of 'CPU_CYCLES'
event syntax error: '{CPU_CYCLES/metric-id=CPU_CYCLES/...'
\___ Cannot find PMU `CPU_CYCLES'.
Missing kernel support?
#
fails. 'perf stat' should not fail on metrics when the referenced CPU Counter Measurement PMU is not available.
Output after:
# perf stat -M est_cpi -- sleep 1
Performance counter stats for 'sleep 1':
1,000,887,494 ns duration_time # 0.00 est_cpi
1.000887494 seconds time elapsed
0.000143000 seconds user
0.000662000 seconds sys#
--- .../arch/s390/cf_z16/transaction.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
tools/perf/pmu-events/arch/s390/cf_z16/transaction.json +14 -14
@@ -2,71 +2,71 @@ { "BriefDescription": "Transaction count", "MetricName": "transaction", - "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL" + "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL if has_event(TX_C_TEND) else 0" }, { "BriefDescription": "Cycles per Instruction", "MetricName": "cpi", - "MetricExpr": "CPU_CYCLES / INSTRUCTIONS" + "MetricExpr": "CPU_CYCLES / INSTRUCTIONS if has_event(INSTRUCTIONS) else 0" }, { "BriefDescription": "Problem State Instruction Ratio", "MetricName": "prbstate", - "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100" + "MetricExpr": "(PROBLEM_STATE_INSTRUCTIONS / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" }, { "BriefDescription": "Level One Miss per 100 Instructions", "MetricName": "l1mp", - "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100" + "MetricExpr": "((L1I_DIR_WRITES + L1D_DIR_WRITES) / INSTRUCTIONS) * 100 if has_event(INSTRUCTIONS) else 0" }, { "BriefDescription": "Percentage sourced from Level 2 cache", "MetricName": "l2p", - "MetricExpr": "((DCW_REQ + DCW_REQ_IV + ICW_REQ + ICW_REQ_IV) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100" + "MetricExpr": "((DCW_REQ + DCW_REQ_IV + ICW_REQ + ICW_REQ_IV) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100 if has_event(DCW_REQ) else 0" }, { "BriefDescription": "Percentage sourced from Level 3 on same chip cache", "MetricName": "l3p", - "MetricExpr": "((DCW_REQ_CHIP_HIT + DCW_ON_CHIP + DCW_ON_CHIP_IV + DCW_ON_CHIP_CHIP_HIT + ICW_REQ_CHIP_HIT + ICW_ON_CHIP + ICW_ON_CHIP_IV + ICW_ON_CHIP_CHIP_HIT) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100" + "MetricExpr": "((DCW_REQ_CHIP_HIT + DCW_ON_CHIP + DCW_ON_CHIP_IV + DCW_ON_CHIP_CHIP_HIT + ICW_REQ_CHIP_HIT + ICW_ON_CHIP + ICW_ON_CHIP_IV + ICW_ON_CHIP_CHIP_HIT) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100 if has_event(DCW_REQ_CHIP_HIT) else 0" }, { "BriefDescription": "Percentage sourced from Level 4 Local cache on same book", "MetricName": "l4lp", - "MetricExpr": "((DCW_REQ_DRAWER_HIT + DCW_ON_CHIP_DRAWER_HIT + DCW_ON_MODULE + DCW_ON_DRAWER + IDCW_ON_MODULE_IV + IDCW_ON_MODULE_CHIP_HIT + IDCW_ON_MODULE_DRAWER_HIT + IDCW_ON_DRAWER_IV + IDCW_ON_DRAWER_CHIP_HIT + IDCW_ON_DRAWER_DRAWER_HIT + ICW_REQ_DRAWER_HIT + ICW_ON_CHIP_DRAWER_HIT + ICW_ON_MODULE + ICW_ON_DRAWER) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100" + "MetricExpr": "((DCW_REQ_DRAWER_HIT + DCW_ON_CHIP_DRAWER_HIT + DCW_ON_MODULE + DCW_ON_DRAWER + IDCW_ON_MODULE_IV + IDCW_ON_MODULE_CHIP_HIT + IDCW_ON_MODULE_DRAWER_HIT + IDCW_ON_DRAWER_IV + IDCW_ON_DRAWER_CHIP_HIT + IDCW_ON_DRAWER_DRAWER_HIT + ICW_REQ_DRAWER_HIT + ICW_ON_CHIP_DRAWER_HIT + ICW_ON_MODULE + ICW_ON_DRAWER) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100 if has_event(DCW_REQ_DRAWER_HIT) else 0" }, { "BriefDescription": "Percentage sourced from Level 4 Remote cache on different book", "MetricName": "l4rp", - "MetricExpr": "((DCW_OFF_DRAWER + IDCW_OFF_DRAWER_IV + IDCW_OFF_DRAWER_CHIP_HIT + IDCW_OFF_DRAWER_DRAWER_HIT + ICW_OFF_DRAWER) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100" + "MetricExpr": "((DCW_OFF_DRAWER + IDCW_OFF_DRAWER_IV + IDCW_OFF_DRAWER_CHIP_HIT + IDCW_OFF_DRAWER_DRAWER_HIT + ICW_OFF_DRAWER) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100 if has_event(DCW_OFF_DRAWER) else 0" }, { "BriefDescription": "Percentage sourced from memory", "MetricName": "memp", - "MetricExpr": "((DCW_ON_CHIP_MEMORY + DCW_ON_MODULE_MEMORY + DCW_ON_DRAWER_MEMORY + DCW_OFF_DRAWER_MEMORY + ICW_ON_CHIP_MEMORY + ICW_ON_MODULE_MEMORY + ICW_ON_DRAWER_MEMORY + ICW_OFF_DRAWER_MEMORY) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100" + "MetricExpr": "((DCW_ON_CHIP_MEMORY + DCW_ON_MODULE_MEMORY + DCW_ON_DRAWER_MEMORY + DCW_OFF_DRAWER_MEMORY + ICW_ON_CHIP_MEMORY + ICW_ON_MODULE_MEMORY + ICW_ON_DRAWER_MEMORY + ICW_OFF_DRAWER_MEMORY) / (L1I_DIR_WRITES + L1D_DIR_WRITES)) * 100 if has_event(DCW_ON_CHIP_MEMORY) else 0" }, { "BriefDescription": "Cycles per Instructions from Finite cache/memory", "MetricName": "finite_cpi", - "MetricExpr": "L1C_TLB2_MISSES / INSTRUCTIONS" + "MetricExpr": "L1C_TLB2_MISSES / INSTRUCTIONS if has_event(L1C_TLB2_MISSES) else 0" }, { "BriefDescription": "Estimated Instruction Complexity CPI infinite Level 1", "MetricName": "est_cpi", - "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS)" + "MetricExpr": "(CPU_CYCLES / INSTRUCTIONS) - (L1C_TLB2_MISSES / INSTRUCTIONS) if has_event(INSTRUCTIONS) else 0" }, { "BriefDescription": "Estimated Sourcing Cycles per Level 1 Miss", "MetricName": "scpl1m", - "MetricExpr": "L1C_TLB2_MISSES / (L1I_DIR_WRITES + L1D_DIR_WRITES)" + "MetricExpr": "L1C_TLB2_MISSES / (L1I_DIR_WRITES + L1D_DIR_WRITES) if has_event(L1C_TLB2_MISSES) else 0" }, { "BriefDescription": "Estimated TLB CPU percentage of Total CPU", "MetricName": "tlb_percent", - "MetricExpr": "((DTLB2_MISSES + ITLB2_MISSES) / CPU_CYCLES) * (L1C_TLB2_MISSES / (L1I_PENALTY_CYCLES + L1D_PENALTY_CYCLES)) * 100" + "MetricExpr": "((DTLB2_MISSES + ITLB2_MISSES) / CPU_CYCLES) * (L1C_TLB2_MISSES / (L1I_PENALTY_CYCLES + L1D_PENALTY_CYCLES)) * 100 if has_event(CPU_CYCLES) else 0" }, { "BriefDescription": "Estimated Cycles per TLB Miss", "MetricName": "tlb_miss", - "MetricExpr": "((DTLB2_MISSES + ITLB2_MISSES) / (DTLB2_WRITES + ITLB2_WRITES)) * (L1C_TLB2_MISSES / (L1I_PENALTY_CYCLES + L1D_PENALTY_CYCLES))" + "MetricExpr": "((DTLB2_MISSES + ITLB2_MISSES) / (DTLB2_WRITES + ITLB2_WRITES)) * (L1C_TLB2_MISSES / (L1I_PENALTY_CYCLES + L1D_PENALTY_CYCLES)) if has_event(DTLB2_MISSES) else 0" } ]
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 404/744 soundwire: cadence: fix invalid PDI offset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 8ee1b439b1540ae543149b15a2a61b9dff937d91 ]
For some reason, we add an offset to the PDI, presumably to skip the PDI0 and PDI1 which are reserved for BPT.
This code is however completely wrong and leads to an out-of-bounds access. We were just lucky so far since we used only a couple of PDIs and remained within the PDI array bounds.
A Fixes: tag is not provided since there are no known platforms where the out-of-bounds would be accessed, and the initial code had problems as well.
A follow-up patch completely removes this useless offset.
--- drivers/soundwire/cadence_master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/cadence_master.c +1 -1
@@ -1880,7 +1880,7 @@ struct sdw_cdns_pdi *sdw_cdns_alloc_pdi(struct sdw_cdns *cdns,/* check if we found a PDI, else find in bi-directional */ if (!pdi) - pdi =cdns_find_pdi (cdns,2 , stream->num_bd, stream->bd, + pdi =cdns_find_pdi (cdns,0 , stream->num_bd, stream->bd, dai_id);if (pdi) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 405/744 dmaengine: idma64: Add check for dma_set_max_seg_size
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 2b1c1cf08a0addb6df42f16b37133dc7a351de29 ]
As the possible failure of the dma_set_max_seg_size(), it should be better to check the return value of the dma_set_max_seg_size().
--- drivers/dma/idma64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/idma64.c +3 -1
@@ -598,7 +598,9 @@ static int idma64_probe(struct idma64_chip *chip) idma64->dma.dev = chip->sysdev; -dma_set_max_seg_size (idma64->dma.dev,IDMA64C_CTLH_BLOCK_TS_MASK ); + ret =dma_set_max_seg_size (idma64->dma.dev,IDMA64C_CTLH_BLOCK_TS_MASK ); +if (ret) +return ret; ret =dma_async_device_register (&idma64->dma);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 406/744 firmware: dmi-id: add a release callback function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit cf770af5645a41a753c55a053fa1237105b0964a ]
dmi_class uses kfree() as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules:
drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
174 | .dev_release = (void(*)(struct device *)) kfree,
Add an explicit function to call kfree() instead.
--- drivers/firmware/dmi-id.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/firmware/dmi-id.c +6 -1
@@ -169,9 +169,14 @@ static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env)return 0 ; } +static void dmi_dev_release (struct device *dev) +{ +kfree (dev); +} +static struct class dmi_class = { .name ="dmi" , - .dev_release = (void (*)(struct device *)) kfree, + .dev_release = dmi_dev_release, .dev_uevent = dmi_dev_uevent, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 407/744 perf record: Lazy load kernel symbols
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 1a27fc01700fbff2f205000edf0d1d315b5f85cc ]
Commit 5b7ba82a75915e73 ("perf symbols: Load kernel maps before using") changed it so that loading a kernel DSO would cause the symbols for the DSO to be eagerly loaded.
For 'perf record' this is overhead as the symbols won't be used. Add a field to 'struct symbol_conf' to control the behavior and disable it for 'perf record' and 'perf inject'.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-inject.c | 6 ++++++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.c | 4 ++-- tools/perf/util/symbol_conf.h | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-)
tools/perf/builtin-inject.c +6 -0
@@ -2265,6 +2265,12 @@ int cmd_inject(int argc, const char **argv)"perf inject [<options>]" , NULL }; + +if (!inject.itrace_synth_opts.set) { +/* Disable eager loading of kernel symbols that adds overhead to perf inject. */ + symbol_conf.lazy_load_kernel_maps = true; + } +#ifndef HAVE_JITDUMP set_option_nobuild (options,'j' ,"jit" ,"NO_LIBELF=1" , true);#endif
tools/perf/builtin-record.c +2 -0
@@ -3936,6 +3936,8 @@ int cmd_record(int argc, const char **argv)# undef set_nobuild#endif +/* Disable eager loading of kernel symbols that adds overhead to perf record. */ + symbol_conf.lazy_load_kernel_maps = true; rec->opts.affinity =PERF_AFFINITY_SYS ; rec->evlist =evlist__new ();
tools/perf/util/event.c +2 -2
@@ -617,13 +617,13 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,if (cpumode ==PERF_RECORD_MISC_KERNEL && perf_host) { al->level ='k' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_USER && perf_host) { al->level ='.' ; }else if (cpumode ==PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { al->level ='g' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_GUEST_USER && perf_guest) { al->level ='u' ; }else {
tools/perf/util/symbol_conf.h +2 -1
@@ -42,7 +42,8 @@ struct symbol_conf { inline_name, disable_add2line_warn, buildid_mmap2, - guest_code; + guest_code, + lazy_load_kernel_maps;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 408/744 perf machine thread: Remove exited threads by default
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 9ffa6c7512ca7aaeb30e596e2c247cb1fae7123a ]
'struct thread' values hold onto references to mmaps, DSOs, etc. When a thread exits it is necessary to clean all of this memory up by removing the thread from the machine's threads. Some tools require this doesn't happen, such as auxtrace events, 'perf report' if offcpu events exist or if a task list is being generated, so add a 'struct symbol_conf' member to make the behavior optional. When an exited thread is left in the machine's threads, mark it as exited.
This change relates to commit 40826c45eb0b8856 ("perf thread: Remove notion of dead threads") . Dead threads were removed as they had a reference count of 0 and were difficult to reason about with the reference count checker. Here a thread is removed from threads when it exits, unless via symbol_conf the exited thread isn't remove and is marked as exited. Reference counting behaves as it normally does.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-report.c | 7 +++++++ tools/perf/util/machine.c | 10 +++++++--- tools/perf/util/session.c | 5 +++++ tools/perf/util/symbol_conf.h | 3 ++- tools/perf/util/thread.h | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 4 deletions(-)
tools/perf/builtin-report.c +7 -0
@@ -1411,6 +1411,13 @@ int cmd_report(int argc, const char **argv)if (ret <0 ) goto exit; +/* +* tasks_mode require access to exited threads to list those that are in +* the data file. Off-cpu events are synthesized after other events and +* reference exited threads. +*/ + symbol_conf.keep_exited_threads = true; +annotation_options__init (&report.annotation_opts); ret =perf_config (report__config, &report);
tools/perf/util/machine.c +7 -3
@@ -2158,9 +2158,13 @@ int machine__process_exit_event(struct machine *machine, union perf_event *eventif (dump_trace)perf_event__fprintf_task (event, stdout); -if (thread !=NULL ) -thread__put (thread); - +if (thread !=NULL ) { +if (symbol_conf.keep_exited_threads) +thread__set_exited (thread,/*exited=*/ true); +else +machine__remove_thread (machine, thread); + } +thread__put (thread);return 0 ; }
tools/perf/util/session.c +5 -0
@@ -115,6 +115,11 @@ static int perf_session__open(struct perf_session *session, int repipe_fd)return -1 ; } +if (perf_header__has_feat (&session->header,HEADER_AUXTRACE )) { +/* Auxiliary events may reference exited threads, hold onto dead ones. */ + symbol_conf.keep_exited_threads = true; + } +if (perf_data__is_pipe (data))return 0 ;
tools/perf/util/symbol_conf.h +2 -1
@@ -43,7 +43,8 @@ struct symbol_conf { disable_add2line_warn, buildid_mmap2, guest_code, - lazy_load_kernel_maps; + lazy_load_kernel_maps, + keep_exited_threads;const char *vmlinux_name, *kallsyms_name, *source_prefix,
tools/perf/util/thread.h +14 -0
@@ -36,13 +36,22 @@ struct thread_rb_node { };DECLARE_RC_STRUCT (thread) { +/** @maps: mmaps associated with this thread. */ struct maps *maps;pid_t pid_;/* Not all tools update this */ +/** @tid: thread ID number unique to a machine. */ pid_t tid; +/** @ppid: parent process of the process this thread belongs to. */ pid_t ppid;int cpu;int guest_cpu;/* For QEMU thread */ refcount_t refcnt; +/** +* @exited: Has the thread had an exit event. Such threads are usually +* removed from the machine's threads but some events/tools require +* access to dead threads. +*/ +bool exited;bool comm_set;int comm_len;struct list_head namespaces_list;
@@ -189,6 +198,11 @@ static inline refcount_t *thread__refcnt(struct thread *thread)return &RC_CHK_ACCESS (thread)->refcnt; } +static inline void thread__set_exited (struct thread *thread,bool exited) +{ +RC_CHK_ACCESS (thread)->exited = exited; +} +static inline bool thread__comm_set (const struct thread *thread) {return RC_CHK_ACCESS (thread)->comm_set;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 409/744 perf annotate: Split branch stack cycles information out of struct annotation_line
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit de2c7eb59c342d1a61124caaf2993e325a9becb7 ]
The cycles info is used only when branch stack is provided. Separate them from 'struct annotation_line' into a separate struct and lazy allocate them to save some memory.
Committer notes:
Make annotation__compute_ipc() check if the lazy allocation works, bailing out if so, its callers already do error checking and propagation.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate.c | 61 ++++++++++++++++++++++--------- tools/perf/util/annotate.h | 15 +++++--- 3 files changed, 54 insertions(+), 24 deletions(-)
tools/perf/ui/browsers/annotate.c +1 -1
@@ -337,7 +337,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, max_percent = percent; } -if (max_percent <0.01 && pos->al.ipc ==0 ) { +if (max_percent <0.01 && (!pos->al.cycles || pos->al.cycles->ipc ==0 )) {RB_CLEAR_NODE (&pos->al.rb_node);continue ; }
tools/perf/util/annotate.c +44 -17
128 lines not on this page · raw message
tools/perf/util/annotate.h +9 -6
@@ -130,6 +130,13 @@ struct annotation_data {struct sym_hist_entry he; }; +struct cycles_info { +float ipc; +u64 avg; +u64 max; +u64 min; +}; +struct annotation_line {struct list_head node;struct rb_node rb_node;
@@ -137,12 +144,9 @@ struct annotation_line {char *line;int line_nr;char *fileloc; -int jump_sources; -float ipc; -u64 cycles; -u64 cycles_max; -u64 cycles_min;char *path; +struct cycles_info *cycles; +int jump_sources;u32 idx;int idx_asm;int data_nr;
@@ -325,7 +329,6 @@ static inline bool annotation_line__filter(struct annotation_line *al, struct an }void annotation__set_offsets (struct annotation *notes,s64 size); -void annotation__compute_ipc (struct annotation *notes,size_t size);void annotation__mark_jump_targets (struct annotation *notes,struct symbol *sym);void annotation__update_column_widths (struct annotation *notes);void annotation__init_column_widths (struct annotation *notes,struct symbol *sym);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 410/744 perf annotate: Introduce global annotation_options
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 9d03194a36345796d4f0f8d6b72eb770a45d614e ]
The annotation options are to control the behavior of objdump and the output. It's basically used by 'perf annotate' but 'perf report' and 'perf top' can call it on TUI dynamically.
But it doesn't need to have a copy of annotation options in many places.
As most of the work is done in the util/annotate.c file, add a global variable and set/use it instead of having their own copies.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-annotate.c | 43 +++++++++++++++++------------------ tools/perf/util/annotate.c | 3 +++ tools/perf/util/annotate.h | 2 ++ 3 files changed, 26 insertions(+), 22 deletions(-)
tools/perf/builtin-annotate.c +21 -22
@@ -45,7 +45,6 @@struct perf_annotate {struct perf_tool tool;struct perf_session *session; -struct annotation_options opts;#ifdef HAVE_SLANG_SUPPORT bool use_tui;#endif
@@ -315,9 +314,9 @@ static int hist_entry__tty_annotate(struct hist_entry *he, struct perf_annotate *ann) {if (!ann->use_stdio2) -return symbol__tty_annotate (&he->ms, evsel, &ann->opts); +return symbol__tty_annotate (&he->ms, evsel, &annotate_opts); -return symbol__tty_annotate2 (&he->ms, evsel, &ann->opts); +return symbol__tty_annotate2 (&he->ms, evsel, &annotate_opts); } static void hists__find_annotations(struct hists *hists,
@@ -373,14 +372,14 @@ static void hists__find_annotations(struct hists *hists,return ; } - ret =annotate (he, evsel, &ann->opts,NULL ); + ret =annotate (he, evsel, &annotate_opts,NULL );if (!ret || !ann->skip_missing)return ;/* skip missing symbols */ nd =rb_next (nd); }else if (use_browser ==1 ) { - key =hist_entry__tui_annotate (he, evsel,NULL , &ann->opts); + key =hist_entry__tui_annotate (he, evsel,NULL , &annotate_opts);switch (key) {case -1 :
@@ -422,9 +421,9 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out; } -if (!ann->opts.objdump_path) { +if (!annotate_opts.objdump_path) { ret =perf_env__lookup_objdump (&session->header.env, - &ann->opts.objdump_path); + &annotate_opts.objdump_path);if (ret) goto out; }
@@ -558,9 +557,9 @@ int cmd_annotate(int argc, const char **argv) "file", "vmlinux pathname"),OPT_BOOLEAN ('m' ,"modules" , &symbol_conf.use_modules,"load module symbols - WARNING: use only with -k and LIVE kernel" ), -OPT_BOOLEAN ('l' ,"print-line" , &annotate.opts.print_lines, +OPT_BOOLEAN ('l' ,"print-line" , &annotate_opts.print_lines,"print matching source lines (may be slow)" ), -OPT_BOOLEAN ('P' ,"full-paths" , &annotate.opts.full_path, +OPT_BOOLEAN ('P' ,"full-paths" , &annotate_opts.full_path,"Don't shorten the displayed pathnames" ),OPT_BOOLEAN (0 ,"skip-missing" , &annotate.skip_missing, "Skip symbols that cannot be annotated"),
@@ -571,15 +570,15 @@ int cmd_annotate(int argc, const char **argv)OPT_CALLBACK (0 ,"symfs" ,NULL ,"directory" ,"Look for files with symbols relative to this directory" , symbol__config_symfs), -OPT_BOOLEAN (0 ,"source" , &annotate.opts.annotate_src, +OPT_BOOLEAN (0 ,"source" , &annotate_opts.annotate_src,"Interleave source code with assembly code (default)" ), -OPT_BOOLEAN (0 ,"asm-raw" , &annotate.opts.show_asm_raw, +OPT_BOOLEAN (0 ,"asm-raw" , &annotate_opts.show_asm_raw,"Display raw encoding of assembly instructions (default)" ),OPT_STRING ('M' ,"disassembler-style" , &disassembler_style,"disassembler style" ,"Specify disassembler style (e.g. -M intel for intel syntax)" ), -OPT_STRING (0 ,"prefix" , &annotate.opts.prefix,"prefix" , +OPT_STRING (0 ,"prefix" , &annotate_opts.prefix,"prefix" ,"Add prefix to source file path names in programs (with --prefix-strip)" ), -OPT_STRING (0 ,"prefix-strip" , &annotate.opts.prefix_strip,"N" , +OPT_STRING (0 ,"prefix-strip" , &annotate_opts.prefix_strip,"N" ,"Strip first N entries of source file path name in programs (with --prefix)" ),OPT_STRING (0 ,"objdump" , &objdump_path,"path" , "objdump binary to use for disassembly and annotations"),
@@ -596,7 +595,7 @@ int cmd_annotate(int argc, const char **argv)OPT_CALLBACK_DEFAULT (0 ,"stdio-color" ,NULL ,"mode" ,"'always' (default), 'never' or 'auto' only applicable to --stdio mode" , stdio__config_color,"always" ), -OPT_CALLBACK (0 ,"percent-type" , &annotate.opts,"local-period" , +OPT_CALLBACK (0 ,"percent-type" , &annotate_opts,"local-period" ,"Set percent type local/global-period/hits" , annotate_parse_percent_type), OPT_CALLBACK(0, "percent-limit", &annotate, "percent",
@@ -612,13 +611,13 @@ int cmd_annotate(int argc, const char **argv)set_option_flag (options,0 ,"show-total-period" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,0 ,"show-nr-samples" ,PARSE_OPT_EXCLUSIVE ); -annotation_options__init (&annotate.opts); +annotation_options__init (&annotate_opts); ret =hists__init ();if (ret <0 )return ret; -annotation_config__init (&annotate.opts); +annotation_config__init (&annotate_opts); argc =parse_options (argc, argv, options, annotate_usage,0 );if (argc) {
@@ -633,13 +632,13 @@ int cmd_annotate(int argc, const char **argv) }if (disassembler_style) { - annotate.opts.disassembler_style =strdup (disassembler_style); -if (!annotate.opts.disassembler_style) + annotate_opts.disassembler_style =strdup (disassembler_style); +if (!annotate_opts.disassembler_style)return -ENOMEM ; }if (objdump_path) { - annotate.opts.objdump_path =strdup (objdump_path); -if (!annotate.opts.objdump_path) + annotate_opts.objdump_path =strdup (objdump_path); +if (!annotate_opts.objdump_path)return -ENOMEM ; }if (addr2line_path) {
@@ -648,7 +647,7 @@ int cmd_annotate(int argc, const char **argv)return -ENOMEM ; } -if (annotate_check_args (&annotate.opts) <0 ) +if (annotate_check_args (&annotate_opts) <0 )return -EINVAL ;#ifdef HAVE_GTK2_SUPPORT
@@ -729,7 +728,7 @@ int cmd_annotate(int argc, const char **argv)#ifndef NDEBUG perf_session__delete (annotate.session);#endif -annotation_options__exit (&annotate.opts); +annotation_options__exit (&annotate_opts);return ret; }
tools/perf/util/annotate.c +3 -0
@@ -57,6 +57,9 @@#include <linux/ctype.h> +/* global annotation options */ +struct annotation_options annotate_opts; +static regex_t file_lineno;static struct ins_ops *ins__find (struct arch *arch,const char *name);
tools/perf/util/annotate.h +2 -0
@@ -101,6 +101,8 @@ struct annotation_options {unsigned int percent_type; }; +extern struct annotation_options annotate_opts; +enum {ANNOTATION__OFFSET_JUMP_TARGETS =1 ,ANNOTATION__OFFSET_CALL ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 411/744 perf report: Convert to the global annotation_options
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 14953f038d6b30e3dc9d1aa4d4584ac505e5a8ec ]
Use the global option and drop the local copy.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-report.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
tools/perf/builtin-report.c +16 -17
@@ -98,7 +98,6 @@ struct report {bool skip_empty;int max_stack;struct perf_read_values show_threads_values; -struct annotation_options annotation_opts;const char *pretty_printing_style;const char *cpu_list;const char *symbol_filter_str;
@@ -542,7 +541,7 @@ static int evlist__tui_block_hists_browse(struct evlist *evlist, struct report * ret =report__browse_block_hists (&rep->block_reports[i++].hist, rep->min_percent, pos, &rep->session->header.env, - &rep->annotation_opts); + &annotate_opts);if (ret !=0 )return ret; }
@@ -670,7 +669,7 @@ static int report__browse_hists(struct report *rep) } ret =evlist__tui_browse_hists (evlist, help,NULL , rep->min_percent, - &session->header.env, true, &rep->annotation_opts); + &session->header.env, true, &annotate_opts);/* * Usually "ret" is the last pressed key, and we only * care if the key notifies us to switch data file.
@@ -730,7 +729,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg)if (rep->symbol_ipc && sym && !sym->annotate2) {struct evsel *evsel =hists_to_evsel (he->hists); -symbol__annotate2 (&he->ms, evsel, &rep->annotation_opts,NULL ); +symbol__annotate2 (&he->ms, evsel, &annotate_opts,NULL ); }return 0 ;
@@ -1326,15 +1325,15 @@ int cmd_report(int argc, const char **argv) "list of cpus to profile"),OPT_BOOLEAN ('I' ,"show-info" , &report.show_full_info,"Display extended information about perf.data file" ), -OPT_BOOLEAN (0 ,"source" , &report.annotation_opts.annotate_src, +OPT_BOOLEAN (0 ,"source" , &annotate_opts.annotate_src,"Interleave source code with assembly code (default)" ), -OPT_BOOLEAN (0 ,"asm-raw" , &report.annotation_opts.show_asm_raw, +OPT_BOOLEAN (0 ,"asm-raw" , &annotate_opts.show_asm_raw,"Display raw encoding of assembly instructions (default)" ),OPT_STRING ('M' ,"disassembler-style" , &disassembler_style,"disassembler style" ,"Specify disassembler style (e.g. -M intel for intel syntax)" ), -OPT_STRING (0 ,"prefix" , &report.annotation_opts.prefix,"prefix" , +OPT_STRING (0 ,"prefix" , &annotate_opts.prefix,"prefix" ,"Add prefix to source file path names in programs (with --prefix-strip)" ), -OPT_STRING (0 ,"prefix-strip" , &report.annotation_opts.prefix_strip,"N" , +OPT_STRING (0 ,"prefix-strip" , &annotate_opts.prefix_strip,"N" ,"Strip first N entries of source file path name in programs (with --prefix)" ),OPT_BOOLEAN (0 ,"show-total-period" , &symbol_conf.show_total_period, "Show a column with the sum of periods"),
@@ -1386,7 +1385,7 @@ int cmd_report(int argc, const char **argv) "Time span of interest (start,stop)"),OPT_BOOLEAN (0 ,"inline" , &symbol_conf.inline_name,"Show inline function" ), -OPT_CALLBACK (0 ,"percent-type" , &report.annotation_opts,"local-period" , +OPT_CALLBACK (0 ,"percent-type" , &annotate_opts,"local-period" ,"Set percent type local/global-period/hits" , annotate_parse_percent_type), OPT_BOOLEAN(0, "ns", &symbol_conf.nanosecs, "Show times in nanosecs"),
@@ -1418,7 +1417,7 @@ int cmd_report(int argc, const char **argv)*/ symbol_conf.keep_exited_threads = true; -annotation_options__init (&report.annotation_opts); +annotation_options__init (&annotate_opts); ret =perf_config (report__config, &report);if (ret)
@@ -1437,13 +1436,13 @@ int cmd_report(int argc, const char **argv) }if (disassembler_style) { - report.annotation_opts.disassembler_style =strdup (disassembler_style); -if (!report.annotation_opts.disassembler_style) + annotate_opts.disassembler_style =strdup (disassembler_style); +if (!annotate_opts.disassembler_style)return -ENOMEM ; }if (objdump_path) { - report.annotation_opts.objdump_path =strdup (objdump_path); -if (!report.annotation_opts.objdump_path) + annotate_opts.objdump_path =strdup (objdump_path); +if (!annotate_opts.objdump_path)return -ENOMEM ; }if (addr2line_path) {
@@ -1452,7 +1451,7 @@ int cmd_report(int argc, const char **argv)return -ENOMEM ; } -if (annotate_check_args (&report.annotation_opts) <0 ) { +if (annotate_check_args (&annotate_opts) <0 ) { ret = -EINVAL ; goto exit; }
@@ -1684,7 +1683,7 @@ int cmd_report(int argc, const char **argv)*/ symbol_conf.priv_size +=sizeof (u32); } -annotation_config__init (&report.annotation_opts); +annotation_config__init (&annotate_opts); }if (symbol__init (&session->header.env) <0 )
@@ -1738,7 +1737,7 @@ int cmd_report(int argc, const char **argv)zstd_fini (&(session->zstd_data));perf_session__delete (session); exit: -annotation_options__exit (&report.annotation_opts); +annotation_options__exit (&annotate_opts);free (sort_order_help);free (field_order_help);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 412/744 perf top: Convert to the global annotation_options
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit c9a21a872c69032cb9a94ebc171649c0c28141d7 ]
Use the global option and drop the local copy.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-top.c | 44 ++++++++++++++++++++-------------------- tools/perf/util/top.h | 1 - 2 files changed, 22 insertions(+), 23 deletions(-)
tools/perf/builtin-top.c +22 -22
@@ -147,7 +147,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)return err; } - err =symbol__annotate (&he->ms, evsel, &top->annotation_opts,NULL ); + err =symbol__annotate (&he->ms, evsel, &annotate_opts,NULL );if (err ==0 ) { top->sym_filter_entry = he; }else {
@@ -261,9 +261,9 @@ static void perf_top__show_details(struct perf_top *top) goto out_unlock;printf ("Showing %s for %s\n" ,evsel__name (top->sym_evsel), symbol->name); -printf (" Events Pcnt (>=%d%%)\n" , top->annotation_opts.min_pcnt); +printf (" Events Pcnt (>=%d%%)\n" , annotate_opts.min_pcnt); - more =symbol__annotate_printf (&he->ms, top->sym_evsel, &top->annotation_opts); + more =symbol__annotate_printf (&he->ms, top->sym_evsel, &annotate_opts);if (top->evlist->enabled) {if (top->zero)
@@ -450,7 +450,7 @@ static void perf_top__print_mapped_keys(struct perf_top *top)fprintf (stdout,"\t[f] profile display filter (count). \t(%d)\n" , top->count_filter); -fprintf (stdout,"\t[F] annotate display filter (percent). \t(%d%%)\n" , top->annotation_opts.min_pcnt); +fprintf (stdout,"\t[F] annotate display filter (percent). \t(%d%%)\n" , annotate_opts.min_pcnt);fprintf (stdout,"\t[s] annotate symbol. \t(%s)\n" , name?:"NULL" );fprintf (stdout,"\t[S] stop annotation.\n" );
@@ -553,7 +553,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)prompt_integer (&top->count_filter,"Enter display event count filter" );break ;case 'F' : -prompt_percent (&top->annotation_opts.min_pcnt, +prompt_percent (&annotate_opts.min_pcnt,"Enter details display event filter (percent)" );break ;case 'K' :
@@ -647,7 +647,7 @@ static void *display_thread_tui(void *arg) ret =evlist__tui_browse_hists (top->evlist, help, &hbt, top->min_percent, &top->session->header.env, !top->record_opts.overwrite, - &top->annotation_opts); + &annotate_opts);if (ret ==K_RELOAD ) { top->zero = true; goto repeat;
@@ -1241,9 +1241,9 @@ static int __cmd_top(struct perf_top *top)pthread_t thread, thread_process;int ret; -if (!top->annotation_opts.objdump_path) { +if (!annotate_opts.objdump_path) { ret =perf_env__lookup_objdump (&top->session->header.env, - &top->annotation_opts.objdump_path); + &annotate_opts.objdump_path);if (ret)return ret; }
@@ -1537,9 +1537,9 @@ int cmd_top(int argc, const char **argv) "only consider symbols in these comms"),OPT_STRING (0 ,"symbols" , &symbol_conf.sym_list_str,"symbol[,symbol...]" ,"only consider these symbols" ), -OPT_BOOLEAN (0 ,"source" , &top.annotation_opts.annotate_src, +OPT_BOOLEAN (0 ,"source" , &annotate_opts.annotate_src,"Interleave source code with assembly code (default)" ), -OPT_BOOLEAN (0 ,"asm-raw" , &top.annotation_opts.show_asm_raw, +OPT_BOOLEAN (0 ,"asm-raw" , &annotate_opts.show_asm_raw,"Display raw encoding of assembly instructions (default)" ),OPT_BOOLEAN (0 ,"demangle-kernel" , &symbol_conf.demangle_kernel, "Enable kernel symbol demangling"),
@@ -1550,9 +1550,9 @@ int cmd_top(int argc, const char **argv) "addr2line binary to use for line numbers"),OPT_STRING ('M' ,"disassembler-style" , &disassembler_style,"disassembler style" ,"Specify disassembler style (e.g. -M intel for intel syntax)" ), -OPT_STRING (0 ,"prefix" , &top.annotation_opts.prefix,"prefix" , +OPT_STRING (0 ,"prefix" , &annotate_opts.prefix,"prefix" ,"Add prefix to source file path names in programs (with --prefix-strip)" ), -OPT_STRING (0 ,"prefix-strip" , &top.annotation_opts.prefix_strip,"N" , +OPT_STRING (0 ,"prefix-strip" , &annotate_opts.prefix_strip,"N" ,"Strip first N entries of source file path name in programs (with --prefix)" ),OPT_STRING ('u' ,"uid" , &target->uid_str,"user" ,"user to profile" ), OPT_CALLBACK(0, "percent-limit", &top, "percent",
@@ -1610,10 +1610,10 @@ int cmd_top(int argc, const char **argv)if (status <0 )return status; -annotation_options__init (&top.annotation_opts); +annotation_options__init (&annotate_opts); - top.annotation_opts.min_pcnt =5 ; - top.annotation_opts.context =4 ; + annotate_opts.min_pcnt =5 ; + annotate_opts.context =4 ; top.evlist =evlist__new ();if (top.evlist ==NULL )
@@ -1643,13 +1643,13 @@ int cmd_top(int argc, const char **argv)usage_with_options (top_usage, options);if (disassembler_style) { - top.annotation_opts.disassembler_style =strdup (disassembler_style); -if (!top.annotation_opts.disassembler_style) + annotate_opts.disassembler_style =strdup (disassembler_style); +if (!annotate_opts.disassembler_style)return -ENOMEM ; }if (objdump_path) { - top.annotation_opts.objdump_path =strdup (objdump_path); -if (!top.annotation_opts.objdump_path) + annotate_opts.objdump_path =strdup (objdump_path); +if (!annotate_opts.objdump_path)return -ENOMEM ; }if (addr2line_path) {
@@ -1662,7 +1662,7 @@ int cmd_top(int argc, const char **argv)if (status) goto out_delete_evlist; -if (annotate_check_args (&top.annotation_opts) <0 ) +if (annotate_check_args (&annotate_opts) <0 ) goto out_delete_evlist;if (!top.evlist->core.nr_entries) {
@@ -1788,7 +1788,7 @@ int cmd_top(int argc, const char **argv)if (status <0 ) goto out_delete_evlist; -annotation_config__init (&top.annotation_opts); +annotation_config__init (&annotate_opts); symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name ==NULL ); status =symbol__init (NULL );
@@ -1841,7 +1841,7 @@ int cmd_top(int argc, const char **argv) out_delete_evlist:evlist__delete (top.evlist);perf_session__delete (top.session); -annotation_options__exit (&top.annotation_opts); +annotation_options__exit (&annotate_opts);return status; }
tools/perf/util/top.h +0 -1
@@ -21,7 +21,6 @@ struct perf_top {struct perf_tool tool;struct evlist *evlist, *sb_evlist;struct record_opts record_opts; -struct annotation_options annotation_opts;struct evswitch evswitch;/* * Symbols will be added here in perf_event__process_sample and will
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 413/744 perf annotate: Use global annotation_options
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 41fd3cacd29f47f6b9c6474b27c5b0513786c4e9 ]
Now it can directly use the global options and no need to pass it as an argument.
Stable-dep-of: aaf494cf483a ("perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()")
--- tools/perf/builtin-annotate.c | 7 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 4 +- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/gtk/annotate.c | 6 +- tools/perf/ui/gtk/gtk.h | 2 - tools/perf/util/annotate.c | 118 ++++++++++++++---------------- tools/perf/util/annotate.h | 15 ++-- 8 files changed, 71 insertions(+), 89 deletions(-)
tools/perf/builtin-annotate.c +3 -4
@@ -314,9 +314,9 @@ static int hist_entry__tty_annotate(struct hist_entry *he, struct perf_annotate *ann) {if (!ann->use_stdio2) -return symbol__tty_annotate (&he->ms, evsel, &annotate_opts); +return symbol__tty_annotate (&he->ms, evsel); -return symbol__tty_annotate2 (&he->ms, evsel, &annotate_opts); +return symbol__tty_annotate2 (&he->ms, evsel); } static void hists__find_annotations(struct hists *hists,
@@ -362,7 +362,6 @@ static void hists__find_annotations(struct hists *hists,int ret;int (*annotate)(struct hist_entry *he,struct evsel *evsel, -struct annotation_options *options,struct hist_browser_timer *hbt); annotate = dlsym(perf_gtk_handle,
@@ -372,7 +371,7 @@ static void hists__find_annotations(struct hists *hists,return ; } - ret =annotate (he, evsel, &annotate_opts,NULL ); + ret =annotate (he, evsel,NULL );if (!ret || !ann->skip_missing)return ;
tools/perf/builtin-report.c +1 -1
@@ -729,7 +729,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg)if (rep->symbol_ipc && sym && !sym->annotate2) {struct evsel *evsel =hists_to_evsel (he->hists); -symbol__annotate2 (&he->ms, evsel, &annotate_opts,NULL ); +symbol__annotate2 (&he->ms, evsel,NULL ); }return 0 ;
tools/perf/builtin-top.c +2 -2
@@ -147,7 +147,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)return err; } - err =symbol__annotate (&he->ms, evsel, &annotate_opts,NULL ); + err =symbol__annotate (&he->ms, evsel,NULL );if (err ==0 ) { top->sym_filter_entry = he; }else {
@@ -263,7 +263,7 @@ static void perf_top__show_details(struct perf_top *top)printf ("Showing %s for %s\n" ,evsel__name (top->sym_evsel), symbol->name);printf (" Events Pcnt (>=%d%%)\n" , annotate_opts.min_pcnt); - more =symbol__annotate_printf (&he->ms, top->sym_evsel, &annotate_opts); + more =symbol__annotate_printf (&he->ms, top->sym_evsel);if (top->evlist->enabled) {if (top->zero)
tools/perf/ui/browsers/annotate.c +3 -3
@@ -114,7 +114,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, intif (!browser->navkeypressed) ops.width +=1 ; -annotation_line__write (al, notes, &ops, ab->opts); +annotation_line__write (al, notes, &ops);if (ops.current_entry) ab->selection = al;
@@ -884,7 +884,7 @@ static int annotate_browser__run(struct annotate_browser *browser,continue ; }case 'P' : -map_symbol__annotation_dump (ms, evsel, browser->opts); +map_symbol__annotation_dump (ms, evsel);continue ;case 't' :if (symbol_conf.show_total_period) {
@@ -979,7 +979,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,return -1 ;if (not_annotated) { - err =symbol__annotate2 (ms, evsel, opts, &browser.arch); + err =symbol__annotate2 (ms, evsel, &browser.arch);if (err) {char msg[BUFSIZ ]; dso->annotate_warned = true;
tools/perf/ui/gtk/annotate.c +2 -4
@@ -162,7 +162,6 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct map_symbol *ms, }static int symbol__gtk_annotate (struct map_symbol *ms,struct evsel *evsel, -struct annotation_options *options,struct hist_browser_timer *hbt) {struct dso *dso =map__dso (ms->map);
@@ -176,7 +175,7 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel,if (dso->annotate_warned)return -1 ; - err =symbol__annotate (ms, evsel, options,NULL ); + err =symbol__annotate (ms, evsel,NULL );if (err) {char msg[BUFSIZ ]; dso->annotate_warned = true;
@@ -244,10 +243,9 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel,int hist_entry__gtk_annotate (struct hist_entry *he,struct evsel *evsel, -struct annotation_options *options,struct hist_browser_timer *hbt) { -return symbol__gtk_annotate (&he->ms, evsel, options, hbt); +return symbol__gtk_annotate (&he->ms, evsel, hbt); }void perf_gtk__show_annotations (void )
tools/perf/ui/gtk/gtk.h +0 -2
@@ -56,13 +56,11 @@ struct evsel;struct evlist ;struct hist_entry ;struct hist_browser_timer ; -struct annotation_options ;int evlist__gtk_browse_hists (struct evlist *evlist,const char *help,struct hist_browser_timer *hbt,float min_pcnt);int hist_entry__gtk_annotate (struct hist_entry *he,struct evsel *evsel, -struct annotation_options *options,struct hist_browser_timer *hbt);void perf_gtk__show_annotations (void );
tools/perf/util/annotate.c +55 -63
370 lines not on this page · raw message
tools/perf/util/annotate.h +5 -10
@@ -220,8 +220,7 @@ struct annotation_write_ops { };void annotation_line__write (struct annotation_line *al,struct annotation *notes, -struct annotation_write_ops *ops, -struct annotation_options *opts); +struct annotation_write_ops *ops); int __annotation__scnprintf_samples_period(struct annotation *notes, char *bf, size_t size,
@@ -366,11 +365,9 @@ void symbol__annotate_zero_histograms(struct symbol *sym);int symbol__annotate (struct map_symbol *ms,struct evsel *evsel, -struct annotation_options *options,struct arch **parch);int symbol__annotate2 (struct map_symbol *ms,struct evsel *evsel, -struct annotation_options *options,struct arch **parch);enum symbol_disassemble_errno {
@@ -397,20 +394,18 @@ enum symbol_disassemble_errno {int symbol__strerror_disassemble (struct map_symbol *ms,int errnum,char *buf,size_t buflen); -int symbol__annotate_printf (struct map_symbol *ms,struct evsel *evsel, -struct annotation_options *options); +int symbol__annotate_printf (struct map_symbol *ms,struct evsel *evsel);void symbol__annotate_zero_histogram (struct symbol *sym,int evidx);void symbol__annotate_decay_histogram (struct symbol *sym,int evidx);void annotated_source__purge (struct annotated_source *as); -int map_symbol__annotation_dump (struct map_symbol *ms,struct evsel *evsel, -struct annotation_options *opts); +int map_symbol__annotation_dump (struct map_symbol *ms,struct evsel *evsel);bool ui__has_annotation (void ); -int symbol__tty_annotate (struct map_symbol *ms,struct evsel *evsel,struct annotation_options *opts); +int symbol__tty_annotate (struct map_symbol *ms,struct evsel *evsel); -int symbol__tty_annotate2 (struct map_symbol *ms,struct evsel *evsel,struct annotation_options *opts); +int symbol__tty_annotate2 (struct map_symbol *ms,struct evsel *evsel);#ifdef HAVE_SLANG_SUPPORT int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 414/744 perf annotate: Fix annotation_calc_lines() to pass correct address to get_srcline()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit aaf494cf483a1a835c44e942861429b30a00cab0 ]
It should pass a proper address (i.e. suitable for objdump or addr2line) to get_srcline() in order to work correctly. It used to pass an address with map__rip_2objdump() as the second argument but later it's changed to use notes->start. It's ok in normal cases but it can be changed when annotate_opts.full_addr is set. So let's convert the address directly instead of using the notes->start.
Also the last argument is an IP to print symbol offset if requested. So it should pass symbol-relative address.
--- tools/perf/util/annotate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
tools/perf/util/annotate.c +6 -4
@@ -2906,7 +2906,7 @@ void annotation__toggle_full_addr(struct annotation *notes, struct map_symbol *mannotation__update_column_widths (notes); } -static void annotation__calc_lines (struct annotation *notes,struct map *map, +static void annotation__calc_lines (struct annotation *notes,struct map_symbol *ms,struct rb_root *root) {struct annotation_line *al;
@@ -2914,6 +2914,7 @@ static void annotation__calc_lines(struct annotation *notes, struct map *map,list_for_each_entry (al, ¬es->src->source, node) {double percent_max =0.0 ; +u64 addr;int i;for (i =0 ; i < al->data_nr; i++) {
@@ -2929,8 +2930,9 @@ static void annotation__calc_lines(struct annotation *notes, struct map *map,if (percent_max <=0.5 )continue ; - al->path =get_srcline (map__dso (map), notes->start + al->offset,NULL , - false, true, notes->start + al->offset); + addr =map__rip_2objdump (ms->map, ms->sym->start); + al->path =get_srcline (map__dso (ms->map), addr + al->offset,NULL , + false, true, ms->sym->start + al->offset);insert_source_line (&tmp_root, al); }
@@ -2941,7 +2943,7 @@ static void symbol__calc_lines(struct map_symbol *ms, struct rb_root *root) {struct annotation *notes =symbol__annotation (ms->sym); -annotation__calc_lines (notes, ms->map, root); +annotation__calc_lines (notes, ms, root); }int symbol__tty_annotate2 (struct map_symbol *ms,struct evsel *evsel)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 415/744 serial: max3100: Lock port->lock when calling uart_handle_cts_change()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 77ab53371a2066fdf9b895246505f5ef5a4b5d47 ]
uart_handle_cts_change() has to be called with port lock taken, Since we run it in a separate work, the lock may not be taken at the time of running. Make sure that it's taken by explicitly doing that. Without it we got a splat:
WARNING: CPU: 0 PID: 10 at drivers/tty/serial/serial_core.c:3491 uart_handle_cts_change+0xa6/0xb0 ... Workqueue: max3100-0 max3100_work [max3100] RIP: 0010:uart_handle_cts_change+0xa6/0xb0 ... max3100_handlerx+0xc5/0x110 [max3100] max3100_work+0x12a/0x340 [max3100]
--- drivers/tty/serial/max3100.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/tty/serial/max3100.c +12 -1
@@ -213,7 +213,7 @@ static int max3100_sr(struct max3100_port *s, u16 tx, u16 *rx)return 0 ; } -static int max3100_handlerx (struct max3100_port *s,u16 rx) +static int max3100_handlerx_unlocked (struct max3100_port *s,u16 rx) {unsigned int status =0 ;int ret =0 , cts;
@@ -254,6 +254,17 @@ static int max3100_handlerx(struct max3100_port *s, u16 rx)return ret; } +static int max3100_handlerx (struct max3100_port *s,u16 rx) +{ +unsigned long flags; +int ret; + +uart_port_lock_irqsave (&s->port, &flags); + ret =max3100_handlerx_unlocked (s, rx); +uart_port_unlock_irqrestore (&s->port, flags); +return ret; +} +static void max3100_work (struct work_struct *w) { struct max3100_port *s = container_of(w, struct max3100_port, work);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 416/744 serial: max3100: Update uart_driver_registered on driver removal
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 712a1fcb38dc7cac6da63ee79a88708fbf9c45ec ]
The removal of the last MAX3100 device triggers the removal of the driver. However, code doesn't update the respective global variable and after insmod — rmmod — insmod cycle the kernel oopses:
max3100 spi-PRP0001:01: max3100_probe: adding port 0
BUG: kernel NULL pointer dereference, address: 0000000000000408 ... RIP: 0010:serial_core_register_port+0xa0/0x840 ... max3100_probe+0x1b6/0x280 [max3100] spi_probe+0x8d/0xb0
Update the actual state so next time UART driver will be registered again.
Hugo also noticed, that the error path in the probe also affected by having the variable set, and not cleared. Instead of clearing it move the assignment after the successfull uart_register_driver() call.
--- drivers/tty/serial/max3100.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tty/serial/max3100.c +3 -1
@@ -749,13 +749,14 @@ static int max3100_probe(struct spi_device *spi)mutex_lock (&max3100s_lock);if (!uart_driver_registered) { - uart_driver_registered =1 ; retval =uart_register_driver (&max3100_uart_driver);if (retval) {printk (KERN_ERR "Couldn't register max3100 uart driver\n" );mutex_unlock (&max3100s_lock);return retval; } + + uart_driver_registered =1 ; }for (i =0 ; i <MAX_MAX3100 ; i++)
@@ -841,6 +842,7 @@ static void max3100_remove(struct spi_device *spi) }pr_debug ("removing max3100 driver\n" );uart_unregister_driver (&max3100_uart_driver); + uart_driver_registered =0 ;mutex_unlock (&max3100s_lock); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 417/744 serial: max3100: Fix bitwise types
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit e60955dbecb97f080848a57524827e2db29c70fd ]
Sparse is not happy about misuse of bitwise types:
.../max3100.c:194:13: warning: incorrect type in assignment (different base types)
.../max3100.c:194:13: expected unsigned short [addressable] [usertype] etx
.../max3100.c:194:13: got restricted __be16 [usertype]
.../max3100.c:202:15: warning: cast to restricted __be16
Fix this by choosing proper types for the respective variables.
--- drivers/tty/serial/max3100.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/serial/max3100.c +4 -1
@@ -45,6 +45,9 @@#include <linux/freezer.h> #include <linux/tty.h> #include <linux/tty_flip.h> +#include <linux/types.h> + +#include <asm/unaligned.h> #include <linux/serial_max3100.h>
@@ -191,7 +194,7 @@ static void max3100_timeout(struct timer_list *t)static int max3100_sr (struct max3100_port *s,u16 tx,u16 *rx) {struct spi_message message; -u16 etx, erx; +__be16 etx, erx;int status;struct spi_transfer tran = { .tx_buf = &etx,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 418/744 greybus: arche-ctrl: move device table to its right location
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 6a0b8c0da8d8d418cde6894a104cf74e6098ddfa ]
The arche-ctrl has two platform drivers and three of_device_id tables, but one table is only used for the the module loader, while the other two seem to be associated with their drivers.
This leads to a W=1 warning when the driver is built-in:
drivers/staging/greybus/arche-platform.c:623:34: error: 'arche_combined_id' defined but not used [-Werror=unused-const-variable=]
623 | static const struct of_device_id arche_combined_id[] = {
Drop the extra table and register both tables that are actually used as the ones for the module loader instead.
--- drivers/staging/greybus/arche-apb-ctrl.c | 1 + drivers/staging/greybus/arche-platform.c | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/greybus/arche-apb-ctrl.c +1 -0
@@ -466,6 +466,7 @@ static const struct of_device_id arche_apb_ctrl_of_match[] = { { .compatible = "usbffff,2", }, { }, }; +MODULE_DEVICE_TABLE (of, arche_apb_ctrl_of_match);static struct platform_driver arche_apb_ctrl_device_driver = { .probe = arche_apb_ctrl_probe,
drivers/staging/greybus/arche-platform.c +1 -8
@@ -619,14 +619,7 @@ static const struct of_device_id arche_platform_of_match[] = { { .compatible = "google,arche-platform", }, { }, }; - -static const struct of_device_id arche_combined_id[] = { -/* Use PID/VID of SVC device */ - { .compatible ="google,arche-platform" , }, - { .compatible ="usbffff,2" , }, - { }, -}; -MODULE_DEVICE_TABLE (of, arche_combined_id); +MODULE_DEVICE_TABLE (of, arche_platform_of_match);static struct platform_driver arche_platform_device_driver = { .probe = arche_platform_probe,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 419/744 PCI: tegra194: Fix probe path for Endpoint mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vidya Sagar <[email protected]>
[ Upstream commit 19326006a21da26532d982254677c892dae8f29b ]
Tegra194 PCIe probe path is taking failure path in success case for Endpoint mode. Return success from the switch case instead of going into the failure path.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/controller/dwc/pcie-tegra194.c +3 -0
@@ -2272,11 +2272,14 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) ret =tegra_pcie_config_ep (pcie, pdev);if (ret <0 ) goto fail; +else +return 0 ;break ;default :dev_err (dev,"Invalid PCIe device type %d\n" , pcie->of_data->mode); + ret = -EINVAL ; } fail:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 420/744 serial: sc16is7xx: add proper sched.h include for sched_set_fifo()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
[ Upstream commit 2a8e4ab0c93fad30769479f86849e22d63cd0e12 ]
Replace incorrect include with the proper one for sched_set_fifo() declaration.
--- drivers/tty/serial/sc16is7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/sc16is7xx.c +1 -1
@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/property.h> #include <linux/regmap.h> +#include <linux/sched.h> #include <linux/serial_core.h> #include <linux/serial.h> #include <linux/tty.h>
@@ -25,7 +26,6 @@#include <linux/spi/spi.h> #include <linux/uaccess.h> #include <linux/units.h> -#include <uapi/linux/sched/types.h> #define SC16IS7XX_NAME "sc16is7xx"#define SC16IS7XX_MAX_DEVS 8
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 421/744 module: dont ignore sysfs_create_link() failures
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 85d2b0aa170351380be39fe4ff7973df1427fe76 ]
The sysfs_create_link() return code is marked as __must_check, but the module_add_driver() function tries hard to not care, by assigning the return code to a variable. When building with 'make W=1', gcc still warns because this variable is only assigned but not used:
drivers/base/module.c: In function 'module_add_driver':drivers/base/module.c:36:6: warning: variable 'no_warn' set but not used [-Wunused-but-set-variable]
Rework the code to properly unwind and return the error code to the caller. My reading of the original code was that it tries to not fail when the links already exist, so keep ignoring -EEXIST errors.
See-also: 4a7fb6363f2d ("add __must_check to device management code")
--- drivers/base/base.h | 9 ++++++--- drivers/base/bus.c | 9 ++++++++- drivers/base/module.c | 42 +++++++++++++++++++++++++++++++----------- 3 files changed, 45 insertions(+), 15 deletions(-)
drivers/base/base.h +6 -3
@@ -192,11 +192,14 @@ extern struct kset *devices_kset;void devices_kset_move_last (struct device *dev);#if defined(CONFIG_MODULES ) && defined(CONFIG_SYSFS ) -void module_add_driver (struct module *mod,struct device_driver *drv); +int module_add_driver (struct module *mod,struct device_driver *drv);void module_remove_driver (struct device_driver *drv);#else -static inline void module_add_driver (struct module *mod, -struct device_driver *drv) { } +static inline int module_add_driver (struct module *mod, +struct device_driver *drv) +{ +return 0 ; +}static inline void module_remove_driver (struct device_driver *drv) { }#endif
drivers/base/bus.c +8 -1
@@ -674,7 +674,12 @@ int bus_add_driver(struct device_driver *drv)if (error) goto out_del_list; } -module_add_driver (drv->owner, drv); + error =module_add_driver (drv->owner, drv); +if (error) { +printk (KERN_ERR "%s: failed to create module links for %s\n" , + __func__, drv->name); + goto out_detach; + } error =driver_create_file (drv, &driver_attr_uevent);if (error) {
@@ -699,6 +704,8 @@ int bus_add_driver(struct device_driver *drv)return 0 ; +out_detach: +driver_detach (drv); out_del_list:klist_del (&priv->knode_bus); out_unregister:
drivers/base/module.c +31 -11
62 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 422/744 interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 230d05b1179f6ce6f8dc8a2b99eba92799ac22d7 ]
The value was wrong, resulting in misprogramming of the hardware. Fix it.
--- drivers/interconnect/qcom/qcm2290.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/interconnect/qcom/qcm2290.c +1 -1
@@ -161,7 +161,7 @@ static struct qcom_icc_node mas_snoc_bimc = { .name = "mas_snoc_bimc", .buswidth = 16, .qos.ap_owned = true, - .qos.qos_port = 2, + .qos.qos_port = 6, .qos.qos_mode = NOC_QOS_MODE_BYPASS, .mas_rpm_id = 164, .slv_rpm_id = -1,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 423/744 arm64: dts: meson: fix S4 power-controller node
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xianwei Zhao <[email protected]>
[ Upstream commit 72907de9051dc2aa7b55c2a020e2872184ac17cd ]
The power-controller module works well by adding its parent node secure-monitor.
--- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-s4.dtsi +9 -4
@@ -61,10 +61,15 @@ xtal: xtal-clk { #clock-cells = <0>; }; - pwrc: power-controller { - compatible = "amlogic,meson-s4-pwrc"; - #power-domain-cells = <1>; - status = "okay"; + firmware { + sm: secure-monitor { + compatible = "amlogic,meson-gxbb-sm"; + + pwrc: power-controller { + compatible = "amlogic,meson-s4-pwrc"; + #power-domain-cells = <1>; + }; + }; }; soc {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 424/744 perf tests: Make "test data symbol" more robust on Neoverse N1
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 256ef072b3842273ce703db18b603b051aca95fe ]
To prevent anyone from seeing a test failure appear as a regression and thinking that it was caused by their code change, insert some noise into the loop which makes it immune to sampling bias issues (errata 1694299).
The "test data symbol" test can fail with any unrelated change that shifts the loop into an unfortunate position in the Perf binary which is almost impossible to debug as the root cause of the test failure. Ultimately it's caused by the referenced errata.
--- tools/perf/tests/workloads/datasym.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/perf/tests/workloads/datasym.c +16 -0
@@ -16,6 +16,22 @@ static int datasym(int argc __maybe_unused, const char **argv __maybe_unused) {for (;;) { buf1.data1++; +if (buf1.data1 ==123 ) { +/* +* Add some 'noise' in the loop to work around errata +* 1694299 on Arm N1. +* +* Bias exists in SPE sampling which can cause the load +* and store instructions to be skipped entirely. This +* comes and goes randomly depending on the offset the +* linker places the datasym loop at in the Perf binary. +* With an extra branch in the middle of the loop that +* isn't always taken, the instruction stream is no +* longer a continuous repeating pattern that interacts +* badly with the bias. +*/ + buf1.data1++; + } buf1.data2 += buf1.data1; }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 425/744 perf tests: Apply attributes to all events in object code reading test
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 2dade41a533f337447b945239b87ff31a8857890 ]
PERF_PMU_CAP_EXTENDED_HW_TYPE results in multiple events being opened on heterogeneous systems. Currently this test only sets its required attributes on the first event. Not disabling enable_on_exec on the other events causes the test to fail because the forked objdump processes are sampled. No tracking event is opened so Perf only knows about its own mappings causing the objdump samples to give the following error:
$ perf test -vvv "object code reading"
Reading object code for memory address: 0xffff9aaa55ec thread__find_map failed
---- end(-1) ----
24: Object code reading : FAILED!
--- tools/perf/tests/code-reading.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/tests/code-reading.c +5 -5
@@ -657,11 +657,11 @@ static int do_test_code_reading(bool try_kcore)evlist__config (evlist, &opts,NULL ); - evsel =evlist__first (evlist); - - evsel->core.attr.comm =1 ; - evsel->core.attr.disabled =1 ; - evsel->core.attr.enable_on_exec =0 ; +evlist__for_each_entry (evlist, evsel) { + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ; + } ret =evlist__open (evlist);if (ret <0 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 426/744 perf evlist: Add evlist__findnew_tracking_event() helper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Jihong <[email protected]>
[ Upstream commit 9c95e4ef065723496442898614d09a9a916eab81 ]
Currently, intel-bts, intel-pt, and arm-spe may add tracking event to the evlist. We may need to search for the tracking event for some settings.
Therefore, add evlist__findnew_tracking_event() helper.
If system_wide is true, evlist__findnew_tracking_event() set the cpu map of the evsel to all online CPUs.
Stable-dep-of: 792bc998baf9 ("perf record: Fix debug message placement for test consumption")
--- tools/perf/builtin-record.c | 11 +++-------- tools/perf/util/evlist.c | 18 ++++++++++++++++++ tools/perf/util/evlist.h | 1 + 3 files changed, 22 insertions(+), 8 deletions(-)
tools/perf/builtin-record.c +3 -8
@@ -1293,14 +1293,9 @@ static int record__open(struct record *rec)*/ if (opts->target.initial_delay ||target__has_cpu (&opts->target) ||perf_pmus__num_core_pmus () >1 ) { - pos =evlist__get_tracking_event (evlist); -if (!evsel__is_dummy_event (pos)) { -/* Set up dummy event. */ -if (evlist__add_dummy (evlist)) -return -ENOMEM ; - pos =evlist__last (evlist); -evlist__set_tracking_event (evlist, pos); - } + pos =evlist__findnew_tracking_event (evlist, false); +if (!pos) +return -ENOMEM ;/* * Enable the dummy event when the process is forked for
tools/perf/util/evlist.c +18 -0
@@ -1702,6 +1702,24 @@ void evlist__set_tracking_event(struct evlist *evlist, struct evsel *tracking_ev tracking_evsel->tracking = true; } +struct evsel *evlist__findnew_tracking_event (struct evlist *evlist,bool system_wide) +{ +struct evsel *evsel; + + evsel =evlist__get_tracking_event (evlist); +if (!evsel__is_dummy_event (evsel)) { + evsel =evlist__add_aux_dummy (evlist, system_wide); +if (!evsel) +return NULL ; + +evlist__set_tracking_event (evlist, evsel); + }else if (system_wide) { +perf_evlist__go_system_wide (&evlist->core, &evsel->core); + } + +return evsel; +} +struct evsel *evlist__find_evsel_by_str (struct evlist *evlist,const char *str) {struct evsel *evsel;
tools/perf/util/evlist.h +1 -0
@@ -387,6 +387,7 @@ bool evlist_cpu_iterator__end(const struct evlist_cpu_iterator *evlist_cpu_itr);struct evsel *evlist__get_tracking_event (struct evlist *evlist);void evlist__set_tracking_event (struct evlist *evlist,struct evsel *tracking_evsel); +struct evsel *evlist__findnew_tracking_event (struct evlist *evlist,bool system_wide);struct evsel *evlist__find_evsel_by_str (struct evlist *evlist,const char *str);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 427/744 perf record: Move setting tracking events before record__init_thread_masks()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Jihong <[email protected]>
[ Upstream commit 1285ab300d598ead593b190af65a16f4b0843c68 ]
User space tasks can migrate between CPUs, so when tracing selected CPUs, sideband for all CPUs is needed. In this case set the cpu map of the evsel to all online CPUs. This may modify the original cpu map of the evlist.
Therefore, need to check whether the preceding scenario exists before record__init_thread_masks().
Dummy tracking has been set in record__open(), move it before record__init_thread_masks() and add a helper for unified processing.
The sys_perf_event_open invoked is as follows:
# perf --debug verbose=3 record -e cpu-clock -D 100 true
<SNIP>
Opening: cpu-clock
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 0 (PERF_COUNT_SW_CPU_CLOCK)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|PERIOD|IDENTIFIER
read_format ID|LOST
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid 10318 cpu 0 group_fd -1 flags 0x8 = 5
sys_perf_event_open: pid 10318 cpu 1 group_fd -1 flags 0x8 = 6
sys_perf_event_open: pid 10318 cpu 2 group_fd -1 flags 0x8 = 7
sys_perf_event_open: pid 10318 cpu 3 group_fd -1 flags 0x8 = 9
sys_perf_event_open: pid 10318 cpu 4 group_fd -1 flags 0x8 = 10
sys_perf_event_open: pid 10318 cpu 5 group_fd -1 flags 0x8 = 11
sys_perf_event_open: pid 10318 cpu 6 group_fd -1 flags 0x8 = 12
sys_perf_event_open: pid 10318 cpu 7 group_fd -1 flags 0x8 = 13
Opening: dummy:u
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 0x9 (PERF_COUNT_SW_DUMMY)
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|IDENTIFIER
read_format ID|LOST
disabled 1
inherit 1
exclude_kernel 1
exclude_hv 1
mmap 1
comm 1
enable_on_exec 1
task 1
sample_id_all 1
exclude_guest 1
mmap2 1
comm_exec 1
ksymbol 1
bpf_event 1
------------------------------------------------------------
sys_perf_event_open: pid 10318 cpu 0 group_fd -1 flags 0x8 = 14
sys_perf_event_open: pid 10318 cpu 1 group_fd -1 flags 0x8 = 15
sys_perf_event_open: pid 10318 cpu 2 group_fd -1 flags 0x8 = 16
sys_perf_event_open: pid 10318 cpu 3 group_fd -1 flags 0x8 = 17
sys_perf_event_open: pid 10318 cpu 4 group_fd -1 flags 0x8 = 18
sys_perf_event_open: pid 10318 cpu 5 group_fd -1 flags 0x8 = 19
sys_perf_event_open: pid 10318 cpu 6 group_fd -1 flags 0x8 = 20
sys_perf_event_open: pid 10318 cpu 7 group_fd -1 flags 0x8 = 21
<SNIP>'perf test' needs to update base-record & system-wide-dummy attr expected values for test-record-C0:
1. Because a dummy sideband event is added to the sampling of specified CPUs. When evlist contains evsel of different sample_type, evlist__config() will change the default PERF_SAMPLE_ID bit to PERF_SAMPLE_IDENTIFICATION bit.
The attr sample_type expected value of base-record and system-wide-dummy in test-record-C0 needs to be updated.
2. The perf record uses evlist__add_aux_dummy() instead of evlist__add_dummy() to add a dummy event.
The expected value of system-wide-dummy attr needs to be updated.
The 'perf test' result is as follows:
# ./perf test list 2>&1 | grep 'Setup struct perf_event_attr' 17: Setup struct perf_event_attr # ./perf test 17 17: Setup struct perf_event_attr : Ok
Stable-dep-of: 792bc998baf9 ("perf record: Fix debug message placement for test consumption")
--- tools/perf/builtin-record.c | 59 ++++++++++++++++--------- tools/perf/tests/attr/system-wide-dummy | 14 +++--- tools/perf/tests/attr/test-record-C0 | 4 +- 3 files changed, 47 insertions(+), 30 deletions(-)
tools/perf/builtin-record.c +37 -22
@@ -906,6 +906,37 @@ static int record__config_off_cpu(struct record *rec)return off_cpu_prepare (rec->evlist, &rec->opts.target, &rec->opts); } +static int record__config_tracking_events (struct record *rec) +{ +struct record_opts *opts = &rec->opts; +struct evlist *evlist = rec->evlist; +struct evsel *evsel; + +/* +* For initial_delay, system wide or a hybrid system, we need to add +* tracking event so that we can track PERF_RECORD_MMAP to cover the +* delay of waiting or event synthesis. +*/ +if (opts->target.initial_delay ||target__has_cpu (&opts->target) || +perf_pmus__num_core_pmus () >1 ) { + evsel =evlist__findnew_tracking_event (evlist, false); +if (!evsel) +return -ENOMEM ; + +/* +* Enable the tracking event when the process is forked for +* initial_delay, immediately for system wide. +*/ +if (opts->target.initial_delay && !evsel->immediate && + !target__has_cpu (&opts->target)) + evsel->core.attr.enable_on_exec =1 ; +else + evsel->immediate =1 ; + } + +return 0 ; +} +static bool record__kcore_readable (struct machine *machine) {char kcore[PATH_MAX ];
@@ -1286,28 +1317,6 @@ static int record__open(struct record *rec)struct record_opts *opts = &rec->opts;int rc =0 ; -/* -* For initial_delay, system wide or a hybrid system, we need to add a -* dummy event so that we can track PERF_RECORD_MMAP to cover the delay -* of waiting or event synthesis. -*/ -if (opts->target.initial_delay ||target__has_cpu (&opts->target) || -perf_pmus__num_core_pmus () >1 ) { - pos =evlist__findnew_tracking_event (evlist, false); -if (!pos) -return -ENOMEM ; - -/* -* Enable the dummy event when the process is forked for -* initial_delay, immediately for system wide. -*/ -if (opts->target.initial_delay && !pos->immediate && - !target__has_cpu (&opts->target)) - pos->core.attr.enable_on_exec =1 ; -else - pos->immediate =1 ; - } -evlist__config (evlist, opts, &callchain_param);evlist__for_each_entry (evlist, pos) {
@@ -4171,6 +4180,12 @@ int cmd_record(int argc, const char **argv) goto out; } + err =record__config_tracking_events (rec); +if (err) { +pr_err ("record__config_tracking_events failed, error %d\n" , err); + goto out; + } + err =record__init_thread_masks (rec);if (err) {pr_err ("Failed to initialize parallel data streaming masks\n" );
tools/perf/tests/attr/system-wide-dummy +8 -6
@@ -9,8 +9,10 @@ flags=8 type=1 size=136 config=9 -sample_period=4000 -sample_type=455 +sample_period=1 +# PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | +# PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER +sample_type=65671 read_format=4|20 # Event will be enabled right away. disabled=0
@@ -18,12 +20,12 @@ inherit=1 pinned=0 exclusive=0 exclude_user=0 -exclude_kernel=0 -exclude_hv=0 +exclude_kernel=1 +exclude_hv=1 exclude_idle=0 mmap=1 comm=1 -freq=1 +freq=0 inherit_stat=0 enable_on_exec=0 task=1
@@ -32,7 +34,7 @@ precise_ip=0 mmap_data=0 sample_id_all=1 exclude_host=0 -exclude_guest=0 +exclude_guest=1 exclude_callchain_kernel=0 exclude_callchain_user=0 mmap2=1
tools/perf/tests/attr/test-record-C0 +2 -2
@@ -10,9 +10,9 @@ cpu=0 enable_on_exec=0 # PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | -# PERF_SAMPLE_ID | PERF_SAMPLE_PERIOD +# PERF_SAMPLE_PERIOD | PERF_SAMPLE_IDENTIFIER # + PERF_SAMPLE_CPU added by -C 0 -sample_type=455 +sample_type=65927 # Dummy event handles mmaps, comm and task. mmap=0
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 428/744 perf record: Fix debug message placement for test consumption
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 792bc998baf9ae17297b1f93b1edc3ca34a0b7e2 ]
evlist__config() might mess up the debug output consumed by test "Test per-thread recording" in "Miscellaneous Intel PT testing".
Move it out from between the debug prints:
"perf record opening and mmapping events" and
"perf record done opening and mmapping events"
--- tools/perf/builtin-record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -1317,8 +1317,6 @@ static int record__open(struct record *rec)struct record_opts *opts = &rec->opts;int rc =0 ; -evlist__config (evlist, opts, &callchain_param); -evlist__for_each_entry (evlist, pos) { try_again:if (evsel__open (pos, pos->core.cpus, pos->core.threads) <0 ) {
@@ -2428,6 +2426,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)evlist__uniquify_name (rec->evlist); +evlist__config (rec->evlist, opts, &callchain_param); +/* Debug message used by test scripts */ pr_debug3 ("perf record opening and mmapping events\n" );if (record__open (rec) !=0 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 429/744 dt-bindings: PCI: rcar-pci-host: Add optional regulators
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit b952f96a57e6fb4528c1d6be19e941c3322f9905 ]
Support regulators found on the KingFisher board for miniPCIe (1.5 and 3.3v). For completeness, describe a 12v regulator while we are here.
Stable-dep-of: 78d212851f0e ("dt-bindings: PCI: rcar-pci-host: Add missing IOMMU properties")
--- .../devicetree/bindings/pci/rcar-pci-host.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+)
Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +11 -0
@@ -68,6 +68,15 @@ properties: phy-names: const: pcie + vpcie1v5-supply: + description: The 1.5v regulator to use for PCIe. + + vpcie3v3-supply: + description: The 3.3v regulator to use for PCIe. + + vpcie12v-supply: + description: The 12v regulator to use for PCIe. + required: - compatible - reg
@@ -121,5 +130,7 @@ examples: clock-names = "pcie", "pcie_bus"; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; resets = <&cpg 319>; + vpcie3v3-supply = <&pcie_3v3>; + vpcie12v-supply = <&pcie_12v>; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 430/744 dt-bindings: PCI: rcar-pci-host: Add missing IOMMU properties
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 78d212851f0e56b7d7083c4d5014aa7fa8b77e20 ]
make dtbs_check:
arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb: pcie@fe000000: Unevaluated properties are not allowed ('iommu-map', 'iommu-map-mask' were unexpected)
from schema $id: http://devicetree.org/schemas/pci/rcar-pci-host.yaml#
Fix this by adding the missing IOMMU-related properties.
--- Documentation/devicetree/bindings/pci/rcar-pci-host.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +3 -0
@@ -77,6 +77,9 @@ properties: vpcie12v-supply: description: The 12v regulator to use for PCIe. + iommu-map: true + iommu-map-mask: true + required: - compatible - reg
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 431/744 perf bench uprobe: Remove lib64 from libc.so.6 binary path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 459fee7b508231cd4622b3bd94aaa85e8e16b888 ]
bpf_program__attach_uprobe_opts will search LD_LIBRARY_PATH and so specifying /lib64 is unnecessary and causes failures for libc.so.6 paths like /lib/x86_64-linux-gnu/libc.so.6.
--- tools/perf/bench/uprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/bench/uprobe.c +1 -1
@@ -47,7 +47,7 @@ static const char * const bench_uprobe_usage[] = {#define bench_uprobe__attach_uprobe (prog) \ skel->links.prog = bpf_program__attach_uprobe_opts(/*prog=*/ skel->progs.prog, \/*pid=*/ -1 , \ -/*binary_path=*/ "/lib64/libc.so.6" , \ +/*binary_path=*/ "libc.so.6" , \/*func_offset=*/ 0 , \ /*opts=*/&uprobe_opts); \if (!skel->links.prog) { \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 432/744 f2fs: compress: fix to relocate check condition in f2fs_{release,reserve}_compress_blocks()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 7c5dffb3d90c5921b91981cc663e02757d90526e ]
Compress flag should be checked after inode lock held to avoid racing w/ f2fs_setflags_common(), fix it.
--- fs/f2fs/file.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
fs/f2fs/file.c +4 -8
@@ -3488,9 +3488,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)if (!f2fs_sb_has_compression (sbi))return -EOPNOTSUPP ; -if (!f2fs_compressed_file (inode)) -return -EINVAL ; -if (f2fs_readonly (sbi->sb))return -EROFS ;
@@ -3509,7 +3506,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) goto out; } -if (is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { +if (!f2fs_compressed_file (inode) || +is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { ret = -EINVAL ; goto out; }
@@ -3672,9 +3670,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)if (!f2fs_sb_has_compression (sbi))return -EOPNOTSUPP ; -if (!f2fs_compressed_file (inode)) -return -EINVAL ; -if (f2fs_readonly (sbi->sb))return -EROFS ;
@@ -3686,7 +3681,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)inode_lock (inode); -if (!is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { +if (!f2fs_compressed_file (inode) || + !is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { ret = -EINVAL ; goto unlock_inode; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 433/744 f2fs: compress: fix to relocate check condition in f2fs_ioc_{,de}compress_file()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit bd9ae4ae9e585061acfd4a169f2321706f900246 ]
Compress flag should be checked after inode lock held to avoid racing w/ f2fs_setflags_common() , fix it.
--- fs/f2fs/file.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
fs/f2fs/file.c +4 -8
@@ -4086,9 +4086,6 @@ static int f2fs_ioc_decompress_file(struct file *filp)if (!(filp->f_mode &FMODE_WRITE ))return -EBADF ; -if (!f2fs_compressed_file (inode)) -return -EINVAL ; -f2fs_balance_fs (sbi, true);file_start_write (filp);
@@ -4099,7 +4096,8 @@ static int f2fs_ioc_decompress_file(struct file *filp) goto out; } -if (is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { +if (!f2fs_compressed_file (inode) || +is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { ret = -EINVAL ; goto out; }
@@ -4165,9 +4163,6 @@ static int f2fs_ioc_compress_file(struct file *filp)if (!(filp->f_mode &FMODE_WRITE ))return -EBADF ; -if (!f2fs_compressed_file (inode)) -return -EINVAL ; -f2fs_balance_fs (sbi, true);file_start_write (filp);
@@ -4178,7 +4173,8 @@ static int f2fs_ioc_compress_file(struct file *filp) goto out; } -if (is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { +if (!f2fs_compressed_file (inode) || +is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 434/744 f2fs: fix to relocate check condition in f2fs_fallocate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 278a6253a673611dbc8ab72a3b34b151a8e75822 ]
compress and pinfile flag should be checked after inode lock held to avoid race condition, fix it.
--- fs/f2fs/file.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
fs/f2fs/file.c +11 -9
@@ -1797,15 +1797,6 @@ static long f2fs_fallocate(struct file *file, int mode, (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))return -EOPNOTSUPP ; -/* -* Pinned file should not support partial truncation since the block -* can be used by applications. -*/ -if ((f2fs_compressed_file (inode) ||f2fs_is_pinned_file (inode)) && - (mode & (FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE | -FALLOC_FL_ZERO_RANGE |FALLOC_FL_INSERT_RANGE ))) -return -EOPNOTSUPP ; -if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE |FALLOC_FL_ZERO_RANGE |FALLOC_FL_INSERT_RANGE ))
@@ -1813,6 +1804,17 @@ static long f2fs_fallocate(struct file *file, int mode,inode_lock (inode); +/* +* Pinned file should not support partial truncation since the block +* can be used by applications. +*/ +if ((f2fs_compressed_file (inode) ||f2fs_is_pinned_file (inode)) && + (mode & (FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE | +FALLOC_FL_ZERO_RANGE |FALLOC_FL_INSERT_RANGE ))) { + ret = -EOPNOTSUPP ; + goto out; + } + ret =file_modified (file);if (ret) goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 435/744 f2fs: fix to check pinfile flag in f2fs_move_file_range()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit e07230da0500e0919a765037c5e81583b519be2c ]
ioctl(F2FS_IOC_MOVE_RANGE) can truncate or punch hole on pinned file, fix to disallow it.
--- fs/f2fs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/file.c +2 -1
@@ -2813,7 +2813,8 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, goto out; } -if (f2fs_compressed_file (src) ||f2fs_compressed_file (dst)) { +if (f2fs_compressed_file (src) ||f2fs_compressed_file (dst) || +f2fs_is_pinned_file (src) ||f2fs_is_pinned_file (dst)) { ret = -EOPNOTSUPP ; goto out_unlock; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 436/744 iio: adc: stm32: Fixing err code to not indicate success
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 3735ca0b072656c3aa2cedc617a5e639b583a472 ]
This path would result in returning 0 / success on an error path.
--- drivers/iio/adc/stm32-adc.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/stm32-adc.c +1 -0
@@ -2234,6 +2234,7 @@ static int stm32_adc_generic_chan_init(struct iio_dev *indio_dev,if (vin[0 ] != val || vin[1 ] >= adc_info->max_channels) {dev_err (&indio_dev->dev,"Invalid channel in%d-in%d\n" , vin[0 ], vin[1 ]); + ret = -EINVAL ; goto err; } }else if (ret != -EINVAL ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 437/744 riscv: dts: starfive: visionfive 2: Remove non-existing TDM hardware
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannah Peuckmann <[email protected]>
[ Upstream commit dcde4e97b122ac318aaa71e8bcd2857dc28a0d12 ]
This partially reverts
commit e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm")
This added device tree nodes for TDM hardware that is not actually on the VisionFive 2 board, but connected on the 40pin header. Many different extension boards could be added on those pins, so this should be handled by overlays instead.
This also conflicts with the I2S node which also attempts to grab GPIO 44:
starfive-jh7110-sys-pinctrl 13040000.pinctrl: pin GPIO44 already requested by 10090000.tdm; cannot claim for 120c0000.i2s
--- .../jh7110-starfive-visionfive-2.dtsi | 40 ------------------- 1 file changed, 40 deletions(-)
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0 -40
@@ -440,40 +440,6 @@ GPOEN_ENABLE, }; }; - tdm_pins: tdm-0 { - tx-pins { - pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD, - GPOEN_ENABLE, - GPI_NONE)>; - bias-pull-up; - drive-strength = <2>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - - rx-pins { - pinmux = <GPIOMUX(61, GPOUT_HIGH, - GPOEN_DISABLE, - GPI_SYS_TDM_RXD)>; - input-enable; - }; - - sync-pins { - pinmux = <GPIOMUX(63, GPOUT_HIGH, - GPOEN_DISABLE, - GPI_SYS_TDM_SYNC)>; - input-enable; - }; - - pcmclk-pins { - pinmux = <GPIOMUX(38, GPOUT_HIGH, - GPOEN_DISABLE, - GPI_SYS_TDM_CLK)>; - input-enable; - }; - }; - uart0_pins: uart0-0 { tx-pins { pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX,
@@ -499,12 +465,6 @@ GPOEN_DISABLE, }; }; -&tdm { - pinctrl-names = "default"; - pinctrl-0 = <&tdm_pins>; - status = "okay"; -}; - &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 438/744 ovl: add helper ovl_file_modified()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit c002728f608183449673818076380124935e6b9b ]
A simple wrapper for updating ovl inode size/mtime, to conform with ovl_file_accessed().
Stable-dep-of: 7c98f7cb8fda ("remove call_{read,write}_iter() functions")
--- fs/overlayfs/file.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
fs/overlayfs/file.c +11 -7
@@ -235,6 +235,12 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)return ret; } +static void ovl_file_modified (struct file *file) +{ +/* Update size/mtime */ +ovl_copyattr (file_inode (file)); +} +static void ovl_file_accessed (struct file *file) {struct inode *inode, *upperinode;
@@ -290,10 +296,8 @@ static void ovl_aio_cleanup_handler(struct ovl_aio_req *aio_req)struct kiocb *orig_iocb = aio_req->orig_iocb;if (iocb->ki_flags &IOCB_WRITE ) { -struct inode *inode =file_inode (orig_iocb->ki_filp); -kiocb_end_write (iocb); -ovl_copyattr (inode); +ovl_file_modified (orig_iocb->ki_filp); } orig_iocb->ki_pos = iocb->ki_pos;
@@ -403,7 +407,7 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) ovl_iocb_to_rwf(ifl));file_end_write (real.file);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (file); }else {struct ovl_aio_req *aio_req;
@@ -489,7 +493,7 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,file_end_write (real.file);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (out);revert_creds (old_cred);fdput (real);
@@ -570,7 +574,7 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenrevert_creds (old_cred);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (file);fdput (real);
@@ -654,7 +658,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,revert_creds (old_cred);/* Update size */ -ovl_copyattr (inode_out); +ovl_file_modified (file_out);fdput (real_in);fdput (real_out);
Signature · 1 line
2.43.0
Re: [PATCH 6.6 438/744] ovl: add helper ovl_file_modified()
Quoted 3 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
As I wrote here:
https://lore.kernel.org/stable/CAOQ4uxj6y0TJs9ZEzGCY4UkqUc1frcEOZsnP4UnWvGtQX89mRA@mail.gmail.com/
No objection to this patch, but this patch in itself is useless for stable. It is being backported as
Stable-dep-of: 7c98f7cb8fda ("remove call_{read,write}_iter() functions")
and I think the decision to backport 7c98f7cb8fda is wrong.
I think that the Fixes: tag in 7c98f7cb8fda is misleading to think that this is a bug fix - it is not.
I wonder how my feedback on Sasha's series got lost?
Thanks,
Amir.
Quoted 86 lines
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit
c002728f608183449673818076380124935e6b9b]A simple wrapper for updating ovl inode size/mtime, to conform with
ovl_file_accessed().Signed-off-by Amir Goldstein <[email protected]>Stable-dep-of:
7c98f7cb8fda("remove call_{read,write}_iter() functions")Signed-off-by Sasha Levin <[email protected]>--- fs/overlayfs/file.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)fs/overlayfs/file.c +11
-8@@ -235,6 +235,12 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)return ret; } +static void ovl_file_modified (struct file *file) +{ +/* Update size/mtime */ +ovl_copyattr (file_inode (file)); +} +static void ovl_file_accessed (struct file *file) {struct inode *inode, *upperinode;@@ -290,10 +296,8 @@ static void ovl_aio_cleanup_handler(struct ovl_aio_req *aio_req)struct kiocb *orig_iocb = aio_req->orig_iocb;if (iocb->ki_flags &IOCB_WRITE ) { -struct inode *inode =file_inode (orig_iocb->ki_filp); -kiocb_end_write (iocb); -ovl_copyattr (inode); +ovl_file_modified (orig_iocb->ki_filp); } orig_iocb->ki_pos = iocb->ki_pos;@@ -403,7 +407,7 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) ovl_iocb_to_rwf(ifl));file_end_write (real.file);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (file); }else {struct ovl_aio_req *aio_req;@@ -489,7 +493,7 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,file_end_write (real.file);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (out);revert_creds (old_cred);fdput (real);@@ -570,7 +574,7 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenrevert_creds (old_cred);/* Update size */ -ovl_copyattr (inode); +ovl_file_modified (file);fdput (real);@@ -654,7 +658,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,revert_creds (old_cred);/* Update size */ -ovl_copyattr (inode_out); +ovl_file_modified (file_out);fdput (real_in);fdput (real_out); --2.43.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.6 438/744] ovl: add helper ovl_file_modified()
Quoted 9 lines · Amir Goldstein
Quoted 3 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
As I wrote here:
https://lore.kernel.org/stable/CAOQ4uxj6y0TJs9ZEzGCY4UkqUc1frcEOZsnP4UnWvGtQX89mRA@mail.gmail.com/
Quoted 6 lines
No objection to this patch, but this patch in itself is useless for stable. It is being backported as
Stable-dep-of:7c98f7cb8fda("remove call_{read,write}_iter() functions")
and I think the decision to backport7c98f7cb8fdais wrong.
I think that the Fixes: tag in7c98f7cb8fdais misleading to think that this is a bug fix - it is not.
THanks for the review, now dropped from both 6.9 and 6.6 queues.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 439/744 splice: remove permission hook from iter_file_splice_write()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit d53471ba6f7ae97a4e223539029528108b705af1 ]
All the callers of ->splice_write(), (e.g. do_splice_direct() and do_splice()) already check rw_verify_area() for the entire range and perform all the other checks that are in vfs_write_iter().
Instead of creating another tiny helper for special caller, just open-code it.
This is needed for fanotify "pre content" events.
Stable-dep-of: 7c98f7cb8fda ("remove call_{read,write}_iter() functions")
--- fs/splice.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
fs/splice.c +10 -3
@@ -673,10 +673,13 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, .u.file = out, };int nbufs = pipe->max_usage; -struct bio_vec *array =kcalloc (nbufs,sizeof (struct bio_vec ), -GFP_KERNEL ); +struct bio_vec *array;ssize_t ret; +if (!out->f_op->write_iter) +return -EINVAL ; + + array =kcalloc (nbufs,sizeof (struct bio_vec ),GFP_KERNEL );if (unlikely (!array))return -ENOMEM ;
@@ -684,6 +687,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,splice_from_pipe_begin (&sd);while (sd.total_len) { +struct kiocb kiocb;struct iov_iter from;unsigned int head, tail, mask;size_t left;
@@ -733,7 +737,10 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, }iov_iter_bvec (&from,ITER_SOURCE , array, n, sd.total_len - left); - ret =vfs_iter_write (out, &from, &sd.pos,0 ); +init_sync_kiocb (&kiocb, out); + kiocb.ki_pos = sd.pos; + ret =call_write_iter (out, &kiocb, &from); + sd.pos = kiocb.ki_pos;if (ret <=0 )break ;
Signature · 1 line
2.43.0
Re: [PATCH 6.6 439/744] splice: remove permission hook from iter_file_splice_write()
Quoted 2 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
I have objections and I wrote them when Sasha posted the patch for review:
https://lore.kernel.org/stable/CAOQ4uxgx7Qe=+Nn7LhPWAzFK3n=qsFC8U++U5XBaLUiTA+EqLw@mail.gmail.com/
Where did this objection get lost?
Thanks,
Amir.
Quoted 72 lines
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit
d53471ba6f7ae97a4e223539029528108b705af1]All the callers of ->splice_write(), (e.g.
do_splice_direct()anddo_splice()) already checkrw_verify_area()for the entire range and perform all the other checks that are invfs_write_iter().Instead of creating another tiny helper for special caller, just open-code it.
This is needed for fanotify "pre content" events.
Suggested-by Jan Kara <[email protected]>Reviewed-by Josef Bacik <[email protected]>Signed-off-by Amir Goldstein <[email protected]>Signed-off-by Christian Brauner <[email protected]>Stable-dep-of:
7c98f7cb8fda("remove call_{read,write}_iter() functions")Signed-off-by Sasha Levin <[email protected]>--- fs/splice.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)fs/splice.c +10
-4@@ -673,10 +673,13 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, .u.file = out, };int nbufs = pipe->max_usage; -struct bio_vec *array =kcalloc (nbufs,sizeof (struct bio_vec ), -GFP_KERNEL ); +struct bio_vec *array;ssize_t ret; +if (!out->f_op->write_iter) +return -EINVAL ; + + array =kcalloc (nbufs,sizeof (struct bio_vec ),GFP_KERNEL );if (unlikely (!array))return -ENOMEM ;@@ -684,6 +687,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,splice_from_pipe_begin (&sd);while (sd.total_len) { +struct kiocb kiocb;struct iov_iter from;unsigned int head, tail, mask;size_t left;@@ -733,7 +737,10 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, }iov_iter_bvec (&from,ITER_SOURCE , array, n, sd.total_len - left); - ret =vfs_iter_write (out, &from, &sd.pos,0 ); +init_sync_kiocb (&kiocb, out); + kiocb.ki_pos = sd.pos; + ret =call_write_iter (out, &kiocb, &from); + sd.pos = kiocb.ki_pos;if (ret <=0 )break ; --2.43.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.6 439/744] splice: remove permission hook from iter_file_splice_write()
Quoted 10 lines · Amir Goldstein
Quoted 2 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
I have objections and I wrote them when Sasha posted the patch for review:
https://lore.kernel.org/stable/CAOQ4uxgx7Qe=+Nn7LhPWAzFK3n=qsFC8U++U5XBaLUiTA+EqLw@mail.gmail.com/
Where did this objection get lost?
Don't know, sorry. Now dropped, thanks for letting me know.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 440/744 fs: move kiocb_start_write() into vfs_iocb_iter_write()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit 6ae654392bb516a0baa47fed1f085d84e8cad739 ]
In vfs code, sb_start_write() is usually called after the permission hook in rw_verify_area(). vfs_iocb_iter_write() is an exception to this rule, where kiocb_start_write() is called by its callers.
Move kiocb_start_write() from the callers into vfs_iocb_iter_write() after the rw_verify_area() checks, to make them "start-write-safe".
The semantics of vfs_iocb_iter_write() is changed, so that the caller is responsible for calling kiocb_end_write() on completion only if async iocb was queued. The completion handlers of both callers were adapted to this semantic change.
This is needed for fanotify "pre content" events.
Stable-dep-of: 7c98f7cb8fda ("remove call_{read,write}_iter() functions")
--- fs/cachefiles/io.c | 5 ++--- fs/overlayfs/file.c | 8 ++++---- fs/read_write.c | 7 +++++++ 3 files changed, 13 insertions(+), 7 deletions(-)
fs/cachefiles/io.c +2 -3
@@ -259,7 +259,8 @@ static void cachefiles_write_complete(struct kiocb *iocb, long ret)_enter ("%ld" , ret); -kiocb_end_write (iocb); +if (ki->was_async) +kiocb_end_write (iocb);if (ret <0 ) trace_cachefiles_io_error(object, inode, ret,
@@ -319,8 +320,6 @@ int __cachefiles_write(struct cachefiles_object *object, ki->iocb.ki_complete = cachefiles_write_complete;atomic_long_add (ki->b_writing, &cache->b_writing); -kiocb_start_write (&ki->iocb); -get_file (ki->iocb.ki_filp);cachefiles_grab_object (object, cachefiles_obj_get_ioreq);
fs/overlayfs/file.c +4 -4
@@ -295,10 +295,8 @@ static void ovl_aio_cleanup_handler(struct ovl_aio_req *aio_req)struct kiocb *iocb = &aio_req->iocb;struct kiocb *orig_iocb = aio_req->orig_iocb; -if (iocb->ki_flags &IOCB_WRITE ) { -kiocb_end_write (iocb); +if (iocb->ki_flags &IOCB_WRITE )ovl_file_modified (orig_iocb->ki_filp); - } orig_iocb->ki_pos = iocb->ki_pos;ovl_aio_put (aio_req);
@@ -310,6 +308,9 @@ static void ovl_aio_rw_complete(struct kiocb *iocb, long res) struct ovl_aio_req, iocb);struct kiocb *orig_iocb = aio_req->orig_iocb; +if (iocb->ki_flags &IOCB_WRITE ) +kiocb_end_write (iocb); +ovl_aio_cleanup_handler (aio_req); orig_iocb->ki_complete (orig_iocb, res); }
@@ -421,7 +422,6 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) aio_req->iocb.ki_flags = ifl; aio_req->iocb.ki_complete = ovl_aio_rw_complete;refcount_set (&aio_req->ref,2 ); -kiocb_start_write (&aio_req->iocb); ret =vfs_iocb_iter_write (real.file, &aio_req->iocb, iter);ovl_aio_put (aio_req);if (ret != -EIOCBQUEUED )
fs/read_write.c +7 -0
@@ -865,6 +865,10 @@ static ssize_t do_iter_write(struct file *file, struct iov_iter *iter,return ret; } +/* +* Caller is responsible for calling kiocb_end_write() on completion +* if async iocb was queued. +*/ ssize_t vfs_iocb_iter_write (struct file *file,struct kiocb *iocb,struct iov_iter *iter) {
@@ -885,7 +889,10 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,if (ret <0 )return ret; +kiocb_start_write (iocb); ret =call_write_iter (file, iocb, iter); +if (ret != -EIOCBQUEUED ) +kiocb_end_write (iocb);if (ret >0 )fsnotify_modify (file);
Signature · 1 line
2.43.0
Re: [PATCH 6.6 440/744] fs: move kiocb_start_write() into vfs_iocb_iter_write()
Quoted 3 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
I have objections and I wrote them when Sasha posted the patch for review:
https://lore.kernel.org/stable/CAOQ4uxg1Ce31UDDeb9ADYgEBvr582j4hqmJ-B72iAL+2xsAYzw@mail.gmail.com/
Where did this objection get lost?
Thanks,
Amir.
Quoted 123 lines
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit
6ae654392bb516a0baa47fed1f085d84e8cad739]In vfs code,
sb_start_write()is usually called after the permission hook inrw_verify_area().vfs_iocb_iter_write()is an exception to this rule, wherekiocb_start_write()is called by its callers.Move
kiocb_start_write()from the callers intovfs_iocb_iter_write()after therw_verify_area()checks, to make them "start-write-safe".The semantics of
vfs_iocb_iter_write()is changed, so that the caller is responsible for callingkiocb_end_write()on completion only if async iocb was queued. The completion handlers of both callers were adapted to this semantic change.This is needed for fanotify "pre content" events.
Suggested-by Jan Kara <[email protected]>Suggested-by Josef Bacik <[email protected]>Signed-off-by Amir Goldstein <[email protected]>Reviewed-by Josef Bacik <[email protected]>Reviewed-by Jan Kara <[email protected]>Signed-off-by Christian Brauner <[email protected]>Stable-dep-of:
7c98f7cb8fda("remove call_{read,write}_iter() functions")Signed-off-by Sasha Levin <[email protected]>--- fs/cachefiles/io.c | 5 ++--- fs/overlayfs/file.c | 8 ++++---- fs/read_write.c | 7 +++++++ 3 files changed, 13 insertions(+), 7 deletions(-)fs/cachefiles/io.c +2
-3@@ -259,7 +259,8 @@ static void cachefiles_write_complete(struct kiocb *iocb, long ret)_enter ("%ld" , ret); -kiocb_end_write (iocb); +if (ki->was_async) +kiocb_end_write (iocb);if (ret <0 ) trace_cachefiles_io_error(object, inode, ret,@@ -319,8 +320,6 @@ int __cachefiles_write(struct cachefiles_object *object, ki->iocb.ki_complete = cachefiles_write_complete;atomic_long_add (ki->b_writing, &cache->b_writing); -kiocb_start_write (&ki->iocb); -get_file (ki->iocb.ki_filp);cachefiles_grab_object (object, cachefiles_obj_get_ioreq);fs/overlayfs/file.c +4
-4@@ -295,10 +295,8 @@ static void ovl_aio_cleanup_handler(struct ovl_aio_req *aio_req)struct kiocb *iocb = &aio_req->iocb;struct kiocb *orig_iocb = aio_req->orig_iocb; -if (iocb->ki_flags &IOCB_WRITE ) { -kiocb_end_write (iocb); +if (iocb->ki_flags &IOCB_WRITE )ovl_file_modified (orig_iocb->ki_filp); - } orig_iocb->ki_pos = iocb->ki_pos;ovl_aio_put (aio_req);@@ -310,6 +308,9 @@ static void ovl_aio_rw_complete(struct kiocb *iocb, long res) struct ovl_aio_req, iocb);struct kiocb *orig_iocb = aio_req->orig_iocb; +if (iocb->ki_flags &IOCB_WRITE ) +kiocb_end_write (iocb); +ovl_aio_cleanup_handler (aio_req); orig_iocb->ki_complete (orig_iocb, res); }@@ -421,7 +422,6 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) aio_req->iocb.ki_flags = ifl; aio_req->iocb.ki_complete = ovl_aio_rw_complete;refcount_set (&aio_req->ref,2 ); -kiocb_start_write (&aio_req->iocb); ret =vfs_iocb_iter_write (real.file, &aio_req->iocb, iter);ovl_aio_put (aio_req);if (ret != -EIOCBQUEUED )fs/read_write.c +7
-1@@ -865,6 +865,10 @@ static ssize_t do_iter_write(struct file *file, struct iov_iter *iter,return ret; } +/* +* Caller is responsible for calling kiocb_end_write() on completion +* if async iocb was queued. +*/ ssize_t vfs_iocb_iter_write (struct file *file,struct kiocb *iocb,struct iov_iter *iter) {@@ -885,7 +889,10 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,if (ret <0 )return ret; +kiocb_start_write (iocb); ret =call_write_iter (file, iocb, iter); +if (ret != -EIOCBQUEUED ) +kiocb_end_write (iocb);if (ret >0 )fsnotify_modify (file); --2.43.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.6 440/744] fs: move kiocb_start_write() into vfs_iocb_iter_write()
Quoted 11 lines · Amir Goldstein
Quoted 3 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
I have objections and I wrote them when Sasha posted the patch for review:
https://lore.kernel.org/stable/CAOQ4uxg1Ce31UDDeb9ADYgEBvr582j4hqmJ-B72iAL+2xsAYzw@mail.gmail.com/
Where did this objection get lost?
Now dropped, thanks
greg k-h
Greg Kroah-Hartman
maintainerPATCH 441/744 remove call_{read,write}_iter() functions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
[ Upstream commit 7c98f7cb8fda964fbc60b9307ad35e94735fa35f ]
These have no clear purpose. This is effectively a revert of commit bb7462b6fd64 ("vfs: use helpers for calling f_op->{read,write}_iter()").
The patch was created with the help of a coccinelle script.
--- drivers/block/loop.c | 4 ++-- drivers/target/target_core_file.c | 4 ++-- fs/aio.c | 4 ++-- fs/read_write.c | 12 ++++++------ fs/splice.c | 4 ++-- include/linux/fs.h | 12 ------------ io_uring/rw.c | 4 ++-- 7 files changed, 16 insertions(+), 28 deletions(-)
drivers/block/loop.c +2 -2
@@ -447,9 +447,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_ioprio =IOPRIO_PRIO_VALUE (IOPRIO_CLASS_NONE ,0 );if (rw ==ITER_SOURCE ) - ret =call_write_iter (file, &cmd->iocb, &iter); + ret = file->f_op->write_iter (&cmd->iocb, &iter);else - ret =call_read_iter (file, &cmd->iocb, &iter); + ret = file->f_op->read_iter (&cmd->iocb, &iter);lo_rw_aio_do_completion (cmd);
drivers/target/target_core_file.c +2 -2
@@ -299,9 +299,9 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, aio_cmd->iocb.ki_flags |=IOCB_DSYNC ;if (is_write) - ret =call_write_iter (file, &aio_cmd->iocb, &iter); + ret = file->f_op->write_iter (&aio_cmd->iocb, &iter);else - ret =call_read_iter (file, &aio_cmd->iocb, &iter); + ret = file->f_op->read_iter (&aio_cmd->iocb, &iter);if (ret != -EIOCBQUEUED )cmd_rw_aio_complete (&aio_cmd->iocb, ret);
fs/aio.c +2 -2
@@ -1559,7 +1559,7 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb,return ret; ret =rw_verify_area (READ , file, &req->ki_pos,iov_iter_count (&iter));if (!ret) -aio_rw_done (req,call_read_iter (file, req, &iter)); +aio_rw_done (req, file->f_op->read_iter (req, &iter));kfree (iovec);return ret; }
@@ -1590,7 +1590,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,if (S_ISREG (file_inode (file)->i_mode))kiocb_start_write (req); req->ki_flags |=IOCB_WRITE ; -aio_rw_done (req,call_write_iter (file, req, &iter)); +aio_rw_done (req, file->f_op->write_iter (req, &iter)); }kfree (iovec);return ret;
fs/read_write.c +6 -6
@@ -386,7 +386,7 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo kiocb.ki_pos = (ppos ? *ppos :0 );iov_iter_ubuf (&iter,ITER_DEST , buf, len); - ret =call_read_iter (filp, &kiocb, &iter); + ret = filp->f_op->read_iter (&kiocb, &iter);BUG_ON (ret == -EIOCBQUEUED );if (ppos) *ppos = kiocb.ki_pos;
@@ -488,7 +488,7 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t kiocb.ki_pos = (ppos ? *ppos :0 );iov_iter_ubuf (&iter,ITER_SOURCE , (void __user *)buf, len); - ret =call_write_iter (filp, &kiocb, &iter); + ret = filp->f_op->write_iter (&kiocb, &iter);BUG_ON (ret == -EIOCBQUEUED );if (ret >0 && ppos) *ppos = kiocb.ki_pos;
@@ -730,9 +730,9 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, kiocb.ki_pos = (ppos ? *ppos :0 );if (type ==READ ) - ret =call_read_iter (filp, &kiocb, iter); + ret = filp->f_op->read_iter (&kiocb, iter);else - ret =call_write_iter (filp, &kiocb, iter); + ret = filp->f_op->write_iter (&kiocb, iter);BUG_ON (ret == -EIOCBQUEUED );if (ppos) *ppos = kiocb.ki_pos;
@@ -821,7 +821,7 @@ ssize_t vfs_iocb_iter_read(struct file *file, struct kiocb *iocb,if (ret <0 )return ret; - ret =call_read_iter (file, iocb, iter); + ret = file->f_op->read_iter (iocb, iter); out:if (ret >=0 )fsnotify_access (file);
@@ -890,7 +890,7 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,return ret;kiocb_start_write (iocb); - ret =call_write_iter (file, iocb, iter); + ret = file->f_op->write_iter (iocb, iter);if (ret != -EIOCBQUEUED )kiocb_end_write (iocb);if (ret >0 )
fs/splice.c +2 -2
@@ -361,7 +361,7 @@ ssize_t copy_splice_read(struct file *in, loff_t *ppos,iov_iter_bvec (&to,ITER_DEST , bv, npages, len);init_sync_kiocb (&kiocb, in); kiocb.ki_pos = *ppos; - ret =call_read_iter (in, &kiocb, &to); + ret = in->f_op->read_iter (&kiocb, &to);if (ret >0 ) { keep =DIV_ROUND_UP (ret,PAGE_SIZE );
@@ -739,7 +739,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,iov_iter_bvec (&from,ITER_SOURCE , array, n, sd.total_len - left);init_sync_kiocb (&kiocb, out); kiocb.ki_pos = sd.pos; - ret =call_write_iter (out, &kiocb, &from); + ret = out->f_op->write_iter (&kiocb, &from); sd.pos = kiocb.ki_pos;if (ret <=0 )break ;
include/linux/fs.h +0 -12
@@ -2005,18 +2005,6 @@ struct inode_operations {struct offset_ctx *(*get_offset_ctx)(struct inode *inode); }____cacheline_aligned ; -static inline ssize_t call_read_iter (struct file *file,struct kiocb *kio, -struct iov_iter *iter) -{ -return file->f_op->read_iter (kio, iter); -} - -static inline ssize_t call_write_iter (struct file *file,struct kiocb *kio, -struct iov_iter *iter) -{ -return file->f_op->write_iter (kio, iter); -} -static inline int call_mmap (struct file *file,struct vm_area_struct *vma) {return file->f_op->mmap (file, vma);
io_uring/rw.c +2 -2
@@ -653,7 +653,7 @@ static inline int io_iter_do_read(struct io_rw *rw, struct iov_iter *iter)struct file *file = rw->kiocb.ki_filp;if (likely (file->f_op->read_iter)) -return call_read_iter (file, &rw->kiocb, iter); +return file->f_op->read_iter (&rw->kiocb, iter);else if (file->f_op->read)return loop_rw_iter (READ , rw, iter);else
@@ -918,7 +918,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags) kiocb->ki_flags |=IOCB_WRITE ;if (likely (req->file->f_op->write_iter)) - ret2 =call_write_iter (req->file, kiocb, &s->iter); + ret2 = req->file->f_op->write_iter (kiocb, &s->iter);else if (req->file->f_op->write) ret2 =loop_rw_iter (WRITE , rw, &s->iter);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 442/744 coresight: etm4x: Fix unbalanced pm_runtime_enable()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anshuman Khandual <[email protected]>
[ Upstream commit caa41c47dab7e1054f587e592ab21296e3a6781c ]
There is an unbalanced pm_runtime_enable() in etm4_probe_platform_dev() when etm4_probe() fails. This problem can be observed via the coresight etm4 module's (load -> unload -> load) sequence when etm4_probe() fails in etm4_probe_platform_dev().
[ 63.379943] coresight-etm4x 7040000.etm: Unbalanced pm_runtime_enable! [ 63.393630] coresight-etm4x 7140000.etm: Unbalanced pm_runtime_enable! [ 63.407455] coresight-etm4x 7240000.etm: Unbalanced pm_runtime_enable! [ 63.420983] coresight-etm4x 7340000.etm: Unbalanced pm_runtime_enable! [ 63.420999] coresight-etm4x 7440000.etm: Unbalanced pm_runtime_enable! [ 63.441209] coresight-etm4x 7540000.etm: Unbalanced pm_runtime_enable! [ 63.454689] coresight-etm4x 7640000.etm: Unbalanced pm_runtime_enable! [ 63.474982] coresight-etm4x 7740000.etm: Unbalanced pm_runtime_enable!
This fixes the above problem - with an explicit pm_runtime_disable() call when etm4_probe() fails during etm4_probe_platform_dev().
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/hwtracing/coresight/coresight-etm4x-core.c +3 -0
@@ -2175,6 +2175,9 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) ret =etm4_probe (&pdev->dev);pm_runtime_put (&pdev->dev); +if (ret) +pm_runtime_disable (&pdev->dev); +return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 443/744 perf docs: Document bpf event modifier
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit eb4d27cf9aef3e6c9bcaf8fa1a1cadc2433d847b ]
Document that 'b' is used as a modifier to make an event use a BPF counter.
--- tools/perf/Documentation/perf-list.txt | 1 + 1 file changed, 1 insertion(+)
tools/perf/Documentation/perf-list.txt +1 -0
@@ -67,6 +67,7 @@ counted. The following modifiers exist: D - pin the event to the PMU W - group is weak and will fallback to non-group if not schedulable, e - group or event are exclusive and do not share the PMU + b - use BPF aggregration (see perf stat --bpf-counters) The 'p' modifier can be used for specifying how precise the instruction address should be. The 'p' modifier can be specified multiple times:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 444/744 perf test shell arm_coresight: Increase buffer size for Coresight basic tests
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 10b6ee3b597b1b1b4dc390aaf9d589664af31df9 ]
These tests record in a mode that includes kernel trace but look for samples of a userspace process. This makes them sensitive to any kernel compilation options that increase the amount of time spent in the kernel. If the trace buffer is completely filled before userspace is reached then the test will fail. Double the buffer size to fix this.
The other tests in the same file aren't sensitive to this for various reasons, for example the iterate devices test filters by userspace trace only. But in order to keep coverage of all the modes, increase the buffer size rather than filtering by userspace for the basic tests.
--- tools/perf/tests/shell/test_arm_coresight.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/test_arm_coresight.sh +1 -1
@@ -186,7 +186,7 @@ arm_cs_etm_snapshot_test() { arm_cs_etm_basic_test() { echo "Recording trace with '$*'" - perf record -o ${perfdata} "$@" -- ls > /dev/null 2>&1 + perf record -o ${perfdata} "$@" -m,8M -- ls > /dev/null 2>&1 perf_script_branch_samples ls && perf_report_branch_samples ls &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 445/744 iio: pressure: dps310: support negative temperature values
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Haemmerle <[email protected]>
[ Upstream commit 9dd6b32e76ff714308964cd9ec91466a343dcb8b ]
The current implementation interprets negative values returned from dps310_calculate_temp as error codes.
This has a side effect that when negative temperature values are calculated, they are interpreted as error.
Fix this by using the return value only for error handling and passing a pointer for the value.
--- drivers/iio/pressure/dps310.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iio/pressure/dps310.c +6 -5
@@ -730,7 +730,7 @@ static int dps310_read_pressure(struct dps310_data *data, int *val, int *val2, } } -static int dps310_calculate_temp (struct dps310_data *data) +static int dps310_calculate_temp (struct dps310_data *data,int *val) {s64 c0;s64 t;
@@ -746,7 +746,9 @@ static int dps310_calculate_temp(struct dps310_data *data) t = c0 + ((s64 )data->temp_raw * (s64 )data->c1);/* Convert to milliCelsius and scale the temperature */ -return (int )div_s64 (t *1000LL , kt); + *val = (int )div_s64 (t *1000LL , kt); + +return 0 ; } static int dps310_read_temp(struct dps310_data *data, int *val, int *val2,
@@ -768,11 +770,10 @@ static int dps310_read_temp(struct dps310_data *data, int *val, int *val2,if (rc)return rc; - rc =dps310_calculate_temp (data); -if (rc <0 ) + rc =dps310_calculate_temp (data, val); +if (rc)return rc; - *val = rc;return IIO_VAL_INT ;case IIO_CHAN_INFO_OVERSAMPLING_RATIO :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 446/744 iio: adc: ad9467: use spi_get_device_match_data()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit b67cc85d45d5d2894d0e2812bba27d7b23befbe6 ]
Make use of spi_get_device_match_data() to simplify things.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/ad9467.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/iio/adc/ad9467.c +1 -3
@@ -454,9 +454,7 @@ static int ad9467_probe(struct spi_device *spi)unsigned int id;int ret; - info =of_device_get_match_data (&spi->dev); -if (!info) - info = (void *)spi_get_device_id (spi)->driver_data; + info =spi_get_device_match_data (spi);if (!info)return -ENODEV ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 447/744 iio: adc: ad9467: use chip_info variables instead of array
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 6dd3fa9fcc66cb71834dc2e0a222324af0d8b95d ]
Instead of having an array and keeping IDs for each entry of the array, just have a chip_info struct per device.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/ad9467.c | 89 +++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 46 deletions(-)
drivers/iio/adc/ad9467.c +43 -46
@@ -101,12 +101,6 @@#define AD9467_DEF_OUTPUT_MODE 0x08#define AD9467_REG_VREF_MASK 0x0F -enum { -ID_AD9265 , -ID_AD9434 , -ID_AD9467 , -}; -struct ad9467_chip_info {struct adi_axi_adc_chip_info axi_adc_info;unsigned int default_output_mode;
@@ -234,43 +228,46 @@ static const struct iio_chan_spec ad9467_channels[] = { AD9467_CHAN(0, 0, 16, 'S'), }; -static const struct ad9467_chip_info ad9467_chip_tbl[] = { - [ID_AD9265 ] = { - .axi_adc_info = { - .id =CHIPID_AD9265 , - .max_rate =125000000UL , - .scale_table = ad9265_scale_table, - .num_scales =ARRAY_SIZE (ad9265_scale_table), - .channels = ad9467_channels, - .num_channels =ARRAY_SIZE (ad9467_channels), - }, - .default_output_mode =AD9265_DEF_OUTPUT_MODE , - .vref_mask =AD9265_REG_VREF_MASK , +static const struct ad9467_chip_info ad9467_chip_tbl = { + .axi_adc_info = { + .name ="ad9467" , + .id =CHIPID_AD9467 , + .max_rate =250000000UL , + .scale_table = ad9467_scale_table, + .num_scales =ARRAY_SIZE (ad9467_scale_table), + .channels = ad9467_channels, + .num_channels =ARRAY_SIZE (ad9467_channels), }, - [ID_AD9434 ] = { - .axi_adc_info = { - .id =CHIPID_AD9434 , - .max_rate =500000000UL , - .scale_table = ad9434_scale_table, - .num_scales =ARRAY_SIZE (ad9434_scale_table), - .channels = ad9434_channels, - .num_channels =ARRAY_SIZE (ad9434_channels), - }, - .default_output_mode =AD9434_DEF_OUTPUT_MODE , - .vref_mask =AD9434_REG_VREF_MASK , + .default_output_mode =AD9467_DEF_OUTPUT_MODE , + .vref_mask =AD9467_REG_VREF_MASK , +}; + +static const struct ad9467_chip_info ad9434_chip_tbl = { + .axi_adc_info = { + .name ="ad9434" , + .id =CHIPID_AD9434 , + .max_rate =500000000UL , + .scale_table = ad9434_scale_table, + .num_scales =ARRAY_SIZE (ad9434_scale_table), + .channels = ad9434_channels, + .num_channels =ARRAY_SIZE (ad9434_channels), }, - [ID_AD9467 ] = { - .axi_adc_info = { - .id =CHIPID_AD9467 , - .max_rate =250000000UL , - .scale_table = ad9467_scale_table, - .num_scales =ARRAY_SIZE (ad9467_scale_table), - .channels = ad9467_channels, - .num_channels =ARRAY_SIZE (ad9467_channels), - }, - .default_output_mode =AD9467_DEF_OUTPUT_MODE , - .vref_mask =AD9467_REG_VREF_MASK , + .default_output_mode =AD9434_DEF_OUTPUT_MODE , + .vref_mask =AD9434_REG_VREF_MASK , +}; + +static const struct ad9467_chip_info ad9265_chip_tbl = { + .axi_adc_info = { + .name ="ad9265" , + .id =CHIPID_AD9265 , + .max_rate =125000000UL , + .scale_table = ad9265_scale_table, + .num_scales =ARRAY_SIZE (ad9265_scale_table), + .channels = ad9467_channels, + .num_channels =ARRAY_SIZE (ad9467_channels), }, + .default_output_mode =AD9265_DEF_OUTPUT_MODE , + .vref_mask =AD9265_REG_VREF_MASK , };static int ad9467_get_scale (struct adi_axi_adc_conv *conv,int *val,int *val2)
@@ -504,17 +501,17 @@ static int ad9467_probe(struct spi_device *spi) }static const struct of_device_id ad9467_of_match[] = { - { .compatible ="adi,ad9265" , .data = &ad9467_chip_tbl[ID_AD9265 ], }, - { .compatible ="adi,ad9434" , .data = &ad9467_chip_tbl[ID_AD9434 ], }, - { .compatible ="adi,ad9467" , .data = &ad9467_chip_tbl[ID_AD9467 ], }, + { .compatible ="adi,ad9265" , .data = &ad9265_chip_tbl, }, + { .compatible ="adi,ad9434" , .data = &ad9434_chip_tbl, }, + { .compatible ="adi,ad9467" , .data = &ad9467_chip_tbl, }, {} };MODULE_DEVICE_TABLE (of, ad9467_of_match);static const struct spi_device_id ad9467_ids[] = { - {"ad9265" , (kernel_ulong_t)&ad9467_chip_tbl[ID_AD9265 ] }, - {"ad9434" , (kernel_ulong_t)&ad9467_chip_tbl[ID_AD9434 ] }, - {"ad9467" , (kernel_ulong_t)&ad9467_chip_tbl[ID_AD9467 ] }, + {"ad9265" , (kernel_ulong_t)&ad9265_chip_tbl }, + {"ad9434" , (kernel_ulong_t)&ad9434_chip_tbl }, + {"ad9467" , (kernel_ulong_t)&ad9467_chip_tbl }, {} };MODULE_DEVICE_TABLE (spi, ad9467_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 448/744 iio: adc: adi-axi-adc: convert to regmap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 21aa971d3e295c2c81d0887f8a3e85a95dd687c5 ]
Use MMIO regmap interface. It makes things easier for manipulating bits.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/Kconfig | 2 +- drivers/iio/adc/adi-axi-adc.c | 85 +++++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 34 deletions(-)
drivers/iio/adc/Kconfig +1 -1
@@ -292,7 +292,7 @@ config ADI_AXI_ADC select IIO_BUFFER select IIO_BUFFER_HW_CONSUMER select IIO_BUFFER_DMAENGINE - depends on HAS_IOMEM + select REGMAP_MMIO depends on OF help Say yes here to build support for Analog Devices Generic
drivers/iio/adc/adi-axi-adc.c +52 -33
149 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 449/744 iio: buffer-dmaengine: export buffer alloc and free functions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 9c446288d7b31402adb454535cb2c3cbdb55bb88 ]
Export iio_dmaengine_buffer_free() and iio_dmaengine_buffer_alloc(). This is in preparation of introducing IIO backends support. This will allow us to allocate a buffer and control it's lifetime from a device different from the one holding the DMA firmware properties. Effectively, in this case the struct device holding the firmware information about the DMA channels is not the same as iio_dev->dev.parent (typical case).
While at it, namespace the buffer-dmaengine exports and update the current user of these buffers.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/adi-axi-adc.c | 1 + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 8 +++++--- include/linux/iio/buffer-dmaengine.h | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/iio/adc/adi-axi-adc.c +1 -0
@@ -447,3 +447,4 @@ module_platform_driver(adi_axi_adc_driver);MODULE_AUTHOR ("Michael Hennerich <[email protected]>" );MODULE_DESCRIPTION ("Analog Devices Generic AXI ADC IP core driver" );MODULE_LICENSE ("GPL v2" ); +MODULE_IMPORT_NS (IIO_DMAENGINE_BUFFER );
drivers/iio/buffer/industrialio-buffer-dmaengine.c +5 -3
@@ -159,7 +159,7 @@ static const struct iio_dev_attr *iio_dmaengine_buffer_attrs[] = {* Once done using the buffer iio_dmaengine_buffer_free() should be used to * release it. */ -static struct iio_buffer *iio_dmaengine_buffer_alloc (struct device *dev, +struct iio_buffer *iio_dmaengine_buffer_alloc (struct device *dev,const char *channel) {struct dmaengine_buffer *dmaengine_buffer;
@@ -210,6 +210,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,kfree (dmaengine_buffer);return ERR_PTR (ret); } +EXPORT_SYMBOL_NS_GPL (iio_dmaengine_buffer_alloc,IIO_DMAENGINE_BUFFER );/** * iio_dmaengine_buffer_free() - Free dmaengine buffer
@@ -217,7 +218,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,* * Frees a buffer previously allocated with iio_dmaengine_buffer_alloc(). */ -static void iio_dmaengine_buffer_free (struct iio_buffer *buffer) +void iio_dmaengine_buffer_free (struct iio_buffer *buffer) {struct dmaengine_buffer *dmaengine_buffer =iio_buffer_to_dmaengine_buffer (buffer);
@@ -227,6 +228,7 @@ static void iio_dmaengine_buffer_free(struct iio_buffer *buffer)iio_buffer_put (buffer); } +EXPORT_SYMBOL_NS_GPL (iio_dmaengine_buffer_free,IIO_DMAENGINE_BUFFER );static void __devm_iio_dmaengine_buffer_free (void *buffer) {
@@ -288,7 +290,7 @@ int devm_iio_dmaengine_buffer_setup(struct device *dev,return iio_device_attach_buffer (indio_dev, buffer); } -EXPORT_SYMBOL_GPL (devm_iio_dmaengine_buffer_setup); +EXPORT_SYMBOL_NS_GPL (devm_iio_dmaengine_buffer_setup,IIO_DMAENGINE_BUFFER );MODULE_AUTHOR ("Lars-Peter Clausen <[email protected]>" );MODULE_DESCRIPTION ("DMA buffer for the IIO framework" );
include/linux/iio/buffer-dmaengine.h +3 -0
@@ -10,6 +10,9 @@struct iio_dev ;struct device ; +struct iio_buffer *iio_dmaengine_buffer_alloc (struct device *dev, +const char *channel); +void iio_dmaengine_buffer_free (struct iio_buffer *buffer);int devm_iio_dmaengine_buffer_setup (struct device *dev,struct iio_dev *indio_dev,const char *channel);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 450/744 iio: add the IIO backend framework
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 1a97905d3e48ebe79a06d16143fbfa427c56ce5f ]
This is a Framework to handle complex IIO aggregate devices.
The typical architecture is to have one device as the frontend device which can be "linked" against one or multiple backend devices. All the IIO and userspace interface is expected to be registers/managed by the frontend device which will callback into the backends when needed (to get/set some configuration that it does not directly control).
The basic framework interface is pretty simple:
- Backends should register themselves with @devm_iio_backend_register()
- Frontend devices should get backends with @devm_iio_backend_get()
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- MAINTAINERS | 8 + drivers/iio/Kconfig | 9 + drivers/iio/Makefile | 1 + drivers/iio/industrialio-backend.c | 418 +++++++++++++++++++++++++++++ include/linux/iio/backend.h | 72 +++++ 5 files changed, 508 insertions(+) create mode 100644 drivers/iio/industrialio-backend.c create mode 100644 include/linux/iio/backend.h
MAINTAINERS +8 -0
@@ -10157,6 +10157,14 @@ L: [email protected] S: Maintained F: drivers/media/rc/iguanair.c +IIO BACKEND FRAMEWORK +M: Nuno Sa <[email protected]> +R: Olivier Moysan <[email protected]> +L: [email protected] +S: Maintained +F: drivers/iio/industrialio-backend.c +F: include/linux/iio/backend.h + IIO DIGITAL POTENTIOMETER DAC M: Peter Rosin <[email protected]> L: [email protected]
drivers/iio/Kconfig +9 -0
@@ -71,6 +71,15 @@ config IIO_TRIGGERED_EVENT help Provides helper functions for setting up triggered events. +config IIO_BACKEND + tristate + help + Framework to handle complex IIO aggregate devices. The typical + architecture that can make use of this framework is to have one + device as the frontend device which can be "linked" against one or + multiple backend devices. The framework then makes it easy to get + and control such backend devices. + source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/addac/Kconfig"
drivers/iio/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_IIO_GTS_HELPER) += industrialio-gts-helper.o obj-$(CONFIG_IIO_SW_DEVICE) += industrialio-sw-device.o obj-$(CONFIG_IIO_SW_TRIGGER) += industrialio-sw-trigger.o obj-$(CONFIG_IIO_TRIGGERED_EVENT) += industrialio-triggered-event.o +obj-$(CONFIG_IIO_BACKEND) += industrialio-backend.o obj-y += accel/ obj-y += adc/
drivers/iio/industrialio-backend.c new file +418 -0
418 lines not on this page · raw message
include/linux/iio/backend.h new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 451/744 iio: adc: ad9467: convert to backend framework
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit bb42191f85c389bf816373d25c3e4c94045cf4ff ]
Convert the driver to use the new IIO backend framework. The device functionality is expected to be the same (meaning no added or removed features).
Also note this patch effectively breaks ABI and that's needed so we can properly support this device and add needed features making use of the new IIO framework.
Given the lack of features (and devices supported) in the ad9467 driver compared with the ADI out of tree version, we don't expect any user of the upstream driver so no one should notice the ABI breakage. However, if someone is affected by this, ADI will happily support transitioning to the backend framework.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/Kconfig | 2 +- drivers/iio/adc/ad9467.c | 267 ++++++++++++++++++++++++++------------- 2 files changed, 178 insertions(+), 91 deletions(-)
drivers/iio/adc/Kconfig +1 -1
@@ -275,7 +275,7 @@ config AD799X config AD9467 tristate "Analog Devices AD9467 High Speed ADC driver" depends on SPI - depends on ADI_AXI_ADC + select IIO_BACKEND help Say yes here to build support for Analog Devices: * AD9467 16-Bit, 200 MSPS/250 MSPS Analog-to-Digital Converter
drivers/iio/adc/ad9467.c +177 -90
443 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 452/744 iio: adc: adi-axi-adc: move to backend framework
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 794ef0e57854d794173c8ab6bcce3285032dcd95 ]
Move to the IIO backend framework. Devices supported by adi-axi-adc now register themselves as backend devices.
Stable-dep-of: cf1c833f89e7 ("iio: adc: adi-axi-adc: only error out in major version mismatch")
--- drivers/iio/adc/Kconfig | 2 +- drivers/iio/adc/adi-axi-adc.c | 384 +++++++--------------------- include/linux/iio/adc/adi-axi-adc.h | 68 ----- 3 files changed, 96 insertions(+), 358 deletions(-) delete mode 100644 include/linux/iio/adc/adi-axi-adc.h
drivers/iio/adc/Kconfig +1 -1
@@ -293,7 +293,7 @@ config ADI_AXI_ADC select IIO_BUFFER_HW_CONSUMER select IIO_BUFFER_DMAENGINE select REGMAP_MMIO - depends on OF + select IIO_BACKEND help Say yes here to build support for Analog Devices Generic AXI ADC IP core. The IP core is used for interfacing with
drivers/iio/adc/adi-axi-adc.c +95 -289
493 lines not on this page · raw message
include/linux/iio/adc/adi-axi-adc.h deleted +0 -68
68 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 453/744 iio: adc: adi-axi-adc: only error out in major version mismatch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit cf1c833f89e7c8635a28c3db15c68ead150ea712 ]
The IP core only has breaking changes when there major version changes. Hence, only match the major number. This is also in line with the other core ADI has upstream. The current check for erroring out 'expected_version > current_version"' is then wrong as we could just increase the core major with breaking changes and that would go unnoticed.
--- drivers/iio/adc/adi-axi-adc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/adi-axi-adc.c +2 -2
@@ -207,9 +207,9 @@ static int adi_axi_adc_probe(struct platform_device *pdev)if (ret)return ret; -if (*expected_ver > ver) { +if (ADI_AXI_PCORE_VER_MAJOR (ver) !=ADI_AXI_PCORE_VER_MAJOR (*expected_ver)) { dev_err(&pdev->dev, - "IP core version is too old. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", + "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", ADI_AXI_PCORE_VER_MAJOR(*expected_ver), ADI_AXI_PCORE_VER_MINOR(*expected_ver), ADI_AXI_PCORE_VER_PATCH(*expected_ver),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 454/744 coresight: etm4x: Do not hardcode IOMEM access for register restore
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit 1e7ba33fa591de1cf60afffcabb45600b3607025 ]
When we restore the register state for ETM4x, while coming back from CPU idle, we hardcode IOMEM access. This is wrong and could blow up for an ETM with system instructions access (and for ETE).
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +4 -2
@@ -1805,8 +1805,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata) {int i;struct etmv4_save_state *state = drvdata->save_state; -struct csdev_access tmp_csa =CSDEV_ACCESS_IOMEM (drvdata->base); -struct csdev_access *csa = &tmp_csa; +struct csdev_access *csa = &drvdata->csdev->access; + +if (WARN_ON (!drvdata->csdev)) +return ;etm4_cs_unlock (drvdata, csa);etm4x_relaxed_write32 (csa, state->trcclaimset,TRCCLAIMSET );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 455/744 coresight: etm4x: Do not save/restore Data trace control registers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit 5eb3a0c2c52368cb9902e9a6ea04888e093c487d ]
ETM4x doesn't support Data trace on A class CPUs. As such do not access the Data trace control registers during CPU idle. This could cause problems for ETE. While at it, remove all references to the Data trace control registers.
--- .../coresight/coresight-etm4x-core.c | 6 ---- drivers/hwtracing/coresight/coresight-etm4x.h | 28 ------------------- 2 files changed, 34 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +0 -6
@@ -1701,9 +1701,6 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata) state->trcvissctlr =etm4x_read32 (csa,TRCVISSCTLR );if (drvdata->nr_pe_cmp) state->trcvipcssctlr =etm4x_read32 (csa,TRCVIPCSSCTLR ); - state->trcvdctlr =etm4x_read32 (csa,TRCVDCTLR ); - state->trcvdsacctlr =etm4x_read32 (csa,TRCVDSACCTLR ); - state->trcvdarcctlr =etm4x_read32 (csa,TRCVDARCCTLR );for (i =0 ; i < drvdata->nrseqstate -1 ; i++) state->trcseqevr[i] =etm4x_read32 (csa,TRCSEQEVRn (i));
@@ -1834,9 +1831,6 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)etm4x_relaxed_write32 (csa, state->trcvissctlr,TRCVISSCTLR );if (drvdata->nr_pe_cmp)etm4x_relaxed_write32 (csa, state->trcvipcssctlr,TRCVIPCSSCTLR ); -etm4x_relaxed_write32 (csa, state->trcvdctlr,TRCVDCTLR ); -etm4x_relaxed_write32 (csa, state->trcvdsacctlr,TRCVDSACCTLR ); -etm4x_relaxed_write32 (csa, state->trcvdarcctlr,TRCVDARCCTLR );for (i =0 ; i < drvdata->nrseqstate -1 ; i++)etm4x_relaxed_write32 (csa, state->trcseqevr[i],TRCSEQEVRn (i));
drivers/hwtracing/coresight/coresight-etm4x.h +0 -28
@@ -43,9 +43,6 @@#define TRCVIIECTLR 0x084#define TRCVISSCTLR 0x088#define TRCVIPCSSCTLR 0x08C -#define TRCVDCTLR 0x0A0 -#define TRCVDSACCTLR 0x0A4 -#define TRCVDARCCTLR 0x0A8/* Derived resources registers */ #define TRCSEQEVRn (n) (0x100 + (n * 4))/* n = 0-2 */ #define TRCSEQRSTEVR 0x118
@@ -90,9 +87,6 @@/* Address Comparator registers n = 0-15 */ #define TRCACVRn (n) (0x400 + (n * 8))#define TRCACATRn (n) (0x480 + (n * 8)) -/* Data Value Comparator Value registers, n = 0-7 */ -#define TRCDVCVRn (n) (0x500 + (n * 16)) -#define TRCDVCMRn (n) (0x580 + (n * 16))/* ContextID/Virtual ContextID comparators, n = 0-7 */ #define TRCCIDCVRn (n) (0x600 + (n * 8))#define TRCVMIDCVRn (n) (0x640 + (n * 8))
@@ -272,9 +266,6 @@/* List of registers accessible via System instructions */ #define ETM4x_ONLY_SYSREG_LIST (op, val) \ CASE_##op((val), TRCPROCSELR) \ - CASE_##op((val), TRCVDCTLR) \ - CASE_##op((val), TRCVDSACCTLR) \ - CASE_##op((val), TRCVDARCCTLR) \ CASE_##op((val), TRCOSLAR)#define ETM_COMMON_SYSREG_LIST (op, val) \
@@ -422,22 +413,6 @@ CASE_##op((val), TRCACATRn(13)) \ CASE_##op((val), TRCACATRn(14)) \ CASE_##op((val), TRCACATRn(15)) \ - CASE_##op((val), TRCDVCVRn(0)) \ - CASE_##op((val), TRCDVCVRn(1)) \ - CASE_##op((val), TRCDVCVRn(2)) \ - CASE_##op((val), TRCDVCVRn(3)) \ - CASE_##op((val), TRCDVCVRn(4)) \ - CASE_##op((val), TRCDVCVRn(5)) \ - CASE_##op((val), TRCDVCVRn(6)) \ - CASE_##op((val), TRCDVCVRn(7)) \ - CASE_##op((val), TRCDVCMRn(0)) \ - CASE_##op((val), TRCDVCMRn(1)) \ - CASE_##op((val), TRCDVCMRn(2)) \ - CASE_##op((val), TRCDVCMRn(3)) \ - CASE_##op((val), TRCDVCMRn(4)) \ - CASE_##op((val), TRCDVCMRn(5)) \ - CASE_##op((val), TRCDVCMRn(6)) \ - CASE_##op((val), TRCDVCMRn(7)) \ CASE_##op((val), TRCCIDCVRn(0)) \ CASE_##op((val), TRCCIDCVRn(1)) \ CASE_##op((val), TRCCIDCVRn(2)) \
@@ -907,9 +882,6 @@ struct etmv4_save_state {u32 trcviiectlr;u32 trcvissctlr;u32 trcvipcssctlr; -u32 trcvdctlr; -u32 trcvdsacctlr; -u32 trcvdarcctlr;u32 trcseqevr[ETM_MAX_SEQ_STATES ];u32 trcseqrstevr;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 456/744 coresight: etm4x: Safe access for TRCQCLTR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit 46bf8d7cd8530eca607379033b9bc4ac5590a0cd ]
ETM4x implements TRCQCLTR only when the Q elements are supported and the Q element filtering is supported (TRCIDR0.QFILT). Access to the register otherwise could be fatal. Fix this by tracking the availability, like the others.
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 ++++++-- drivers/hwtracing/coresight/coresight-etm4x.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +6 -2
@@ -1204,6 +1204,8 @@ static void etm4_init_arch_data(void *info) drvdata->nr_event =FIELD_GET (TRCIDR0_NUMEVENT_MASK , etmidr0);/* QSUPP, bits[16:15] Q element support field */ drvdata->q_support =FIELD_GET (TRCIDR0_QSUPP_MASK , etmidr0); +if (drvdata->q_support) + drvdata->q_filt = !!(etmidr0 &TRCIDR0_QFILT );/* TSSIZE, bits[28:24] Global timestamp size field */ drvdata->ts_size =FIELD_GET (TRCIDR0_TSSIZE_MASK , etmidr0);
@@ -1694,7 +1696,8 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata) state->trcccctlr =etm4x_read32 (csa,TRCCCCTLR ); state->trcbbctlr =etm4x_read32 (csa,TRCBBCTLR ); state->trctraceidr =etm4x_read32 (csa,TRCTRACEIDR ); - state->trcqctlr =etm4x_read32 (csa,TRCQCTLR ); +if (drvdata->q_filt) + state->trcqctlr =etm4x_read32 (csa,TRCQCTLR ); state->trcvictlr =etm4x_read32 (csa,TRCVICTLR ); state->trcviiectlr =etm4x_read32 (csa,TRCVIIECTLR );
@@ -1824,7 +1827,8 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)etm4x_relaxed_write32 (csa, state->trcccctlr,TRCCCCTLR );etm4x_relaxed_write32 (csa, state->trcbbctlr,TRCBBCTLR );etm4x_relaxed_write32 (csa, state->trctraceidr,TRCTRACEIDR ); -etm4x_relaxed_write32 (csa, state->trcqctlr,TRCQCTLR ); +if (drvdata->q_filt) +etm4x_relaxed_write32 (csa, state->trcqctlr,TRCQCTLR );etm4x_relaxed_write32 (csa, state->trcvictlr,TRCVICTLR );etm4x_relaxed_write32 (csa, state->trcviiectlr,TRCVIIECTLR );
drivers/hwtracing/coresight/coresight-etm4x.h +3 -0
@@ -135,6 +135,7 @@#define TRCIDR0_TRCCCI BIT(7)#define TRCIDR0_RETSTACK BIT(9)#define TRCIDR0_NUMEVENT_MASK GENMASK(11, 10) +#define TRCIDR0_QFILT BIT(14)#define TRCIDR0_QSUPP_MASK GENMASK(16, 15)#define TRCIDR0_TSSIZE_MASK GENMASK(28, 24)
@@ -954,6 +955,7 @@ struct etmv4_save_state {* @os_unlock: True if access to management registers is allowed. * @instrp0: Tracing of load and store instructions * as P0 elements is supported. +* @q_filt: Q element filtering support, if Q elements are supported. * @trcbb: Indicates if the trace unit supports branch broadcast tracing. * @trccond: If the trace unit supports conditional * instruction tracing.
@@ -1017,6 +1019,7 @@ struct etmv4_drvdata {bool boot_enable;bool os_unlock;bool instrp0; +bool q_filt;bool trcbb;bool trccond;bool retstack;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 457/744 coresight: etm4x: Fix access to resource selector registers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit d6fc00d0f640d6010b51054aa8b0fd191177dbc9 ]
Resource selector pair 0 is always implemented and reserved. We must not touch it, even during save/restore for CPU Idle. Rest of the driver is well behaved. Fix the offending ones.
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +4 -2
@@ -1720,7 +1720,8 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata) state->trccntvr[i] =etm4x_read32 (csa,TRCCNTVRn (i)); } -for (i =0 ; i < drvdata->nr_resource *2 ; i++) +/* Resource selector pair 0 is reserved */ +for (i =2 ; i < drvdata->nr_resource *2 ; i++) state->trcrsctlr[i] =etm4x_read32 (csa,TRCRSCTLRn (i));for (i =0 ; i < drvdata->nr_ss_cmp; i++) {
@@ -1851,7 +1852,8 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)etm4x_relaxed_write32 (csa, state->trccntvr[i],TRCCNTVRn (i)); } -for (i =0 ; i < drvdata->nr_resource *2 ; i++) +/* Resource selector pair 0 is reserved */ +for (i =2 ; i < drvdata->nr_resource *2 ; i++)etm4x_relaxed_write32 (csa, state->trcrsctlr[i],TRCRSCTLRn (i));for (i =0 ; i < drvdata->nr_ss_cmp; i++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 458/744 i915: make inject_virtual_interrupt() void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 85884871921000b9bca2184077b1159771e50047 ]
The single caller of inject_virtual_interrupt() ignores the return value anyway. This allows us to simplify eventfd_signal() in follow-up patches.
Stable-dep-of: 82b951e6fbd3 ("vfio/pci: fix potential memory leak in vfio_intx_enable()")
--- drivers/gpu/drm/i915/gvt/interrupt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gvt/interrupt.c +6 -7
@@ -405,7 +405,7 @@ static void init_irq_map(struct intel_gvt_irq *irq)#define MSI_CAP_DATA (offset) (offset + 8)#define MSI_CAP_EN 0x1 -static int inject_virtual_interrupt (struct intel_vgpu *vgpu) +static void inject_virtual_interrupt (struct intel_vgpu *vgpu) {unsigned long offset = vgpu->gvt->device_info.msi_cap_offset;u16 control, data;
@@ -417,10 +417,10 @@ static int inject_virtual_interrupt(struct intel_vgpu *vgpu)/* Do not generate MSI if MSIEN is disabled */ if (!(control &MSI_CAP_EN )) -return 0 ; +return ;if (WARN (control &GENMASK (15 ,1 ),"only support one MSI format\n" )) -return -EINVAL ; +return ;trace_inject_msi (vgpu->id, addr, data);
@@ -434,10 +434,9 @@ static int inject_virtual_interrupt(struct intel_vgpu *vgpu)* returned and don't inject interrupt into guest. */ if (!test_bit (INTEL_VGPU_STATUS_ATTACHED , vgpu->status)) -return -ESRCH ; -if (vgpu->msi_trigger &&eventfd_signal (vgpu->msi_trigger,1 ) !=1 ) -return -EFAULT ; -return 0 ; +return ; +if (vgpu->msi_trigger) +eventfd_signal (vgpu->msi_trigger,1 ); } static void propagate_event(struct intel_gvt_irq *irq,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 459/744 vfio/pci: fix potential memory leak in vfio_intx_enable()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ye Bin <[email protected]>
[ Upstream commit 82b951e6fbd31d85ae7f4feb5f00ddd4c5d256e2 ]
If vfio_irq_ctx_alloc() failed will lead to 'name' memory leak.
--- drivers/vfio/pci/vfio_pci_intrs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_intrs.c +3 -1
@@ -277,8 +277,10 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev,return -ENOMEM ; ctx =vfio_irq_ctx_alloc (vdev,0 ); -if (!ctx) +if (!ctx) { +kfree (name);return -ENOMEM ; + } ctx->name = name; ctx->trigger = trigger;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 460/744 fpga: region: add owner module and take its refcount
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Pagani <[email protected]>
[ Upstream commit b7c0e1ecee403a43abc89eb3e75672b01ff2ece9 ]
The current implementation of the fpga region assumes that the low-level module registers a driver for the parent device and uses its owner pointer to take the module's refcount. This approach is problematic since it can lead to a null pointer dereference while attempting to get the region during programming if the parent device does not have a driver.
To address this problem, add a module owner pointer to the fpga_region struct and use it to take the module's refcount. Modify the functions for registering a region to take an additional owner module parameter and rename them to avoid conflicts. Use the old function names for helper macros that automatically set the module that registers the region as the owner. This ensures compatibility with existing low-level control modules and reduces the chances of registering a region without setting the owner.
Also, update the documentation to keep it consistent with the new interface for registering an fpga region.
--- Documentation/driver-api/fpga/fpga-region.rst | 13 ++++++---- drivers/fpga/fpga-region.c | 24 +++++++++++-------- include/linux/fpga/fpga-region.h | 13 +++++++--- 3 files changed, 32 insertions(+), 18 deletions(-)
Documentation/driver-api/fpga/fpga-region.rst +8 -5
@@ -46,13 +46,16 @@ API to add a new FPGA region ---------------------------- * struct fpga_region - The FPGA region struct -* struct fpga_region_info - Parameter structure for fpga_region_register_full() -* fpga_region_register_full() - Create and register an FPGA region using the +* struct fpga_region_info - Parameter structure for __fpga_region_register_full() +* __fpga_region_register_full() - Create and register an FPGA region using the fpga_region_info structure to provide the full flexibility of options -* fpga_region_register() - Create and register an FPGA region using standard +* __fpga_region_register() - Create and register an FPGA region using standard arguments * fpga_region_unregister() - Unregister an FPGA region +Helper macros ``fpga_region_register()`` and ``fpga_region_register_full()`` +automatically set the module that registers the FPGA region as the owner. + The FPGA region's probe function will need to get a reference to the FPGA Manager it will be using to do the programming. This usually would happen during the region's probe function.
@@ -82,10 +85,10 @@ following APIs to handle building or tearing down that list. :functions: fpga_region_info .. kernel-doc:: drivers/fpga/fpga-region.c - :functions: fpga_region_register_full + :functions: __fpga_region_register_full .. kernel-doc:: drivers/fpga/fpga-region.c - :functions: fpga_region_register + :functions: __fpga_region_register .. kernel-doc:: drivers/fpga/fpga-region.c :functions: fpga_region_unregister
drivers/fpga/fpga-region.c +14 -10
@@ -53,7 +53,7 @@ static struct fpga_region *fpga_region_get(struct fpga_region *region) }get_device (dev); -if (!try_module_get (dev->parent->driver->owner)) { +if (!try_module_get (region->ops_owner)) {put_device (dev);mutex_unlock (®ion->mutex);return ERR_PTR (-ENODEV );
@@ -75,7 +75,7 @@ static void fpga_region_put(struct fpga_region *region)dev_dbg (dev,"put\n" ); -module_put (dev->parent->driver->owner); +module_put (region->ops_owner);put_device (dev);mutex_unlock (®ion->mutex); }
@@ -181,14 +181,16 @@ static struct attribute *fpga_region_attrs[] = {ATTRIBUTE_GROUPS (fpga_region);/** -* fpga_region_register_full - create and register an FPGA Region device +* __fpga_region_register_full - create and register an FPGA Region device * @parent: device parent * @info: parameters for FPGA Region +* @owner: module containing the get_bridges function * * Return: struct fpga_region or ERR_PTR() */ struct fpga_region * -fpga_region_register_full (struct device *parent,const struct fpga_region_info *info) +__fpga_region_register_full (struct device *parent,const struct fpga_region_info *info, +struct module *owner) {struct fpga_region *region;int id, ret =0 ;
@@ -213,6 +215,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info * region->compat_id = info->compat_id; region->priv = info->priv; region->get_bridges = info->get_bridges; + region->ops_owner = owner;mutex_init (®ion->mutex);INIT_LIST_HEAD (®ion->bridge_list);
@@ -241,13 +244,14 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *return ERR_PTR (ret); } -EXPORT_SYMBOL_GPL (fpga_region_register_full); +EXPORT_SYMBOL_GPL (__fpga_region_register_full);/** -* fpga_region_register - create and register an FPGA Region device +* __fpga_region_register - create and register an FPGA Region device * @parent: device parent * @mgr: manager that programs this region * @get_bridges: optional function to get bridges to a list +* @owner: module containing the get_bridges function * * This simple version of the register function should be sufficient for most users. * The fpga_region_register_full() function is available for users that need to
@@ -256,17 +260,17 @@ EXPORT_SYMBOL_GPL(fpga_region_register_full);* Return: struct fpga_region or ERR_PTR() */ struct fpga_region * -fpga_region_register (struct device *parent,struct fpga_manager *mgr, -int (*get_bridges)(struct fpga_region *)) +__fpga_region_register (struct device *parent,struct fpga_manager *mgr, +int (*get_bridges)(struct fpga_region *),struct module *owner) {struct fpga_region_info info = {0 }; info.mgr = mgr; info.get_bridges = get_bridges; -return fpga_region_register_full (parent, &info); +return __fpga_region_register_full (parent, &info, owner); } -EXPORT_SYMBOL_GPL (fpga_region_register); +EXPORT_SYMBOL_GPL (__fpga_region_register);/** * fpga_region_unregister - unregister an FPGA region
include/linux/fpga/fpga-region.h +10 -3
@@ -36,6 +36,7 @@ struct fpga_region_info {* @mgr: FPGA manager * @info: FPGA image info * @compat_id: FPGA region id for compatibility check. +* @ops_owner: module containing the get_bridges function * @priv: private data * @get_bridges: optional function to get bridges to a list */
@@ -46,6 +47,7 @@ struct fpga_region {struct fpga_manager *mgr;struct fpga_image_info *info;struct fpga_compat_id *compat_id; +struct module *ops_owner;void *priv;int (*get_bridges)(struct fpga_region *region); };
@@ -58,12 +60,17 @@ fpga_region_class_find(struct device *start, const void *data,int fpga_region_program_fpga (struct fpga_region *region); +#define fpga_region_register_full (parent, info) \ + __fpga_region_register_full(parent, info, THIS_MODULE)struct fpga_region * -fpga_region_register_full (struct device *parent,const struct fpga_region_info *info); +__fpga_region_register_full (struct device *parent,const struct fpga_region_info *info, +struct module *owner); +#define fpga_region_register (parent, mgr, get_bridges) \ + __fpga_region_register(parent, mgr, get_bridges, THIS_MODULE)struct fpga_region * -fpga_region_register (struct device *parent,struct fpga_manager *mgr, -int (*get_bridges)(struct fpga_region *)); +__fpga_region_register (struct device *parent,struct fpga_manager *mgr, +int (*get_bridges)(struct fpga_region *),struct module *owner);void fpga_region_unregister (struct fpga_region *region);#endif /* _FPGA_REGION_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 461/744 udf: Remove GFP_NOFS allocation in udf_expand_file_adinicb()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 38f8af2a7191e5da21c557210d810c6d0d34f6c4 ]
udf_expand_file_adinicb() is called under inode->i_rwsem and mapping->invalidate_lock. i_rwsem is safe wrt fs reclaim, invalidate_lock on this inode is safe as well (we hold inode reference so reclaim will not touch it, furthermore even lockdep should not complain as invalidate_lock is acquired from udf_evict_inode() only when truncating inode which should not happen from fs reclaim).
Stable-dep-of: db6754090a4f ("udf: Convert udf_expand_file_adinicb() to use a folio")
--- fs/udf/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/udf/inode.c +1 -1
@@ -357,7 +357,7 @@ int udf_expand_file_adinicb(struct inode *inode)return 0 ; } - page =find_or_create_page (inode->i_mapping,0 ,GFP_NOFS ); + page =find_or_create_page (inode->i_mapping,0 ,GFP_KERNEL );if (!page)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 462/744 udf: Convert udf_expand_file_adinicb() to use a folio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit db6754090a4f99c67e05ae6b87343ba6e013531f ]
Use the folio APIs throughout this function.
Message-Id: <[email protected]>
--- fs/udf/inode.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
fs/udf/inode.c +14 -13
@@ -341,7 +341,7 @@ const struct address_space_operations udf_aops = {*/ int udf_expand_file_adinicb (struct inode *inode) { -struct page *page; +struct folio *folio;struct udf_inode_info *iinfo =UDF_I (inode);int err;
@@ -357,12 +357,13 @@ int udf_expand_file_adinicb(struct inode *inode)return 0 ; } - page =find_or_create_page (inode->i_mapping,0 ,GFP_KERNEL ); -if (!page) -return -ENOMEM ; + folio =__filemap_get_folio (inode->i_mapping,0 , +FGP_LOCK |FGP_ACCESSED |FGP_CREAT ,GFP_KERNEL ); +if (IS_ERR (folio)) +return PTR_ERR (folio); -if (!PageUptodate (page)) -udf_adinicb_readpage (page); +if (!folio_test_uptodate (folio)) +udf_adinicb_readpage (&folio->page);down_write (&iinfo->i_data_sem);memset (iinfo->i_data + iinfo->i_lenEAttr,0x00 , iinfo->i_lenAlloc);
@@ -371,22 +372,22 @@ int udf_expand_file_adinicb(struct inode *inode) iinfo->i_alloc_type =ICBTAG_FLAG_AD_SHORT ; else iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG; -set_page_dirty (page); -unlock_page (page); +folio_mark_dirty (folio); +folio_unlock (folio);up_write (&iinfo->i_data_sem); err =filemap_fdatawrite (inode->i_mapping);if (err) {/* Restore everything back so that we don't lose data... */ -lock_page (page); +folio_lock (folio);down_write (&iinfo->i_data_sem); -memcpy_to_page (page,0 , iinfo->i_data + iinfo->i_lenEAttr, - inode->i_size); -unlock_page (page); +memcpy_from_folio (iinfo->i_data + iinfo->i_lenEAttr, + folio,0 , inode->i_size); +folio_unlock (folio); iinfo->i_alloc_type =ICBTAG_FLAG_AD_IN_ICB ; iinfo->i_lenAlloc = inode->i_size;up_write (&iinfo->i_data_sem); } -put_page (page); +folio_put (folio);mark_inode_dirty (inode);return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 463/744 xfs: require XFS_SB_FEAT_INCOMPAT_LOG_XATTRS for attr log intent item recovery
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Darrick J. Wong <[email protected]>
[ Upstream commit 8ef1d96a985e4dc07ffbd71bd7fc5604a80cc644 ]
The XFS_SB_FEAT_INCOMPAT_LOG_XATTRS feature bit protects a filesystem from old kernels that do not know how to recover extended attribute log intent items. Make this check mandatory instead of a debugging assert.
--- fs/xfs/xfs_attr_item.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/xfs_attr_item.c +3 -2
@@ -510,6 +510,9 @@ xfs_attri_validate(unsigned int op = attrp->alfi_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +if (!xfs_sb_version_haslogxattrs (&mp->m_sb)) +return false; +if (attrp->__pad !=0 )return false;
@@ -602,8 +605,6 @@ xfs_attri_item_recover( args->op_flags =XFS_DA_OP_RECOVERY |XFS_DA_OP_OKNOENT |XFS_DA_OP_LOGGED ; -ASSERT (xfs_sb_version_haslogxattrs (&mp->m_sb)); -switch (attr->xattri_op_flags) {case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 464/744 microblaze: Remove gcc flag for non existing early_printk.c file
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Simek <[email protected]>
[ Upstream commit edc66cf0c4164aa3daf6cc55e970bb94383a6a57 ]
early_printk support for removed long time ago but compilation flag for ftrace still points to already removed file that's why remove that line too.
--- arch/microblaze/kernel/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/microblaze/kernel/Makefile +0 -1
@@ -7,7 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER # Do not trace early boot code and low level code CFLAGS_REMOVE_timer.o = -pg CFLAGS_REMOVE_intc.o = -pg -CFLAGS_REMOVE_early_printk.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_process.o = -pg endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 465/744 microblaze: Remove early printk call from cpuinfo-static.c
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Simek <[email protected]>
[ Upstream commit 58d647506c92ccd3cfa0c453c68ddd14f40bf06f ]
Early printk has been removed already that's why also remove calling it. Similar change has been done in cpuinfo-pvr-full.c by commit cfbd8d1979af ("microblaze: Remove early printk setup").
--- arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/microblaze/kernel/cpu/cpuinfo-static.c +1 -1
@@ -18,7 +18,7 @@ static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY;static const char cpu_ver_string[] =CONFIG_XILINX_MICROBLAZE0_HW_VER ;#define err_printk (x) \ - early_printk("ERROR: Microblaze " x "-different for kernel and DTS\n"); + pr_err("ERROR: Microblaze " x "-different for kernel and DTS\n");void __init set_cpuinfo_static (struct cpuinfo *ci,struct device_node *cpu) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 466/744 PCI: Wait for Link Training==0 before starting Link retrain
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 73cb3a35f94db723c0211ad099bce55b2155e3f0 ]
Two changes were made in link retraining logic independent of each other.
The commit e7e39756363a ("PCI/ASPM: Avoid link retraining race") added a check to pcie_retrain_link() to ensure no Link Training is currently active to address the Implementation Note in PCIe r6.1 sec 7.5.3.7. At that time pcie_wait_for_retrain() only checked for the Link Training (LT) bit being cleared.
The commit 680e9c47a229 ("PCI: Add support for polling DLLLA to pcie_retrain_link()") generalized pcie_wait_for_retrain() into pcie_wait_for_link_status() which can wait either for LT or the Data Link Layer Link Active (DLLLA) bit with 'use_lt' argument and supporting waiting for either cleared or set using 'active' argument.
In the merge commit 1abb47390350 ("Merge branch 'pci/enumeration'"), those two divergent branches converged. The merge changed LT bit checking added in the commit e7e39756363a ("PCI/ASPM: Avoid link retraining race") to now wait for completion of any ongoing Link Training using DLLLA bit being set if 'use_lt' is false.
When 'use_lt' is false, the pseudo-code steps of what occurs in pcie_retrain_link():
1. Wait for DLLLA==1
2. Trigger link to retrain
3. Wait for DLLLA==1
Step 3 waits for the link to come up from the retraining triggered by Step
2. As Step 1 is supposed to wait for any ongoing retraining to end, using DLLLA also for it does not make sense because link training being active is still indicated using LT bit, not with DLLLA.
Correct the pcie_wait_for_link_status() parameters in Step 1 to only wait for LT==0 to ensure there is no ongoing Link Training.
This only impacts the Target Speed quirk, which is the only case where waiting for DLLLA bit is used. It currently works in the problematic case by means of link training getting initiated by hardware repeatedly and respecting the new link parameters set by the caller, which then make training succeed and bring the link up, setting DLLLA and causing pcie_wait_for_link_status() to return success. We are not supposed to rely on luck and need to make sure that LT transitioned through the inactive state though before we initiate link training by hand via RL (Retrain Link) bit.
--- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.c +1 -1
@@ -4986,7 +4986,7 @@ int pcie_retrain_link(struct pci_dev *pdev, bool use_lt)* avoid LTSSM race as recommended in Implementation Note at the * end of PCIe r6.0.1 sec 7.5.3.7. */ - rc =pcie_wait_for_link_status (pdev, use_lt, !use_lt); + rc =pcie_wait_for_link_status (pdev, true, false);if (rc)return rc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 467/744 perf intel-pt: Fix unassigned instruction op (discovered by MemorySanitizer)
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit e101a05f79fd4ee3e89d2f3fb716493c33a33708 ]
MemorySanitizer discovered instances where the instruction op value was not assigned.:
WARNING: MemorySanitizer: use-of-uninitialized-value
#0 0x5581c00a76b3 in intel_pt_sample_flags tools/perf/util/intel-pt.c:1527:17
Uninitialized value was stored to memory at
#0 0x5581c005ddf8 in intel_pt_walk_insn tools/perf/util/intel-pt-decoder/intel-pt-decoder.c:1256:25The op value is used to set branch flags for branch instructions encountered when walking the code, so fix by setting op to INTEL_PT_OP_OTHER in other cases.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++ tools/perf/util/intel-pt.c | 2 ++ 2 files changed, 4 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +2 -0
@@ -1319,6 +1319,8 @@ static bool intel_pt_fup_event(struct intel_pt_decoder *decoder, bool no_tip)bool ret = false; decoder->state.type &= ~INTEL_PT_BRANCH ; + decoder->state.insn_op =INTEL_PT_OP_OTHER ; + decoder->state.insn_len =0 ;if (decoder->set_fup_cfe_ip || decoder->set_fup_cfe) {bool ip = decoder->set_fup_cfe_ip;
tools/perf/util/intel-pt.c +2 -0
@@ -764,6 +764,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn,addr_location__init (&al); intel_pt_insn->length =0 ; + intel_pt_insn->op =INTEL_PT_OP_OTHER ;if (to_ip && *ip == to_ip) goto out_no_cache;
@@ -898,6 +899,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn,if (to_ip && *ip == to_ip) { intel_pt_insn->length =0 ; + intel_pt_insn->op =INTEL_PT_OP_OTHER ; goto out_no_cache; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 468/744 xfs: match lock mode in xfs_buffered_write_iomap_begin()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit bb712842a85d595525e72f0e378c143e620b3ea2 ]
Commit 1aa91d9c9933 ("xfs: Add async buffered write support") replace xfs_ilock(XFS_ILOCK_EXCL) with xfs_ilock_for_iomap() when locking the writing inode, and a new variable lockmode is used to indicate the lock mode. Although the lockmode should always be XFS_ILOCK_EXCL, it's still better to use this variable instead of useing XFS_ILOCK_EXCL directly when unlocking the inode.
--- fs/xfs/xfs_iomap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/xfs/xfs_iomap.c +5 -5
@@ -1149,13 +1149,13 @@ xfs_buffered_write_iomap_begin(* them out if the write happens to fail. */ seq =xfs_iomap_inode_sequence (ip,IOMAP_F_NEW ); -xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (ip, lockmode);trace_xfs_iomap_alloc (ip, offset, count, allocfork, &imap);return xfs_bmbt_to_iomap (ip, iomap, &imap, flags,IOMAP_F_NEW , seq); found_imap: seq =xfs_iomap_inode_sequence (ip,0 ); -xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (ip, lockmode);return xfs_bmbt_to_iomap (ip, iomap, &imap, flags,0 , seq); found_cow:
@@ -1165,17 +1165,17 @@ xfs_buffered_write_iomap_begin(if (error) goto out_unlock; seq =xfs_iomap_inode_sequence (ip,IOMAP_F_SHARED ); -xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (ip, lockmode);return xfs_bmbt_to_iomap (ip, iomap, &cmap, flags,IOMAP_F_SHARED , seq); }xfs_trim_extent (&cmap, offset_fsb, imap.br_startoff - offset_fsb); -xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (ip, lockmode);return xfs_bmbt_to_iomap (ip, iomap, &cmap, flags,0 , seq); out_unlock: -xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (ip, lockmode);return error; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 469/744 RISC-V: Enable cbo.zero in usermode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Jones <[email protected]>
[ Upstream commit 43c16d51a19b0ba2ed66978d5924d486ec1e42bc ]
When Zicboz is present, enable its instruction (cbo.zero) in usermode by setting its respective senvcfg bit. We don't bother trying to set this bit per-task, which would also require an interface for tasks to request enabling and/or disabling. Instead, permanently set the bit for each hart which has the extension when bringing it online.
This patch also introduces riscv_cpu_has_extension_[un]likely() functions to check a specific hart's ISA bitmap for extensions. Prior to checking the specific hart's bitmap in these functions we try the bitmap which represents the LCD of extensions, but only when we know it will use its optimized, alternatives path by gating its call on CONFIG_RISCV_ALTERNATIVE. When alternatives are used, the compiler ensures that the invocation of the LCD search becomes a constant true or false. When it's true, even the new functions will completely vanish from their callsites. OTOH, when the LCD check is false, we need to do a search of the hart's ISA bitmap. Had we also checked the LCD bitmap without the use of alternatives, then we would have ended up with two bitmap searches instead of one.
Stable-dep-of: 58661a30f1bc ("riscv: Flush the instruction cache during SMP bringup")
--- arch/riscv/include/asm/cpufeature.h | 1 + arch/riscv/include/asm/csr.h | 1 + arch/riscv/include/asm/hwcap.h | 16 ++++++++++++++++ arch/riscv/kernel/cpufeature.c | 6 ++++++ arch/riscv/kernel/setup.c | 4 ++++ arch/riscv/kernel/smpboot.c | 4 ++++ 6 files changed, 32 insertions(+)
arch/riscv/include/asm/cpufeature.h +1 -0
@@ -31,5 +31,6 @@ DECLARE_PER_CPU(long, misaligned_access_speed);extern struct riscv_isainfo hart_isa[NR_CPUS ];void check_unaligned_access (int cpu); +void riscv_user_isa_enable (void );#endif
arch/riscv/include/asm/csr.h +1 -0
@@ -275,6 +275,7 @@#define CSR_SIE 0x104#define CSR_STVEC 0x105#define CSR_SCOUNTEREN 0x106 +#define CSR_SENVCFG 0x10a#define CSR_SSCRATCH 0x140#define CSR_SEPC 0x141#define CSR_SCAUSE 0x142
arch/riscv/include/asm/hwcap.h +16 -0
@@ -70,6 +70,7 @@#ifndef __ASSEMBLY__#include <linux/jump_label.h> +#include <asm/cpufeature.h> unsigned long riscv_get_elf_hwcap (void );
@@ -137,6 +138,21 @@ riscv_has_extension_unlikely(const unsigned long ext)return true; } +static __always_inline bool riscv_cpu_has_extension_likely(int cpu, const unsigned long ext) +{ +if (IS_ENABLED (CONFIG_RISCV_ALTERNATIVE ) &&riscv_has_extension_likely (ext)) +return true; + +return __riscv_isa_extension_available (hart_isa[cpu].isa, ext); +} + +static __always_inline bool riscv_cpu_has_extension_unlikely(int cpu, const unsigned long ext) +{ +if (IS_ENABLED (CONFIG_RISCV_ALTERNATIVE ) &&riscv_has_extension_unlikely (ext)) +return true; + +return __riscv_isa_extension_available (hart_isa[cpu].isa, ext); +}#endif #endif /* _ASM_RISCV_HWCAP_H */
arch/riscv/kernel/cpufeature.c +6 -0
@@ -672,6 +672,12 @@ static int check_unaligned_access_boot_cpu(void)arch_initcall (check_unaligned_access_boot_cpu); +void riscv_user_isa_enable (void ) +{ +if (riscv_cpu_has_extension_unlikely (smp_processor_id (),RISCV_ISA_EXT_ZICBOZ )) +csr_set (CSR_SENVCFG ,ENVCFG_CBZE ); +} +#ifdef CONFIG_RISCV_ALTERNATIVE /* * Alternative patch sites consider 48 bits when determining when to patch
arch/riscv/kernel/setup.c +4 -0
@@ -26,6 +26,7 @@#include <asm/acpi.h> #include <asm/alternative.h> #include <asm/cacheflush.h> +#include <asm/cpufeature.h> #include <asm/cpu_ops.h> #include <asm/early_ioremap.h> #include <asm/pgtable.h>
@@ -314,10 +315,13 @@ void __init setup_arch(char **cmdline_p)riscv_fill_hwcap ();init_rt_signal_env ();apply_boot_alternatives (); +if (IS_ENABLED (CONFIG_RISCV_ISA_ZICBOM ) &&riscv_isa_extension_available (NULL ,ZICBOM ))riscv_noncoherent_supported ();riscv_set_dma_cache_alignment (); + +riscv_user_isa_enable (); }static int __init topology_init (void )
arch/riscv/kernel/smpboot.c +4 -0
@@ -25,6 +25,8 @@#include <linux/of.h> #include <linux/sched/task_stack.h> #include <linux/sched/mm.h> + +#include <asm/cpufeature.h> #include <asm/cpu_ops.h> #include <asm/cpufeature.h> #include <asm/irq.h>
@@ -253,6 +255,8 @@ asmlinkage __visible void smp_callin(void) elf_hwcap &= ~COMPAT_HWCAP_ISA_V ; } +riscv_user_isa_enable (); +/* * Remote TLB flushes are ignored while the CPU is offline, so emit * a local TLB flush right now just in case.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 470/744 riscv: Flush the instruction cache during SMP bringup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Holland <[email protected]>
[ Upstream commit 58661a30f1bcc748475ffd9be6d2fc9e4e6be679 ]
Instruction cache flush IPIs are sent only to CPUs in cpu_online_mask, so they will not target a CPU until it calls set_cpu_online() earlier in smp_callin(). As a result, if instruction memory is modified between the CPU coming out of reset and that point, then its instruction cache may contain stale data. Therefore, the instruction cache must be flushed after the set_cpu_online() synchronization point.
--- arch/riscv/kernel/smpboot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/riscv/kernel/smpboot.c +4 -3
@@ -26,7 +26,7 @@#include <linux/sched/task_stack.h> #include <linux/sched/mm.h> -#include <asm/cpufeature.h> +#include <asm/cacheflush.h> #include <asm/cpu_ops.h> #include <asm/cpufeature.h> #include <asm/irq.h>
@@ -258,9 +258,10 @@ asmlinkage __visible void smp_callin(void)riscv_user_isa_enable ();/* -* Remote TLB flushes are ignored while the CPU is offline, so emit -* a local TLB flush right now just in case. +* Remote cache and TLB flushes are ignored while the CPU is offline, +* so flush them both right now just in case. */ +local_flush_icache_all ();local_flush_tlb_all ();complete (&cpu_running);/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 471/744 pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
[ Upstream commit c748a6d77c06a78651030e17da6beb278a1c9470 ]
In order to introduce a pwm api which can be used from atomic context, we will need two functions for applying pwm changes:
int pwm_apply_might_sleep(struct pwm *, struct pwm_state *); int pwm_apply_atomic(struct pwm *, struct pwm_state *);
This commit just deals with renaming pwm_apply_state(), a following commit will introduce the pwm_apply_atomic() function.
Stable-dep-of: 974afccd3794 ("leds: pwm: Disable PWM when going to suspend")
--- Documentation/driver-api/pwm.rst | 8 +++--- MAINTAINERS | 2 +- .../gpu/drm/i915/display/intel_backlight.c | 6 ++-- drivers/gpu/drm/solomon/ssd130x.c | 2 +- drivers/hwmon/pwm-fan.c | 8 +++--- drivers/input/misc/da7280.c | 4 +-- drivers/input/misc/pwm-beeper.c | 4 +-- drivers/input/misc/pwm-vibra.c | 8 +++--- drivers/leds/leds-pwm.c | 2 +- drivers/leds/rgb/leds-pwm-multicolor.c | 4 +-- drivers/media/rc/ir-rx51.c | 4 +-- drivers/media/rc/pwm-ir-tx.c | 4 +-- drivers/platform/x86/lenovo-yogabook.c | 2 +- drivers/pwm/core.c | 18 ++++++------ drivers/pwm/pwm-twl-led.c | 2 +- drivers/pwm/pwm-vt8500.c | 2 +- drivers/pwm/sysfs.c | 10 +++---- drivers/regulator/pwm-regulator.c | 4 +-- drivers/video/backlight/lm3630a_bl.c | 2 +- drivers/video/backlight/lp855x_bl.c | 2 +- drivers/video/backlight/pwm_bl.c | 12 ++++---- drivers/video/fbdev/ssd1307fb.c | 2 +- include/linux/pwm.h | 28 +++++++++---------- 23 files changed, 70 insertions(+), 70 deletions(-)
Documentation/driver-api/pwm.rst +4 -4
@@ -41,7 +41,7 @@ the getter, devm_pwm_get() and devm_fwnode_pwm_get(), also exist. After being requested, a PWM has to be configured using:: - int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state); + int pwm_apply_might_sleep(struct pwm_device *pwm, struct pwm_state *state); This API controls both the PWM period/duty_cycle config and the enable/disable state.
@@ -57,13 +57,13 @@ If supported by the driver, the signal can be optimized, for example to improve EMI by phase shifting the individual channels of a chip. The pwm_config(), pwm_enable() and pwm_disable() functions are just wrappers -around pwm_apply_state() and should not be used if the user wants to change +around pwm_apply_might_sleep() and should not be used if the user wants to change several parameter at once. For example, if you see pwm_config() and pwm_{enable,disable}() calls in the same function, this probably means you -should switch to pwm_apply_state(). +should switch to pwm_apply_might_sleep(). The PWM user API also allows one to query the PWM state that was passed to the -last invocation of pwm_apply_state() using pwm_get_state(). Note this is +last invocation of pwm_apply_might_sleep() using pwm_get_state(). Note this is different to what the driver has actually implemented if the request cannot be satisfied exactly with the hardware in use. There is currently no way for consumers to get the actually implemented settings.
MAINTAINERS +1 -1
@@ -17388,7 +17388,7 @@ F: drivers/video/backlight/pwm_bl.c F: include/dt-bindings/pwm/ F: include/linux/pwm.h F: include/linux/pwm_backlight.h -K: pwm_(config|apply_state|ops) +K: pwm_(config|apply_might_sleep|ops) PXA GPIO DRIVER M: Robert Jarzmik <[email protected]>
drivers/gpu/drm/i915/display/intel_backlight.c +3 -3
@@ -274,7 +274,7 @@ static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state,struct intel_panel *panel = &to_intel_connector (conn_state->connector)->panel;pwm_set_relative_duty_cycle (&panel->backlight.pwm_state, level,100 ); -pwm_apply_state (panel->backlight.pwm, &panel->backlight.pwm_state); +pwm_apply_might_sleep (panel->backlight.pwm, &panel->backlight.pwm_state); } static void
@@ -427,7 +427,7 @@ static void ext_pwm_disable_backlight(const struct drm_connector_state *old_connintel_backlight_set_pwm_level (old_conn_state, level); panel->backlight.pwm_state.enabled = false; -pwm_apply_state (panel->backlight.pwm, &panel->backlight.pwm_state); +pwm_apply_might_sleep (panel->backlight.pwm, &panel->backlight.pwm_state); }void intel_backlight_disable (const struct drm_connector_state *old_conn_state)
@@ -749,7 +749,7 @@ static void ext_pwm_enable_backlight(const struct intel_crtc_state *crtc_state,pwm_set_relative_duty_cycle (&panel->backlight.pwm_state, level,100 ); panel->backlight.pwm_state.enabled = true; -pwm_apply_state (panel->backlight.pwm, &panel->backlight.pwm_state); +pwm_apply_might_sleep (panel->backlight.pwm, &panel->backlight.pwm_state); } static void __intel_backlight_enable(const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/solomon/ssd130x.c +1 -1
@@ -267,7 +267,7 @@ static int ssd130x_pwm_enable(struct ssd130x_device *ssd130x)pwm_init_state (ssd130x->pwm, &pwmstate);pwm_set_relative_duty_cycle (&pwmstate,50 ,100 ); -pwm_apply_state (ssd130x->pwm, &pwmstate); +pwm_apply_might_sleep (ssd130x->pwm, &pwmstate);/* Enable the PWM */ pwm_enable (ssd130x->pwm);
drivers/hwmon/pwm-fan.c +4 -4
@@ -151,7 +151,7 @@ static int pwm_fan_power_on(struct pwm_fan_ctx *ctx) } state->enabled = true; - ret =pwm_apply_state (ctx->pwm, state); + ret =pwm_apply_might_sleep (ctx->pwm, state);if (ret) {dev_err (ctx->dev,"failed to enable PWM\n" ); goto disable_regulator;
@@ -181,7 +181,7 @@ static int pwm_fan_power_off(struct pwm_fan_ctx *ctx) state->enabled = false; state->duty_cycle =0 ; - ret =pwm_apply_state (ctx->pwm, state); + ret =pwm_apply_might_sleep (ctx->pwm, state);if (ret) {dev_err (ctx->dev,"failed to disable PWM\n" );return ret;
@@ -207,7 +207,7 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) period = state->period; state->duty_cycle =DIV_ROUND_UP (pwm * (period -1 ),MAX_PWM ); - ret =pwm_apply_state (ctx->pwm, state); + ret =pwm_apply_might_sleep (ctx->pwm, state);if (ret)return ret; ret =pwm_fan_power_on (ctx);
@@ -278,7 +278,7 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val) state, &enable_regulator); -pwm_apply_state (ctx->pwm, state); +pwm_apply_might_sleep (ctx->pwm, state);pwm_fan_switch_power (ctx, enable_regulator);pwm_fan_update_state (ctx,0 ); }
drivers/input/misc/da7280.c +2 -2
@@ -352,7 +352,7 @@ static int da7280_haptic_set_pwm(struct da7280_haptic *haptics, bool enabled) state.duty_cycle = period_mag_multi; } - error =pwm_apply_state (haptics->pwm_dev, &state); + error =pwm_apply_might_sleep (haptics->pwm_dev, &state);if (error)dev_err (haptics->dev,"Failed to apply pwm state: %d\n" , error);
@@ -1175,7 +1175,7 @@ static int da7280_probe(struct i2c_client *client)/* Sync up PWM state and ensure it is off. */ pwm_init_state (haptics->pwm_dev, &state); state.enabled = false; - error =pwm_apply_state (haptics->pwm_dev, &state); + error =pwm_apply_might_sleep (haptics->pwm_dev, &state);if (error) {dev_err (dev,"Failed to apply PWM state: %d\n" , error);return error;
drivers/input/misc/pwm-beeper.c +2 -2
@@ -39,7 +39,7 @@ static int pwm_beeper_on(struct pwm_beeper *beeper, unsigned long period) state.period = period;pwm_set_relative_duty_cycle (&state,50 ,100 ); - error =pwm_apply_state (beeper->pwm, &state); + error =pwm_apply_might_sleep (beeper->pwm, &state);if (error)return error;
@@ -138,7 +138,7 @@ static int pwm_beeper_probe(struct platform_device *pdev)/* Sync up PWM state and ensure it is off. */ pwm_init_state (beeper->pwm, &state); state.enabled = false; - error =pwm_apply_state (beeper->pwm, &state); + error =pwm_apply_might_sleep (beeper->pwm, &state);if (error) {dev_err (dev,"failed to apply initial PWM state: %d\n" , error);
drivers/input/misc/pwm-vibra.c +4 -4
@@ -56,7 +56,7 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)pwm_set_relative_duty_cycle (&state, vibrator->level,0xffff ); state.enabled = true; - err =pwm_apply_state (vibrator->pwm, &state); + err =pwm_apply_might_sleep (vibrator->pwm, &state);if (err) {dev_err (pdev,"failed to apply pwm state: %d\n" , err);return err;
@@ -67,7 +67,7 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator) state.duty_cycle = vibrator->direction_duty_cycle; state.enabled = true; - err =pwm_apply_state (vibrator->pwm_dir, &state); + err =pwm_apply_might_sleep (vibrator->pwm_dir, &state);if (err) {dev_err (pdev,"failed to apply dir-pwm state: %d\n" , err);pwm_disable (vibrator->pwm);
@@ -160,7 +160,7 @@ static int pwm_vibrator_probe(struct platform_device *pdev)/* Sync up PWM state and ensure it is off. */ pwm_init_state (vibrator->pwm, &state); state.enabled = false; - err =pwm_apply_state (vibrator->pwm, &state); + err =pwm_apply_might_sleep (vibrator->pwm, &state);if (err) {dev_err (&pdev->dev,"failed to apply initial PWM state: %d\n" , err);
@@ -174,7 +174,7 @@ static int pwm_vibrator_probe(struct platform_device *pdev)/* Sync up PWM state and ensure it is off. */ pwm_init_state (vibrator->pwm_dir, &state); state.enabled = false; - err =pwm_apply_state (vibrator->pwm_dir, &state); + err =pwm_apply_might_sleep (vibrator->pwm_dir, &state);if (err) {dev_err (&pdev->dev,"failed to apply initial PWM state: %d\n" , err);
drivers/leds/leds-pwm.c +1 -1
@@ -54,7 +54,7 @@ static int led_pwm_set(struct led_classdev *led_cdev, led_dat->pwmstate.duty_cycle = duty; led_dat->pwmstate.enabled = true; -return pwm_apply_state (led_dat->pwm, &led_dat->pwmstate); +return pwm_apply_might_sleep (led_dat->pwm, &led_dat->pwmstate); } __attribute__((nonnull))
drivers/leds/rgb/leds-pwm-multicolor.c +2 -2
@@ -51,8 +51,8 @@ static int led_pwm_mc_set(struct led_classdev *cdev, priv->leds[i].state.duty_cycle = duty; priv->leds[i].state.enabled = duty >0 ; - ret =pwm_apply_state (priv->leds[i].pwm, - &priv->leds[i].state); + ret =pwm_apply_might_sleep (priv->leds[i].pwm, + &priv->leds[i].state);if (ret)break ; }
drivers/media/rc/ir-rx51.c +2 -2
@@ -34,13 +34,13 @@ struct ir_rx51 {static inline void ir_rx51_on (struct ir_rx51 *ir_rx51) { ir_rx51->state.enabled = true; -pwm_apply_state (ir_rx51->pwm, &ir_rx51->state); +pwm_apply_might_sleep (ir_rx51->pwm, &ir_rx51->state); }static inline void ir_rx51_off (struct ir_rx51 *ir_rx51) { ir_rx51->state.enabled = false; -pwm_apply_state (ir_rx51->pwm, &ir_rx51->state); +pwm_apply_might_sleep (ir_rx51->pwm, &ir_rx51->state); }static int init_timing_params (struct ir_rx51 *ir_rx51)
drivers/media/rc/pwm-ir-tx.c +2 -2
@@ -67,7 +67,7 @@ static int pwm_ir_tx(struct rc_dev *dev, unsigned int *txbuf,for (i =0 ; i < count; i++) { state.enabled = !(i %2 ); -pwm_apply_state (pwm, &state); +pwm_apply_might_sleep (pwm, &state); edge =ktime_add_us (edge, txbuf[i]); delta =ktime_us_delta (edge,ktime_get ());
@@ -76,7 +76,7 @@ static int pwm_ir_tx(struct rc_dev *dev, unsigned int *txbuf, } state.enabled = false; -pwm_apply_state (pwm, &state); +pwm_apply_might_sleep (pwm, &state);return count; }
drivers/platform/x86/lenovo-yogabook.c +1 -1
@@ -435,7 +435,7 @@ static int yogabook_pdev_set_kbd_backlight(struct yogabook_data *data, u8 level) .enabled = level, }; -pwm_apply_state (data->kbd_bl_pwm, &state); +pwm_apply_might_sleep (data->kbd_bl_pwm, &state);gpiod_set_value (data->kbd_bl_led_enable, level ?1 :0 );return 0 ; }
drivers/pwm/core.c +9 -9
@@ -382,8 +382,8 @@ struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip, }EXPORT_SYMBOL_GPL (pwm_request_from_chip); -static void pwm_apply_state_debug (struct pwm_device *pwm, -const struct pwm_state *state) +static void pwm_apply_debug (struct pwm_device *pwm, +const struct pwm_state *state) {struct pwm_state *last = &pwm->last;struct pwm_chip *chip = pwm->chip;
@@ -489,11 +489,11 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, }/** -* pwm_apply_state() - atomically apply a new state to a PWM device +* pwm_apply_might_sleep() - atomically apply a new state to a PWM device * @pwm: PWM device * @state: new state to apply */ -int pwm_apply_state (struct pwm_device *pwm,const struct pwm_state *state) +int pwm_apply_might_sleep (struct pwm_device *pwm,const struct pwm_state *state) {struct pwm_chip *chip;int err;
@@ -501,7 +501,7 @@ int pwm_apply_state(struct pwm_device *pwm, const struct pwm_state *state)/* * Some lowlevel driver's implementations of .apply() make use of * mutexes, also with some drivers only returning when the new -* configuration is active calling pwm_apply_state() from atomic context +* configuration is active calling pwm_apply_might_sleep() from atomic context * is a bad idea. So make it explicit that calling this function might * sleep. */
@@ -531,11 +531,11 @@ int pwm_apply_state(struct pwm_device *pwm, const struct pwm_state *state)* only do this after pwm->state was applied as some * implementations of .get_state depend on this */ -pwm_apply_state_debug (pwm, state); +pwm_apply_debug (pwm, state);return 0 ; } -EXPORT_SYMBOL_GPL (pwm_apply_state); +EXPORT_SYMBOL_GPL (pwm_apply_might_sleep);/** * pwm_capture() - capture and report a PWM signal
@@ -593,7 +593,7 @@ int pwm_adjust_config(struct pwm_device *pwm) state.period = pargs.period; state.polarity = pargs.polarity; -return pwm_apply_state (pwm, &state); +return pwm_apply_might_sleep (pwm, &state); }/*
@@ -616,7 +616,7 @@ int pwm_adjust_config(struct pwm_device *pwm) state.duty_cycle = state.period - state.duty_cycle; } -return pwm_apply_state (pwm, &state); +return pwm_apply_might_sleep (pwm, &state); }EXPORT_SYMBOL_GPL (pwm_adjust_config);
drivers/pwm/pwm-twl-led.c +1 -1
@@ -172,7 +172,7 @@ static int twl4030_pwmled_apply(struct pwm_chip *chip, struct pwm_device *pwm,* We cannot skip calling ->config even if state->period == * pwm->state.period && state->duty_cycle == pwm->state.duty_cycle * because we might have exited early in the last call to -* pwm_apply_state because of !state->enabled and so the two values in +* pwm_apply_might_sleep because of !state->enabled and so the two values in * pwm->state might not be configured in hardware. */ ret = twl4030_pwmled_config(pwm->chip, pwm,
drivers/pwm/pwm-vt8500.c +1 -1
@@ -206,7 +206,7 @@ static int vt8500_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,* We cannot skip calling ->config even if state->period == * pwm->state.period && state->duty_cycle == pwm->state.duty_cycle * because we might have exited early in the last call to -* pwm_apply_state because of !state->enabled and so the two values in +* pwm_apply_might_sleep because of !state->enabled and so the two values in * pwm->state might not be configured in hardware. */ err =vt8500_pwm_config (pwm->chip, pwm, state->duty_cycle, state->period);
drivers/pwm/sysfs.c +5 -5
@@ -62,7 +62,7 @@ static ssize_t period_store(struct device *child,mutex_lock (&export->lock);pwm_get_state (pwm, &state); state.period = val; - ret =pwm_apply_state (pwm, &state); + ret =pwm_apply_might_sleep (pwm, &state);mutex_unlock (&export->lock);return ret ? : size;
@@ -97,7 +97,7 @@ static ssize_t duty_cycle_store(struct device *child,mutex_lock (&export->lock);pwm_get_state (pwm, &state); state.duty_cycle = val; - ret =pwm_apply_state (pwm, &state); + ret =pwm_apply_might_sleep (pwm, &state);mutex_unlock (&export->lock);return ret ? : size;
@@ -144,7 +144,7 @@ static ssize_t enable_store(struct device *child, goto unlock; } - ret =pwm_apply_state (pwm, &state); + ret =pwm_apply_might_sleep (pwm, &state); unlock:mutex_unlock (&export->lock);
@@ -194,7 +194,7 @@ static ssize_t polarity_store(struct device *child,mutex_lock (&export->lock);pwm_get_state (pwm, &state); state.polarity = polarity; - ret =pwm_apply_state (pwm, &state); + ret =pwm_apply_might_sleep (pwm, &state);mutex_unlock (&export->lock);return ret ? : size;
@@ -401,7 +401,7 @@ static int pwm_class_apply_state(struct pwm_export *export,struct pwm_device *pwm, struct pwm_state *state) { - int ret = pwm_apply_state(pwm, state); + int ret = pwm_apply_might_sleep(pwm, state);/* release lock taken in pwm_class_get_state */ mutex_unlock (&export->lock);
drivers/regulator/pwm-regulator.c +2 -2
@@ -90,7 +90,7 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *rdev,pwm_set_relative_duty_cycle (&pstate, drvdata->duty_cycle_table[selector].dutycycle,100 ); - ret =pwm_apply_state (drvdata->pwm, &pstate); + ret =pwm_apply_might_sleep (drvdata->pwm, &pstate);if (ret) {dev_err (&rdev->dev,"Failed to configure PWM: %d\n" , ret);return ret;
@@ -219,7 +219,7 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,pwm_set_relative_duty_cycle (&pstate, dutycycle, duty_unit); - ret =pwm_apply_state (drvdata->pwm, &pstate); + ret =pwm_apply_might_sleep (drvdata->pwm, &pstate);if (ret) {dev_err (&rdev->dev,"Failed to configure PWM: %d\n" , ret);return ret;
drivers/video/backlight/lm3630a_bl.c +1 -1
@@ -180,7 +180,7 @@ static int lm3630a_pwm_ctrl(struct lm3630a_chip *pchip, int br, int br_max) pchip->pwmd_state.enabled = pchip->pwmd_state.duty_cycle ? true : false; -return pwm_apply_state (pchip->pwmd, &pchip->pwmd_state); +return pwm_apply_might_sleep (pchip->pwmd, &pchip->pwmd_state); }/* update and get brightness */
drivers/video/backlight/lp855x_bl.c +1 -1
@@ -234,7 +234,7 @@ static int lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br) state.duty_cycle =div_u64 (br * state.period, max_br); state.enabled = state.duty_cycle; -return pwm_apply_state (lp->pwm, &state); +return pwm_apply_might_sleep (lp->pwm, &state); }static int lp855x_bl_update_status (struct backlight_device *bl)
drivers/video/backlight/pwm_bl.c +6 -6
@@ -103,7 +103,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)pwm_get_state (pb->pwm, &state); state.duty_cycle =compute_duty_cycle (pb, brightness, &state); state.enabled = true; -pwm_apply_state (pb->pwm, &state); +pwm_apply_might_sleep (pb->pwm, &state);pwm_backlight_power_on (pb); }else {
@@ -120,7 +120,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)* inactive output. */ state.enabled = !pb->power_supply && !pb->enable_gpio; -pwm_apply_state (pb->pwm, &state); +pwm_apply_might_sleep (pb->pwm, &state); }if (pb->notify_after)
@@ -528,7 +528,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)if (!state.period && (data->pwm_period_ns >0 )) state.period = data->pwm_period_ns; - ret =pwm_apply_state (pb->pwm, &state); + ret =pwm_apply_might_sleep (pb->pwm, &state);if (ret) {dev_err (&pdev->dev,"failed to apply initial PWM state: %d\n" , ret);
@@ -633,7 +633,7 @@ static void pwm_backlight_remove(struct platform_device *pdev)pwm_get_state (pb->pwm, &state); state.duty_cycle =0 ; state.enabled = false; -pwm_apply_state (pb->pwm, &state); +pwm_apply_might_sleep (pb->pwm, &state);if (pb->exit) pb->exit (&pdev->dev);
@@ -649,7 +649,7 @@ static void pwm_backlight_shutdown(struct platform_device *pdev)pwm_get_state (pb->pwm, &state); state.duty_cycle =0 ; state.enabled = false; -pwm_apply_state (pb->pwm, &state); +pwm_apply_might_sleep (pb->pwm, &state); }#ifdef CONFIG_PM_SLEEP
@@ -673,7 +673,7 @@ static int pwm_backlight_suspend(struct device *dev)pwm_get_state (pb->pwm, &state); state.duty_cycle =0 ; state.enabled = false; -pwm_apply_state (pb->pwm, &state); +pwm_apply_might_sleep (pb->pwm, &state);if (pb->notify_after) pb->notify_after (pb->dev,0 );
drivers/video/fbdev/ssd1307fb.c +1 -1
@@ -347,7 +347,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)pwm_init_state (par->pwm, &pwmstate);pwm_set_relative_duty_cycle (&pwmstate,50 ,100 ); -pwm_apply_state (par->pwm, &pwmstate); +pwm_apply_might_sleep (par->pwm, &pwmstate);/* Enable the PWM */ pwm_enable (par->pwm);
include/linux/pwm.h +14 -14
@@ -95,8 +95,8 @@ struct pwm_device {* @state: state to fill with the current PWM state * * The returned PWM state represents the state that was applied by a previous call to -* pwm_apply_state(). Drivers may have to slightly tweak that state before programming it to -* hardware. If pwm_apply_state() was never called, this returns either the current hardware +* pwm_apply_might_sleep(). Drivers may have to slightly tweak that state before programming it to +* hardware. If pwm_apply_might_sleep() was never called, this returns either the current hardware * state (if supported) or the default settings. */ static inline void pwm_get_state(const struct pwm_device *pwm,
@@ -160,20 +160,20 @@ static inline void pwm_get_args(const struct pwm_device *pwm, }/** -* pwm_init_state() - prepare a new state to be applied with pwm_apply_state() +* pwm_init_state() - prepare a new state to be applied with pwm_apply_might_sleep() * @pwm: PWM device * @state: state to fill with the prepared PWM state * * This functions prepares a state that can later be tweaked and applied -* to the PWM device with pwm_apply_state(). This is a convenient function +* to the PWM device with pwm_apply_might_sleep(). This is a convenient function * that first retrieves the current PWM state and the replaces the period * and polarity fields with the reference values defined in pwm->args. * Once the function returns, you can adjust the ->enabled and ->duty_cycle -* fields according to your needs before calling pwm_apply_state(). +* fields according to your needs before calling pwm_apply_might_sleep(). * * ->duty_cycle is initially set to zero to avoid cases where the current * ->duty_cycle value exceed the pwm_args->period one, which would trigger -* an error if the user calls pwm_apply_state() without adjusting ->duty_cycle +* an error if the user calls pwm_apply_might_sleep() without adjusting ->duty_cycle * first. */ static inline void pwm_init_state(const struct pwm_device *pwm,
@@ -229,7 +229,7 @@ pwm_get_relative_duty_cycle(const struct pwm_state *state, unsigned int scale)* * pwm_init_state(pwm, &state); * pwm_set_relative_duty_cycle(&state, 50, 100); -* pwm_apply_state(pwm, &state); +* pwm_apply_might_sleep(pwm, &state); * * This functions returns -EINVAL if @duty_cycle and/or @scale are * inconsistent (@scale == 0 or @duty_cycle > @scale).
@@ -309,7 +309,7 @@ struct pwm_chip {#if IS_ENABLED (CONFIG_PWM )/* PWM user APIs */ -int pwm_apply_state (struct pwm_device *pwm,const struct pwm_state *state); +int pwm_apply_might_sleep (struct pwm_device *pwm,const struct pwm_state *state);int pwm_adjust_config (struct pwm_device *pwm);/**
@@ -337,7 +337,7 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns, state.duty_cycle = duty_ns; state.period = period_ns; -return pwm_apply_state (pwm, &state); +return pwm_apply_might_sleep (pwm, &state); }/**
@@ -358,7 +358,7 @@ static inline int pwm_enable(struct pwm_device *pwm)return 0 ; state.enabled = true; -return pwm_apply_state (pwm, &state); +return pwm_apply_might_sleep (pwm, &state); }/**
@@ -377,7 +377,7 @@ static inline void pwm_disable(struct pwm_device *pwm)return ; state.enabled = false; -pwm_apply_state (pwm, &state); +pwm_apply_might_sleep (pwm, &state); }/* PWM provider APIs */
@@ -408,8 +408,8 @@ struct pwm_device *devm_fwnode_pwm_get(struct device *dev,struct fwnode_handle *fwnode, const char *con_id);#else -static inline int pwm_apply_state (struct pwm_device *pwm, -const struct pwm_state *state) +static inline int pwm_apply_might_sleep (struct pwm_device *pwm, +const struct pwm_state *state) {might_sleep ();return -ENOTSUPP ;
@@ -536,7 +536,7 @@ static inline void pwm_apply_args(struct pwm_device *pwm) state.period = pwm->args.period; state.usage_power = false; -pwm_apply_state (pwm, &state); +pwm_apply_might_sleep (pwm, &state); }struct pwm_lookup {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 472/744 leds: pwm: Disable PWM when going to suspend
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 974afccd37947a6951a052ef8118c961e57eaf7b ]
On stm32mp1xx based machines (and others) a PWM consumer has to disable the PWM because an enabled PWM refuses to suspend. So check the LED_SUSPENDED flag and depending on that set the .enabled property.
--- drivers/leds/leds-pwm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/leds/leds-pwm.c +7 -1
@@ -53,7 +53,13 @@ static int led_pwm_set(struct led_classdev *led_cdev, duty = led_dat->pwmstate.period - duty; led_dat->pwmstate.duty_cycle = duty; - led_dat->pwmstate.enabled = true; +/* +* Disabling a PWM doesn't guarantee that it emits the inactive level. +* So keep it on. Only for suspending the PWM should be disabled because +* otherwise it refuses to suspend. The possible downside is that the +* LED might stay (or even go) on. +*/ + led_dat->pwmstate.enabled = !(led_cdev->flags &LED_SUSPENDED );return pwm_apply_might_sleep (led_dat->pwm, &led_dat->pwmstate); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 473/744 ovl: remove upper umask handling from ovl_create_upper()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
[ Upstream commit 096802748ea1dea8b476938e0a8dc16f4bd2f1ad ]
This is already done by vfs_prepare_mode() when creating the upper object by vfs_create(), vfs_mkdir() and vfs_mknod().
No regressions have been observed in xfstests run with posix acls turned off for the upper filesystem.
--- fs/overlayfs/dir.c | 3 --- 1 file changed, 3 deletions(-)
fs/overlayfs/dir.c +0 -3
@@ -327,9 +327,6 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,struct dentry *newdentry;int err; -if (!attr->hardlink && !IS_POSIXACL (udir)) - attr->mode &= ~current_umask (); -inode_lock_nested (udir,I_MUTEX_PARENT ); newdentry = ovl_create_real(ofs, udir, ovl_lookup_upper(ofs, dentry->d_name.name,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 474/744 PCI: of_property: Return error for int_map allocation failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duoming Zhou <[email protected]>
[ Upstream commit e6f7d27df5d208b50cae817a91d128fb434bb12c ]
Return -ENOMEM from of_pci_prop_intr_map() if kcalloc() fails to prevent a NULL pointer dereference in this case.
--- drivers/pci/of_property.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/of_property.c +2 -0
@@ -238,6 +238,8 @@ static int of_pci_prop_intr_map(struct pci_dev *pdev, struct of_changeset *ocs,return 0 ; int_map =kcalloc (map_sz,sizeof (u32),GFP_KERNEL ); +if (!int_map) +return -ENOMEM ; mapp = int_map;list_for_each_entry (child, &pdev->subordinate->devices, bus_list) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 475/744 VMCI: Fix an error handling path in vmci_guest_probe_device()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 73df3d6f2e9533e93a5039a33c40dd7216b81801 ]
After a successful pci_iomap_range() call, pci_iounmap() should be called in the error handling path, as already done in the remove function.
Add the missing call.
The corresponding call was added in the remove function in commit 5ee109828e73 ("VMCI: dma dg: allocate send and receive buffers for DMA datagrams")
--- drivers/misc/vmw_vmci/vmci_guest.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/misc/vmw_vmci/vmci_guest.c +8 -2
@@ -625,7 +625,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,if (!vmci_dev) {dev_err (&pdev->dev,"Can't allocate memory for VMCI device\n" ); -return -ENOMEM ; + error = -ENOMEM ; + goto err_unmap_mmio_base; } vmci_dev->dev = &pdev->dev;
@@ -642,7 +643,8 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,if (!vmci_dev->tx_buffer) {dev_err (&pdev->dev,"Can't allocate memory for datagram tx buffer\n" ); -return -ENOMEM ; + error = -ENOMEM ; + goto err_unmap_mmio_base; } vmci_dev->data_buffer = dma_alloc_coherent(&pdev->dev, VMCI_DMA_DG_BUFFER_SIZE,
@@ -893,6 +895,10 @@ static int vmci_guest_probe_device(struct pci_dev *pdev, err_free_data_buffers:vmci_free_dg_buffers (vmci_dev); +err_unmap_mmio_base: +if (mmio_base !=NULL ) +pci_iounmap (pdev, mmio_base); +/* The rest are managed resources and will be freed by PCI core */ return error; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 476/744 xfs: convert kmem_free() for kvmalloc users to kvfree()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Chinner <[email protected]>
[ Upstream commit 49292576136fd2a6b58a51677c53151cf4877fa6 ]
Start getting rid of kmem_free() by converting all the cases where memory can come from vmalloc interfaces to calling kvfree() directly.
Stable-dep-of: 45cf976008dd ("xfs: fix log recovery buffer allocation for the legacy h_size fixup")
--- fs/xfs/xfs_acl.c | 4 ++-- fs/xfs/xfs_attr_item.c | 4 ++-- fs/xfs/xfs_bmap_item.c | 4 ++-- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_extfree_item.c | 4 ++-- fs/xfs/xfs_icreate_item.c | 2 +- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_log.c | 4 ++-- fs/xfs/xfs_log_cil.c | 2 +- fs/xfs/xfs_log_recover.c | 42 +++++++++++++++++++------------------- fs/xfs/xfs_refcount_item.c | 4 ++-- fs/xfs/xfs_rmap_item.c | 4 ++-- fs/xfs/xfs_rtalloc.c | 6 +++--- 15 files changed, 44 insertions(+), 44 deletions(-)
fs/xfs/xfs_acl.c +2 -2
@@ -167,7 +167,7 @@ xfs_get_acl(struct inode *inode, int type, bool rcu) acl =ERR_PTR (error); } -kmem_free (args.value); +kvfree (args.value);return acl; }
@@ -204,7 +204,7 @@ __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) } error =xfs_attr_change (&args); -kmem_free (args.value); +kvfree (args.value);/* * If the attribute didn't exist to start with that's fine.
fs/xfs/xfs_attr_item.c +2 -2
@@ -110,7 +110,7 @@ STATIC voidxfs_attri_item_free ( struct xfs_attri_log_item *attrip) { -kmem_free (attrip->attri_item.li_lv_shadow); +kvfree (attrip->attri_item.li_lv_shadow);xfs_attri_log_nameval_put (attrip->attri_nameval);kmem_cache_free (xfs_attri_cache, attrip); }
@@ -253,7 +253,7 @@ static inline struct xfs_attrd_log_item *ATTRD_ITEM(struct xfs_log_item *lip) STATIC voidxfs_attrd_item_free (struct xfs_attrd_log_item *attrdp) { -kmem_free (attrdp->attrd_item.li_lv_shadow); +kvfree (attrdp->attrd_item.li_lv_shadow);kmem_cache_free (xfs_attrd_cache, attrdp); }
fs/xfs/xfs_bmap_item.c +2 -2
@@ -40,7 +40,7 @@ STATIC voidxfs_bui_item_free ( struct xfs_bui_log_item *buip) { -kmem_free (buip->bui_item.li_lv_shadow); +kvfree (buip->bui_item.li_lv_shadow);kmem_cache_free (xfs_bui_cache, buip); }
@@ -201,7 +201,7 @@ xfs_bud_item_release(struct xfs_bud_log_item *budp =BUD_ITEM (lip);xfs_bui_release (budp->bud_buip); -kmem_free (budp->bud_item.li_lv_shadow); +kvfree (budp->bud_item.li_lv_shadow);kmem_cache_free (xfs_bud_cache, budp); }
fs/xfs/xfs_buf_item.c +1 -1
@@ -1044,7 +1044,7 @@ xfs_buf_item_free( struct xfs_buf_log_item *bip) {xfs_buf_item_free_format (bip); -kmem_free (bip->bli_item.li_lv_shadow); +kvfree (bip->bli_item.li_lv_shadow);kmem_cache_free (xfs_buf_item_cache, bip); }
fs/xfs/xfs_dquot.c +1 -1
@@ -53,7 +53,7 @@ xfs_qm_dqdestroy( {ASSERT (list_empty (&dqp->q_lru)); -kmem_free (dqp->q_logitem.qli_item.li_lv_shadow); +kvfree (dqp->q_logitem.qli_item.li_lv_shadow);mutex_destroy (&dqp->q_qlock);XFS_STATS_DEC (dqp->q_mount, xs_qm_dquot);
fs/xfs/xfs_extfree_item.c +2 -2
@@ -40,7 +40,7 @@ STATIC voidxfs_efi_item_free ( struct xfs_efi_log_item *efip) { -kmem_free (efip->efi_item.li_lv_shadow); +kvfree (efip->efi_item.li_lv_shadow);if (efip->efi_format.efi_nextents >XFS_EFI_MAX_FAST_EXTENTS )kmem_free (efip);else
@@ -229,7 +229,7 @@ static inline struct xfs_efd_log_item *EFD_ITEM(struct xfs_log_item *lip) STATIC voidxfs_efd_item_free (struct xfs_efd_log_item *efdp) { -kmem_free (efdp->efd_item.li_lv_shadow); +kvfree (efdp->efd_item.li_lv_shadow);if (efdp->efd_format.efd_nextents >XFS_EFD_MAX_FAST_EXTENTS )kmem_free (efdp);else
fs/xfs/xfs_icreate_item.c +1 -1
@@ -63,7 +63,7 @@ STATIC voidxfs_icreate_item_release ( struct xfs_log_item *lip) { -kmem_free (ICR_ITEM (lip)->ic_item.li_lv_shadow); +kvfree (ICR_ITEM (lip)->ic_item.li_lv_shadow);kmem_cache_free (xfs_icreate_cache,ICR_ITEM (lip)); }
fs/xfs/xfs_inode_item.c +1 -1
@@ -857,7 +857,7 @@ xfs_inode_item_destroy(ASSERT (iip->ili_item.li_buf ==NULL ); ip->i_itemp =NULL ; -kmem_free (iip->ili_item.li_lv_shadow); +kvfree (iip->ili_item.li_lv_shadow);kmem_cache_free (xfs_ili_cache, iip); }
fs/xfs/xfs_ioctl.c +1 -1
@@ -492,7 +492,7 @@ xfs_attrmulti_attr_get( error = -EFAULT ; out_kfree: -kmem_free (args.value); +kvfree (args.value);return error; }
fs/xfs/xfs_log.c +2 -2
@@ -1661,7 +1661,7 @@ xlog_alloc_log( out_free_iclog:for (iclog = log->l_iclog; iclog; iclog = prev_iclog) { prev_iclog = iclog->ic_next; -kmem_free (iclog->ic_data); +kvfree (iclog->ic_data);kmem_free (iclog);if (prev_iclog == log->l_iclog)break ;
@@ -2118,7 +2118,7 @@ xlog_dealloc_log( iclog = log->l_iclog;for (i =0 ; i < log->l_iclog_bufs; i++) { next_iclog = iclog->ic_next; -kmem_free (iclog->ic_data); +kvfree (iclog->ic_data);kmem_free (iclog); iclog = next_iclog; }
fs/xfs/xfs_log_cil.c +1 -1
@@ -339,7 +339,7 @@ xlog_cil_alloc_shadow_bufs(* the buffer, only the log vector header and the iovec * storage. */ -kmem_free (lip->li_lv_shadow); +kvfree (lip->li_lv_shadow); lv =xlog_kvmalloc (buf_size);memset (lv,0 ,xlog_cil_iovec_space (niovecs));
fs/xfs/xfs_log_recover.c +21 -21
153 lines not on this page · raw message
fs/xfs/xfs_refcount_item.c +2 -2
@@ -36,7 +36,7 @@ STATIC voidxfs_cui_item_free ( struct xfs_cui_log_item *cuip) { -kmem_free (cuip->cui_item.li_lv_shadow); +kvfree (cuip->cui_item.li_lv_shadow);if (cuip->cui_format.cui_nextents >XFS_CUI_MAX_FAST_EXTENTS )kmem_free (cuip);else
@@ -207,7 +207,7 @@ xfs_cud_item_release(struct xfs_cud_log_item *cudp =CUD_ITEM (lip);xfs_cui_release (cudp->cud_cuip); -kmem_free (cudp->cud_item.li_lv_shadow); +kvfree (cudp->cud_item.li_lv_shadow);kmem_cache_free (xfs_cud_cache, cudp); }
fs/xfs/xfs_rmap_item.c +2 -2
@@ -36,7 +36,7 @@ STATIC voidxfs_rui_item_free ( struct xfs_rui_log_item *ruip) { -kmem_free (ruip->rui_item.li_lv_shadow); +kvfree (ruip->rui_item.li_lv_shadow);if (ruip->rui_format.rui_nextents >XFS_RUI_MAX_FAST_EXTENTS )kmem_free (ruip);else
@@ -205,7 +205,7 @@ xfs_rud_item_release(struct xfs_rud_log_item *rudp =RUD_ITEM (lip);xfs_rui_release (rudp->rud_ruip); -kmem_free (rudp->rud_item.li_lv_shadow); +kvfree (rudp->rud_item.li_lv_shadow);kmem_cache_free (xfs_rud_cache, rudp); }
fs/xfs/xfs_rtalloc.c +3 -3
@@ -1185,10 +1185,10 @@ xfs_growfs_rt(*/ if (rsum_cache != mp->m_rsum_cache) {if (error) { -kmem_free (mp->m_rsum_cache); +kvfree (mp->m_rsum_cache); mp->m_rsum_cache = rsum_cache; }else { -kmem_free (rsum_cache); +kvfree (rsum_cache); } }
@@ -1433,7 +1433,7 @@ voidxfs_rtunmount_inodes ( struct xfs_mount *mp) { -kmem_free (mp->m_rsum_cache); +kvfree (mp->m_rsum_cache);if (mp->m_rbmip)xfs_irele (mp->m_rbmip);if (mp->m_rsumip)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 477/744 xfs: fix log recovery buffer allocation for the legacy h_size fixup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 45cf976008ddef4a9c9a30310c9b4fb2a9a6602a ]
Commit a70f9fe52daa ("xfs: detect and handle invalid iclog size set by mkfs") added a fixup for incorrect h_size values used for the initial umount record in old xfsprogs versions. Later commit 0c771b99d6c9 ("xfs: clean up calculation of LR header blocks") cleaned up the log reover buffer calculation, but stoped using the fixed up h_size value to size the log recovery buffer, which can lead to an out of bounds access when the incorrect h_size does not come from the old mkfs tool, but a fuzzer.
Fix this by open coding xlog_logrec_hblks and taking the fixed h_size into account for this calculation.
--- fs/xfs/xfs_log_recover.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
fs/xfs/xfs_log_recover.c +14 -6
@@ -2965,7 +2965,7 @@ xlog_do_recovery_pass(int error =0 , h_size, h_len;int error2 =0 ;int bblks, split_bblks; -int hblks, split_hblks, wrapped_hblks; +int hblks =1 , split_hblks, wrapped_hblks;int i;struct hlist_head rhash[XLOG_RHASH_SIZE ];LIST_HEAD (buffer_list);
@@ -3021,14 +3021,22 @@ xlog_do_recovery_pass(if (error) goto bread_err1; - hblks =xlog_logrec_hblks (log, rhead); -if (hblks !=1 ) { -kvfree (hbp); - hbp =xlog_alloc_buffer (log, hblks); +/* +* This open codes xlog_logrec_hblks so that we can reuse the +* fixed up h_size value calculated above. Without that we'd +* still allocate the buffer based on the incorrect on-disk +* size. +*/ +if (h_size >XLOG_HEADER_CYCLE_SIZE && + (rhead->h_version &cpu_to_be32 (XLOG_VERSION_2 ))) { + hblks =DIV_ROUND_UP (h_size,XLOG_HEADER_CYCLE_SIZE ); +if (hblks >1 ) { +kvfree (hbp); + hbp =xlog_alloc_buffer (log, hblks); + } } }else {ASSERT (log->l_sectBBsize ==1 ); - hblks =1 ; hbp =xlog_alloc_buffer (log,1 ); h_size =XLOG_BIG_RECORD_BSIZE ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 478/744 xfs: upgrade the extent counters in xfs_reflink_end_cow_extent later
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 99fb6b7ad1f2fb83d8df2c1382be63a1f50b1ae0 ]
Defer the extent counter size upgrade until we know we're going to modify the extent mapping. This also defers dirtying the transaction and will allow us safely back out later in the function in later changes.
--- fs/xfs/xfs_reflink.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
fs/xfs/xfs_reflink.c +8 -8
@@ -750,14 +750,6 @@ xfs_reflink_end_cow_extent(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); - error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , -XFS_IEXT_REFLINK_END_COW_CNT ); -if (error == -EFBIG ) - error =xfs_iext_count_upgrade (tp, ip, -XFS_IEXT_REFLINK_END_COW_CNT ); -if (error) - goto out_cancel; -/* * In case of racing, overlapping AIO writes no COW extents might be * left by the time I/O completes for the loser of the race. In that
@@ -786,6 +778,14 @@ xfs_reflink_end_cow_extent( del = got;xfs_trim_extent (&del, *offset_fsb, end_fsb - *offset_fsb); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_END_COW_CNT ); +if (error == -EFBIG ) + error =xfs_iext_count_upgrade (tp, ip, +XFS_IEXT_REFLINK_END_COW_CNT ); +if (error) + goto out_cancel; +/* Grab the corresponding mapping in the data fork. */ nmaps =1 ; error = xfs_bmapi_read(ip, del.br_startoff, del.br_blockcount, &data,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 479/744 dt-bindings: pinctrl: mediatek: mt7622: fix array properties
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit 61fcbbf3ca038c048c942ce31bb3d3c846c87581 ]
Some properties (function groups & pins) are meant to be arrays and should allow multiple entries out of enum sets. Use "items" for those.
Mistake was noticed during validation of in-kernel DTS files.
Message-ID: <[email protected]>
--- .../pinctrl/mediatek,mt7622-pinctrl.yaml | 92 ++++++++++--------- 1 file changed, 49 insertions(+), 43 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +49 -43
@@ -97,7 +97,8 @@ patternProperties: then: properties: groups: - enum: [emmc, emmc_rst] + items: + enum: [emmc, emmc_rst] - if: properties: function:
@@ -105,8 +106,9 @@ patternProperties: then: properties: groups: - enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, - rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] + items: + enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, + rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] - if: properties: function:
@@ -123,10 +125,11 @@ patternProperties: then: properties: groups: - enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, - i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, - i2s1_out_data, i2s2_out_data, i2s3_out_data, - i2s4_out_data] + items: + enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, + i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, + i2s1_out_data, i2s2_out_data, i2s3_out_data, + i2s4_out_data] - if: properties: function:
@@ -159,10 +162,11 @@ patternProperties: then: properties: groups: - enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, - pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, - pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, - pcie_wake, pcie_clkreq] + items: + enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, + pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, + pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, + pcie_wake, pcie_clkreq] - if: properties: function:
@@ -178,11 +182,12 @@ patternProperties: then: properties: groups: - enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, - pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, - pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, - pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, - pwm_ch7_0, pwm_0, pwm_1] + items: + enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, + pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, + pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, + pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, + pwm_ch7_0, pwm_0, pwm_1] - if: properties: function:
@@ -260,33 +265,34 @@ patternProperties: pins: description: An array of strings. Each string contains the name of a pin. - enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, - RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, - I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, - I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, - G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, - G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, - NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, - MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, - MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, - MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, - MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, - PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, - GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, - PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, - AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, - PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, - WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, - WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, - EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, - EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, - WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, - UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, - UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, - PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, - GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, - TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, - WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] + items: + enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, + RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, + I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, + I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, + G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, + G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, + NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, + MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, + MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, + MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, + MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, + PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, + GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, + PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, + AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, + PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, + WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, + WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, + EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, + EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, + WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, + UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, + UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, + PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, + GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, + TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, + WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] bias-disable: true
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 480/744 pinctrl: qcom: pinctrl-sm7150: Fix sdc1 and ufs special pins regs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danila Tikhonov <[email protected]>
[ Upstream commit 5ed79863fae5c06eb33f5cd6b6bdf22dd7089392 ]
SDC1 and UFS_RESET special pins are located in the west memory bank.
SDC1 have address 0x359a000:0x3500000 (TLMM BASE) + 0x0 (WEST) + 0x9a000 (SDC1_OFFSET) = 0x359a000
UFS_RESET have address 0x359f000:0x3500000 (TLMM BASE) + 0x0 (WEST) + 0x9f000 (UFS_OFFSET) = 0x359a000
Message-ID: <[email protected]>
--- drivers/pinctrl/qcom/pinctrl-sm7150.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/pinctrl/qcom/pinctrl-sm7150.c +10 -10
@@ -65,7 +65,7 @@ enum { .intr_detection_width = 2, \ } -#define SDC_QDSD_PINGROUP (pg_name, ctl, pull, drv) \ +#define SDC_QDSD_PINGROUP (pg_name, _tile, ctl, pull, drv) \ { \ .grp = PINCTRL_PINGROUP(#pg_name, \ pg_name##_pins, \
@@ -75,7 +75,7 @@ enum { .intr_cfg_reg = 0, \ .intr_status_reg = 0, \ .intr_target_reg = 0, \ - .tile = SOUTH, \ + .tile = _tile, \ .mux_bit = -1, \ .pull_bit = pull, \ .drv_bit = drv, \
@@ -101,7 +101,7 @@ enum { .intr_cfg_reg = 0, \ .intr_status_reg = 0, \ .intr_target_reg = 0, \ - .tile = SOUTH, \ + .tile = WEST, \ .mux_bit = -1, \ .pull_bit = 3, \ .drv_bit = 0, \
@@ -1199,13 +1199,13 @@ static const struct msm_pingroup sm7150_groups[] = { [117] = PINGROUP(117, NORTH, _, _, _, _, _, _, _, _, _), [118] = PINGROUP(118, NORTH, _, _, _, _, _, _, _, _, _), [119] = UFS_RESET(ufs_reset, 0x9f000), - [120] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x9a000, 15, 0), - [121] = SDC_QDSD_PINGROUP(sdc1_clk, 0x9a000, 13, 6), - [122] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x9a000, 11, 3), - [123] = SDC_QDSD_PINGROUP(sdc1_data, 0x9a000, 9, 0), - [124] = SDC_QDSD_PINGROUP(sdc2_clk, 0x98000, 14, 6), - [125] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x98000, 11, 3), - [126] = SDC_QDSD_PINGROUP(sdc2_data, 0x98000, 9, 0), + [120] = SDC_QDSD_PINGROUP(sdc1_rclk, WEST, 0x9a000, 15, 0), + [121] = SDC_QDSD_PINGROUP(sdc1_clk, WEST, 0x9a000, 13, 6), + [122] = SDC_QDSD_PINGROUP(sdc1_cmd, WEST, 0x9a000, 11, 3), + [123] = SDC_QDSD_PINGROUP(sdc1_data, WEST, 0x9a000, 9, 0), + [124] = SDC_QDSD_PINGROUP(sdc2_clk, SOUTH, 0x98000, 14, 6), + [125] = SDC_QDSD_PINGROUP(sdc2_cmd, SOUTH, 0x98000, 11, 3), + [126] = SDC_QDSD_PINGROUP(sdc2_data, SOUTH, 0x98000, 9, 0), };static const struct msm_gpio_wakeirq_map sm7150_pdc_map[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 481/744 watchdog: cpu5wdt.c: Fix use-after-free bug caused by cpu5wdt_trigger
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duoming Zhou <[email protected]>
[ Upstream commit 573601521277119f2e2ba5f28ae6e87fc594f4d4 ]
When the cpu5wdt module is removing, the origin code uses del_timer() to de-activate the timer. If the timer handler is running, del_timer() could not stop it and will return directly. If the port region is released by release_region() and then the timer handler cpu5wdt_trigger() calls outb() to write into the region that is released, the use-after-free bug will happen.
Change del_timer() to timer_shutdown_sync() in order that the timer handler could be finished before the port region is released.
--- drivers/watchdog/cpu5wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/cpu5wdt.c +1 -1
@@ -252,7 +252,7 @@ static void cpu5wdt_exit(void)if (cpu5wdt_device.queue) { cpu5wdt_device.queue =0 ;wait_for_completion (&cpu5wdt_device.stop); -del_timer (&cpu5wdt_device.timer); +timer_shutdown_sync (&cpu5wdt_device.timer); }misc_deregister (&cpu5wdt_misc);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 482/744 watchdog: bd9576: Drop "always-running" property
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit e3b3afd34d84efcbe4543deb966b1990f43584b8 ]
The always-running (from linux,wdt-gpio.yaml) is abused by the BD9576 watchdog driver. It's defined meaning is "the watchdog is always running and can not be stopped". The BD9576 watchdog driver has implemented it as "start watchdog when loading the module and prevent it from being stopped".
Furthermore, the implementation does not set the WDOG_HW_RUNNING when enabling the watchdog due to the "always-running" at module loading. This will end up resulting a watchdog timeout if the device is not opened.
The culprit was pointed out by Guenter, discussion can be found from
https://lore.kernel.org/lkml/[email protected]/
Drop the invalid "always-running" handling.
--- drivers/watchdog/bd9576_wdt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/watchdog/bd9576_wdt.c +1 -11
@@ -29,7 +29,6 @@ struct bd9576_wdt_priv {struct gpio_desc *gpiod_en;struct device *dev;struct regmap *regmap; -bool always_running;struct watchdog_device wdd; };
@@ -62,10 +61,7 @@ static int bd9576_wdt_stop(struct watchdog_device *wdd) {struct bd9576_wdt_priv *priv =watchdog_get_drvdata (wdd); -if (!priv->always_running) -bd9576_wdt_disable (priv); -else -set_bit (WDOG_HW_RUNNING , &wdd->status); +bd9576_wdt_disable (priv);return 0 ; }
@@ -264,9 +260,6 @@ static int bd9576_wdt_probe(struct platform_device *pdev)if (ret)return ret; - priv->always_running =device_property_read_bool (dev->parent, -"always-running" ); -watchdog_set_drvdata (&priv->wdd, priv); priv->wdd.info = &bd957x_wdt_ident;
@@ -281,9 +274,6 @@ static int bd9576_wdt_probe(struct platform_device *pdev)watchdog_stop_on_reboot (&priv->wdd); -if (priv->always_running) -bd9576_wdt_start (&priv->wdd); -return devm_watchdog_register_device (dev, &priv->wdd); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 483/744 watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 413bf4e857fd79617524d5dcd35f463e9aa2dd41 ]
devm_ioremap() doesn't return error pointers, it returns NULL on error. Update the check accordingly.
--- drivers/watchdog/sa1100_wdt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/sa1100_wdt.c +2 -3
@@ -191,9 +191,8 @@ static int sa1100dog_probe(struct platform_device *pdev)if (!res)return -ENXIO ; reg_base =devm_ioremap (&pdev->dev, res->start,resource_size (res)); - ret =PTR_ERR_OR_ZERO (reg_base); -if (ret) -return ret; +if (!reg_base) +return -ENOMEM ; clk =clk_get (NULL ,"OSTIMER0" );if (IS_ERR (clk)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 484/744 dt-bindings: phy: qcom,sc8280xp-qmp-ufs-phy: fix msm899[68] power-domains
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 59e377a124dc9039d9554d823b1cb4942bcee9a0 ]
The Qualcomm MSM8996 and MSM8998 platforms don't have separate power domain for the UFS PHY. Replace required:power-domains with the conditional schema.
--- .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml +15 -1
@@ -71,7 +71,6 @@ required: - reg - clocks - clock-names - - power-domains - resets - reset-names - vdda-phy-supply
@@ -130,6 +129,21 @@ allOf: clock-names: maxItems: 1 + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8996-qmp-ufs-phy + - qcom,msm8998-qmp-ufs-phy + then: + properties: + power-domains: + false + else: + required: + - power-domains + additionalProperties: false examples:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 485/744 dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 960b3f023d3bda0efd6e573a0647227d1115d266 ]
The qcom,sc8180x-usb-hs-phy device uses qcom,usb-snps-hs-7nm-phy fallback. Correct the schema for this platform.
--- .../devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml +1 -3
@@ -15,9 +15,6 @@ description: | properties: compatible: oneOf: - - enum: - - qcom,sc8180x-usb-hs-phy - - qcom,usb-snps-femto-v2-phy - items: - enum: - qcom,sa8775p-usb-hs-phy
@@ -26,6 +23,7 @@ properties: - items: - enum: - qcom,sc7280-usb-hs-phy + - qcom,sc8180x-usb-hs-phy - qcom,sdx55-usb-hs-phy - qcom,sdx65-usb-hs-phy - qcom,sm6375-usb-hs-phy
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 486/744 dmaengine: idxd: Avoid unnecessary destruction of file_ida
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fenghua Yu <[email protected]>
[ Upstream commit 76e43fa6a456787bad31b8d0daeabda27351a480 ]
file_ida is allocated during cdev open and is freed accordingly during cdev release. This sequence is guaranteed by driver file operations. Therefore, there is no need to destroy an already empty file_ida when the WQ cdev is removed.
Worse, ida_free() in cdev release may happen after destruction of file_ida per WQ cdev. This can lead to accessing an id in file_ida after it has been destroyed, resulting in a kernel panic.
Remove ida_destroy(&file_ida) to address these issues.
--- drivers/dma/idxd/cdev.c | 1 - 1 file changed, 1 deletion(-)
drivers/dma/idxd/cdev.c +0 -1
@@ -577,7 +577,6 @@ void idxd_wq_del_cdev(struct idxd_wq *wq)struct idxd_cdev *idxd_cdev; idxd_cdev = wq->idxd_cdev; -ida_destroy (&file_ida); wq->idxd_cdev =NULL ;cdev_device_del (&idxd_cdev->cdev,cdev_dev (idxd_cdev));put_device (cdev_dev (idxd_cdev));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 487/744 usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wulff <[email protected]>
[ Upstream commit 1b739388aa3f8dfb63a9fca777e6dfa6912d0464 ]
Hang on to the control IDs instead of pointers since those are correctly handled with locks.
--- drivers/usb/gadget/function/u_audio.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/usb/gadget/function/u_audio.c +9 -10
@@ -57,13 +57,13 @@ struct uac_rtd_params {/* Volume/Mute controls and their state */ int fu_id;/* Feature Unit ID */ -struct snd_kcontrol *snd_kctl_volume; -struct snd_kcontrol *snd_kctl_mute; +struct snd_ctl_elem_id snd_kctl_volume_id; +struct snd_ctl_elem_id snd_kctl_mute_id;s16 volume_min, volume_max, volume_res;s16 volume;int mute; -struct snd_kcontrol *snd_kctl_rate;/* read-only current rate */ +struct snd_ctl_elem_id snd_kctl_rate_id;/* read-only current rate */ int srate;/* selected samplerate */ int active;/* playback/capture running */
@@ -494,14 +494,13 @@ static inline void free_ep_fback(struct uac_rtd_params *prm, struct usb_ep *ep)static void set_active (struct uac_rtd_params *prm,bool active) {// notifying through the Rate ctrl -struct snd_kcontrol *kctl = prm->snd_kctl_rate;unsigned long flags;spin_lock_irqsave (&prm->lock, flags);if (prm->active != active) { prm->active = active;snd_ctl_notify (prm->uac->card,SNDRV_CTL_EVENT_MASK_VALUE , - &kctl->id); + &prm->snd_kctl_rate_id); }spin_unlock_irqrestore (&prm->lock, flags); }
@@ -807,7 +806,7 @@ int u_audio_set_volume(struct g_audio *audio_dev, int playback, s16 val)if (change)snd_ctl_notify (uac->card,SNDRV_CTL_EVENT_MASK_VALUE , - &prm->snd_kctl_volume->id); + &prm->snd_kctl_volume_id);return 0 ; }
@@ -856,7 +855,7 @@ int u_audio_set_mute(struct g_audio *audio_dev, int playback, int val)if (change)snd_ctl_notify (uac->card,SNDRV_CTL_EVENT_MASK_VALUE , - &prm->snd_kctl_mute->id); + &prm->snd_kctl_mute_id);return 0 ; }
@@ -1331,7 +1330,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, err =snd_ctl_add (card, kctl);if (err <0 ) goto snd_fail; - prm->snd_kctl_mute = kctl; + prm->snd_kctl_mute_id = kctl->id; prm->mute =0 ; }
@@ -1359,7 +1358,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, err =snd_ctl_add (card, kctl);if (err <0 ) goto snd_fail; - prm->snd_kctl_volume = kctl; + prm->snd_kctl_volume_id = kctl->id; prm->volume = fu->volume_max; prm->volume_max = fu->volume_max; prm->volume_min = fu->volume_min;
@@ -1383,7 +1382,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, err =snd_ctl_add (card, kctl);if (err <0 ) goto snd_fail; - prm->snd_kctl_rate = kctl; + prm->snd_kctl_rate_id = kctl->id; }strscpy (card->driver, card_name,sizeof (card->driver));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 488/744 usb: gadget: u_audio: Clear uac pointer when freed.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wulff <[email protected]>
[ Upstream commit a2cf936ebef291ef7395172b9e2f624779fb6dc0 ]
This prevents use of a stale pointer if functions are called after g_cleanup that shouldn't be. This doesn't fix any races, but converts a possibly silent kernel memory corruption into an obvious NULL pointer dereference report.
--- drivers/usb/gadget/function/u_audio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/function/u_audio.c +2 -0
@@ -1419,6 +1419,8 @@ void g_audio_cleanup(struct g_audio *g_audio)return ; uac = g_audio->uac; + g_audio->uac =NULL ; + card = uac->card;if (card)snd_card_free_when_closed (card);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 489/744 stm class: Fix a double free in stm_register_device()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 3df463865ba42b8f88a590326f4c9ea17a1ce459 ]
The put_device(&stm->dev) call will trigger stm_device_release() which frees "stm" so the vfree(stm) on the next line is a double free.
--- drivers/hwtracing/stm/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/hwtracing/stm/core.c +6 -5
@@ -868,8 +868,11 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,return -ENOMEM ; stm->major =register_chrdev (0 , stm_data->name, &stm_fops); -if (stm->major <0 ) - goto err_free; +if (stm->major <0 ) { + err = stm->major; +vfree (stm); +return err; + }device_initialize (&stm->dev); stm->dev.devt =MKDEV (stm->major,0 );
@@ -913,10 +916,8 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, err_device:unregister_chrdev (stm->major, stm_data->name); -/* matches device_initialize() above */ +/* calls stm_device_release() */ put_device (&stm->dev); -err_free: -vfree (stm);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 490/744 ppdev: Remove usage of the deprecated ida_simple_xx() API
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit d8407f71ebeaeb6f50bd89791837873e44609708 ]
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove().
This is less verbose.
Stable-dep-of: fbf740aeb86a ("ppdev: Add an error check in register_device")
--- drivers/char/ppdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/char/ppdev.c +3 -3
@@ -299,7 +299,7 @@ static int register_device(int minor, struct pp_struct *pp) goto err; } - index =ida_simple_get (&ida_index,0 ,0 ,GFP_KERNEL ); + index =ida_alloc (&ida_index,GFP_KERNEL );memset (&ppdev_cb,0 ,sizeof (ppdev_cb)); ppdev_cb.irq_func = pp_irq; ppdev_cb.flags = (pp->flags &PP_EXCL ) ?PARPORT_FLAG_EXCL :0 ;
@@ -310,7 +310,7 @@ static int register_device(int minor, struct pp_struct *pp)if (!pdev) {pr_warn ("%s: failed to register device!\n" , name); rc = -ENXIO ; -ida_simple_remove (&ida_index, index); +ida_free (&ida_index, index); goto err; }
@@ -750,7 +750,7 @@ static int pp_release(struct inode *inode, struct file *file)if (pp->pdev) {parport_unregister_device (pp->pdev); -ida_simple_remove (&ida_index, pp->index); +ida_free (&ida_index, pp->index); pp->pdev =NULL ;pr_debug (CHRDEV "%x: unregistered pardevice\n" , minor); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 491/744 ppdev: Add an error check in register_device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huai-Yuan Liu <[email protected]>
[ Upstream commit fbf740aeb86a4fe82ad158d26d711f2f3be79b3e ]
In register_device, the return value of ida_simple_get is unchecked, in witch ida_simple_get will use an invalid index value.
To address this issue, index should be checked after ida_simple_get. When the index value is abnormal, a warning message should be printed, the port should be dropped, and the value should be recorded.
--- drivers/char/ppdev.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/char/ppdev.c +11 -4
@@ -296,28 +296,35 @@ static int register_device(int minor, struct pp_struct *pp)if (!port) {pr_warn ("%s: no associated port!\n" , name); rc = -ENXIO ; - goto err; + goto err_free_name; } index =ida_alloc (&ida_index,GFP_KERNEL ); +if (index <0 ) { +pr_warn ("%s: failed to get index!\n" , name); + rc = index; + goto err_put_port; + } +memset (&ppdev_cb,0 ,sizeof (ppdev_cb)); ppdev_cb.irq_func = pp_irq; ppdev_cb.flags = (pp->flags &PP_EXCL ) ?PARPORT_FLAG_EXCL :0 ; ppdev_cb.private = pp; pdev =parport_register_dev_model (port, name, &ppdev_cb, index); -parport_put_port (port);if (!pdev) {pr_warn ("%s: failed to register device!\n" , name); rc = -ENXIO ;ida_free (&ida_index, index); - goto err; + goto err_put_port; } pp->pdev = pdev; pp->index = index;dev_dbg (&pdev->dev,"registered pardevice\n" ); -err: +err_put_port: +parport_put_port (port); +err_free_name:kfree (name);return rc; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 492/744 i2c: cadence: Avoid fifo clear after start
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sai Pavan Boddu <[email protected]>
[ Upstream commit c2e55b449de7298a751ed0256251019d302af453 ]
The Driver unintentionally programs ctrl reg to clear the fifo, which happens after the start of transaction. Previously, this was not an issue as it involved read-modified-write. However, this issue breaks i2c reads on QEMU, as i2c-read is executed before guest starts programming control register.
--- drivers/i2c/busses/i2c-cadence.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-cadence.c +1 -0
@@ -633,6 +633,7 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id)if (hold_clear) { ctrl_reg &= ~CDNS_I2C_CR_HOLD ; + ctrl_reg &= ~CDNS_I2C_CR_CLR_FIFO ;/* * In case of Xilinx Zynq SOC, clear the HOLD bit before transfer size * register reaches '0'. This is an IP bug which causes transfer size
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 493/744 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 55750148e5595bb85605e8fbb40b2759c2c4c2d7 ]
If an error occurs after the clk_prepare_enable() call, it should be undone by a corresponding clk_disable_unprepare() call, as already done in the remove() function.
As devm_clk_get() is used, we can switch to devm_clk_get_enabled() to handle it automatically and fix the probe.
Update the remove() function accordingly and remove the now useless clk_disable_unprepare() call.
--- drivers/i2c/busses/i2c-synquacer.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/i2c/busses/i2c-synquacer.c +7 -13
@@ -550,17 +550,13 @@ static int synquacer_i2c_probe(struct platform_device *pdev)device_property_read_u32 (&pdev->dev,"socionext,pclk-rate" , &i2c->pclkrate); - i2c->pclk =devm_clk_get (&pdev->dev,"pclk" ); -if (PTR_ERR (i2c->pclk) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; -if (!IS_ERR_OR_NULL (i2c->pclk)) { -dev_dbg (&pdev->dev,"clock source %p\n" , i2c->pclk); - - ret =clk_prepare_enable (i2c->pclk); -if (ret) -return dev_err_probe (&pdev->dev, ret,"failed to enable clock\n" ); - i2c->pclkrate =clk_get_rate (i2c->pclk); - } + i2c->pclk =devm_clk_get_enabled (&pdev->dev,"pclk" ); +if (IS_ERR (i2c->pclk)) +return dev_err_probe (&pdev->dev,PTR_ERR (i2c->pclk), +"failed to get and enable clock\n" ); + +dev_dbg (&pdev->dev,"clock source %p\n" , i2c->pclk); + i2c->pclkrate =clk_get_rate (i2c->pclk);if (i2c->pclkrate <SYNQUACER_I2C_MIN_CLK_RATE || i2c->pclkrate >SYNQUACER_I2C_MAX_CLK_RATE )
@@ -615,8 +611,6 @@ static void synquacer_i2c_remove(struct platform_device *pdev)struct synquacer_i2c *i2c =platform_get_drvdata (pdev);i2c_del_adapter (&i2c->adapter); -if (!IS_ERR (i2c->pclk)) -clk_disable_unprepare (i2c->pclk); };static const struct of_device_id synquacer_i2c_dt_ids[]__maybe_unused = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 494/744 perf bench internals inject-build-id: Fix trap divide when collecting just one DSO
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: He Zhe <[email protected]>
[ Upstream commit d9180e23fbfa3875424d3a6b28b71b072862a52a ]
'perf bench internals inject-build-id' suffers from the following error when only one DSO is collected.
# perf bench internals inject-build-id -v
Collected 1 DSOs
traps: internals-injec[2305] trap divide error
ip:557566ba6394 sp:7ffd4de97fe0 error:0 in perf[557566b2a000+23d000]
Build-id injection benchmark
Iteration #1
Floating point exceptionThis patch removes the unnecessary minus one from the divisor which also corrects the randomization range.
--- tools/perf/bench/inject-buildid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/bench/inject-buildid.c +1 -1
@@ -362,7 +362,7 @@ static int inject_build_id(struct bench_data *data, u64 *max_rss)return -1 ;for (i =0 ; i < nr_mmaps; i++) { -int idx =rand () % (nr_dsos -1 ); +int idx =rand () % nr_dsos;struct bench_dso *dso = &dsos[idx];u64 timestamp =rand () %1000000 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 495/744 perf ui browser: Dont save pointer to stack memory
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 769e6a1e15bdbbaf2b0d2f37c24f2c53268bd21f ]
ui_browser__show() is capturing the input title that is stack allocated memory in hist_browser__run().
Avoid a use after return by strdup-ing the string.
Committer notes:
Further explanation from Ian Rogers:
My command line using tui is:
$ sudo bash -c 'rm /tmp/asan.log*; export
ASAN_OPTIONS="log_path=/tmp/asan.log"; /tmp/perf/perf mem record -a
sleep 1; /tmp/perf/perf mem report'
I then go to the perf annotate view and quit. This triggers the asan
error (from the log file):
```
==1254591==ERROR: AddressSanitizer: stack-use-after-return on address
0x7f2813331920 at pc 0x7f28180
65991 bp 0x7fff0a21c750 sp 0x7fff0a21bf10
READ of size 80 at 0x7f2813331920 thread T0
#0 0x7f2818065990 in __interceptor_strlen
../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:461
#1 0x7f2817698251 in SLsmg_write_wrapped_string
(/lib/x86_64-linux-gnu/libslang.so.2+0x98251)
#2 0x7f28176984b9 in SLsmg_write_nstring
(/lib/x86_64-linux-gnu/libslang.so.2+0x984b9)
#3 0x55c94045b365 in ui_browser__write_nstring ui/browser.c:60
#4 0x55c94045c558 in __ui_browser__show_title ui/browser.c:266
#5 0x55c94045c776 in ui_browser__show ui/browser.c:288
#6 0x55c94045c06d in ui_browser__handle_resize ui/browser.c:206
#7 0x55c94047979b in do_annotate ui/browsers/hists.c:2458
#8 0x55c94047fb17 in evsel__hists_browse ui/browsers/hists.c:3412
#9 0x55c940480a0c in perf_evsel_menu__run ui/browsers/hists.c:3527
#10 0x55c940481108 in __evlist__tui_browse_hists ui/browsers/hists.c:3613
#11 0x55c9404813f7 in evlist__tui_browse_hists ui/browsers/hists.c:3661
#12 0x55c93ffa253f in report__browse_hists tools/perf/builtin-report.c:671
#13 0x55c93ffa58ca in __cmd_report tools/perf/builtin-report.c:1141
#14 0x55c93ffaf159 in cmd_report tools/perf/builtin-report.c:1805
#15 0x55c94000c05c in report_events tools/perf/builtin-mem.c:374
#16 0x55c94000d96d in cmd_mem tools/perf/builtin-mem.c:516
#17 0x55c9400e44ee in run_builtin tools/perf/perf.c:350
#18 0x55c9400e4a5a in handle_internal_command tools/perf/perf.c:403
#19 0x55c9400e4e22 in run_argv tools/perf/perf.c:447
#20 0x55c9400e53ad in main tools/perf/perf.c:561
#21 0x7f28170456c9 in __libc_start_call_main
../sysdeps/nptl/libc_start_call_main.h:58
#22 0x7f2817045784 in __libc_start_main_impl ../csu/libc-start.c:360
#23 0x55c93ff544c0 in _start (/tmp/perf/perf+0x19a4c0) (BuildId:
84899b0e8c7d3a3eaa67b2eb35e3d8b2f8cd4c93)Address 0x7f2813331920 is located in stack of thread T0 at offset 32 in frame
#0 0x55c94046e85e in hist_browser__run ui/browsers/hists.c:746
This frame has 1 object(s):
[32, 192) 'title' (line 747) <== Memory access at offset 32 is
inside this variable
HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork
```hist_browser__run isn't on the stack so the asan error looks legit. There's no clean init/exit on struct ui_browser so I may be trading a use-after-return for a memory leak, but that seems look a good trade anyway.
--- tools/perf/ui/browser.c | 4 +++- tools/perf/ui/browser.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/ui/browser.c +3 -1
@@ -287,7 +287,8 @@ int ui_browser__show(struct ui_browser *browser, const char *title,mutex_lock (&ui__lock);__ui_browser__show_title (browser, title); - browser->title = title; +free (browser->title); + browser->title =strdup (title);zfree (&browser->helpline);va_start (ap, helpline);
@@ -304,6 +305,7 @@ void ui_browser__hide(struct ui_browser *browser)mutex_lock (&ui__lock);ui_helpline__pop ();zfree (&browser->helpline); +zfree (&browser->title);mutex_unlock (&ui__lock); }
tools/perf/ui/browser.h +1 -1
@@ -21,7 +21,7 @@ struct ui_browser {u8 extra_title_lines;int current_color;void *priv; -const char *title; +char *title;char *helpline;const char *no_samples_msg;void (*refresh_dimensions)(struct ui_browser *browser);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 496/744 extcon: max8997: select IRQ_DOMAIN instead of depending on it
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit b1781d0a1458070d40134e4f3412ec9d70099bec ]
IRQ_DOMAIN is a hidden (not user visible) symbol. Users cannot set it directly thru "make *config", so drivers should select it instead of depending on it if they need it.
Relying on it being set for a dependency is risky.
Consistently using "select" or "depends on" can also help reduce Kconfig circular dependency issues.
Therefore, change EXTCON_MAX8997's use of "depends on" for IRQ_DOMAIN to "select".
--- drivers/extcon/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/extcon/Kconfig +2 -1
@@ -116,7 +116,8 @@ config EXTCON_MAX77843 config EXTCON_MAX8997 tristate "Maxim MAX8997 EXTCON Support" - depends on MFD_MAX8997 && IRQ_DOMAIN + depends on MFD_MAX8997 + select IRQ_DOMAIN help If you say yes here you get support for the MUIC device of Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 497/744 dt-bindings: spmi: hisilicon,hisi-spmi-controller: fix binding references
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit c6c1b27f9a9a20ad2db663628fccaed72c6a0f1f ]
Fix up the free text binding references which were not updated when moving the bindings out of staging and which had a leading current directory component, respectively.
--- .../bindings/spmi/hisilicon,hisi-spmi-controller.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml +2 -2
@@ -14,7 +14,7 @@ description: | It is a MIPI System Power Management (SPMI) controller. The PMIC part is provided by - ./Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml. + Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml. allOf: - $ref: spmi.yaml#
@@ -48,7 +48,7 @@ patternProperties: PMIC properties, which are specific to the used SPMI PMIC device(s). When used in combination with HiSilicon 6421v600, the properties are documented at - drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml. + Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml unevaluatedProperties: false
Signature · 1 line
2.43.0