wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
cover wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
From: Kalle Valo <[email protected]>
Fix a recently introduced sparse warning in ath11k_mac_op_ipv6_changed() and switch to use list_for_each_entry() in the same function. My plan is to get first patch to wireless tree and the second patch ath-next (once the first patch is there).
Please review.
Kalle Valo (2):
wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
wifi: ath11k: ath11k_mac_op_ipv6_changed(): use list_for_each_entry()
drivers/net/wireless/ath/ath11k/mac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
base-commit: 363e7193eaf258fe7f04e8db560bd8a282a12cd9
Signature · 1 line
2.39.2
PATCH 1/2 wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
From: Kalle Valo <[email protected]>
Commit c3718936ec47 ("ipv6: anycast: complete RCU handling of struct ifacaddr6") converted struct inet6_dev::ac_list to use RCU but missed that ath11k also accesses this list. Now sparse warns:
drivers/net/wireless/ath/ath11k/mac.c:9145:21: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:21: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:21: got struct ifacaddr6 [noderef] __rcu *ac_listdrivers/net/wireless/ath/ath11k/mac.c:9145:53: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:53: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:53: got struct ifacaddr6 [noderef] __rcu *aca_next
Fix it by using rtnl_dereference(). Also add a note that read_lock_bh() calls rcu_read_lock() which I was not aware of.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.c +3 -1
@@ -9112,6 +9112,7 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw, offload = &arvif->arp_ns_offload; count =0 ; +/* Note: read_lock_bh() calls rcu_read_lock() */ read_lock_bh (&idev->lock);memset (offload->ipv6_addr,0 ,sizeof (offload->ipv6_addr));
@@ -9142,7 +9143,8 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw, }/* get anycast address */ -for (ifaca6 = idev->ac_list; ifaca6; ifaca6 = ifaca6->aca_next) { +for (ifaca6 =rcu_dereference (idev->ac_list); ifaca6; + ifaca6 =rcu_dereference (ifaca6->aca_next)) {if (count >=ATH11K_IPV6_MAX_COUNT ) goto generate;
Signature · 1 line
2.39.2
Quoted 13 lines · Kalle Valo
From: Kalle Valo <[email protected]>
Commit
c3718936ec47("ipv6: anycast: complete RCU handling of struct ifacaddr6") converted structinet6_dev::ac_listto use RCU but missed that ath11k also accesses this list. Now sparse warns:
drivers/net/wireless/ath/ath11k/mac.c:9145:21: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:21: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:21: got struct ifacaddr6 [noderef]__rcu*ac_listdrivers/net/wireless/ath/ath11k/mac.c:9145:53: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:53: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:53: got struct ifacaddr6 [noderef]__rcu*aca_next
Quoted 7 lines
Fix it by using
rtnl_dereference(). Also add a note thatread_lock_bh()callsrcu_read_lock()which I was not aware of.Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
Fixes c3718936ec47 ("ipv6: anycast: complete RCU handling of struct ifacaddr6")Signed-off-by Kalle Valo <[email protected]>
Quoted 13 lines · Kalle Valo
From: Kalle Valo <[email protected]>
Commit
c3718936ec47("ipv6: anycast: complete RCU handling of struct ifacaddr6") converted structinet6_dev::ac_listto use RCU but missed that ath11k also accesses this list. Now sparse warns:
drivers/net/wireless/ath/ath11k/mac.c:9145:21: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:21: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:21: got struct ifacaddr6 [noderef]__rcu*ac_listdrivers/net/wireless/ath/ath11k/mac.c:9145:53: warning: incorrect type in assignment (different address spaces)drivers/net/wireless/ath/ath11k/mac.c:9145:53: expected struct ifacaddr6 *ifaca6drivers/net/wireless/ath/ath11k/mac.c:9145:53: got struct ifacaddr6 [noderef]__rcu*aca_next
Quoted 8 lines
Fix it by using
rtnl_dereference(). Also add a note thatread_lock_bh()callsrcu_read_lock()which I was not aware of.Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
Fixes c3718936ec47 ("ipv6: anycast: complete RCU handling of struct ifacaddr6")Signed-off-by Kalle Valo <[email protected]>Acked-by Jeff Johnson <[email protected]>
Patch applied to wireless.git, thanks.
feafe59c8975 wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/2 wifi: ath11k: ath11k_mac_op_ipv6_changed(): use list_for_each_entry()
In reply to Kalle ValoFrom: Kalle Valo <[email protected]>
Simplify the loop by using list_for_each_entry(). No functional changes.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/mac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -3
@@ -9104,7 +9104,6 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw,struct ath11k_vif *arvif =ath11k_vif_to_arvif (vif);struct inet6_ifaddr *ifa6;struct ifacaddr6 *ifaca6; -struct list_head *p;u32 count, scope;ath11k_dbg (ar->ab,ATH11K_DBG_MAC ,"op ipv6 changed\n" );
@@ -9120,11 +9119,10 @@ static void ath11k_mac_op_ipv6_changed(struct ieee80211_hw *hw,memcpy (offload->mac_addr, vif->addr,ETH_ALEN );/* get unicast address */ -list_for_each (p, &idev->addr_list) { +list_for_each_entry (ifa6, &idev->addr_list, if_list) {if (count >=ATH11K_IPV6_MAX_COUNT ) goto generate; - ifa6 = list_entry(p, struct inet6_ifaddr, if_list);if (ifa6->flags &IFA_F_DADFAILED )continue ; scope =ipv6_addr_src_scope (&ifa6->addr);
Signature · 1 line
2.39.2
Re: [PATCH 2/2] wifi: ath11k: ath11k_mac_op_ipv6_changed(): use list_for_each_entry()
Quoted 7 lines · Kalle Valo
From: Kalle Valo <[email protected]>
Simplify the loop by using
list_for_each_entry(). No functional changes.Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
Signed-off-by Kalle Valo <[email protected]>
Re: [PATCH 2/2] wifi: ath11k: ath11k_mac_op_ipv6_changed(): use list_for_each_entry()
In reply to Kalle ValoQuoted 6 lines · Kalle Valo
Simplify the loop by using
list_for_each_entry(). No functional changes.Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
Signed-off-by Kalle Valo <[email protected]>Acked-by Jeff Johnson <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
f41c7cab8727 wifi: ath11k: ath11k_mac_op_ipv6_changed(): use list_for_each_entry()
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches