6.6.33-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 128/744 wifi: ath11k: dont force enable power save on non-running vdevs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 01296b39d3515f20a1db64d3c421c592b1e264a0 ]
Currently we force enable power save on non-running vdevs, this results in unexpected ping latency in below scenarios:
1. disable power save from userspace.
2. trigger suspend/resume.
With step 1 power save is disabled successfully and we get a good latency:
PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. 64 bytes from 192.168.1.1: icmp_seq=1 ttl=64 time=5.13 ms 64 bytes from 192.168.1.1: icmp_seq=2 ttl=64 time=5.45 ms 64 bytes from 192.168.1.1: icmp_seq=3 ttl=64 time=5.99 ms 64 bytes from 192.168.1.1: icmp_seq=4 ttl=64 time=6.34 ms 64 bytes from 192.168.1.1: icmp_seq=5 ttl=64 time=4.47 ms 64 bytes from 192.168.1.1: icmp_seq=6 ttl=64 time=6.45 ms
While after step 2, the latency becomes much larger:
PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. 64 bytes from 192.168.1.1: icmp_seq=1 ttl=64 time=17.7 ms 64 bytes from 192.168.1.1: icmp_seq=2 ttl=64 time=15.0 ms 64 bytes from 192.168.1.1: icmp_seq=3 ttl=64 time=14.3 ms 64 bytes from 192.168.1.1: icmp_seq=4 ttl=64 time=16.5 ms 64 bytes from 192.168.1.1: icmp_seq=5 ttl=64 time=20.1 ms
The reason is, with step 2, power save is force enabled due to vdev not running, although mac80211 was trying to disable it to honor userspace configuration:
ath11k_pci 0000:03:00.0: wmi cmd sta powersave mode psmode 1 vdev id 0
Call Trace: ath11k_wmi_pdev_set_ps_mode ath11k_mac_op_bss_info_changed ieee80211_bss_info_change_notify ieee80211_reconfig ieee80211_resume wiphy_resume
This logic is taken from ath10k where it was added due to below comment:
Firmware doesn't behave nicely and consumes more power than necessary if PS is disabled on a non-started vdev.
However we don't know whether such an issue also occurs to ath11k firmware or not. But even if it does, it's not appropriate because it goes against userspace, even cfg/mac80211 don't know we have enabled it in fact.
Remove it to fix this issue. In this way we not only get a better latency, but also, and the most important, keeps the consistency between userspace and kernel/driver. The biggest price for that would be the power consumption, which is not that important, compared with the consistency.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
--- drivers/net/wireless/ath/ath11k/mac.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -8
@@ -1233,14 +1233,7 @@ static int ath11k_mac_vif_setup_ps(struct ath11k_vif *arvif) enable_ps = arvif->ps; -if (!arvif->is_started) { -/* mac80211 can update vif powersave state while disconnected. -* Firmware doesn't behave nicely and consumes more power than -* necessary if PS is disabled on a non-started vdev. Hence -* force-enable PS for non-running vdevs. -*/ - psmode =WMI_STA_PS_MODE_ENABLED ; - }else if (enable_ps) { +if (enable_ps) { psmode =WMI_STA_PS_MODE_ENABLED ; param =WMI_STA_PS_PARAM_INACTIVITY_TIME ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 129/744 bpftool: Fix missing pids during link show
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit fe879bb42f8a6513ed18e9d22efb99cb35590201 ]
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
# --- a/tools/bpf/bpftool/pids.c # +++ b/tools/bpf/bpftool/pids.c # @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) # /* we don't want output polluted with libbpf errors if bpf_iter is not # * supported # */ # - default_print = libbpf_set_print(libbpf_print_none); # + /* default_print = libbpf_set_print(libbpf_print_none); */ # err = pid_iter_bpf__load(skel); # - libbpf_set_print(default_print); # + /* libbpf_set_print(default_print); */
Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...
The 'file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.
To fix the issue, restore the previous BPF_CORE_READ so old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320
pids systemd(1)--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +2 -2
@@ -102,8 +102,8 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; - if (link->type == bpf_core_enum_value(enum bpf_link_type___local, - BPF_LINK_TYPE_PERF_EVENT___local)) { + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, + BPF_LINK_TYPE_PERF_EVENT___local)) { e.has_bpf_cookie = true; e.bpf_cookie =get_bpf_cookie (link); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/744 wifi: ath12k: use correct flag field for 320 MHz channels
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aloka Dixit <[email protected]>
[ Upstream commit 020e08ae5e68cbc0791e8d842443a86eb6aa99f6 ]
Due to an error during rebasing the patchset 320 MHz channel support got broken. ath12k was setting the QoS bit instead of the correct flag. WMI_PEER_EXT_320MHZ (0x2) is defined as an extended flag, replace peer_flags by peer_flags_ext while sending peer data.
This affected both QCN9274 and WCN7850 which use the same flag.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/wmi.c +1 -1
@@ -1834,7 +1834,7 @@ static void ath12k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd,if (arg->bw_160) cmd->peer_flags |=cpu_to_le32 (WMI_PEER_160MHZ );if (arg->bw_320) - cmd->peer_flags |=cpu_to_le32 (WMI_PEER_EXT_320MHZ ); + cmd->peer_flags_ext |=cpu_to_le32 (WMI_PEER_EXT_320MHZ );/* Typically if STBC is enabled for VHT it should be enabled * for HT as well
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/744 wifi: mt76: mt7915: workaround too long expansion sparse warnings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 2d5cde1143eca31c72547dfd589702c6b4a7e684 ]
Fix the following sparse warnings:
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:1133:29: error: too long token expansion drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:1133:29: error: too long token expansion drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:1133:29: error: too long token expansion drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:1133:29: error: too long token expansion
No functional changes, compile tested only.
--- drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +3 -3
@@ -1049,6 +1049,7 @@ static ssize_t mt7915_rate_txpower_set(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) { + int i, ret, pwr, pwr160 = 0, pwr80 = 0, pwr40 = 0, pwr20 = 0;struct mt7915_phy *phy = file->private_data;struct mt7915_dev *dev = phy->dev;struct mt76_phy *mphy = phy->mt76;
@@ -1057,7 +1058,6 @@ mt7915_rate_txpower_set(struct file *file, const char __user *user_buf, .band_idx = phy->mt76->band_idx, };char buf[100 ]; -int i, ret, pwr160 =0 , pwr80 =0 , pwr40 =0 , pwr20 =0 ;enum mac80211_rx_encoding mode;u32 offs =0 , len =0 ;
@@ -1130,8 +1130,8 @@ mt7915_rate_txpower_set(struct file *file, const char __user *user_buf,if (ret) goto out; - mphy->txpower_cur =max (mphy->txpower_cur, -max (pwr160,max (pwr80,max (pwr40, pwr20)))); + pwr =max3 (pwr80, pwr40, pwr20); + mphy->txpower_cur =max3 (mphy->txpower_cur, pwr160, pwr); out:mutex_unlock (&dev->mt76.mutex);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/744 x86/boot: Ignore relocations in .notes sections in walk_relocs() too
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guixiong Wei <[email protected]>
[ Upstream commit 76e9762d66373354b45c33b60e9a53ef2a3c5ff2 ]
Commit:
aaa8736370db ("x86, relocs: Ignore relocations in .notes section")
... only started ignoring the .notes sections in print_absolute_relocs(), but the same logic should also by applied in walk_relocs() to avoid such relocations.
[ mingo: Fixed various typos in the changelog, removed extra curly braces from the code. ]
--- arch/x86/tools/relocs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/tools/relocs.c +9 -0
@@ -746,6 +746,15 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,if (!(sec_applies->shdr.sh_flags &SHF_ALLOC )) {continue ; } + +/* +* Do not perform relocations in .notes sections; any +* values there are meant for pre-boot consumption (e.g. +* startup_xen). +*/ +if (sec_applies->shdr.sh_type ==SHT_NOTE ) +continue ; + sh_symtab = sec_symtab->symtab; sym_strtab = sec_symtab->link->strtab;for (j =0 ; j < sec->shdr.sh_size/sizeof (Elf_Rel); j++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/744 wifi: ieee80211: fix ieee80211_mle_basic_sta_prof_size_ok()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit c121514df0daa800cc500dc2738e0b8a1c54af98 ]
If there was a possibility of an MLE basic STA profile without subelements, we might reject it because we account for the one octet for sta_info_len twice (it's part of itself, and in the fixed portion). Like in ieee80211_mle_reconf_sta_prof_size_ok, subtract 1 to adjust that.
When reading the elements we did take this into account, and since there are always elements, this never really mattered.
--- include/linux/ieee80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ieee80211.h +1 -1
@@ -5081,7 +5081,7 @@ static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, info_len +=1 ;return prof->sta_info_len >= info_len && - fixed + prof->sta_info_len <= len; + fixed + prof->sta_info_len -1 <= len; }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/744 wifi: iwlwifi: mvm: allocate STA links only for active links
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 62bdd97598f8be82a24f556f78336b05d1c3e84b ]
For the mvm driver, data structures match what's in the firmware, we allocate FW IDs for them already etc. During link switch we already allocate/free the STA links appropriately, but initially we'd allocate them always. Fix this to allocate memory, a STA ID, etc. only for active links.
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +3 -3
@@ -582,14 +582,14 @@ static int iwl_mvm_mld_alloc_sta_links(struct iwl_mvm *mvm, struct ieee80211_sta *sta) {struct iwl_mvm_sta *mvm_sta =iwl_mvm_sta_from_mac80211 (sta); +struct ieee80211_link_sta *link_sta;unsigned int link_id;int ret;lockdep_assert_held (&mvm->mutex); -for (link_id =0 ; link_id <ARRAY_SIZE (sta->link); link_id++) { -if (!rcu_access_pointer (sta->link[link_id]) || - mvm_sta->link[link_id]) +for_each_sta_active_link (vif, sta, link_sta, link_id) { +if (WARN_ON (mvm_sta->link[link_id]))continue ; ret =iwl_mvm_mld_alloc_sta_link (mvm, vif, sta, link_id);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/744 wifi: iwlwifi: mvm: select STA mask only for active links
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 2783ab506eaa36dbef40bda0f96eb49fe149790e ]
During reconfig, we might send keys, but those should be only sent to already active link stations. Iterate only active ones to fix that issue.
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +7 -4
@@ -9,7 +9,9 @@u32 iwl_mvm_sta_fw_id_mask (struct iwl_mvm *mvm,struct ieee80211_sta *sta,int filter_link_id) { +struct ieee80211_link_sta *link_sta;struct iwl_mvm_sta *mvmsta; +struct ieee80211_vif *vif;unsigned int link_id;u32 result =0 ;
@@ -17,26 +19,27 @@ u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta,return 0 ; mvmsta =iwl_mvm_sta_from_mac80211 (sta); + vif = mvmsta->vif;/* it's easy when the STA is not an MLD */ if (!sta->valid_links)return BIT (mvmsta->deflink.sta_id);/* but if it is an MLD, get the mask of all the FW STAs it has ... */ -for (link_id =0 ; link_id <ARRAY_SIZE (mvmsta->link); link_id++) { -struct iwl_mvm_link_sta *link_sta; +for_each_sta_active_link (vif, sta, link_sta, link_id) { +struct iwl_mvm_link_sta *mvm_link_sta;/* unless we have a specific link in mind */ if (filter_link_id >=0 && link_id != filter_link_id)continue ; - link_sta = + mvm_link_sta =rcu_dereference_check (mvmsta->link[link_id],lockdep_is_held (&mvm->mutex));if (!link_sta)continue ; - result |=BIT (link_sta->sta_id); + result |=BIT (mvm_link_sta->sta_id); }return result;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/744 wifi: iwlwifi: reconfigure TLC during HW restart
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 96833fb3c7abfd57bb3ee2de2534c5a3f52b0838 ]
Since the HW restart flow with multi-link is very similar to the initial association, we do need to reconfigure TLC there. Remove the check that prevented that.
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +1 -6
@@ -296,13 +296,8 @@ __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm,* this needs the phy context assigned (and in FW?), and we cannot * do it later because it needs to be initialized as soon as we're * able to TX on the link, i.e. when active. -* -* Firmware restart isn't quite correct yet for MLO, but we don't -* need to do it in that case anyway since it will happen from the -* normal station state callback. */ -if (mvmvif->ap_sta && - !test_bit (IWL_MVM_STATUS_IN_HW_RESTART , &mvm->status)) { +if (mvmvif->ap_sta) {struct ieee80211_link_sta *link_sta;rcu_read_lock ();
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/744 wifi: iwlwifi: mvm: fix check in iwl_mvm_sta_fw_id_mask
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit d69aef8084cc72df7b0f2583096d9b037c647ec8 ]
In the previous commit, I renamed the variable to differentiate mac80211/mvm link STA, but forgot to adjust the check. The one from mac80211 is already non-NULL anyway, but the mvm one can be NULL when the mac80211 isn't during link switch conditions. Fix the check.
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +1 -1
@@ -36,7 +36,7 @@ u32 iwl_mvm_sta_fw_id_mask(struct iwl_mvm *mvm, struct ieee80211_sta *sta, mvm_link_sta =rcu_dereference_check (mvmsta->link[link_id],lockdep_is_held (&mvm->mutex)); -if (!link_sta) +if (!mvm_link_sta)continue ; result |=BIT (mvm_link_sta->sta_id);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/744 sched/fair: Add EAS checks before updating root_domain::overutilized
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shrikanth Hegde <[email protected]>
[ Upstream commit be3a51e68f2f1b17250ce40d8872c7645b7a2991 ]
root_domain::overutilized is only used for EAS(energy aware scheduler) to decide whether to do load balance or not. It is not used if EAS not possible.
Currently enqueue_task_fair and task_tick_fair accesses, sometime updates this field. In update_sd_lb_stats it is updated often. This causes cache contention due to true sharing and burns a lot of cycles. ::overload and ::overutilized are part of the same cacheline. Updating it often invalidates the cacheline. That causes access to ::overload to slow down due to false sharing. Hence add EAS check before accessing/updating this field. EAS check is optimized at compile time or it is a static branch. Hence it shouldn't cost much.
With the patch, both enqueue_task_fair and newidle_balance don't show up as hot routines in perf profile.
6.8-rc4:
7.18% swapper [kernel.vmlinux] [k] enqueue_task_fair 6.78% s [kernel.vmlinux] [k] newidle_balance
+patch:
0.14% swapper [kernel.vmlinux] [k] enqueue_task_fair 0.00% swapper [kernel.vmlinux] [k] newidle_balance
While at it: trace_sched_overutilized_tp expect that second argument to be bool. So do a int to bool conversion for that.
--- kernel/sched/fair.c | 53 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 19 deletions(-)
kernel/sched/fair.c +34 -19
@@ -6564,22 +6564,42 @@ static inline void hrtick_update(struct rq *rq)#ifdef CONFIG_SMP static inline bool cpu_overutilized (int cpu) { -unsigned long rq_util_min =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MIN ); -unsigned long rq_util_max =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MAX ); +unsigned long rq_util_min, rq_util_max; + +if (!sched_energy_enabled ()) +return false; + + rq_util_min =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MIN ); + rq_util_max =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MAX );/* Return true only if the utilization doesn't fit CPU's capacity */ return !util_fits_cpu (cpu_util_cfs (cpu), rq_util_min, rq_util_max, cpu); } -static inline void update_overutilized_status (struct rq *rq) +static inline void set_rd_overutilized_status (struct root_domain *rd, +unsigned int status) { -if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) { -WRITE_ONCE (rq->rd->overutilized,SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rq->rd,SG_OVERUTILIZED ); - } +if (!sched_energy_enabled ()) +return ; + +WRITE_ONCE (rd->overutilized, status); +trace_sched_overutilized_tp (rd, !!status); +} + +static inline void check_update_overutilized_status (struct rq *rq) +{ +/* +* overutilized field is used for load balancing decisions only +* if energy aware scheduler is being used +*/ +if (!sched_energy_enabled ()) +return ; + +if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) +set_rd_overutilized_status (rq->rd,SG_OVERUTILIZED ); }#else -static inline void update_overutilized_status (struct rq *rq) { } +static inline void check_update_overutilized_status (struct rq *rq) { }#endif /* Runqueue only has SCHED_IDLE tasks enqueued */
@@ -6680,7 +6700,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)* and the following generally works well enough in practice. */ if (!task_new) -update_overutilized_status (rq); +check_update_overutilized_status (rq); enqueue_throttle:assert_list_leaf_cfs_rq (rq);
@@ -10500,19 +10520,14 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd env->fbq_type =fbq_classify_group (&sds->busiest_stat);if (!env->sd->parent) { -struct root_domain *rd = env->dst_rq->rd; -/* update overload indicator if we are at root domain */ -WRITE_ONCE (rd->overload, sg_status &SG_OVERLOAD ); +WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD );/* Update over-utilization (tipping point, U >= 0) indicator */ -WRITE_ONCE (rd->overutilized, sg_status &SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rd, sg_status &SG_OVERUTILIZED ); +set_rd_overutilized_status (env->dst_rq->rd, + sg_status &SG_OVERUTILIZED ); }else if (sg_status &SG_OVERUTILIZED ) { -struct root_domain *rd = env->dst_rq->rd; - -WRITE_ONCE (rd->overutilized,SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rd,SG_OVERUTILIZED ); +set_rd_overutilized_status (env->dst_rq->rd,SG_OVERUTILIZED ); }update_idle_cpu_scan (env, sum_util);
@@ -12503,7 +12518,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)task_tick_numa (rq, curr);update_misfit_status (curr, rq); -update_overutilized_status (task_rq (curr)); +check_update_overutilized_status (task_rq (curr));task_tick_core (rq, curr); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/744 ACPI: Fix Generic Initiator Affinity _OSC bit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Armin Wolf <[email protected]>
[ Upstream commit d0d4f1474e36b195eaad477373127ae621334c01 ]
The ACPI spec says bit 17 should be used to indicate support for Generic Initiator Affinity Structure in SRAT, but we currently set bit 13 ("Interrupt ResourceSource support").
Fix this by actually setting bit 17 when evaluating _OSC.
--- include/linux/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -1
@@ -571,8 +571,8 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);#define OSC_SB_PCLPI_SUPPORT 0x00000080#define OSC_SB_OSLPI_SUPPORT 0x00000100#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000 -#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000#define OSC_SB_CPC_FLEXIBLE_ADR_SPACE 0x00004000 +#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00020000#define OSC_SB_NATIVE_USB4_SUPPORT 0x00040000#define OSC_SB_PRM_SUPPORT 0x00200000#define OSC_SB_FFH_OPR_SUPPORT 0x00400000
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/744 enetc: avoid truncating error message
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 9046d581ed586f3c715357638ca12c0e84402002 ]
As clang points out, the error message in enetc_setup_xdp_prog() still does not fit in the buffer and will be truncated:
drivers/net/ethernet/freescale/enetc/enetc.c:2771:3: error: 'snprintf' will always be truncated; specified size is 80, but format string expands to at least 87 [-Werror,-Wformat-truncation]
Replace it with an even shorter message that should fit.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +1 -1
@@ -2769,7 +2769,7 @@ static int enetc_setup_xdp_prog(struct net_device *ndev, struct bpf_prog *prog,if (priv->min_num_stack_tx_queues + num_xdp_tx_queues > priv->num_tx_rings) {NL_SET_ERR_MSG_FMT_MOD (extack, -"Reserving %d XDP TXQs does not leave a minimum of %d for stack (total %d)" , +"Reserving %d XDP TXQs leaves under %d for stack (total %d)" , num_xdp_tx_queues, priv->min_num_stack_tx_queues, priv->num_tx_rings);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/744 qed: avoid truncating work queue length
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 954fd908f177604d4cce77e2a88cc50b29bad5ff ]
clang complains that the temporary string for the name passed into alloc_workqueue() is too short for its contents:
drivers/net/ethernet/qlogic/qed/qed_main.c:1218:3: error: 'snprintf' will always be truncated; specified size is 16, but format string expands to at least 18 [-Werror,-Wformat-truncation]
There is no need for a temporary buffer, and the actual name of a workqueue is 32 bytes (WQ_NAME_LEN), so just use the interface as intended to avoid the truncation.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +4 -5
@@ -1206,7 +1206,6 @@ static void qed_slowpath_task(struct work_struct *work)static int qed_slowpath_wq_start (struct qed_dev *cdev) {struct qed_hwfn *hwfn; -char name[NAME_SIZE ];int i;if (IS_VF (cdev))
@@ -1215,11 +1214,11 @@ static int qed_slowpath_wq_start(struct qed_dev *cdev)for_each_hwfn (cdev, i) { hwfn = &cdev->hwfns[i]; -snprintf (name,NAME_SIZE ,"slowpath-%02x:%02x.%02x" , - cdev->pdev->bus->number, -PCI_SLOT (cdev->pdev->devfn), hwfn->abs_pf_id); + hwfn->slowpath_wq =alloc_workqueue ("slowpath-%02x:%02x.%02x" , +0 ,0 , cdev->pdev->bus->number, +PCI_SLOT (cdev->pdev->devfn), + hwfn->abs_pf_id); - hwfn->slowpath_wq =alloc_workqueue (name,0 ,0 );if (!hwfn->slowpath_wq) {DP_NOTICE (hwfn,"Cannot create slowpath workqueue\n" );return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/744 mlx5: avoid truncating error message
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 b324a960354b872431d25959ad384ab66a7116ec ]
clang warns that one error message is too long for its destination buffer:
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c:1876:4: error: 'snprintf' will always be truncated; specified size is 80, but format string expands to at least 94 [-Werror,-Wformat-truncation-non-kprintf]
Reword it to be a bit shorter so it always fits.
--- drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +1 -1
@@ -1874,7 +1874,7 @@ int mlx5_esw_bridge_port_mdb_add(struct net_device *dev, u16 vport_num, u16 esw_"Failed to lookup bridge port vlan metadata to create MDB (MAC=%pM,vid=%u,vport=%u)\n" , addr, vid, vport_num);NL_SET_ERR_MSG_FMT_MOD (extack, -"Failed to lookup bridge port vlan metadata to create MDB (MAC=%pM,vid=%u,vport=%u)\n" , +"Failed to lookup vlan metadata for MDB (MAC=%pM,vid=%u,vport=%u)\n" , addr, vid, vport_num);return -EINVAL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/744 mlx5: stop warning for 64KB pages
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 a5535e5336943b33689f558199366102387b7bbf ]
When building with 64KB pages, clang points out that xsk->chunk_size can never be PAGE_SIZE:
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c:19:22: error: result of comparison of constant 65536 with expression of type 'u16' (aka 'unsigned short') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
if (xsk->chunk_size > PAGE_SIZE ||
~~~~~~~~~~~~~~~ ^ ~~~~~~~~~In older versions of this code, using PAGE_SIZE was the only possibility, so this would have never worked on 64KB page kernels, but the patch apparently did not address this case completely.
As Maxim Mikityanskiy suggested, 64KB chunks are really not all that useful, so just shut up the warning by adding a cast.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +4 -2
@@ -28,8 +28,10 @@ bool mlx5e_validate_xsk_param(struct mlx5e_params *params, struct mlx5e_xsk_param *xsk, struct mlx5_core_dev *mdev) { -/* AF_XDP doesn't support frames larger than PAGE_SIZE. */ -if (xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) { +/* AF_XDP doesn't support frames larger than PAGE_SIZE, +* and xsk->chunk_size is limited to 65535 bytes. +*/ +if ((size_t )xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) {mlx5_core_err (mdev,"XSK chunk size %u out of bounds [%u, %lu]\n" , xsk->chunk_size,MLX5E_MIN_XSK_CHUNK_SIZE ,PAGE_SIZE );return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/744 bitops: add missing prototype check
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Lobakin <[email protected]>
[ Upstream commit 72cc1980a0ef3ccad0d539e7dace63d0d7d432a4 ]
Commit 8238b4579866 ("wait_on_bit: add an acquire memory barrier") added a new bitop, test_bit_acquire(), with proper wrapping in order to try to optimize it at compile-time, but missed the list of bitops used for checking their prototypes a bit below.
The functions added have consistent prototypes, so that no more changes are required and no functional changes take place.
--- include/linux/bitops.h | 1 + 1 file changed, 1 insertion(+)
include/linux/bitops.h +1 -0
@@ -80,6 +80,7 @@ __check_bitop_pr(__test_and_set_bit);__check_bitop_pr (__test_and_clear_bit);__check_bitop_pr (__test_and_change_bit);__check_bitop_pr (test_bit); +__check_bitop_pr (test_bit_acquire);#undef __check_bitop_pr
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/744 dlm: fix user space lock decision to copy lvb
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
[ Upstream commit ad191e0eeebf64a60ca2d16ca01a223d2b1dd25e ]
This patch fixes the copy lvb decision for user space lock requests. Checking dlm_lvb_operations is done earlier, where granted/requested lock modes are available to use in the matrix.
The decision had been moved to the wrong location, where granted mode and requested mode where the same, which causes the dlm_lvb_operations matix to produce the wrong copy decision. For PW or EX requests, the caller could get invalid lvb data.
--- fs/dlm/ast.c | 14 ++++++++++++++ fs/dlm/dlm_internal.h | 1 + fs/dlm/user.c | 15 ++------------- 3 files changed, 17 insertions(+), 13 deletions(-)
fs/dlm/ast.c +14 -0
@@ -12,6 +12,7 @@#include <trace/events/dlm.h> #include "dlm_internal.h" +#include "lvb_table.h" #include "memory.h" #include "lock.h" #include "user.h"
@@ -42,6 +43,7 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,struct dlm_ls *ls = lkb->lkb_resource->res_ls;int rv =DLM_ENQUEUE_CALLBACK_SUCCESS ;struct dlm_callback *cb; +int copy_lvb =0 ;int prev_mode;if (flags &DLM_CB_BAST ) {
@@ -73,6 +75,17 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode, goto out; } } + }else if (flags &DLM_CB_CAST ) { +if (test_bit (DLM_DFL_USER_BIT , &lkb->lkb_dflags)) { +if (lkb->lkb_last_cast) + prev_mode = lkb->lkb_last_cb->mode; +else + prev_mode =-1 ; + +if (!status && lkb->lkb_lksb->sb_lvbptr && + dlm_lvb_operations[prev_mode +1 ][mode +1 ]) + copy_lvb =1 ; + } } cb =dlm_allocate_cb ();
@@ -85,6 +98,7 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode, cb->mode = mode; cb->sb_status = status; cb->sb_flags = (sbflags &0x000000FF ); + cb->copy_lvb = copy_lvb;kref_init (&cb->ref);if (!test_and_set_bit (DLM_IFL_CB_PENDING_BIT , &lkb->lkb_iflags)) rv =DLM_ENQUEUE_CALLBACK_NEED_SCHED ;
fs/dlm/dlm_internal.h +1 -0
@@ -222,6 +222,7 @@ struct dlm_callback {int sb_status;/* copy to lksb status */ uint8_t sb_flags;/* copy to lksb flags */ int8_t mode;/* rq mode of bast, gr mode of cast */ +int copy_lvb;struct list_head list;struct kref ref;
fs/dlm/user.c +2 -13
@@ -21,7 +21,6 @@#include "dlm_internal.h" #include "lockspace.h" #include "lock.h" -#include "lvb_table.h" #include "user.h" #include "ast.h" #include "config.h"
@@ -806,8 +805,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,struct dlm_lkb *lkb;DECLARE_WAITQUEUE (wait, current);struct dlm_callback *cb; -int rv, ret, copy_lvb =0 ; -int old_mode, new_mode; +int rv, ret;if (count ==sizeof (struct dlm_device_version )) { rv =copy_version_to_user (buf, count);
@@ -864,9 +862,6 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count, lkb = list_first_entry(&proc->asts, struct dlm_lkb, lkb_cb_list); -/* rem_lkb_callback sets a new lkb_last_cast */ - old_mode = lkb->lkb_last_cast->mode; - rv =dlm_dequeue_lkb_callback (lkb, &cb);switch (rv) {case DLM_DEQUEUE_CALLBACK_EMPTY :
@@ -895,12 +890,6 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,if (cb->flags &DLM_CB_BAST ) {trace_dlm_bast (lkb->lkb_resource->res_ls, lkb, cb->mode); }else if (cb->flags &DLM_CB_CAST ) { - new_mode = cb->mode; - -if (!cb->sb_status && lkb->lkb_lksb->sb_lvbptr && - dlm_lvb_operations[old_mode +1 ][new_mode +1 ]) - copy_lvb =1 ; - lkb->lkb_lksb->sb_status = cb->sb_status; lkb->lkb_lksb->sb_flags = cb->sb_flags;trace_dlm_ast (lkb->lkb_resource->res_ls, lkb);
@@ -908,7 +897,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count, ret =copy_result_to_user (lkb->lkb_ua,test_bit (DLM_PROC_FLAGS_COMPAT , &proc->flags), - cb->flags, cb->mode, copy_lvb, buf, count); + cb->flags, cb->mode, cb->copy_lvb, buf, count);kref_put (&cb->ref, dlm_release_callback);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/744 wifi: carl9170: re-fix fortified-memset warning
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 066afafc10c9476ee36c47c9062527a17e763901 ]
The carl9170_tx_release() function sometimes triggers a fortified-memset warning in my randconfig builds:
In file included from include/linux/string.h:254,
from drivers/net/wireless/ath/carl9170/tx.c:40:
In function 'fortify_memset_chk',
inlined from 'carl9170_tx_release' at drivers/net/wireless/ath/carl9170/tx.c:283:2,
inlined from 'kref_put' at include/linux/kref.h:65:3,
inlined from 'carl9170_tx_put_skb' at drivers/net/wireless/ath/carl9170/tx.c:342:9:include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
493 | __write_overflow_field(p_size_field, size);
Kees previously tried to avoid this by using memset_after(), but it seems this does not fully address the problem. I noticed that the memset_after() here is done on a different part of the union (status) than the original cast was from (rate_driver_data), which may confuse the compiler.
Unfortunately, the memset_after() trick does not work on driver_rates[] because that is part of an anonymous struct, and I could not get struct_group() to do this either. Using two separate memset() calls on the two members does address the warning though.
--- drivers/net/wireless/ath/carl9170/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/tx.c +2 -1
@@ -280,7 +280,8 @@ static void carl9170_tx_release(struct kref *ref)* carl9170_tx_fill_rateinfo() has filled the rate information * before we get to this point. */ -memset_after (&txinfo->status,0 , rates); +memset (&txinfo->pad,0 ,sizeof (txinfo->pad)); +memset (&txinfo->rate_driver_data,0 ,sizeof (txinfo->rate_driver_data));if (atomic_read (&ar->tx_total_queued)) ar->tx_schedule = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/744 bpftool: Mount bpffs on provided dir instead of parent dir
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sahil Siddiq <[email protected]>
[ Upstream commit 478a535ae54ad3831371904d93b5dfc403222e17 ]
When pinning programs/objects under PATH (eg: during "bpftool prog loadall") the bpffs is mounted on the parent dir of PATH in the following situations:
- the given dir exists but it is not bpffs.
- the given dir doesn't exist and the parent dir is not bpffs.
Mounting on the parent dir can also have the unintentional side- effect of hiding other files located under the parent dir.
If the given dir exists but is not bpffs, then the bpffs should be mounted on the given dir and not its parent dir.
Similarly, if the given dir doesn't exist and its parent dir is not bpffs, then the given dir should be created and the bpffs should be mounted on this new dir.
Changes since v1:
- Split "mount_bpffs_for_pin" into two functions. This is done to improve maintainability and readability.
Changes since v2:
- mount_bpffs_for_pin: rename to "create_and_mount_bpffs_dir".
- mount_bpffs_given_file: rename to "mount_bpffs_given_file".
- create_and_mount_bpffs_dir:
- introduce "dir_exists" boolean.
- remove new dir if "mnt_fs" fails.
- improve error handling and error messages.
Changes since v3:
- Rectify function name.
- Improve error messages and formatting.
- mount_bpffs_for_file:
- Check if dir exists before block_mount check.
Changes since v4:
- Use strdup instead of strcpy.
- create_and_mount_bpffs_dir:
- Use S_IRWXU instead of 0700.
- Improve error handling and formatting.
--- tools/bpf/bpftool/common.c | 96 +++++++++++++++++++++++++++++----- tools/bpf/bpftool/iter.c | 2 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/prog.c | 5 +- tools/bpf/bpftool/struct_ops.c | 2 +- 5 files changed, 92 insertions(+), 16 deletions(-)
tools/bpf/bpftool/common.c +84 -12
@@ -244,29 +244,101 @@ int open_obj_pinned_any(const char *path, enum bpf_obj_type exp_type)return fd; } -int mount_bpffs_for_pin (const char *name,bool is_dir) +int create_and_mount_bpffs_dir (const char *dir_name) {char err_str[ERR_MAX_LEN ]; -char *file; -char *dir; +bool dir_exists;int err =0 ; -if (is_dir &&is_bpffs (name)) +if (is_bpffs (dir_name))return err; - file =malloc (strlen (name) +1 ); -if (!file) { + dir_exists =access (dir_name,F_OK ) ==0 ; + +if (!dir_exists) { +char *temp_name; +char *parent_name; + + temp_name =strdup (dir_name); +if (!temp_name) { +p_err ("mem alloc failed" ); +return -1 ; + } + + parent_name =dirname (temp_name); + +if (is_bpffs (parent_name)) { +/* nothing to do if already mounted */ +free (temp_name); +return err; + } + +if (access (parent_name,F_OK ) ==-1 ) { +p_err ("can't create dir '%s' to pin BPF object: parent dir '%s' doesn't exist" , + dir_name, parent_name); +free (temp_name); +return -1 ; + } + +free (temp_name); + } + +if (block_mount) { +p_err ("no BPF file system found, not mounting it due to --nomount option" ); +return -1 ; + } + +if (!dir_exists) { + err =mkdir (dir_name,S_IRWXU ); +if (err) { +p_err ("failed to create dir '%s': %s" , dir_name,strerror (errno)); +return err; + } + } + + err =mnt_fs (dir_name,"bpf" , err_str,ERR_MAX_LEN ); +if (err) { + err_str[ERR_MAX_LEN -1 ] ='\0' ; +p_err ("can't mount BPF file system on given dir '%s': %s" , + dir_name, err_str); + +if (!dir_exists) +rmdir (dir_name); + } + +return err; +} + +int mount_bpffs_for_file (const char *file_name) +{ +char err_str[ERR_MAX_LEN ]; +char *temp_name; +char *dir; +int err =0 ; + +if (access (file_name,F_OK ) !=-1 ) { +p_err ("can't pin BPF object: path '%s' already exists" , file_name); +return -1 ; + } + + temp_name =strdup (file_name); +if (!temp_name) {p_err ("mem alloc failed" );return -1 ; } -strcpy (file, name); - dir =dirname (file); + dir =dirname (temp_name);if (is_bpffs (dir))/* nothing to do if already mounted */ goto out_free; +if (access (dir,F_OK ) ==-1 ) { +p_err ("can't pin BPF object: dir '%s' doesn't exist" , dir); + err =-1 ; + goto out_free; + } +if (block_mount) {p_err ("no BPF file system found, not mounting it due to --nomount option" ); err =-1 ;
@@ -276,12 +348,12 @@ int mount_bpffs_for_pin(const char *name, bool is_dir) err =mnt_fs (dir,"bpf" , err_str,ERR_MAX_LEN );if (err) { err_str[ERR_MAX_LEN -1 ] ='\0' ; -p_err ("can't mount BPF file system to pin the object (%s): %s" , - name, err_str); +p_err ("can't mount BPF file system to pin the object '%s': %s" , + file_name, err_str); } out_free: -free (file); +free (temp_name);return err; }
@@ -289,7 +361,7 @@ int do_pin_fd(int fd, const char *name) {int err; - err =mount_bpffs_for_pin (name, false); + err =mount_bpffs_for_file (name);if (err)return err;
tools/bpf/bpftool/iter.c +1 -1
@@ -76,7 +76,7 @@ static int do_pin(int argc, char **argv) goto close_obj; } - err =mount_bpffs_for_pin (path, false); + err =mount_bpffs_for_file (path);if (err) goto close_link;
tools/bpf/bpftool/main.h +2 -1
@@ -142,7 +142,8 @@ const char *get_fd_type_name(enum bpf_obj_type type);char *get_fdinfo (int fd,const char *key);int open_obj_pinned (const char *path,bool quiet);int open_obj_pinned_any (const char *path,enum bpf_obj_type exp_type); -int mount_bpffs_for_pin (const char *name,bool is_dir); +int mount_bpffs_for_file (const char *file_name); +int create_and_mount_bpffs_dir (const char *dir_name);int do_pin_any (int argc,char **argv,int (*get_fd_by_id)(int *,char ***));int do_pin_fd (int fd,const char *name);
tools/bpf/bpftool/prog.c +4 -1
@@ -1774,7 +1774,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) goto err_close_obj; } - err =mount_bpffs_for_pin (pinfile, !first_prog_only); +if (first_prog_only) + err =mount_bpffs_for_file (pinfile); +else + err =create_and_mount_bpffs_dir (pinfile);if (err) goto err_close_obj;
tools/bpf/bpftool/struct_ops.c +1 -1
@@ -509,7 +509,7 @@ static int do_register(int argc, char **argv)if (argc ==1 ) linkdir =GET_ARG (); -if (linkdir &&mount_bpffs_for_pin (linkdir, true)) { +if (linkdir &&create_and_mount_bpffs_dir (linkdir)) {p_err ("can't mount bpffs for pinning" );return -1 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/744 bpf: Pack struct bpf_fib_lookup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Protopopov <[email protected]>
[ Upstream commit f91717007217d975aa975ddabd91ae1a107b9bff ]
The struct bpf_fib_lookup is supposed to be of size 64. A recent commit 59b418c7063d ("bpf: Add a check for struct bpf_fib_lookup size") added a static assertion to check this property so that future changes to the structure will not accidentally break this assumption.
As it immediately turned out, on some 32-bit arm systems, when AEABI=n, the total size of the structure was equal to 68, see [1]. This happened because the bpf_fib_lookup structure contains a union of two 16-bit fields:
union {
__u16 tot_len;
__u16 mtu_result;
};which was supposed to compile to a 16-bit-aligned 16-bit field. On the aforementioned setups it was instead both aligned and padded to 32-bits.
Declare this inner union as __attribute__((packed, aligned(2))) such that it always is of size 2 and is aligned to 16 bits.
[1] https://lore.kernel.org/all/CA+G9fYtsoP51f-oP_Sp5MOq-Ffv8La2RztNpwvE6+R1VtFiLrw@mail.gmail.com/#t
--- include/uapi/linux/bpf.h | 2 +- tools/include/uapi/linux/bpf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +1 -1
@@ -6994,7 +6994,7 @@ struct bpf_fib_lookup {/* output: MTU value */ __u16 mtu_result; - }; + } __attribute__((packed, aligned(2)));/* input: L3 device index for lookup * output: device index from FIB lookup */
tools/include/uapi/linux/bpf.h +1 -1
@@ -6994,7 +6994,7 @@ struct bpf_fib_lookup {/* output: MTU value */ __u16 mtu_result; - }; + } __attribute__((packed, aligned(2)));/* input: L3 device index for lookup * output: device index from FIB lookup */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/744 bpf: prevent r10 register from being marked as precise
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Nakryiko <[email protected]>
[ Upstream commit 1f2a74b41ea8b902687eb97c4e7e3f558801865b ]
r10 is a special register that is not under BPF program's control and is always effectively precise. The rest of precision logic assumes that only r0-r9 SCALAR registers are marked as precise, so prevent r10 from being marked precise.
This can happen due to signed cast instruction allowing to do something like r0 = (s8)r10;, which later, if r0 needs to be precise, would lead to an attempt to mark r10 as precise.
Prevent this with an extra check during instruction backtracking.
--- kernel/bpf/verifier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +4 -2
@@ -3679,7 +3679,8 @@ static int backtrack_insn(struct bpf_verifier_env *env, int idx, int subseq_idx,* sreg needs precision before this insn */ bt_clear_reg (bt, dreg); -bt_set_reg (bt, sreg); +if (sreg !=BPF_REG_FP ) +bt_set_reg (bt, sreg); }else {/* dreg = K * dreg needs precision after this insn.
@@ -3695,7 +3696,8 @@ static int backtrack_insn(struct bpf_verifier_env *env, int idx, int subseq_idx,* both dreg and sreg need precision * before this insn */ -bt_set_reg (bt, sreg); +if (sreg !=BPF_REG_FP ) +bt_set_reg (bt, sreg); }/* else dreg += K * dreg still needs precision before this insn */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/744 scsi: ufs: qcom: Perform read back after writing reset bit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit c4d28e06b0c94636f6e35d003fa9ebac0a94e1ae ]
Currently, the reset bit for the UFS provided reset controller (used by its phy) is written to, and then a mb() happens to try and ensure that hit the device. Immediately afterwards a usleep_range() occurs.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. By doing so and guaranteeing the ordering against the immediately following usleep_range(), the mb() can safely be removed.
--- drivers/ufs/host/ufs-qcom.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-qcom.h +6 -6
@@ -149,10 +149,10 @@ static inline void ufs_qcom_assert_reset(struct ufs_hba *hba) REG_UFS_CFG1);/* -* Make sure assertion of ufs phy reset is written to -* register before returning +* Dummy read to ensure the write takes effect before doing any sort +* of delay */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG1 ); }static inline void ufs_qcom_deassert_reset (struct ufs_hba *hba)
@@ -161,10 +161,10 @@ static inline void ufs_qcom_deassert_reset(struct ufs_hba *hba) REG_UFS_CFG1);/* -* Make sure de-assertion of ufs phy reset is written to -* register before returning +* Dummy read to ensure the write takes effect before doing any sort +* of delay */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG1 ); }/* Host controller hardware version: major.minor.step */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/744 scsi: ufs: qcom: Perform read back after writing REG_UFS_SYS1CLK_1US
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit a862fafa263aea0f427d51aca6ff7fd9eeaaa8bd ]
Currently after writing to REG_UFS_SYS1CLK_1US a mb() is used to ensure that write has gone through to the device.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -597,7 +597,7 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,* make sure above write gets applied before we return from * this function. */ -mb (); +ufshcd_readl (hba,REG_UFS_SYS1CLK_1US ); }if (ufs_qcom_cap_qunipro (host))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/744 scsi: ufs: qcom: Perform read back after writing unipro mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit 823150ecf04f958213cf3bf162187cd1a91c885c ]
Currently, the QUNIPRO_SEL bit is written to and then an mb() is used to ensure that completes before continuing.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
But, there's really no reason to even ensure completion before continuing. The only requirement here is that this write is ordered to this endpoint (which readl()/writel() guarantees already). For that reason the mb() can be dropped altogether without anything forcing completion.
--- drivers/ufs/host/ufs-qcom.c | 3 --- 1 file changed, 3 deletions(-)
drivers/ufs/host/ufs-qcom.c +0 -3
@@ -373,9 +373,6 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host)if (host->hw_ver.major >=0x05 )ufshcd_rmwl (host->hba,QUNIPRO_G4_SEL ,0 ,REG_UFS_CFG0 ); - -/* make sure above configuration is applied before we return */ -mb (); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/744 scsi: ufs: qcom: Perform read back after writing CGC enable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit d9488511b3ac7eb48a91bc5eded7027525525e03 ]
Currently, the CGC enable bit is written and then an mb() is used to ensure that completes before continuing.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -498,7 +498,7 @@ static void ufs_qcom_enable_hw_clk_gating(struct ufs_hba *hba) REG_UFS_CFG2);/* Ensure that HW clock gating is enabled before next operations */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG2 ); } static int ufs_qcom_hce_enable_notify(struct ufs_hba *hba,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/744 scsi: ufs: cdns-pltfrm: Perform read back after writing HCLKDIV
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit b715c55daf598aac8fa339048e4ca8a0916b332e ]
Currently, HCLKDIV is written to and then completed with an mb().
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/cdns-pltfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/cdns-pltfrm.c +1 -1
@@ -136,7 +136,7 @@ static int cdns_ufs_set_hclkdiv(struct ufs_hba *hba)* Make sure the register was updated, * UniPro layer will not work with an incorrect value. */ -mb (); +ufshcd_readl (hba,CDNS_UFS_REG_HCLKDIV );return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/744 scsi: ufs: core: Perform read back after writing UTP_TASK_REQ_LIST_BASE_H
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit 408e28086f1c7a6423efc79926a43d7001902fae ]
Currently, the UTP_TASK_REQ_LIST_BASE_L/UTP_TASK_REQ_LIST_BASE_H regs are written to and then completed with an mb().
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring these bits have taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bits hit the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -10152,7 +10152,7 @@ int ufshcd_system_restore(struct device *dev)* are updated with the latest queue addresses. Only after * updating these addresses, we can queue the new commands. */ -mb (); +ufshcd_readl (hba,REG_UTP_TASK_REQ_LIST_BASE_H );/* Resuming from hibernate, assume that link was OFF */ ufshcd_set_link_off (hba);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/744 scsi: ufs: core: Perform read back after disabling interrupts
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit e4a628877119bd40164a651d20321247b6f94a8b ]
Currently, interrupts are cleared and disabled prior to registering the interrupt. An mb() is used to complete the clear/disable writes before the interrupt is registered.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring these bits have taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure these bits hit the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -10369,7 +10369,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)* Make sure that UFS interrupts are disabled and any pending interrupt * status is cleared before registering UFS interrupt handler. */ -mb (); +ufshcd_readl (hba,REG_INTERRUPT_ENABLE );/* IRQ registration */ err =devm_request_irq (dev, irq, ufshcd_intr,IRQF_SHARED ,UFSHCD , hba);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/744 scsi: ufs: core: Perform read back after disabling UIC_COMMAND_COMPL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit 4bf3855497b60765ca03b983d064b25e99b97657 ]
Currently, the UIC_COMMAND_COMPL interrupt is disabled and a wmb() is used to complete the register write before any following writes.
wmb() ensures the writes complete in that order, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the wmb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -4136,7 +4136,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)* Make sure UIC command completion interrupt is disabled before * issuing UIC command. */ -wmb (); +ufshcd_readl (hba,REG_INTERRUPT_ENABLE ); reenable_intr = true; }spin_unlock_irqrestore (hba->host->host_lock, flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/744 ACPI: LPSS: Advertise number of chip selects via property
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 07b73ee599428b41d0240f2f7b31b524eba07dd0 ]
Advertise number of chip selects via property for Intel Braswell.
--- drivers/acpi/acpi_lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/acpi_lpss.c +1 -0
@@ -333,6 +333,7 @@ static const struct lpss_device_desc bsw_i2c_dev_desc = {static const struct property_entry bsw_spi_properties[] = {PROPERTY_ENTRY_U32 ("intel,spi-pxa2xx-type" ,LPSS_BSW_SSP ), +PROPERTY_ENTRY_U32 ("num-cs" ,2 ), { } };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 159/744 locking/atomic/x86: Correct the definition of __arch_try_cmpxchg128()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uros Bizjak <[email protected]>
[ Upstream commit 929ad065ba2967be238dfdc0895b79fda62c7f16 ]
Correct the definition of __arch_try_cmpxchg128(), introduced by:
b23e139d0b66 ("arch: Introduce arch_{,try_}_cmpxchg128{,_local}()")
--- arch/x86/include/asm/cmpxchg_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/cmpxchg_64.h +1 -1
@@ -62,7 +62,7 @@ static __always_inline u128 arch_cmpxchg128_local(volatile u128 *ptr, u128 old, asm volatile(_lock "cmpxchg16b %[ptr]" \ CC_SET(e) \ : CC_OUT(e) (ret), \ - [ptr] "+m" (*ptr), \ + [ptr] "+m" (*(_ptr)), \" +a" (o.low), " +d" (o.high) \ : " b" (n.low), " c" (n.high) \ : "memory"); \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/744 irqchip/alpine-msi: Fix off-by-one in allocation error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zenghui Yu <[email protected]>
[ Upstream commit ff3669a71afa06208de58d6bea1cc49d5e3fcbd1 ]
When alpine_msix_gic_domain_alloc() fails, there is an off-by-one in the number of interrupts to be freed.
Fix it by passing the number of successfully allocated interrupts, instead of the relative index of the last allocated one.
--- drivers/irqchip/irq-alpine-msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -165,7 +165,7 @@ static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,return 0 ; err_sgi: -irq_domain_free_irqs_parent (domain, virq, i -1 ); +irq_domain_free_irqs_parent (domain, virq, i);alpine_msix_free_sgi (priv, sgi, nr_irqs);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/744 irqchip/loongson-pch-msi: Fix off-by-one on allocation error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zenghui Yu <[email protected]>
[ Upstream commit b327708798809328f21da8dc14cc8883d1e8a4b3 ]
When pch_msi_parent_domain_alloc() returns an error, there is an off-by-one in the number of interrupts to be freed.
Fix it by passing the number of successfully allocated interrupts, instead of the relative index of the last allocated one.
--- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -136,7 +136,7 @@ static int pch_msi_middle_domain_alloc(struct irq_domain *domain, err_hwirq:pch_msi_free_hwirq (priv, hwirq, nr_irqs); -irq_domain_free_irqs_parent (domain, virq, i -1 ); +irq_domain_free_irqs_parent (domain, virq, i);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/744 ACPI: disable -Wstringop-truncation
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 a3403d304708f60565582d60af4316289d0316a0 ]
gcc -Wstringop-truncation warns about copying a string that results in a missing nul termination:
drivers/acpi/acpica/tbfind.c: In function 'acpi_tb_find_table':drivers/acpi/acpica/tbfind.c:60:9: error: 'strncpy' specified bound 6 equals destination size [-Werror=stringop-truncation]
60 | strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/acpi/acpica/tbfind.c:61:9: error: 'strncpy' specified bound 8 equals destination size [-Werror=stringop-truncation]
61 | strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The code works as intended, and the warning could be addressed by using a memcpy(), but turning the warning off for this file works equally well and may be easier to merge.
--- drivers/acpi/acpica/Makefile | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/acpica/Makefile +1 -0
@@ -5,6 +5,7 @@ ccflags-y := -D_LINUX -DBUILDING_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT +CFLAGS_tbfind.o += $(call cc-disable-warning, stringop-truncation) # use acpi.o to put all files here into acpi.o modparam namespace obj-y += acpi.o
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/744 gfs2: Dont forget to complete delayed withdraw
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit b01189333ee91c1ae6cd96dfd1e3a3c2e69202f0 ]
Commit fffe9bee14b0 ("gfs2: Delay withdraw from atomic context") switched from gfs2_withdraw() to gfs2_withdraw_delayed() in gfs2_ail_error(), but failed to then check if a delayed withdraw had occurred. Fix that by adding the missing check in __gfs2_ail_flush(), where the spin locks are already dropped and a withdraw is possible.
--- fs/gfs2/glops.c | 3 +++ 1 file changed, 3 insertions(+)
fs/gfs2/glops.c +3 -0
@@ -82,6 +82,9 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,GLOCK_BUG_ON (gl, !fsync &&atomic_read (&gl->gl_ail_count));spin_unlock (&sdp->sd_ail_lock);gfs2_log_unlock (sdp); + +if (gfs2_withdrawing (sdp)) +gfs2_withdraw (sdp); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/744 gfs2: Fix "ignore unlock failures after withdraw"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 5d9231111966b6c5a65016d58dcbeab91055bc91 ]
Commit 3e11e53041502 tries to suppress dlm_lock() lock conversion errors that occur when the lockspace has already been released.
It does that by setting and checking the SDF_SKIP_DLM_UNLOCK flag. This conflicts with the intended meaning of the SDF_SKIP_DLM_UNLOCK flag, so check whether the lockspace is still allocated instead.
(Given the current DLM API, checking for this kind of error after the fact seems easier that than to make sure that the lockspace is still allocated before calling dlm_lock(). Changing the DLM API so that users maintain the lockspace references themselves would be an option.)
--- fs/gfs2/glock.c | 4 +++- fs/gfs2/util.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-)
fs/gfs2/glock.c +3 -1
@@ -785,11 +785,13 @@ __acquires(&gl->gl_lockref.lock) }if (sdp->sd_lockstruct.ls_ops->lm_lock) { +struct lm_lockstruct *ls = &sdp->sd_lockstruct; +/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret == -EINVAL && gl->gl_target ==LM_ST_UNLOCKED && target ==LM_ST_UNLOCKED && -test_bit (SDF_SKIP_DLM_UNLOCK , &sdp->sd_flags)) { +test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) {finish_xmote (gl, target);gfs2_glock_queue_work (gl,0 ); }else if (ret) {
fs/gfs2/util.c +0 -1
@@ -350,7 +350,6 @@ int gfs2_withdraw(struct gfs2_sbd *sdp)fs_err (sdp,"telling LM to unmount\n" ); lm->lm_unmount (sdp); } -set_bit (SDF_SKIP_DLM_UNLOCK , &sdp->sd_flags);fs_err (sdp,"File system withdrawn\n" );dump_stack ();clear_bit (SDF_WITHDRAW_IN_PROG , &sdp->sd_flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/744 x86/boot/64: Clear most of CR4 in startup_64(), except PAE, MCE and LA57
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit a0025f587c685e5ff842fb0194036f2ca0b6eaf4 ]
The early 64-bit boot code must be entered with a 1:1 mapping of the bootable image, but it cannot operate without a 1:1 mapping of all the assets in memory that it accesses, and therefore, it creates such mappings for all known assets upfront, and additional ones on demand when a page fault happens on a memory address.
These mappings are created with the global bit G set, as the flags used to create page table descriptors are based on __PAGE_KERNEL_LARGE_EXEC defined by the core kernel, even though the context where these mappings are used is very different.
This means that the TLB maintenance carried out by the decompressor is not sufficient if it is entered with CR4.PGE enabled, which has been observed to happen with the stage0 bootloader of project Oak. While this is a dubious practice if no global mappings are being used to begin with, the decompressor is clearly at fault here for creating global mappings and not performing the appropriate TLB maintenance.
Since commit:
f97b67a773cd84b ("x86/decompressor: Only call the trampoline when changing paging levels")
CR4 is no longer modified by the decompressor if no change in the number of paging levels is needed. Before that, CR4 would always be set to a consistent value with PGE cleared.
So let's reinstate a simplified version of the original logic to put CR4 into a known state, and preserve the PAE, MCE and LA57 bits, none of which can be modified freely at this point (PAE and LA57 cannot be changed while running in long mode, and MCE cannot be cleared when running under some hypervisors).
This effectively clears PGE and works around the project Oak bug.
--- arch/x86/boot/compressed/head_64.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/boot/compressed/head_64.S +5 -0
@@ -398,6 +398,11 @@ SYM_CODE_START(startup_64) call sev_enable #endif + /* Preserve only the CR4 bits that must be preserved, and clear the rest */ + movq %cr4, %rax + andl $(X86_CR4_PAE | X86_CR4_MCE | X86_CR4_LA57), %eax + movq %rax, %cr4 + /* * configure_5level_paging() updates the number of paging levels using * a trampoline in 32-bit addressable memory if the current number does
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/744 selftests/bpf: Fix umount cgroup2 error in test_sockmap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit d75142dbeb2bd1587b9cc19f841578f541275a64 ]
This patch fixes the following "umount cgroup2" error in test_sockmap.c:
(cgroup_helpers.c:353: errno: Device or resource busy) umount cgroup2
Cgroup fd cg_fd should be closed before cleanup_cgroup_environment().
--- tools/testing/selftests/bpf/test_sockmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_sockmap.c +1 -1
@@ -2104,9 +2104,9 @@ int main(int argc, char **argv)free (options.whitelist);if (options.blacklist)free (options.blacklist); +close (cg_fd);if (cg_created)cleanup_cgroup_environment (); -close (cg_fd);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/744 tcp: define initial scaling factor value as a macro
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 849ee75a38b297187c760bb1d23d8f2a7b1fc73e ]
So that other users could access it. Notably MPTCP will use it in the next patch.
No functional change intended.
Stable-dep-of: 697a6c8cec03 ("tcp: increase the default TCP scaling ratio")
--- include/net/tcp.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
include/net/tcp.h +7 -5
@@ -1460,13 +1460,15 @@ static inline int tcp_space_from_win(const struct sock *sk, int win)return __tcp_space_from_win (tcp_sk (sk)->scaling_ratio, win); } +/* Assume a conservative default of 1200 bytes of payload per 4K page. +* This may be adjusted later in tcp_measure_rcv_mss(). +*/ +#define TCP_DEFAULT_SCALING_RATIO ((1200 << TCP_RMEM_TO_WIN_SCALE) / \ + SKB_TRUESIZE(4096)) +static inline void tcp_scaling_ratio_init (struct sock *sk) { -/* Assume a conservative default of 1200 bytes of payload per 4K page. -* This may be adjusted later in tcp_measure_rcv_mss(). -*/ -tcp_sk (sk)->scaling_ratio = (1200 <<TCP_RMEM_TO_WIN_SCALE ) / -SKB_TRUESIZE (4096 ); +tcp_sk (sk)->scaling_ratio =TCP_DEFAULT_SCALING_RATIO ; }/* Note: caller must be prepared to deal with negative returns */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/744 tcp: increase the default TCP scaling ratio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hechao Li <[email protected]>
[ Upstream commit 697a6c8cec03c2299f850fa50322641a8bf6b915 ]
After commit dfa2f0483360 ("tcp: get rid of sysctl_tcp_adv_win_scale"), we noticed an application-level timeout due to reduced throughput.
Before the commit, for a client that sets SO_RCVBUF to 65k, it takes around 22 seconds to transfer 10M data. After the commit, it takes 40 seconds. Because our application has a 30-second timeout, this regression broke the application.
The reason that it takes longer to transfer data is that tp->scaling_ratio is initialized to a value that results in ~0.25 of rcvbuf. In our case, SO_RCVBUF is set to 65536 by the application, which translates to 2 * 65536 = 131,072 bytes in rcvbuf and hence a ~28k initial receive window.
Later, even though the scaling_ratio is updated to a more accurate skb->len/skb->truesize, which is ~0.66 in our environment, the window stays at ~0.25 * rcvbuf. This is because tp->window_clamp does not change together with the tp->scaling_ratio update when autotuning is disabled due to SO_RCVBUF. As a result, the window size is capped at the initial window_clamp, which is also ~0.25 * rcvbuf, and never grows bigger.
Most modern applications let the kernel do autotuning, and benefit from the increased scaling_ratio. But there are applications such as kafka that has a default setting of SO_RCVBUF=64k.
This patch increases the initial scaling_ratio from ~25% to 50% in order to make it backward compatible with the original default sysctl_tcp_adv_win_scale for applications setting SO_RCVBUF.
--- include/net/tcp.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/net/tcp.h +2 -3
@@ -1460,11 +1460,10 @@ static inline int tcp_space_from_win(const struct sock *sk, int win)return __tcp_space_from_win (tcp_sk (sk)->scaling_ratio, win); } -/* Assume a conservative default of 1200 bytes of payload per 4K page. +/* Assume a 50% default for skb->len/skb->truesize ratio. * This may be adjusted later in tcp_measure_rcv_mss(). */ -#define TCP_DEFAULT_SCALING_RATIO ((1200 << TCP_RMEM_TO_WIN_SCALE) / \ - SKB_TRUESIZE(4096)) +#define TCP_DEFAULT_SCALING_RATIO (1 << (TCP_RMEM_TO_WIN_SCALE - 1))static inline void tcp_scaling_ratio_init (struct sock *sk) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/744 cpufreq: exit() callback is optional
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
[ Upstream commit b8f85833c05730d631576008daaa34096bc7f3ce ]
The exit() callback is optional and shouldn't be called without checking a valid pointer first.
Also, we must clear freq_table pointer even if the exit() callback isn't present.
--- drivers/cpufreq/cpufreq.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/cpufreq/cpufreq.c +7 -4
@@ -1670,10 +1670,13 @@ static void __cpufreq_offline(unsigned int cpu, struct cpufreq_policy *policy)*/ if (cpufreq_driver->offline) { cpufreq_driver->offline (policy); - }else if (cpufreq_driver->exit) { - cpufreq_driver->exit (policy); - policy->freq_table =NULL ; +return ; } + +if (cpufreq_driver->exit) + cpufreq_driver->exit (policy); + + policy->freq_table =NULL ; }static int cpufreq_offline (unsigned int cpu)
@@ -1731,7 +1734,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) }/* We did light-weight exit earlier, do full tear down now */ -if (cpufreq_driver->offline) +if (cpufreq_driver->offline && cpufreq_driver->exit) cpufreq_driver->exit (policy);up_write (&policy->rwsem);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/744 x86/pat: Introduce lookup_address_in_pgd_attr()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit ceb647b4b529fdeca9021cd34486f5a170746bda ]
Add lookup_address_in_pgd_attr() doing the same as the already existing lookup_address_in_pgd(), but returning the effective settings of the NX and RW bits of all walked page table levels, too.
This will be needed in order to match hardware behavior when looking for effective access rights, especially for detecting writable code pages.
In order to avoid code duplication, let lookup_address_in_pgd() call lookup_address_in_pgd_attr() with dummy parameters.
Stable-dep-of: 5bc8b0f5dac0 ("x86/pat: Fix W^X violation false-positives when running as Xen PV guest")
--- arch/x86/include/asm/pgtable_types.h | 2 ++ arch/x86/mm/pat/set_memory.c | 33 +++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-)
arch/x86/include/asm/pgtable_types.h +2 -0
@@ -567,6 +567,8 @@ static inline void update_page_count(int level, unsigned long pages) { }extern pte_t *lookup_address (unsigned long address,unsigned int *level);extern pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address,unsigned int *level); +pte_t *lookup_address_in_pgd_attr (pgd_t *pgd,unsigned long address, +unsigned int *level,bool *nx,bool *rw);extern pmd_t *lookup_pmd_address (unsigned long address);extern phys_addr_t slow_virt_to_phys (void *__address); extern int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn,
arch/x86/mm/pat/set_memory.c +30 -3
@@ -657,20 +657,26 @@ static inline pgprot_t verify_rwx(pgprot_t old, pgprot_t new, unsigned long star/* * Lookup the page table entry for a virtual address in a specific pgd. -* Return a pointer to the entry and the level of the mapping. +* Return a pointer to the entry, the level of the mapping, and the effective +* NX and RW bits of all page table levels. */ -pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address, -unsigned int *level) +pte_t *lookup_address_in_pgd_attr (pgd_t *pgd,unsigned long address, +unsigned int *level,bool *nx,bool *rw) {p4d_t *p4d;pud_t *pud;pmd_t *pmd; *level =PG_LEVEL_NONE ; + *nx = false; + *rw = true;if (pgd_none (*pgd))return NULL ; + *nx |=pgd_flags (*pgd) & _PAGE_NX; + *rw &=pgd_flags (*pgd) & _PAGE_RW; + p4d =p4d_offset (pgd, address);if (p4d_none (*p4d))return NULL ;
@@ -679,6 +685,9 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (p4d_large (*p4d) || !p4d_present (*p4d))return (pte_t *)p4d; + *nx |=p4d_flags (*p4d) & _PAGE_NX; + *rw &=p4d_flags (*p4d) & _PAGE_RW; + pud =pud_offset (p4d, address);if (pud_none (*pud))return NULL ;
@@ -687,6 +696,9 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (pud_leaf (*pud) || !pud_present (*pud))return (pte_t *)pud; + *nx |=pud_flags (*pud) & _PAGE_NX; + *rw &=pud_flags (*pud) & _PAGE_RW; + pmd =pmd_offset (pud, address);if (pmd_none (*pmd))return NULL ;
@@ -695,11 +707,26 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (pmd_large (*pmd) || !pmd_present (*pmd))return (pte_t *)pmd; + *nx |=pmd_flags (*pmd) & _PAGE_NX; + *rw &=pmd_flags (*pmd) & _PAGE_RW; + *level =PG_LEVEL_4K ;return pte_offset_kernel (pmd, address); } +/* +* Lookup the page table entry for a virtual address in a specific pgd. +* Return a pointer to the entry and the level of the mapping. +*/ +pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address, +unsigned int *level) +{ +bool nx, rw; + +return lookup_address_in_pgd_attr (pgd, address, level, &nx, &rw); +} +/* * Lookup the page table entry for a virtual address. Return a pointer * to the entry and the level of the mapping.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/744 x86/pat: Restructure _lookup_address_cpa()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit 02eac06b820c3eae73e5736ae62f986d37fed991 ]
Modify _lookup_address_cpa() to no longer use lookup_address(), but only lookup_address_in_pgd().
This is done in preparation of using lookup_address_in_pgd_attr().
No functional change intended.
Stable-dep-of: 5bc8b0f5dac0 ("x86/pat: Fix W^X violation false-positives when running as Xen PV guest")
--- arch/x86/mm/pat/set_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/mm/pat/set_memory.c +7 -4
@@ -744,11 +744,14 @@ EXPORT_SYMBOL_GPL(lookup_address);static pte_t *_lookup_address_cpa (struct cpa_data *cpa,unsigned long address,unsigned int *level) { -if (cpa->pgd) -return lookup_address_in_pgd (cpa->pgd +pgd_index (address), - address, level); +pgd_t *pgd; + +if (!cpa->pgd) + pgd =pgd_offset_k (address); +else + pgd = cpa->pgd +pgd_index (address); -return lookup_address (address, level); +return lookup_address_in_pgd (pgd, address, level); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/744 x86/pat: Fix W^X violation false-positives when running as Xen PV guest
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit 5bc8b0f5dac04cd4ebe47f8090a5942f2f2647ef ]
When running as Xen PV guest in some cases W^X violation WARN()s have been observed. Those WARN()s are produced by verify_rwx(), which looks into the PTE to verify that writable kernel pages have the NX bit set in order to avoid code modifications of the kernel by rogue code.
As the NX bits of all levels of translation entries are or-ed and the RW bits of all levels are and-ed, looking just into the PTE isn't enough for the decision that a writable page is executable, too.
When running as a Xen PV guest, the direct map PMDs and kernel high map PMDs share the same set of PTEs. Xen kernel initialization will set the NX bit in the direct map PMD entries, and not the shared PTEs.
--- arch/x86/mm/pat/set_memory.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
arch/x86/mm/pat/set_memory.c +18 -8
@@ -619,7 +619,8 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long start,* Validate strict W^X semantics. */ static inline pgprot_t verify_rwx (pgprot_t old,pgprot_t new,unsigned long start, -unsigned long pfn,unsigned long npg) +unsigned long pfn,unsigned long npg, +bool nx,bool rw) {unsigned long end;
@@ -641,6 +642,10 @@ static inline pgprot_t verify_rwx(pgprot_t old, pgprot_t new, unsigned long starif ((pgprot_val (new) & (_PAGE_RW | _PAGE_NX)) != _PAGE_RW)return new; +/* Non-leaf translation entries can disable writing or execution. */ +if (!rw || nx) +return new; + end = start + npg *PAGE_SIZE -1 ; WARN_ONCE(1, "CPA detected W^X violation: %016llx -> %016llx range: 0x%016lx - 0x%016lx PFN %lx\n", (unsigned long long)pgprot_val(old),
@@ -742,7 +747,7 @@ pte_t *lookup_address(unsigned long address, unsigned int *level)EXPORT_SYMBOL_GPL (lookup_address);static pte_t *_lookup_address_cpa (struct cpa_data *cpa,unsigned long address, -unsigned int *level) +unsigned int *level,bool *nx,bool *rw) {pgd_t *pgd;
@@ -751,7 +756,7 @@ static pte_t *_lookup_address_cpa(struct cpa_data *cpa, unsigned long address,else pgd = cpa->pgd +pgd_index (address); -return lookup_address_in_pgd (pgd, address, level); +return lookup_address_in_pgd_attr (pgd, address, level, nx, rw); }/*
@@ -875,12 +880,13 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,pgprot_t old_prot, new_prot, req_prot, chk_prot;pte_t new_pte, *tmp;enum pg_level level; +bool nx, rw;/* * Check for races, another CPU might have split this page * up already: */ - tmp =_lookup_address_cpa (cpa, address, &level); + tmp =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (tmp != kpte)return 1 ;
@@ -991,7 +997,8 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address, new_prot =static_protections (req_prot, lpaddr, old_pfn, numpages, psize,CPA_DETECT ); - new_prot =verify_rwx (old_prot, new_prot, lpaddr, old_pfn, numpages); + new_prot =verify_rwx (old_prot, new_prot, lpaddr, old_pfn, numpages, + nx, rw);/* * If there is a conflict, split the large page.
@@ -1072,6 +1079,7 @@ __split_large_page(struct cpa_data *cpa, pte_t *kpte, unsigned long address,pte_t *pbase = (pte_t *)page_address (base);unsigned int i, level;pgprot_t ref_prot; +bool nx, rw;pte_t *tmp;spin_lock (&pgd_lock);
@@ -1079,7 +1087,7 @@ __split_large_page(struct cpa_data *cpa, pte_t *kpte, unsigned long address,* Check for races, another CPU might have split this page * up for us already: */ - tmp =_lookup_address_cpa (cpa, address, &level); + tmp =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (tmp != kpte) {spin_unlock (&pgd_lock);return 1 ;
@@ -1620,10 +1628,11 @@ static int __change_page_attr(struct cpa_data *cpa, int primary)int do_split, err;unsigned int level;pte_t *kpte, old_pte; +bool nx, rw; address =__cpa_addr (cpa, cpa->curpage); repeat: - kpte =_lookup_address_cpa (cpa, address, &level); + kpte =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (!kpte)return __cpa_process_fault (cpa, address, primary);
@@ -1645,7 +1654,8 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) new_prot =static_protections (new_prot, address, pfn,1 ,0 ,CPA_PROTECT ); - new_prot =verify_rwx (old_prot, new_prot, address, pfn,1 ); + new_prot =verify_rwx (old_prot, new_prot, address, pfn,1 , + nx, rw); new_prot =pgprot_clear_protnone_bits (new_prot);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/744 udp: Avoid call to compute_score on multiple sites
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit 50aee97d15113b95a68848db1f0cb2a6c09f753a ]
We've observed a 7-12% performance regression in iperf3 UDP ipv4 and ipv6 tests with multiple sockets on Zen3 cpus, which we traced back to commit f0ea27e7bfe1 ("udp: re-score reuseport groups when connected sockets are present"). The failing tests were those that would spawn UDP sockets per-cpu on systems that have a high number of cpus.
Unsurprisingly, it is not caused by the extra re-scoring of the reused socket, but due to the compiler no longer inlining compute_score, once it has the extra call site in udp4_lib_lookup2. This is augmented by the "Safe RET" mitigation for SRSO, needed in our Zen3 cpus.
We could just explicitly inline it, but compute_score() is quite a large function, around 300b. Inlining in two sites would almost double udp4_lib_lookup2, which is a silly thing to do just to workaround a mitigation. Instead, this patch shuffles the code a bit to avoid the multiple calls to compute_score. Since it is a static function used in one spot, the compiler can safely fold it in, as it did before, without increasing the text size.
With this patch applied I ran my original iperf3 testcases. The failing cases all looked like this (ipv4):
iperf3 -c 127.0.0.1 --udp -4 -f K -b $R -l 8920 -t 30 -i 5 -P 64 -O 2
where $R is either 1G/10G/0 (max, unlimited). I ran 3 times each. baseline is v6.9-rc3. harmean == harmonic mean; CV == coefficient of variation.
ipv4:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 1743852.66(0.0208) 1725933.02(0.0167) 1705203.78(0.0386) patched 1968727.61(0.0035) 1962283.22(0.0195) 1923853.50(0.0256)
ipv6:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 1729020.03(0.0028) 1691704.49(0.0243) 1692251.34(0.0083) patched 1900422.19(0.0067) 1900968.01(0.0067) 1568532.72(0.1519)
This restores the performance we had before the change above with this benchmark. We obviously don't expect any real impact when mitigations are disabled, but just to be sure it also doesn't regresses:
mitigations=off ipv4:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 3230279.97(0.0066) 3229320.91(0.0060) 2605693.19(0.0697) patched 3242802.36(0.0073) 3239310.71(0.0035) 2502427.19(0.0882)
--- net/ipv4/udp.c | 21 ++++++++++++++++----- net/ipv6/udp.c | 20 ++++++++++++++++---- 2 files changed, 32 insertions(+), 9 deletions(-)
net/ipv4/udp.c +16 -5
@@ -429,15 +429,21 @@ static struct sock *udp4_lib_lookup2(struct net *net, {struct sock *sk, *result;int score, badness; +bool need_rescore; result =NULL ; badness =0 ;udp_portaddr_for_each_entry_rcu (sk, &hslot2->head) { - score =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); + need_rescore = false; +rescore: + score =compute_score (need_rescore ? result : sk, net, saddr, + sport, daddr, hnum, dif, sdif);if (score > badness) { badness = score; +if (need_rescore) +continue ; +if (sk->sk_state ==TCP_ESTABLISHED ) { result = sk;continue ;
@@ -458,9 +464,14 @@ static struct sock *udp4_lib_lookup2(struct net *net,if (IS_ERR (result))continue ; - badness =compute_score (result, net, saddr, sport, - daddr, hnum, dif, sdif); - +/* compute_score is too long of a function to be +* inlined, and calling it again here yields +* measureable overhead for some +* workloads. Work around it by jumping +* backwards to rescore 'result'. +*/ + need_rescore = true; + goto rescore; } }return result;
net/ipv6/udp.c +16 -4
@@ -171,15 +171,21 @@ static struct sock *udp6_lib_lookup2(struct net *net, {struct sock *sk, *result;int score, badness; +bool need_rescore; result =NULL ; badness =-1 ;udp_portaddr_for_each_entry_rcu (sk, &hslot2->head) { - score =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); + need_rescore = false; +rescore: + score =compute_score (need_rescore ? result : sk, net, saddr, + sport, daddr, hnum, dif, sdif);if (score > badness) { badness = score; +if (need_rescore) +continue ; +if (sk->sk_state ==TCP_ESTABLISHED ) { result = sk;continue ;
@@ -200,8 +206,14 @@ static struct sock *udp6_lib_lookup2(struct net *net,if (IS_ERR (result))continue ; - badness =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); +/* compute_score is too long of a function to be +* inlined, and calling it again here yields +* measureable overhead for some +* workloads. Work around it by jumping +* backwards to rescore 'result'. +*/ + need_rescore = true; + goto rescore; } }return result;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/744 openrisc: traps: Dont send signals to kernel mode threads
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stafford Horne <[email protected]>
[ Upstream commit c88cfb5cea5f8f9868ef02cc9ce9183a26dcf20f ]
OpenRISC exception handling sends signals to user processes on floating point exceptions and trap instructions (for debugging) among others. There is a bug where the trap handling logic may send signals to kernel threads, we should not send these signals to kernel threads, if that happens we treat it as an error.
This patch adds conditions to die if the kernel receives these exceptions in kernel mode code.
--- arch/openrisc/kernel/traps.c | 48 ++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 19 deletions(-)
arch/openrisc/kernel/traps.c +29 -19
@@ -180,29 +180,39 @@ asmlinkage void unhandled_exception(struct pt_regs *regs, int ea, int vector) asmlinkage void do_fpe_trap(struct pt_regs *regs, unsigned long address) { -int code =FPE_FLTUNK ; -unsigned long fpcsr = regs->fpcsr; - -if (fpcsr &SPR_FPCSR_IVF ) - code =FPE_FLTINV ; -else if (fpcsr &SPR_FPCSR_OVF ) - code =FPE_FLTOVF ; -else if (fpcsr &SPR_FPCSR_UNF ) - code =FPE_FLTUND ; -else if (fpcsr &SPR_FPCSR_DZF ) - code =FPE_FLTDIV ; -else if (fpcsr &SPR_FPCSR_IXF ) - code =FPE_FLTRES ; - -/* Clear all flags */ - regs->fpcsr &= ~SPR_FPCSR_ALLF ; - -force_sig_fault (SIGFPE , code, (void __user *)regs->pc); +if (user_mode (regs)) { +int code =FPE_FLTUNK ; +unsigned long fpcsr = regs->fpcsr; + +if (fpcsr &SPR_FPCSR_IVF ) + code =FPE_FLTINV ; +else if (fpcsr &SPR_FPCSR_OVF ) + code =FPE_FLTOVF ; +else if (fpcsr &SPR_FPCSR_UNF ) + code =FPE_FLTUND ; +else if (fpcsr &SPR_FPCSR_DZF ) + code =FPE_FLTDIV ; +else if (fpcsr &SPR_FPCSR_IXF ) + code =FPE_FLTRES ; + +/* Clear all flags */ + regs->fpcsr &= ~SPR_FPCSR_ALLF ; + +force_sig_fault (SIGFPE , code, (void __user *)regs->pc); + }else { +pr_emerg ("KERNEL: Illegal fpe exception 0x%.8lx\n" , regs->pc); +die ("Die:" , regs,SIGFPE ); + } } asmlinkage void do_trap(struct pt_regs *regs, unsigned long address) { -force_sig_fault (SIGTRAP ,TRAP_BRKPT , (void __user *)regs->pc); +if (user_mode (regs)) { +force_sig_fault (SIGTRAP ,TRAP_BRKPT , (void __user *)regs->pc); + }else { +pr_emerg ("KERNEL: Illegal trap exception 0x%.8lx\n" , regs->pc); +die ("Die:" , regs,SIGILL ); + } } asmlinkage void do_unaligned_access(struct pt_regs *regs, unsigned long address)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/744 cppc_cpufreq: Fix possible null pointer dereference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit cf7de25878a1f4508c69dc9f6819c21ba177dbfe ]
cppc_cpufreq_get_rate() and hisi_cppc_cpufreq_get_rate() can be called from different places with various parameters. So cpufreq_cpu_get() can return null as 'policy' in some circumstances.
Fix this bug by adding null return check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/cpufreq/cppc_cpufreq.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/cpufreq/cppc_cpufreq.c +12 -2
@@ -844,10 +844,15 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) {struct cppc_perf_fb_ctrs fb_ctrs_t0 = {0 }, fb_ctrs_t1 = {0 };struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); -struct cppc_cpudata *cpu_data = policy->driver_data; +struct cppc_cpudata *cpu_data;u64 delivered_perf;int ret; +if (!policy) +return -ENODEV ; + + cpu_data = policy->driver_data; +cpufreq_cpu_put (policy); ret =cppc_get_perf_ctrs (cpu, &fb_ctrs_t0);
@@ -927,10 +932,15 @@ static struct cpufreq_driver cppc_cpufreq_driver = {static unsigned int hisi_cppc_cpufreq_get_rate (unsigned int cpu) {struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); -struct cppc_cpudata *cpu_data = policy->driver_data; +struct cppc_cpudata *cpu_data;u64 desired_perf;int ret; +if (!policy) +return -ENODEV ; + + cpu_data = policy->driver_data; +cpufreq_cpu_put (policy); ret =cppc_get_desired_perf (cpu, &desired_perf);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/744 wifi: iwlwifi: mvm: init vif works only once
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 0bcc2155983e03c41b21a356af87ae839a6b3ead ]
It's dangerous to re-initialize works repeatedly, especially delayed ones that have an associated timer, and even more so if they're not necessarily canceled inbetween. This can be the case for these workers here during FW restart scenarios, so make sure to initialize it only once.
While at it, also ensure it is cancelled correctly.
--- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 19 +++++++++++++++++-- .../wireless/intel/iwlwifi/mvm/mld-mac80211.c | 2 ++ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +17 -2
@@ -1513,6 +1513,17 @@ static int iwl_mvm_alloc_bcast_mcast_sta(struct iwl_mvm *mvm, IWL_STA_MULTICAST); } +void iwl_mvm_mac_init_mvmvif (struct iwl_mvm *mvm,struct iwl_mvm_vif *mvmvif) +{ +lockdep_assert_held (&mvm->mutex); + +if (test_bit (IWL_MVM_STATUS_IN_HW_RESTART , &mvm->status)) +return ; + +INIT_DELAYED_WORK (&mvmvif->csa_work, + iwl_mvm_channel_switch_disconnect_wk); +} +static int iwl_mvm_mac_add_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) {
@@ -1522,6 +1533,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,mutex_lock (&mvm->mutex); +iwl_mvm_mac_init_mvmvif (mvm, mvmvif); + mvmvif->mvm = mvm;/* the first link always points to the default one */
@@ -1595,8 +1608,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, mvm->p2p_device_vif = vif;iwl_mvm_tcm_add_vif (mvm, vif); -INIT_DELAYED_WORK (&mvmvif->csa_work, - iwl_mvm_channel_switch_disconnect_wk);if (vif->type ==NL80211_IFTYPE_MONITOR ) { mvm->monitor_on = true;
@@ -1638,6 +1649,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,void iwl_mvm_prepare_mac_removal (struct iwl_mvm *mvm,struct ieee80211_vif *vif) { +struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif); +if (vif->type ==NL80211_IFTYPE_P2P_DEVICE ) {/* * Flush the ROC worker which will flush the OFFCHANNEL queue.
@@ -1646,6 +1659,8 @@ void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,*/ flush_work (&mvm->roc_done_wk); } + +cancel_delayed_work_sync (&mvmvif->csa_work); }/* This function is doing the common part of removing the interface for
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +2 -0
@@ -13,6 +13,8 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,mutex_lock (&mvm->mutex); +iwl_mvm_mac_init_mvmvif (mvm, mvmvif); + mvmvif->mvm = mvm;/* Not much to do here. The stack will not allow interface
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +2 -0
@@ -1737,6 +1737,8 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm);int iwl_mvm_mac_setup_register (struct iwl_mvm *mvm); +void iwl_mvm_mac_init_mvmvif (struct iwl_mvm *mvm,struct iwl_mvm_vif *mvmvif); +/* * FW notifications / CMD responses handlers * Convention: iwl_mvm_rx_<NAME OF THE CMD>
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/744 scsi: libsas: Fix the failure of adding phy with zero-address to port
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit 06036a0a5db34642c5dbe22021a767141f010b7a ]
As of commit 7d1d86518118 ("[SCSI] libsas: fix false positive 'device attached' conditions"), reset the phy->entacted_sas_addr address to a zero-address when the link rate is less than 1.5G.
Currently we find that when a new device is attached, and the link rate is less than 1.5G, but the device type is not NO_DEVICE, for example: the link rate is SAS_PHY_RESET_IN_PROGRESS and the device type is stp. After setting the phy->entacted_sas_addr address to the zero address, the port will continue to be created for the phy with the zero-address, and other phys with the zero-address will be tried to be added to the new port:
[562240.051197] sas: ex 500e004aaaaaaa1f phy19:U:0 attached: 0000000000000000 (no device) // phy19 is deleted but still on the parent port's phy_list [562240.062536] sas: ex 500e004aaaaaaa1f phy0 new device attached [562240.062616] sas: ex 500e004aaaaaaa1f phy00:U:5 attached: 0000000000000000 (stp) [562240.062680] port-7:7:0: trying to add phy phy-7:7:19 fails: it's already part of another port
Therefore, it should be the same as sas_get_phy_attached_dev(). Only when device_type is SAS_PHY_UNUSED, sas_address is set to the 0 address.
--- drivers/scsi/libsas/sas_expander.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/libsas/sas_expander.c +1 -2
@@ -239,8 +239,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id,/* help some expanders that fail to zero sas_address in the 'no * device' case */ -if (phy->attached_dev_type ==SAS_PHY_UNUSED || - phy->linkrate <SAS_LINK_RATE_1_5_GBPS ) +if (phy->attached_dev_type ==SAS_PHY_UNUSED )memset (phy->attached_sas_addr,0 ,SAS_ADDR_SIZE );else memcpy (phy->attached_sas_addr, dr->attached_sas_addr,SAS_ADDR_SIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/744 scsi: hpsa: Fix allocation size for Scsi_Host private data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuri Karpov <[email protected]>
[ Upstream commit 504e2bed5d50610c1836046c0c195b0a6dba9c72 ]
struct Scsi_Host private data contains pointer to struct ctlr_info.
Restore allocation of only 8 bytes to store pointer in struct Scsi_Host private data area.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/scsi/hpsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hpsa.c +1 -1
@@ -5850,7 +5850,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h) {struct Scsi_Host *sh; - sh =scsi_host_alloc (&hpsa_driver_template,sizeof (struct ctlr_info )); + sh =scsi_host_alloc (&hpsa_driver_template,sizeof (struct ctlr_info *));if (sh ==NULL ) {dev_err (&h->pdev->dev,"scsi_host_alloc failed\n" );return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/744 x86/purgatory: Switch to the position-independent small code model
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit cba786af84a0f9716204e09f518ce3b7ada8555e ]
On x86, the ordinary, position dependent small and kernel code models only support placement of the executable in 32-bit addressable memory, due to the use of 32-bit signed immediates to generate references to global variables. For the kernel, this implies that all global variables must reside in the top 2 GiB of the kernel virtual address space, where the implicit address bits 63:32 are equal to sign bit 31.
This means the kernel code model is not suitable for other bare metal executables such as the kexec purgatory, which can be placed arbitrarily in the physical address space, where its address may no longer be representable as a sign extended 32-bit quantity. For this reason, commit
e16c2983fba0 ("x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors")
switched to the large code model, which uses 64-bit immediates for all symbol references, including function calls, in order to avoid relying on any assumptions regarding proximity of symbols in the final executable.
The large code model is rarely used, clunky and the least likely to operate in a similar fashion when comparing GCC and Clang, so it is best avoided. This is especially true now that Clang 18 has started to emit executable code in two separate sections (.text and .ltext), which triggers an issue in the kexec loading code at runtime.
The SUSE bugzilla fixes tag points to gcc 13 having issues with the large model too and that perhaps the large model should simply not be used at all.
Instead, use the position independent small code model, which makes no assumptions about placement but only about proximity, where all referenced symbols must be within -/+ 2 GiB, i.e., in range for a RIP-relative reference. Use hidden visibility to suppress the use of a GOT, which carries absolute addresses that are not covered by static ELF relocations, and is therefore incompatible with the kexec loader's relocation logic.
[ bp: Massage commit message. ]
--- arch/x86/purgatory/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/purgatory/Makefile +2 -1
@@ -42,7 +42,8 @@ KCOV_INSTRUMENT := n # make up the standalone purgatory.ro PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel -PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -g0 +PURGATORY_CFLAGS := -mcmodel=small -ffreestanding -fno-zero-initialized-in-bss -g0 +PURGATORY_CFLAGS += -fpic -fvisibility=hidden PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING PURGATORY_CFLAGS += -fno-stack-protector
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/744 wifi: ath12k: fix out-of-bound access of qmi_invoke_handler()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit e1bdff48a1bb4a4ac660c19c55a820968c48b3f2 ]
Currently, there is no terminator entry for ath12k_qmi_msg_handlers hence facing below KASAN warning,
==================================================================
BUG: KASAN: global-out-of-bounds in qmi_invoke_handler+0xa4/0x148 Read of size 8 at addr ffffffd00a6428d8 by task kworker/u8:2/1273 CPU: 0 PID: 1273 Comm: kworker/u8:2 Not tainted 5.4.213 #0 Workqueue: qmi_msg_handler qmi_data_ready_work Call trace: dump_backtrace+0x0/0x20c show_stack+0x14/0x1c dump_stack+0xe0/0x138 print_address_description.isra.5+0x30/0x330 __kasan_report+0x16c/0x1bc kasan_report+0xc/0x14 __asan_load8+0xa8/0xb0 qmi_invoke_handler+0xa4/0x148 qmi_handle_message+0x18c/0x1bc qmi_data_ready_work+0x4ec/0x528 process_one_work+0x2c0/0x440 worker_thread+0x324/0x4b8 kthread+0x210/0x228 ret_from_fork+0x10/0x18
The address belongs to the variable:
ath12k_mac_mon_status_filter_default+0x4bd8/0xfffffffffffe2300 [ath12k] [...] ==================================================================
Add a dummy terminator entry at the end to assist the qmi_invoke_handler() in traversing up to the terminator entry without accessing an out-of-boundary index.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/qmi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath12k/qmi.c +3 -0
@@ -2935,6 +2935,9 @@ static const struct qmi_msg_handler ath12k_qmi_msg_handlers[] = { .decoded_size = sizeof(struct qmi_wlanfw_fw_ready_ind_msg_v01), .fn = ath12k_qmi_msg_fw_ready_cb, }, + +/* end of list */ + {}, }; static int ath12k_qmi_ops_new_server(struct qmi_handle *qmi_hdl,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/744 thermal/drivers/tsens: Fix null pointer dereference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit d998ddc86a27c92140b9f7984ff41e3d1d07a48f ]
compute_intercept_slope() is called from calibrate_8960() (in tsens-8960.c) as compute_intercept_slope(priv, p1, NULL, ONE_PT_CALIB) which lead to null pointer dereference (if DEBUG or DYNAMIC_DEBUG set).
Fix this bug by adding null pointer check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/thermal/qcom/tsens.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/qcom/tsens.c +1 -1
@@ -264,7 +264,7 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1,for (i =0 ; i < priv->num_sensors; i++) {dev_dbg (priv->dev,"%s: sensor%d - data_point1:%#x data_point2:%#x\n" , - __func__, i, p1[i], p2[i]); + __func__, i, p1[i], p2 ? p2[i] :0 );if (!priv->sensor[i].slope) priv->sensor[i].slope =SLOPE_DEFAULT ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/744 dt-bindings: thermal: loongson,ls2k-thermal: Fix binding check issues
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Binbin Zhou <[email protected]>
[ Upstream commit 88071e31e994ee23356674e0c5461b25e2a95cdc ]
Add the missing 'thermal-sensor-cells' property which is required for every thermal sensor as it's used when using phandles.
And add the thermal-sensor.yaml reference.
In fact, it was a careless mistake when submitting the driver that caused it to not work properly. So the fix is necessary, although it will result in the ABI break.
Stable-dep-of: c8c435368577 ("dt-bindings: thermal: loongson,ls2k-thermal: Fix incorrect compatible definition")
--- .../bindings/thermal/loongson,ls2k-thermal.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml +9 -1
@@ -10,6 +10,9 @@ maintainers: - zhanghongchen <[email protected]> - Yinbo Zhu <[email protected]> +allOf: + - $ref: /schemas/thermal/thermal-sensor.yaml# + properties: compatible: oneOf:
@@ -26,12 +29,16 @@ properties: interrupts: maxItems: 1 + '#thermal-sensor-cells': + const: 1 + required: - compatible - reg - interrupts + - '#thermal-sensor-cells' -additionalProperties: false +unevaluatedProperties: false examples: - |
@@ -41,4 +48,5 @@ examples: reg = <0x1fe01500 0x30>; interrupt-parent = <&liointc0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/744 dt-bindings: thermal: loongson,ls2k-thermal: Add Loongson-2K0500 compatible
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Binbin Zhou <[email protected]>
[ Upstream commit 25c7d8472f6e90390931e93f59135478af3e5d86 ]
The thermal on the Loongson-2K0500 shares the design with the Loongson-2K1000. Define corresponding compatible string, having the loongson,ls2k1000-thermal as a fallback.
Stable-dep-of: c8c435368577 ("dt-bindings: thermal: loongson,ls2k-thermal: Fix incorrect compatible definition")
--- .../devicetree/bindings/thermal/loongson,ls2k-thermal.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml +1 -0
@@ -20,6 +20,7 @@ properties: - loongson,ls2k1000-thermal - items: - enum: + - loongson,ls2k0500-thermal - loongson,ls2k2000-thermal - const: loongson,ls2k1000-thermal
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/744 dt-bindings: thermal: loongson,ls2k-thermal: Fix incorrect compatible definition
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Binbin Zhou <[email protected]>
[ Upstream commit c8c4353685778e75e186103411e9d01a4a3f2b90 ]
The temperature output register of the Loongson-2K2000 is defined in the chip configuration domain, which is different from the Loongson-2K1000, so it can't be fallbacked.
We need to use two groups of registers to describe it: the first group is the high and low temperature threshold setting register; the second group is the temperature output register.
It is true that this fix will cause ABI corruption, but it is necessary otherwise the Loongson-2K2000 temperature sensor will not work properly.
--- .../thermal/loongson,ls2k-thermal.yaml | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml +21 -2
@@ -18,14 +18,15 @@ properties: oneOf: - enum: - loongson,ls2k1000-thermal + - loongson,ls2k2000-thermal - items: - enum: - loongson,ls2k0500-thermal - - loongson,ls2k2000-thermal - const: loongson,ls2k1000-thermal reg: - maxItems: 1 + minItems: 1 + maxItems: 2 interrupts: maxItems: 1
@@ -39,6 +40,24 @@ required: - interrupts - '#thermal-sensor-cells' +if: + properties: + compatible: + contains: + enum: + - loongson,ls2k2000-thermal + +then: + properties: + reg: + minItems: 2 + maxItems: 2 + +else: + properties: + reg: + maxItems: 1 + unevaluatedProperties: false examples:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/744 wifi: ath10k: Fix an error code problem in ath10k_dbg_sta_write_peer_debug_trigger()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit c511a9c12674d246916bb16c479d496b76983193 ]
Clang Static Checker (scan-build) warns:
drivers/net/wireless/ath/ath10k/debugfs_sta.c:line 429, column 3 Value stored to 'ret' is never read.
Return 'ret' rather than 'count' when 'ret' stores an error code.
--- drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/debugfs_sta.c +1 -1
@@ -438,7 +438,7 @@ ath10k_dbg_sta_write_peer_debug_trigger(struct file *file, } out:mutex_unlock (&ar->conf_mutex); -return count; +return ret ?: count; }static const struct file_operations fops_peer_debug_trigger = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/744 gfs2: Get rid of gfs2_alloc_blocks generation parameter
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 4c7b3f7fb7c8c66d669d107e717f9de41ef81e92 ]
Get rid of the generation parameter of gfs2_alloc_blocks(): we only ever set the generation of the current inode while creating it, so do so directly.
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
--- fs/gfs2/bmap.c | 4 ++-- fs/gfs2/dir.c | 2 +- fs/gfs2/inode.c | 2 +- fs/gfs2/rgrp.c | 12 +++++++----- fs/gfs2/rgrp.h | 2 +- fs/gfs2/xattr.c | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-)
fs/gfs2/bmap.c +2 -2
@@ -106,7 +106,7 @@ static int __gfs2_unstuff_inode(struct gfs2_inode *ip, struct page *page)and write it out to disk */ unsigned int n =1 ; - error =gfs2_alloc_blocks (ip, &block, &n,0 ,NULL ); + error =gfs2_alloc_blocks (ip, &block, &n,0 );if (error) goto out_brelse;if (isdir) {
@@ -702,7 +702,7 @@ static int __gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap, i = mp->mp_aheight; do { n = blks - alloced; - ret = gfs2_alloc_blocks(ip, &bn, &n, 0, NULL); + ret = gfs2_alloc_blocks(ip, &bn, &n, 0); if (ret) goto out; alloced += n;
fs/gfs2/dir.c +1 -1
@@ -868,7 +868,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh,struct gfs2_dirent *dent;struct timespec64 tv =current_time (inode); - error =gfs2_alloc_blocks (ip, &bn, &n,0 ,NULL ); + error =gfs2_alloc_blocks (ip, &bn, &n,0 );if (error)return NULL ; bh =gfs2_meta_new (ip->i_gl, bn);
fs/gfs2/inode.c +1 -1
@@ -417,7 +417,7 @@ static int alloc_dinode(struct gfs2_inode *ip, u32 flags, unsigned *dblocks)if (error) goto out_ipreserv; - error =gfs2_alloc_blocks (ip, &ip->i_no_addr, dblocks,1 , &ip->i_generation); + error =gfs2_alloc_blocks (ip, &ip->i_no_addr, dblocks,1 );if (error) goto out_trans_end;
fs/gfs2/rgrp.c +7 -5
@@ -2411,13 +2411,12 @@ static void gfs2_set_alloc_start(struct gfs2_rbm *rbm,* @bn: Used to return the starting block number * @nblocks: requested number of blocks/extent length (value/result) * @dinode: 1 if we're allocating a dinode block, else 0 -* @generation: the generation number of the inode * * Returns: 0 or error */ int gfs2_alloc_blocks (struct gfs2_inode *ip,u64 *bn,unsigned int *nblocks, -bool dinode,u64 *generation) +bool dinode) {struct gfs2_sbd *sdp =GFS2_SB (&ip->i_inode);struct buffer_head *dibh;
@@ -2477,10 +2476,13 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks, rbm.rgd->rd_free -= *nblocks;spin_unlock (&rbm.rgd->rd_rsspin);if (dinode) { +u64 generation; + rbm.rgd->rd_dinodes++; - *generation = rbm.rgd->rd_igeneration++; -if (*generation ==0 ) - *generation = rbm.rgd->rd_igeneration++; + generation = rbm.rgd->rd_igeneration++; +if (generation ==0 ) + generation = rbm.rgd->rd_igeneration++; + ip->i_generation = generation; }gfs2_trans_add_meta (rbm.rgd->rd_gl, rbm.rgd->rd_bits[0 ].bi_bh);
fs/gfs2/rgrp.h +1 -1
@@ -42,7 +42,7 @@ extern int gfs2_inplace_reserve(struct gfs2_inode *ip,extern void gfs2_inplace_release (struct gfs2_inode *ip);extern int gfs2_alloc_blocks (struct gfs2_inode *ip,u64 *bn,unsigned int *n, -bool dinode,u64 *generation); +bool dinode);extern void gfs2_rs_deltree (struct gfs2_blkreserv *rs);extern void gfs2_rs_delete (struct gfs2_inode *ip);
fs/gfs2/xattr.c +3 -3
@@ -639,7 +639,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp)u64 block;int error; - error =gfs2_alloc_blocks (ip, &block, &n,0 ,NULL ); + error =gfs2_alloc_blocks (ip, &block, &n,0 );if (error)return error;gfs2_trans_remove_revoke (sdp, block,1 );
@@ -701,7 +701,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea,int mh_size =sizeof (struct gfs2_meta_header );unsigned int n =1 ; - error =gfs2_alloc_blocks (ip, &block, &n,0 ,NULL ); + error =gfs2_alloc_blocks (ip, &block, &n,0 );if (error)return error;gfs2_trans_remove_revoke (sdp, block,1 );
@@ -1002,7 +1002,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er, }else {u64 blk;unsigned int n =1 ; - error =gfs2_alloc_blocks (ip, &blk, &n,0 ,NULL ); + error =gfs2_alloc_blocks (ip, &blk, &n,0 );if (error)return error;gfs2_trans_remove_revoke (sdp, blk,1 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/744 gfs2: Convert gfs2_internal_read to folios
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit be7f6a6b0bca708999eef4f8e9f2b128c73b9e17 ]
Change gfs2_internal_read() to use folios. Convert sizes to size_t.
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
--- fs/gfs2/aops.c | 34 ++++++++++++++++------------------ fs/gfs2/inode.h | 4 ++-- 2 files changed, 18 insertions(+), 20 deletions(-)
fs/gfs2/aops.c +16 -18
@@ -479,31 +479,29 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)* */ -int gfs2_internal_read (struct gfs2_inode *ip,char *buf,loff_t *pos, -unsigned size) +ssize_t gfs2_internal_read (struct gfs2_inode *ip,char *buf,loff_t *pos, +size_t size) {struct address_space *mapping = ip->i_inode.i_mapping;unsigned long index = *pos >>PAGE_SHIFT ; -unsigned offset = *pos & (PAGE_SIZE -1 ); -unsigned copied =0 ; -unsigned amt; -struct page *page; +size_t copied =0 ;do { - page =read_cache_page (mapping, index, gfs2_read_folio,NULL ); -if (IS_ERR (page)) { -if (PTR_ERR (page) == -EINTR ) +size_t offset, chunk; +struct folio *folio; + + folio =read_cache_folio (mapping, index, gfs2_read_folio,NULL ); +if (IS_ERR (folio)) { +if (PTR_ERR (folio) == -EINTR )continue ; -return PTR_ERR (page); +return PTR_ERR (folio); } - amt = size - copied; -if (offset + size >PAGE_SIZE ) - amt =PAGE_SIZE - offset; -memcpy_from_page (buf + copied, page, offset, amt); -put_page (page); - copied += amt; - index++; - offset =0 ; + offset = *pos + copied -folio_pos (folio); + chunk =min (size - copied,folio_size (folio) - offset); +memcpy_from_folio (buf + copied, folio, offset, chunk); + index =folio_next_index (folio); +folio_put (folio); + copied += chunk; }while (copied < size); (*pos) += size;return size;
fs/gfs2/inode.h +2 -2
@@ -13,8 +13,8 @@#include "util.h" bool gfs2_release_folio (struct folio *folio,gfp_t gfp_mask); -extern int gfs2_internal_read (struct gfs2_inode *ip, -char *buf,loff_t *pos,unsigned size); +extern ssize_t gfs2_internal_read (struct gfs2_inode *ip, +char *buf,loff_t *pos,size_t size);extern void gfs2_set_aops (struct inode *inode);static inline int gfs2_is_stuffed (const struct gfs2_inode *ip)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/744 gfs2: Rename gfs2_lookup_{ simple => meta }
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 062fb903895a035ed382a0d3f9b9d459b2718217 ]
Function gfs2_lookup_simple() is used for looking up inodes in the metadata directory tree, so rename it to gfs2_lookup_meta() to closer match its purpose. Clean the function up a little on the way.
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
--- fs/gfs2/inode.c | 13 +++++++------ fs/gfs2/inode.h | 2 +- fs/gfs2/ops_fstype.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 15 deletions(-)
fs/gfs2/inode.c +7 -6
@@ -265,17 +265,18 @@ struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr, } -struct inode *gfs2_lookup_simple (struct inode *dip,const char *name) +/** +* gfs2_lookup_meta - Look up an inode in a metadata directory +* @dip: The directory +* @name: The name of the inode +*/ +struct inode *gfs2_lookup_meta (struct inode *dip,const char *name) {struct qstr qstr;struct inode *inode; +gfs2_str2qstr (&qstr, name); inode =gfs2_lookupi (dip, &qstr,1 ); -/* gfs2_lookupi has inconsistent callers: vfs -* related routines expect NULL for no entry found, -* gfs2_lookup_simple callers expect ENOENT -* and do not check for NULL. -*/ if (IS_ERR_OR_NULL (inode))return inode ? inode :ERR_PTR (-ENOENT );
fs/gfs2/inode.h +1 -1
@@ -101,7 +101,7 @@ extern struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, int is_root);extern int gfs2_permission (struct mnt_idmap *idmap,struct inode *inode,int mask); -extern struct inode *gfs2_lookup_simple (struct inode *dip,const char *name); +extern struct inode *gfs2_lookup_meta (struct inode *dip,const char *name);extern void gfs2_dinode_out (const struct gfs2_inode *ip,void *buf);extern int gfs2_open_common (struct inode *inode,struct file *file);extern loff_t gfs2_seek_data (struct file *file,loff_t offset);
fs/gfs2/ops_fstype.c +8 -8
@@ -648,7 +648,7 @@ static int init_statfs(struct gfs2_sbd *sdp)struct gfs2_jdesc *jd;struct gfs2_inode *ip; - sdp->sd_statfs_inode =gfs2_lookup_simple (master,"statfs" ); + sdp->sd_statfs_inode =gfs2_lookup_meta (master,"statfs" );if (IS_ERR (sdp->sd_statfs_inode)) { error =PTR_ERR (sdp->sd_statfs_inode);fs_err (sdp,"can't read in statfs inode: %d\n" , error);
@@ -657,7 +657,7 @@ static int init_statfs(struct gfs2_sbd *sdp)if (sdp->sd_args.ar_spectator) goto out; - pn =gfs2_lookup_simple (master,"per_node" ); + pn =gfs2_lookup_meta (master,"per_node" );if (IS_ERR (pn)) { error =PTR_ERR (pn);fs_err (sdp,"can't find per_node directory: %d\n" , error);
@@ -674,7 +674,7 @@ static int init_statfs(struct gfs2_sbd *sdp) goto free_local; }sprintf (buf,"statfs_change%u" , jd->jd_jid); - lsi->si_sc_inode =gfs2_lookup_simple (pn, buf); + lsi->si_sc_inode =gfs2_lookup_meta (pn, buf);if (IS_ERR (lsi->si_sc_inode)) { error =PTR_ERR (lsi->si_sc_inode); fs_err(sdp, "can't find local \"sc\" file#%u: %d\n",
@@ -739,7 +739,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)if (undo) goto fail_statfs; - sdp->sd_jindex =gfs2_lookup_simple (master,"jindex" ); + sdp->sd_jindex =gfs2_lookup_meta (master,"jindex" );if (IS_ERR (sdp->sd_jindex)) {fs_err (sdp,"can't lookup journal index: %d\n" , error);return PTR_ERR (sdp->sd_jindex);
@@ -888,7 +888,7 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) goto fail;/* Read in the resource index inode */ - sdp->sd_rindex =gfs2_lookup_simple (master,"rindex" ); + sdp->sd_rindex =gfs2_lookup_meta (master,"rindex" );if (IS_ERR (sdp->sd_rindex)) { error =PTR_ERR (sdp->sd_rindex);fs_err (sdp,"can't get resource index inode: %d\n" , error);
@@ -897,7 +897,7 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) sdp->sd_rindex_uptodate =0 ;/* Read in the quota inode */ - sdp->sd_quota_inode =gfs2_lookup_simple (master,"quota" ); + sdp->sd_quota_inode =gfs2_lookup_meta (master,"quota" );if (IS_ERR (sdp->sd_quota_inode)) { error =PTR_ERR (sdp->sd_quota_inode);fs_err (sdp,"can't get quota file inode: %d\n" , error);
@@ -941,7 +941,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo)if (undo) goto fail_qc_gh; - pn =gfs2_lookup_simple (master,"per_node" ); + pn =gfs2_lookup_meta (master,"per_node" );if (IS_ERR (pn)) { error =PTR_ERR (pn);fs_err (sdp,"can't find per_node directory: %d\n" , error);
@@ -949,7 +949,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) }sprintf (buf,"quota_change%u" , sdp->sd_jdesc->jd_jid); - sdp->sd_qc_inode =gfs2_lookup_simple (pn, buf); + sdp->sd_qc_inode =gfs2_lookup_meta (pn, buf);if (IS_ERR (sdp->sd_qc_inode)) { error =PTR_ERR (sdp->sd_qc_inode);fs_err (sdp,"can't find local \"qc\" file: %d\n" , error);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/744 gfs2: No longer use extern in function declarations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 0b2355fe91ac3756a9e29c8b833ba33f9affb520 ]
For non-static function declarations, external linkage is implied and the 'extern' keyword isn't needed. Some static checkers complain about the overuse of 'extern', so clean up all the function declarations.
In addition, remove 'extern' from the definition of free_local_statfs_inodes(); it isn't needed there, either.
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
--- fs/gfs2/acl.h | 8 ++-- fs/gfs2/aops.h | 6 +-- fs/gfs2/bmap.h | 38 ++++++++--------- fs/gfs2/dir.h | 38 ++++++++--------- fs/gfs2/glock.h | 100 ++++++++++++++++++++++----------------------- fs/gfs2/glops.h | 4 +- fs/gfs2/incore.h | 2 +- fs/gfs2/inode.h | 52 +++++++++++------------ fs/gfs2/log.h | 46 ++++++++++----------- fs/gfs2/lops.h | 22 +++++----- fs/gfs2/meta_io.h | 20 ++++----- fs/gfs2/quota.h | 35 ++++++++-------- fs/gfs2/recovery.h | 18 ++++---- fs/gfs2/rgrp.h | 85 +++++++++++++++++++------------------- fs/gfs2/super.c | 6 +-- fs/gfs2/super.h | 50 +++++++++++------------ fs/gfs2/trans.h | 24 +++++------ fs/gfs2/util.h | 8 ++-- fs/gfs2/xattr.h | 12 +++--- 19 files changed, 289 insertions(+), 285 deletions(-)
fs/gfs2/acl.h +4 -4
@@ -11,9 +11,9 @@#define GFS2_ACL_MAX_ENTRIES (sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12) -extern struct posix_acl *gfs2_get_acl (struct inode *inode,int type,bool rcu); -extern int __gfs2_set_acl (struct inode *inode,struct posix_acl *acl,int type); -extern int gfs2_set_acl (struct mnt_idmap *idmap,struct dentry *dentry, -struct posix_acl *acl,int type); +struct posix_acl *gfs2_get_acl (struct inode *inode,int type,bool rcu); +int __gfs2_set_acl (struct inode *inode,struct posix_acl *acl,int type); +int gfs2_set_acl (struct mnt_idmap *idmap,struct dentry *dentry, +struct posix_acl *acl,int type);#endif /* __ACL_DOT_H__ */
fs/gfs2/aops.h +3 -3
@@ -8,8 +8,8 @@#include "incore.h" -extern void adjust_fs_space (struct inode *inode); -extern void gfs2_trans_add_databufs (struct gfs2_inode *ip,struct folio *folio, -size_t from,size_t len); +void adjust_fs_space (struct inode *inode); +void gfs2_trans_add_databufs (struct gfs2_inode *ip,struct folio *folio, +size_t from,size_t len);#endif /* __AOPS_DOT_H__ */
fs/gfs2/bmap.h +19 -19
@@ -46,24 +46,24 @@ static inline void gfs2_write_calc_reserv(const struct gfs2_inode *ip,extern const struct iomap_ops gfs2_iomap_ops;extern const struct iomap_writeback_ops gfs2_writeback_ops; -extern int gfs2_unstuff_dinode (struct gfs2_inode *ip); -extern int gfs2_block_map (struct inode *inode,sector_t lblock, -struct buffer_head *bh,int create); -extern int gfs2_iomap_get (struct inode *inode,loff_t pos,loff_t length, -struct iomap *iomap); -extern int gfs2_iomap_alloc (struct inode *inode,loff_t pos,loff_t length, -struct iomap *iomap); -extern int gfs2_get_extent (struct inode *inode,u64 lblock,u64 *dblock, -unsigned int *extlen); -extern int gfs2_alloc_extent (struct inode *inode,u64 lblock,u64 *dblock, -unsigned *extlen,bool *new); -extern int gfs2_setattr_size (struct inode *inode,u64 size); -extern int gfs2_truncatei_resume (struct gfs2_inode *ip); -extern int gfs2_file_dealloc (struct gfs2_inode *ip); -extern int gfs2_write_alloc_required (struct gfs2_inode *ip,u64 offset, -unsigned int len); -extern int gfs2_map_journal_extents (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd); -extern void gfs2_free_journal_extents (struct gfs2_jdesc *jd); -extern int __gfs2_punch_hole (struct file *file,loff_t offset,loff_t length); +int gfs2_unstuff_dinode (struct gfs2_inode *ip); +int gfs2_block_map (struct inode *inode,sector_t lblock, +struct buffer_head *bh,int create); +int gfs2_iomap_get (struct inode *inode,loff_t pos,loff_t length, +struct iomap *iomap); +int gfs2_iomap_alloc (struct inode *inode,loff_t pos,loff_t length, +struct iomap *iomap); +int gfs2_get_extent (struct inode *inode,u64 lblock,u64 *dblock, +unsigned int *extlen); +int gfs2_alloc_extent (struct inode *inode,u64 lblock,u64 *dblock, +unsigned *extlen,bool *new); +int gfs2_setattr_size (struct inode *inode,u64 size); +int gfs2_truncatei_resume (struct gfs2_inode *ip); +int gfs2_file_dealloc (struct gfs2_inode *ip); +int gfs2_write_alloc_required (struct gfs2_inode *ip,u64 offset, +unsigned int len); +int gfs2_map_journal_extents (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd); +void gfs2_free_journal_extents (struct gfs2_jdesc *jd); +int __gfs2_punch_hole (struct file *file,loff_t offset,loff_t length);#endif /* __BMAP_DOT_H__ */
fs/gfs2/dir.h +19 -19
@@ -23,32 +23,32 @@ struct gfs2_diradd {int save_loc; }; -extern struct inode *gfs2_dir_search (struct inode *dir, -const struct qstr *filename, -bool fail_on_exist); -extern int gfs2_dir_check (struct inode *dir,const struct qstr *filename, -const struct gfs2_inode *ip); -extern int gfs2_dir_add (struct inode *inode,const struct qstr *filename, -const struct gfs2_inode *ip,struct gfs2_diradd *da); +struct inode *gfs2_dir_search (struct inode *dir, +const struct qstr *filename, +bool fail_on_exist); +int gfs2_dir_check (struct inode *dir,const struct qstr *filename, +const struct gfs2_inode *ip); +int gfs2_dir_add (struct inode *inode,const struct qstr *filename, +const struct gfs2_inode *ip,struct gfs2_diradd *da);static inline void gfs2_dir_no_add (struct gfs2_diradd *da) {brelse (da->bh); da->bh =NULL ; } -extern int gfs2_dir_del (struct gfs2_inode *dip,const struct dentry *dentry); -extern int gfs2_dir_read (struct inode *inode,struct dir_context *ctx, -struct file_ra_state *f_ra); -extern int gfs2_dir_mvino (struct gfs2_inode *dip,const struct qstr *filename, -const struct gfs2_inode *nip,unsigned int new_type); +int gfs2_dir_del (struct gfs2_inode *dip,const struct dentry *dentry); +int gfs2_dir_read (struct inode *inode,struct dir_context *ctx, +struct file_ra_state *f_ra); +int gfs2_dir_mvino (struct gfs2_inode *dip,const struct qstr *filename, +const struct gfs2_inode *nip,unsigned int new_type); -extern int gfs2_dir_exhash_dealloc (struct gfs2_inode *dip); +int gfs2_dir_exhash_dealloc (struct gfs2_inode *dip); -extern int gfs2_diradd_alloc_required (struct inode *dir, -const struct qstr *filename, -struct gfs2_diradd *da); -extern int gfs2_dir_get_new_buffer (struct gfs2_inode *ip,u64 block, -struct buffer_head **bhp); -extern void gfs2_dir_hash_inval (struct gfs2_inode *ip); +int gfs2_diradd_alloc_required (struct inode *dir, +const struct qstr *filename, +struct gfs2_diradd *da); +int gfs2_dir_get_new_buffer (struct gfs2_inode *ip,u64 block, +struct buffer_head **bhp); +void gfs2_dir_hash_inval (struct gfs2_inode *ip);static inline u32 gfs2_disk_hash (const char *data,int len) {
fs/gfs2/glock.h +50 -50
131 lines not on this page · raw message
fs/gfs2/glops.h +2 -2
@@ -22,7 +22,7 @@ extern const struct gfs2_glock_operations gfs2_quota_glops;extern const struct gfs2_glock_operations gfs2_journal_glops;extern const struct gfs2_glock_operations *gfs2_glops_list[]; -extern int gfs2_inode_metasync (struct gfs2_glock *gl); -extern void gfs2_ail_flush (struct gfs2_glock *gl,bool fsync); +int gfs2_inode_metasync (struct gfs2_glock *gl); +void gfs2_ail_flush (struct gfs2_glock *gl,bool fsync);#endif /* __GLOPS_DOT_H__ */
fs/gfs2/incore.h +1 -1
@@ -863,7 +863,7 @@ static inline void gfs2_sbstats_inc(const struct gfs2_glock *gl, int which)preempt_enable (); } -extern struct gfs2_rgrpd *gfs2_glock2rgrp (struct gfs2_glock *gl); +struct gfs2_rgrpd *gfs2_glock2rgrp (struct gfs2_glock *gl);static inline unsigned gfs2_max_stuffed_size (const struct gfs2_inode *ip) {
fs/gfs2/inode.h +26 -26
68 lines not on this page · raw message
fs/gfs2/log.h +23 -23
52 lines not on this page · raw message
fs/gfs2/lops.h +12 -10
@@ -11,16 +11,18 @@#include "incore.h" extern const struct gfs2_log_operations *gfs2_log_ops[]; -extern void gfs2_log_incr_head (struct gfs2_sbd *sdp); -extern u64 gfs2_log_bmap (struct gfs2_jdesc *jd,unsigned int lbn); -extern void gfs2_log_write (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd, -struct page *page,unsigned size,unsigned offset, -u64 blkno); -extern void gfs2_log_submit_bio (struct bio **biop,blk_opf_t opf); -extern void gfs2_pin (struct gfs2_sbd *sdp,struct buffer_head *bh); -extern int gfs2_find_jhead (struct gfs2_jdesc *jd, -struct gfs2_log_header_host *head,bool keep_cache); -extern void gfs2_drain_revokes (struct gfs2_sbd *sdp); + +void gfs2_log_incr_head (struct gfs2_sbd *sdp); +u64 gfs2_log_bmap (struct gfs2_jdesc *jd,unsigned int lbn); +void gfs2_log_write (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd, +struct page *page,unsigned size,unsigned offset, +u64 blkno); +void gfs2_log_submit_bio (struct bio **biop,blk_opf_t opf); +void gfs2_pin (struct gfs2_sbd *sdp,struct buffer_head *bh); +int gfs2_find_jhead (struct gfs2_jdesc *jd, +struct gfs2_log_header_host *head,bool keep_cache); +void gfs2_drain_revokes (struct gfs2_sbd *sdp); +static inline unsigned int buf_limit (struct gfs2_sbd *sdp) {return sdp->sd_ldptrs;
fs/gfs2/meta_io.h +10 -10
@@ -50,21 +50,21 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping)return inode->i_sb->s_fs_info; } -extern struct buffer_head *gfs2_meta_new (struct gfs2_glock *gl,u64 blkno); -extern int gfs2_meta_read (struct gfs2_glock *gl,u64 blkno,int flags, -int rahead,struct buffer_head **bhp); -extern int gfs2_meta_wait (struct gfs2_sbd *sdp,struct buffer_head *bh); -extern struct buffer_head *gfs2_getbuf (struct gfs2_glock *gl,u64 blkno, -int create); +struct buffer_head *gfs2_meta_new (struct gfs2_glock *gl,u64 blkno); +int gfs2_meta_read (struct gfs2_glock *gl,u64 blkno,int flags, +int rahead,struct buffer_head **bhp); +int gfs2_meta_wait (struct gfs2_sbd *sdp,struct buffer_head *bh); +struct buffer_head *gfs2_getbuf (struct gfs2_glock *gl,u64 blkno, +int create);enum {REMOVE_JDATA =0 ,REMOVE_META =1 , }; -extern void gfs2_remove_from_journal (struct buffer_head *bh,int meta); -extern void gfs2_journal_wipe (struct gfs2_inode *ip,u64 bstart,u32 blen); -extern int gfs2_meta_buffer (struct gfs2_inode *ip,u32 mtype,u64 num, -struct buffer_head **bhp); +void gfs2_remove_from_journal (struct buffer_head *bh,int meta); +void gfs2_journal_wipe (struct gfs2_inode *ip,u64 bstart,u32 blen); +int gfs2_meta_buffer (struct gfs2_inode *ip,u32 mtype,u64 num, +struct buffer_head **bhp);static inline int gfs2_meta_inode_buffer (struct gfs2_inode *ip,struct buffer_head **bhp)
fs/gfs2/quota.h +18 -17
@@ -15,27 +15,27 @@ struct gfs2_sbd;#define NO_UID_QUOTA_CHANGE INVALID_UID#define NO_GID_QUOTA_CHANGE INVALID_GID -extern int gfs2_qa_get (struct gfs2_inode *ip); -extern void gfs2_qa_put (struct gfs2_inode *ip); -extern int gfs2_quota_hold (struct gfs2_inode *ip,kuid_t uid,kgid_t gid); -extern void gfs2_quota_unhold (struct gfs2_inode *ip); +int gfs2_qa_get (struct gfs2_inode *ip); +void gfs2_qa_put (struct gfs2_inode *ip); +int gfs2_quota_hold (struct gfs2_inode *ip,kuid_t uid,kgid_t gid); +void gfs2_quota_unhold (struct gfs2_inode *ip); -extern int gfs2_quota_lock (struct gfs2_inode *ip,kuid_t uid,kgid_t gid); -extern void gfs2_quota_unlock (struct gfs2_inode *ip); +int gfs2_quota_lock (struct gfs2_inode *ip,kuid_t uid,kgid_t gid); +void gfs2_quota_unlock (struct gfs2_inode *ip); -extern int gfs2_quota_check (struct gfs2_inode *ip,kuid_t uid,kgid_t gid, -struct gfs2_alloc_parms *ap); -extern void gfs2_quota_change (struct gfs2_inode *ip,s64 change, -kuid_t uid,kgid_t gid); +int gfs2_quota_check (struct gfs2_inode *ip,kuid_t uid,kgid_t gid, +struct gfs2_alloc_parms *ap); +void gfs2_quota_change (struct gfs2_inode *ip,s64 change, +kuid_t uid,kgid_t gid); -extern int gfs2_quota_sync (struct super_block *sb,int type); -extern int gfs2_quota_refresh (struct gfs2_sbd *sdp,struct kqid qid); +int gfs2_quota_sync (struct super_block *sb,int type); +int gfs2_quota_refresh (struct gfs2_sbd *sdp,struct kqid qid); -extern int gfs2_quota_init (struct gfs2_sbd *sdp); -extern void gfs2_quota_cleanup (struct gfs2_sbd *sdp); -extern int gfs2_quotad (void *data); +int gfs2_quota_init (struct gfs2_sbd *sdp); +void gfs2_quota_cleanup (struct gfs2_sbd *sdp); +int gfs2_quotad (void *data); -extern void gfs2_wake_up_statfs (struct gfs2_sbd *sdp); +void gfs2_wake_up_statfs (struct gfs2_sbd *sdp);static inline int gfs2_quota_lock_check (struct gfs2_inode *ip,struct gfs2_alloc_parms *ap)
@@ -62,6 +62,7 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip,extern const struct quotactl_ops gfs2_quotactl_ops;extern struct shrinker gfs2_qd_shrinker;extern struct list_lru gfs2_qd_lru; -extern void __init gfs2_quota_hash_init (void ); + +void __init gfs2_quota_hash_init (void );#endif /* __QUOTA_DOT_H__ */
fs/gfs2/recovery.h +9 -9
@@ -17,18 +17,18 @@ static inline void gfs2_replay_incr_blk(struct gfs2_jdesc *jd, u32 *blk) *blk = 0; } -extern int gfs2_replay_read_block (struct gfs2_jdesc *jd,unsigned int blk, +int gfs2_replay_read_block (struct gfs2_jdesc *jd,unsigned int blk,struct buffer_head **bh); -extern int gfs2_revoke_add (struct gfs2_jdesc *jd,u64 blkno,unsigned int where); -extern int gfs2_revoke_check (struct gfs2_jdesc *jd,u64 blkno,unsigned int where); -extern void gfs2_revoke_clean (struct gfs2_jdesc *jd); +int gfs2_revoke_add (struct gfs2_jdesc *jd,u64 blkno,unsigned int where); +int gfs2_revoke_check (struct gfs2_jdesc *jd,u64 blkno,unsigned int where); +void gfs2_revoke_clean (struct gfs2_jdesc *jd); -extern int gfs2_recover_journal (struct gfs2_jdesc *gfs2_jd,bool wait); -extern void gfs2_recover_func (struct work_struct *work); -extern int __get_log_header (struct gfs2_sbd *sdp, -const struct gfs2_log_header *lh,unsigned int blkno, -struct gfs2_log_header_host *head); +int gfs2_recover_journal (struct gfs2_jdesc *gfs2_jd,bool wait); +void gfs2_recover_func (struct work_struct *work); +int __get_log_header (struct gfs2_sbd *sdp, +const struct gfs2_log_header *lh,unsigned int blkno, +struct gfs2_log_header_host *head);#endif /* __RECOVERY_DOT_H__ */
fs/gfs2/rgrp.h +43 -42
108 lines not on this page · raw message
fs/gfs2/super.c +3 -3
@@ -1578,7 +1578,7 @@ static void gfs2_free_inode(struct inode *inode)kmem_cache_free (gfs2_inode_cachep,GFS2_I (inode)); } -extern void free_local_statfs_inodes (struct gfs2_sbd *sdp) +void free_local_statfs_inodes (struct gfs2_sbd *sdp) {struct local_statfs_inode *lsi, *safe;
@@ -1593,8 +1593,8 @@ extern void free_local_statfs_inodes(struct gfs2_sbd *sdp) } } -extern struct inode *find_local_statfs_inode (struct gfs2_sbd *sdp, -unsigned int index) +struct inode *find_local_statfs_inode (struct gfs2_sbd *sdp, +unsigned int index) {struct local_statfs_inode *lsi;
fs/gfs2/super.h +25 -25
65 lines not on this page · raw message
fs/gfs2/trans.h +12 -12
@@ -34,17 +34,17 @@ static inline unsigned int gfs2_rg_blocks(const struct gfs2_inode *ip, unsignedreturn rgd->rd_length; } -extern int __gfs2_trans_begin (struct gfs2_trans *tr,struct gfs2_sbd *sdp, -unsigned int blocks,unsigned int revokes, -unsigned long ip); -extern int gfs2_trans_begin (struct gfs2_sbd *sdp,unsigned int blocks, -unsigned int revokes); - -extern void gfs2_trans_end (struct gfs2_sbd *sdp); -extern void gfs2_trans_add_data (struct gfs2_glock *gl,struct buffer_head *bh); -extern void gfs2_trans_add_meta (struct gfs2_glock *gl,struct buffer_head *bh); -extern void gfs2_trans_add_revoke (struct gfs2_sbd *sdp,struct gfs2_bufdata *bd); -extern void gfs2_trans_remove_revoke (struct gfs2_sbd *sdp,u64 blkno,unsigned int len); -extern void gfs2_trans_free (struct gfs2_sbd *sdp,struct gfs2_trans *tr); +int __gfs2_trans_begin (struct gfs2_trans *tr,struct gfs2_sbd *sdp, +unsigned int blocks,unsigned int revokes, +unsigned long ip); +int gfs2_trans_begin (struct gfs2_sbd *sdp,unsigned int blocks, +unsigned int revokes); + +void gfs2_trans_end (struct gfs2_sbd *sdp); +void gfs2_trans_add_data (struct gfs2_glock *gl,struct buffer_head *bh); +void gfs2_trans_add_meta (struct gfs2_glock *gl,struct buffer_head *bh); +void gfs2_trans_add_revoke (struct gfs2_sbd *sdp,struct gfs2_bufdata *bd); +void gfs2_trans_remove_revoke (struct gfs2_sbd *sdp,u64 blkno,unsigned int len); +void gfs2_trans_free (struct gfs2_sbd *sdp,struct gfs2_trans *tr);#endif /* __TRANS_DOT_H__ */
fs/gfs2/util.h +4 -4
@@ -147,10 +147,10 @@ static inline void gfs2_metatype_set(struct buffer_head *bh, u16 type,int gfs2_io_error_i (struct gfs2_sbd *sdp,const char *function,char *file,unsigned int line); -extern int check_journal_clean (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd, -bool verbose); -extern int gfs2_freeze_lock_shared (struct gfs2_sbd *sdp); -extern void gfs2_freeze_unlock (struct gfs2_holder *freeze_gh); +int check_journal_clean (struct gfs2_sbd *sdp,struct gfs2_jdesc *jd, +bool verbose); +int gfs2_freeze_lock_shared (struct gfs2_sbd *sdp); +void gfs2_freeze_unlock (struct gfs2_holder *freeze_gh);#define gfs2_io_error (sdp) \ gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__)
fs/gfs2/xattr.h +6 -6
@@ -50,14 +50,14 @@ struct gfs2_ea_location { struct gfs2_ea_header *el_prev; }; -extern int __gfs2_xattr_set (struct inode *inode,const char *name, -const void *value,size_t size, -int flags,int type); -extern ssize_t gfs2_listxattr (struct dentry *dentry,char *buffer,size_t size); -extern int gfs2_ea_dealloc (struct gfs2_inode *ip); +int __gfs2_xattr_set (struct inode *inode,const char *name, +const void *value,size_t size, +int flags,int type); +ssize_t gfs2_listxattr (struct dentry *dentry,char *buffer,size_t size); +int gfs2_ea_dealloc (struct gfs2_inode *ip);/* Exported to acl.c */ -extern int gfs2_xattr_acl_get (struct gfs2_inode *ip,const char *name,char **data); +int gfs2_xattr_acl_get (struct gfs2_inode *ip,const char *name,char **data);#endif /* __EATTR_DOT_H__ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/744 gfs2: Remove ill-placed consistency check
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 59f60005797b4018d7b46620037e0c53d690795e ]
This consistency check was originally added by commit 9287c6452d2b1 ("gfs2: Fix occasional glock use-after-free"). It is ill-placed in gfs2_glock_free() because if it holds there, it must equally hold in __gfs2_glock_put() already. Either way, the check doesn't seem necessary anymore.
Stable-dep-of: d98779e68772 ("gfs2: Fix potential glock use-after-free on unmount")
--- fs/gfs2/glock.c | 1 - 1 file changed, 1 deletion(-)
fs/gfs2/glock.c +0 -1
@@ -170,7 +170,6 @@ void gfs2_glock_free(struct gfs2_glock *gl) {struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; -gfs2_glock_assert_withdraw (gl,atomic_read (&gl->gl_revokes) ==0 );rhashtable_remove_fast (&gl_hash_table, &gl->gl_node, ht_parms);smp_mb ();wake_up_glock (gl);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/744 gfs2: Fix potential glock use-after-free on unmount
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit d98779e687726d8f8860f1c54b5687eec5f63a73 ]
When a DLM lockspace is released and there ares still locks in that lockspace, DLM will unlock those locks automatically. Commit fb6791d100d1b started exploiting this behavior to speed up filesystem
unmount: gfs2 would simply free glocks it didn't want to unlock and then release the lockspace. This didn't take the bast callbacks for asynchronous lock contention notifications into account, which remain active until until a lock is unlocked or its lockspace is released.
To prevent those callbacks from accessing deallocated objects, put the glocks that should not be unlocked on the sd_dead_glocks list, release the lockspace, and only then free those glocks.
As an additional measure, ignore unexpected ast and bast callbacks if the receiving glock is dead.
--- fs/gfs2/glock.c | 35 ++++++++++++++++++++++++++++++++--- fs/gfs2/glock.h | 1 + fs/gfs2/incore.h | 1 + fs/gfs2/lock_dlm.c | 32 ++++++++++++++++++++++---------- fs/gfs2/ops_fstype.c | 1 + fs/gfs2/super.c | 3 --- 6 files changed, 57 insertions(+), 16 deletions(-)
fs/gfs2/glock.c +32 -3
@@ -166,18 +166,45 @@ static bool glock_blocked_by_withdraw(struct gfs2_glock *gl)return true; } -void gfs2_glock_free (struct gfs2_glock *gl) +static void __gfs2_glock_free (struct gfs2_glock *gl) { -struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; -rhashtable_remove_fast (&gl_hash_table, &gl->gl_node, ht_parms);smp_mb ();wake_up_glock (gl);call_rcu (&gl->gl_rcu, gfs2_glock_dealloc); +} + +void gfs2_glock_free (struct gfs2_glock *gl) { +struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; + +__gfs2_glock_free (gl);if (atomic_dec_and_test (&sdp->sd_glock_disposal))wake_up (&sdp->sd_kill_wait); } +void gfs2_glock_free_later (struct gfs2_glock *gl) { +struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; + +spin_lock (&lru_lock); +list_add (&gl->gl_lru, &sdp->sd_dead_glocks); +spin_unlock (&lru_lock); +if (atomic_dec_and_test (&sdp->sd_glock_disposal)) +wake_up (&sdp->sd_kill_wait); +} + +static void gfs2_free_dead_glocks (struct gfs2_sbd *sdp) +{ +struct list_head *list = &sdp->sd_dead_glocks; + +while (!list_empty (list)) { +struct gfs2_glock *gl; + + gl = list_first_entry(list, struct gfs2_glock, gl_lru); +list_del_init (&gl->gl_lru); +__gfs2_glock_free (gl); + } +} +/** * gfs2_glock_hold() - increment reference count on glock * @gl: The glock to hold
@@ -2194,6 +2221,8 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp)wait_event_timeout (sdp->sd_kill_wait,atomic_read (&sdp->sd_glock_disposal) ==0 ,HZ *600 ); +gfs2_lm_unmount (sdp); +gfs2_free_dead_glocks (sdp);glock_hash_walk (dump_glock_func, sdp); }
fs/gfs2/glock.h +1 -0
@@ -266,6 +266,7 @@ void gfs2_gl_dq_holders(struct gfs2_sbd *sdp);void gfs2_glock_thaw (struct gfs2_sbd *sdp);void gfs2_glock_add_to_lru (struct gfs2_glock *gl);void gfs2_glock_free (struct gfs2_glock *gl); +void gfs2_glock_free_later (struct gfs2_glock *gl);int __init gfs2_glock_init (void );void gfs2_glock_exit (void );
fs/gfs2/incore.h +1 -0
@@ -838,6 +838,7 @@ struct gfs2_sbd {/* For quiescing the filesystem */ struct gfs2_holder sd_freeze_gh;struct mutex sd_freeze_mutex; +struct list_head sd_dead_glocks;char sd_fsname[GFS2_FSNAME_LEN +3 *sizeof (int ) +2 ];char sd_table_name[GFS2_FSNAME_LEN ];
fs/gfs2/lock_dlm.c +22 -10
@@ -121,6 +121,11 @@ static void gdlm_ast(void *arg)struct gfs2_glock *gl = arg;unsigned ret = gl->gl_state; +/* If the glock is dead, we only react to a dlm_unlock() reply. */ +if (__lockref_is_dead (&gl->gl_lockref) && + gl->gl_lksb.sb_status != -DLM_EUNLOCK ) +return ; +gfs2_update_reply_times (gl);BUG_ON (gl->gl_lksb.sb_flags &DLM_SBF_DEMOTED );
@@ -171,6 +176,9 @@ static void gdlm_bast(void *arg, int mode) {struct gfs2_glock *gl = arg; +if (__lockref_is_dead (&gl->gl_lockref)) +return ; +switch (mode) {case DLM_LOCK_EX :gfs2_glock_cb (gl,LM_ST_UNLOCKED );
@@ -291,8 +299,12 @@ static void gdlm_put_lock(struct gfs2_glock *gl)struct lm_lockstruct *ls = &sdp->sd_lockstruct;int error; -if (gl->gl_lksb.sb_lkid ==0 ) - goto out_free; +BUG_ON (!__lockref_is_dead (&gl->gl_lockref)); + +if (gl->gl_lksb.sb_lkid ==0 ) { +gfs2_glock_free (gl); +return ; + }clear_bit (GLF_BLOCKING , &gl->gl_flags);gfs2_glstats_inc (gl,GFS2_LKS_DCOUNT );
@@ -300,13 +312,17 @@ static void gdlm_put_lock(struct gfs2_glock *gl)gfs2_update_request_times (gl);/* don't want to call dlm if we've unmounted the lock protocol */ -if (test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) - goto out_free; +if (test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) { +gfs2_glock_free (gl); +return ; + }/* don't want to skip dlm_unlock writing the lvb when lock has one */ if (test_bit (SDF_SKIP_DLM_UNLOCK , &sdp->sd_flags) && - !gl->gl_lksb.sb_lvbptr) - goto out_free; + !gl->gl_lksb.sb_lvbptr) { +gfs2_glock_free_later (gl); +return ; + } again: error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK,
@@ -321,10 +337,6 @@ static void gdlm_put_lock(struct gfs2_glock *gl) gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number, error); } -return ; - -out_free: -gfs2_glock_free (gl); }static void gdlm_cancel (struct gfs2_glock *gl)
fs/gfs2/ops_fstype.c +1 -0
@@ -136,6 +136,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)atomic_set (&sdp->sd_log_in_flight,0 );init_waitqueue_head (&sdp->sd_log_flush_wait);mutex_init (&sdp->sd_freeze_mutex); +INIT_LIST_HEAD (&sdp->sd_dead_glocks);return sdp;
fs/gfs2/super.c +0 -3
@@ -646,10 +646,7 @@ static void gfs2_put_super(struct super_block *sb)gfs2_gl_hash_clear (sdp);truncate_inode_pages_final (&sdp->sd_aspace);gfs2_delete_debugfs_file (sdp); -/* Unmount the locking protocol */ -gfs2_lm_unmount (sdp); -/* At this point, we're through participating in the lockspace */ gfs2_sys_fs_del (sdp);free_sbd (sdp); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/744 gfs2: Mark withdraws as unlikely
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 015af1af44003fff797f8632e940824c07d282bf ]
Mark the gfs2_withdrawn(), gfs2_withdrawing(), and gfs2_withdraw_in_prog() inline functions as likely to return %false. This allows to get rid of likely() and unlikely() annotations at the call sites of those functions.
Stable-dep-of: 9947a06d29c0 ("gfs2: do_xmote fixes")
--- fs/gfs2/aops.c | 2 +- fs/gfs2/file.c | 2 +- fs/gfs2/glock.c | 4 ++-- fs/gfs2/meta_io.c | 6 +++--- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/super.c | 2 +- fs/gfs2/trans.c | 2 +- fs/gfs2/util.h | 10 +++++----- 8 files changed, 15 insertions(+), 15 deletions(-)
fs/gfs2/aops.c +1 -1
@@ -464,7 +464,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio) error =mpage_read_folio (folio, gfs2_block_map); } -if (unlikely (gfs2_withdrawn (sdp))) +if (gfs2_withdrawn (sdp))return -EIO ;return error;
fs/gfs2/file.c +1 -1
@@ -1436,7 +1436,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_POSIX ))return -ENOLCK ; -if (unlikely (gfs2_withdrawn (sdp))) { +if (gfs2_withdrawn (sdp)) {if (fl->fl_type ==F_UNLCK )locks_lock_file_wait (file, fl);return -EIO ;
fs/gfs2/glock.c +2 -2
@@ -156,7 +156,7 @@ static bool glock_blocked_by_withdraw(struct gfs2_glock *gl) {struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; -if (likely (!gfs2_withdrawn (sdp))) +if (!gfs2_withdrawn (sdp))return false;if (gl->gl_ops->go_flags &GLOF_NONDISK )return false;
@@ -783,7 +783,7 @@ __acquires(&gl->gl_lockref.lock)* gfs2_gl_hash_clear calls clear_glock) and recovery is complete * then it's okay to tell dlm to unlock it. */ -if (unlikely (sdp->sd_log_error && !gfs2_withdrawn (sdp))) +if (unlikely (sdp->sd_log_error) && !gfs2_withdrawn (sdp))gfs2_withdraw_delayed (sdp); if (glock_blocked_by_withdraw(gl) && (target != LM_ST_UNLOCKED ||
fs/gfs2/meta_io.c +3 -3
@@ -257,7 +257,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,struct buffer_head *bh, *bhs[2 ];int num =0 ; -if (unlikely (gfs2_withdrawn (sdp)) && !gfs2_withdraw_in_prog (sdp)) { +if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp)) { *bhp =NULL ;return -EIO ; }
@@ -315,7 +315,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,int gfs2_meta_wait (struct gfs2_sbd *sdp,struct buffer_head *bh) { -if (unlikely (gfs2_withdrawn (sdp)) && !gfs2_withdraw_in_prog (sdp)) +if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp))return -EIO ;wait_on_buffer (bh);
@@ -326,7 +326,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)gfs2_io_error_bh_wd (sdp, bh);return -EIO ; } -if (unlikely (gfs2_withdrawn (sdp)) && !gfs2_withdraw_in_prog (sdp)) +if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp))return -EIO ;return 0 ;
fs/gfs2/ops_fstype.c +1 -1
@@ -1075,7 +1075,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)void gfs2_lm_unmount (struct gfs2_sbd *sdp) {const struct lm_lockops *lm = sdp->sd_lockstruct.ls_ops; -if (likely (!gfs2_withdrawn (sdp)) && lm->lm_unmount) +if (!gfs2_withdrawn (sdp) && lm->lm_unmount) lm->lm_unmount (sdp); }
fs/gfs2/super.c +1 -1
@@ -499,7 +499,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)return ; } -if (unlikely (gfs2_withdrawn (sdp))) +if (gfs2_withdrawn (sdp))return ;if (!gfs2_glock_is_locked_by_me (ip->i_gl)) { ret =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,0 , &gh);
fs/gfs2/trans.c +1 -1
@@ -268,7 +268,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) (unsigned long long)bd->bd_bh->b_blocknr);BUG (); } -if (unlikely (gfs2_withdrawn (sdp))) { +if (gfs2_withdrawn (sdp)) {fs_info (sdp,"GFS2:adding buf while withdrawn! 0x%llx\n" , (unsigned long long )bd->bd_bh->b_blocknr); goto out_unlock;
fs/gfs2/util.h +5 -5
@@ -203,8 +203,8 @@ static inline void gfs2_withdraw_delayed(struct gfs2_sbd *sdp)*/ static inline bool gfs2_withdrawn (struct gfs2_sbd *sdp) { -return test_bit (SDF_WITHDRAWN , &sdp->sd_flags) || -test_bit (SDF_WITHDRAWING , &sdp->sd_flags); +return unlikely (test_bit (SDF_WITHDRAWN , &sdp->sd_flags) || +test_bit (SDF_WITHDRAWING , &sdp->sd_flags)); }/**
@@ -213,13 +213,13 @@ static inline bool gfs2_withdrawn(struct gfs2_sbd *sdp)*/ static inline bool gfs2_withdrawing (struct gfs2_sbd *sdp) { -return test_bit (SDF_WITHDRAWING , &sdp->sd_flags) && - !test_bit (SDF_WITHDRAWN , &sdp->sd_flags); +return unlikely (test_bit (SDF_WITHDRAWING , &sdp->sd_flags) && + !test_bit (SDF_WITHDRAWN , &sdp->sd_flags)); }static inline bool gfs2_withdraw_in_prog (struct gfs2_sbd *sdp) { -return test_bit (SDF_WITHDRAW_IN_PROG , &sdp->sd_flags); +return unlikely (test_bit (SDF_WITHDRAW_IN_PROG , &sdp->sd_flags)); }#define gfs2_tune_get (sdp, field) \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/744 gfs2: Rename gfs2_withdrawn to gfs2_withdrawing_or_withdrawn
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 4d927b03a68846e4e791ccde6b4c274df02f11e9 ]
This function checks whether the filesystem has been been marked to be withdrawn eventually or has been withdrawn already. Rename this function to avoid confusing code like checking for gfs2_withdrawing() when gfs2_withdrawn() has already returned true.
Stable-dep-of: 9947a06d29c0 ("gfs2: do_xmote fixes")
--- fs/gfs2/aops.c | 2 +- fs/gfs2/file.c | 2 +- fs/gfs2/glock.c | 8 ++++---- fs/gfs2/glops.c | 2 +- fs/gfs2/lock_dlm.c | 8 ++++---- fs/gfs2/log.c | 21 +++++++++++---------- fs/gfs2/meta_io.c | 9 ++++++--- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/quota.c | 8 ++++---- fs/gfs2/recovery.c | 2 +- fs/gfs2/super.c | 10 +++++----- fs/gfs2/sys.c | 2 +- fs/gfs2/trans.c | 2 +- fs/gfs2/util.c | 4 ++-- fs/gfs2/util.h | 5 +++-- 15 files changed, 46 insertions(+), 41 deletions(-)
fs/gfs2/aops.c +1 -1
@@ -464,7 +464,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio) error =mpage_read_folio (folio, gfs2_block_map); } -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))return -EIO ;return error;
fs/gfs2/file.c +1 -1
@@ -1436,7 +1436,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_POSIX ))return -ENOLCK ; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {if (fl->fl_type ==F_UNLCK )locks_lock_file_wait (file, fl);return -EIO ;
fs/gfs2/glock.c +4 -4
@@ -156,7 +156,7 @@ static bool glock_blocked_by_withdraw(struct gfs2_glock *gl) {struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; -if (!gfs2_withdrawn (sdp)) +if (!gfs2_withdrawing_or_withdrawn (sdp))return false;if (gl->gl_ops->go_flags &GLOF_NONDISK )return false;
@@ -304,7 +304,7 @@ static void __gfs2_glock_put(struct gfs2_glock *gl)GLOCK_BUG_ON (gl, !list_empty (&gl->gl_holders));if (mapping) {truncate_inode_pages_final (mapping); -if (!gfs2_withdrawn (sdp)) +if (!gfs2_withdrawing_or_withdrawn (sdp))GLOCK_BUG_ON (gl, !mapping_empty (mapping)); }trace_gfs2_glock_put (gl);
@@ -783,7 +783,7 @@ __acquires(&gl->gl_lockref.lock)* gfs2_gl_hash_clear calls clear_glock) and recovery is complete * then it's okay to tell dlm to unlock it. */ -if (unlikely (sdp->sd_log_error) && !gfs2_withdrawn (sdp)) +if (unlikely (sdp->sd_log_error) && !gfs2_withdrawing_or_withdrawn (sdp))gfs2_withdraw_delayed (sdp); if (glock_blocked_by_withdraw(gl) && (target != LM_ST_UNLOCKED ||
@@ -822,7 +822,7 @@ __acquires(&gl->gl_lockref.lock)gfs2_glock_queue_work (gl,0 ); }else if (ret) {fs_err (sdp,"lm_lock ret %d\n" , ret); -GLOCK_BUG_ON (gl, !gfs2_withdrawn (sdp)); +GLOCK_BUG_ON (gl, !gfs2_withdrawing_or_withdrawn (sdp)); } }else {/* lock_nolock */ finish_xmote (gl, target);
fs/gfs2/glops.c +1 -1
@@ -177,7 +177,7 @@ static int gfs2_rgrp_metasync(struct gfs2_glock *gl)filemap_fdatawrite_range (metamapping, start, end); error =filemap_fdatawait_range (metamapping, start, end); -WARN_ON_ONCE (error && !gfs2_withdrawn (sdp)); +WARN_ON_ONCE (error && !gfs2_withdrawing_or_withdrawn (sdp));mapping_set_error (metamapping, error);if (error)gfs2_io_error (sdp);
fs/gfs2/lock_dlm.c +4 -4
@@ -1134,7 +1134,7 @@ static void gdlm_recover_prep(void *arg)struct gfs2_sbd *sdp = arg;struct lm_lockstruct *ls = &sdp->sd_lockstruct; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_err (sdp,"recover_prep ignored due to withdraw.\n" );return ; }
@@ -1160,7 +1160,7 @@ static void gdlm_recover_slot(void *arg, struct dlm_slot *slot)struct lm_lockstruct *ls = &sdp->sd_lockstruct;int jid = slot->slot -1 ; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_err (sdp,"recover_slot jid %d ignored due to withdraw.\n" , jid);return ;
@@ -1189,7 +1189,7 @@ static void gdlm_recover_done(void *arg, struct dlm_slot *slots, int num_slots,struct gfs2_sbd *sdp = arg;struct lm_lockstruct *ls = &sdp->sd_lockstruct; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_err (sdp,"recover_done ignored due to withdraw.\n" );return ; }
@@ -1220,7 +1220,7 @@ static void gdlm_recovery_result(struct gfs2_sbd *sdp, unsigned int jid, {struct lm_lockstruct *ls = &sdp->sd_lockstruct; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_err (sdp,"recovery_result jid %d ignored due to withdraw.\n" , jid);return ;
fs/gfs2/log.c +11 -10
@@ -126,7 +126,7 @@ __acquires(&sdp->sd_ail_lock) } } -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {gfs2_remove_from_ail (bd);continue ; }
@@ -841,7 +841,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,struct super_block *sb = sdp->sd_vfs;u64 dblock; -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))return ; page =mempool_alloc (gfs2_page_pool,GFP_NOIO );
@@ -1047,7 +1047,8 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)* Do this check while holding the log_flush_lock to prevent new * buffers from being added to the ail via gfs2_pin() */ -if (gfs2_withdrawn (sdp) || !test_bit (SDF_JOURNAL_LIVE , &sdp->sd_flags)) +if (gfs2_withdrawing_or_withdrawn (sdp) || + !test_bit (SDF_JOURNAL_LIVE , &sdp->sd_flags)) goto out;/* Log might have been flushed while we waited for the flush lock */
@@ -1096,13 +1097,13 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) goto out_withdraw;gfs2_ordered_write (sdp); -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp)) goto out_withdraw;lops_before_commit (sdp, tr); -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp)) goto out_withdraw;gfs2_log_submit_bio (&sdp->sd_jdesc->jd_log_bio,REQ_OP_WRITE ); -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp)) goto out_withdraw;if (sdp->sd_log_head != sdp->sd_log_flush_head) {
@@ -1110,7 +1111,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) }else if (sdp->sd_log_tail != sdp->sd_log_flush_tail && !sdp->sd_log_idle) {log_write_header (sdp, flags); } -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp)) goto out_withdraw;lops_after_commit (sdp, tr);
@@ -1128,7 +1129,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)if (!(flags &GFS2_LOG_HEAD_FLUSH_NORMAL )) {if (!sdp->sd_log_idle) {empty_ail1_list (sdp); -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp)) goto out_withdraw;log_write_header (sdp, flags); }
@@ -1298,7 +1299,7 @@ int gfs2_logd(void *data)unsigned long t =1 ;while (!kthread_should_stop ()) { -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))break ;/* Check for errors writing to the journal */
@@ -1337,7 +1338,7 @@ int gfs2_logd(void *data)gfs2_ail_flush_reqd (sdp) ||gfs2_jrnl_flush_reqd (sdp) || sdp->sd_log_error || -gfs2_withdrawn (sdp) || +gfs2_withdrawing_or_withdrawn (sdp) ||kthread_should_stop (), t); }
fs/gfs2/meta_io.c +6 -3
@@ -257,7 +257,8 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,struct buffer_head *bh, *bhs[2 ];int num =0 ; -if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp) && + !gfs2_withdraw_in_prog (sdp)) { *bhp =NULL ;return -EIO ; }
@@ -315,7 +316,8 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,int gfs2_meta_wait (struct gfs2_sbd *sdp,struct buffer_head *bh) { -if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp) && + !gfs2_withdraw_in_prog (sdp))return -EIO ;wait_on_buffer (bh);
@@ -326,7 +328,8 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)gfs2_io_error_bh_wd (sdp, bh);return -EIO ; } -if (gfs2_withdrawn (sdp) && !gfs2_withdraw_in_prog (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp) && + !gfs2_withdraw_in_prog (sdp))return -EIO ;return 0 ;
fs/gfs2/ops_fstype.c +1 -1
@@ -1075,7 +1075,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)void gfs2_lm_unmount (struct gfs2_sbd *sdp) {const struct lm_lockops *lm = sdp->sd_lockstruct.ls_ops; -if (!gfs2_withdrawn (sdp) && lm->lm_unmount) +if (!gfs2_withdrawing_or_withdrawn (sdp) && lm->lm_unmount) lm->lm_unmount (sdp); }
fs/gfs2/quota.c +4 -4
@@ -128,7 +128,7 @@ static void gfs2_qd_dispose(struct gfs2_quota_data *qd)hlist_bl_del_rcu (&qd->qd_hlist);spin_unlock_bucket (qd->qd_hash); -if (!gfs2_withdrawn (sdp)) { +if (!gfs2_withdrawing_or_withdrawn (sdp)) {gfs2_assert_warn (sdp, !qd->qd_change);gfs2_assert_warn (sdp, !qd->qd_slot_ref);gfs2_assert_warn (sdp, !qd->qd_bh_count);
@@ -1528,7 +1528,7 @@ static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error) {if (error ==0 || error == -EROFS )return ; -if (!gfs2_withdrawn (sdp)) { +if (!gfs2_withdrawing_or_withdrawn (sdp)) {if (!cmpxchg (&sdp->sd_log_error,0 , error))fs_err (sdp,"gfs2_quotad: %s error %d\n" , msg, error);wake_up (&sdp->sd_logd_waitq);
@@ -1572,7 +1572,7 @@ int gfs2_quotad(void *data)unsigned long t =0 ;while (!kthread_should_stop ()) { -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))break ;/* Update the master statfs file */
@@ -1596,7 +1596,7 @@ int gfs2_quotad(void *data) t =wait_event_interruptible_timeout (sdp->sd_quota_wait, sdp->sd_statfs_force_sync || -gfs2_withdrawn (sdp) || +gfs2_withdrawing_or_withdrawn (sdp) ||kthread_should_stop (), t);
fs/gfs2/recovery.c +1 -1
@@ -411,7 +411,7 @@ void gfs2_recover_func(struct work_struct *work)int error =0 ;int jlocked =0 ; -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_err (sdp,"jid=%u: Recovery not attempted due to withdraw.\n" , jd->jd_jid); goto fail;
fs/gfs2/super.c +5 -5
@@ -134,7 +134,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)int error; j_gl->gl_ops->go_inval (j_gl,DIO_METADATA ); -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))return -EIO ; error =gfs2_find_jhead (sdp->sd_jdesc, &head, false);
@@ -153,7 +153,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)gfs2_log_pointers_init (sdp, head.lh_blkno); error =gfs2_quota_init (sdp); -if (!error &&gfs2_withdrawn (sdp)) +if (!error &&gfs2_withdrawing_or_withdrawn (sdp)) error = -EIO ;if (!error)set_bit (SDF_JOURNAL_LIVE , &sdp->sd_flags);
@@ -499,7 +499,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)return ; } -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))return ;if (!gfs2_glock_is_locked_by_me (ip->i_gl)) { ret =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,0 , &gh);
@@ -605,7 +605,7 @@ static void gfs2_put_super(struct super_block *sb)if (!sb_rdonly (sb))gfs2_make_fs_ro (sdp);else { -if (gfs2_withdrawn (sdp)) +if (gfs2_withdrawing_or_withdrawn (sdp))gfs2_destroy_threads (sdp);gfs2_quota_cleanup (sdp);
@@ -682,7 +682,7 @@ static int gfs2_freeze_locally(struct gfs2_sbd *sdp)if (test_bit (SDF_JOURNAL_LIVE , &sdp->sd_flags)) {gfs2_log_flush (sdp,NULL ,GFS2_LOG_HEAD_FLUSH_FREEZE |GFS2_LFC_FREEZE_GO_SYNC ); -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) { error =thaw_super (sb,FREEZE_HOLDER_USERSPACE );if (error)return error;
fs/gfs2/sys.c +1 -1
@@ -193,7 +193,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)static ssize_t withdraw_show (struct gfs2_sbd *sdp,char *buf) { -unsigned int b =gfs2_withdrawn (sdp); +unsigned int b =gfs2_withdrawing_or_withdrawn (sdp);return snprintf (buf,PAGE_SIZE ,"%u\n" , b); }
fs/gfs2/trans.c +1 -1
@@ -268,7 +268,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh) (unsigned long long)bd->bd_bh->b_blocknr);BUG (); } -if (gfs2_withdrawn (sdp)) { +if (gfs2_withdrawing_or_withdrawn (sdp)) {fs_info (sdp,"GFS2:adding buf while withdrawn! 0x%llx\n" , (unsigned long long )bd->bd_bh->b_blocknr); goto out_unlock;
fs/gfs2/util.c +2 -2
@@ -371,7 +371,7 @@ void gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion, const char *function, char *file, unsigned int line, bool delayed) { - if (gfs2_withdrawn(sdp)) + if (gfs2_withdrawing_or_withdrawn(sdp)) return; fs_err(sdp,
@@ -547,7 +547,7 @@ void gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh, const char *function, char *file, unsigned int line, bool withdraw) { - if (gfs2_withdrawn(sdp)) + if (gfs2_withdrawing_or_withdrawn(sdp)) return; fs_err(sdp, "fatal: I/O error\n"
fs/gfs2/util.h +3 -2
@@ -198,10 +198,11 @@ static inline void gfs2_withdraw_delayed(struct gfs2_sbd *sdp) }/** -* gfs2_withdrawn - test whether the file system is withdrawing or withdrawn +* gfs2_withdrawing_or_withdrawn - test whether the file system is withdrawing +* or withdrawn * @sdp: the superblock */ -static inline bool gfs2_withdrawn (struct gfs2_sbd *sdp) +static inline bool gfs2_withdrawing_or_withdrawn (struct gfs2_sbd *sdp) {return unlikely (test_bit (SDF_WITHDRAWN , &sdp->sd_flags) ||test_bit (SDF_WITHDRAWING , &sdp->sd_flags));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/744 gfs2: finish_xmote cleanup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 1cd28e15864054f3c48baee9eecda1c0441c48ac ]
Currently, function finish_xmote() takes and releases the glock spinlock. However, all of its callers immediately take that spinlock again, so it makes more sense to take the spin lock before calling finish_xmote() already.
With that, thaw_glock() is the only place that sets the GLF_HAVE_REPLY flag outside of the glock spinlock, but it also takes that spinlock immediately thereafter. Change that to set the bit when the spinlock is already held. This allows to switch from test_and_clear_bit() to test_bit() and clear_bit() in glock_work_func().
Stable-dep-of: 9947a06d29c0 ("gfs2: do_xmote fixes")
--- fs/gfs2/glock.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
fs/gfs2/glock.c +13 -8
@@ -600,7 +600,6 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret)struct gfs2_holder *gh;unsigned state = ret &LM_OUT_ST_MASK ; -spin_lock (&gl->gl_lockref.lock);trace_gfs2_glock_state_change (gl, state);state_change (gl, state); gh =find_first_waiter (gl);
@@ -648,7 +647,6 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret) gl->gl_target, state);GLOCK_BUG_ON (gl,1 ); } -spin_unlock (&gl->gl_lockref.lock);return ; }
@@ -671,7 +669,6 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret) } out:clear_bit (GLF_LOCK , &gl->gl_flags); -spin_unlock (&gl->gl_lockref.lock); }static bool is_system_glock (struct gfs2_glock *gl)
@@ -818,15 +815,19 @@ __acquires(&gl->gl_lockref.lock)if (ret == -EINVAL && gl->gl_target ==LM_ST_UNLOCKED && target ==LM_ST_UNLOCKED &&test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) { +spin_lock (&gl->gl_lockref.lock);finish_xmote (gl, target); -gfs2_glock_queue_work (gl,0 ); +__gfs2_glock_queue_work (gl,0 ); +spin_unlock (&gl->gl_lockref.lock); }else if (ret) {fs_err (sdp,"lm_lock ret %d\n" , ret);GLOCK_BUG_ON (gl, !gfs2_withdrawing_or_withdrawn (sdp)); } }else {/* lock_nolock */ +spin_lock (&gl->gl_lockref.lock);finish_xmote (gl, target); -gfs2_glock_queue_work (gl,0 ); +__gfs2_glock_queue_work (gl,0 ); +spin_unlock (&gl->gl_lockref.lock); } out:spin_lock (&gl->gl_lockref.lock);
@@ -1082,11 +1083,12 @@ static void glock_work_func(struct work_struct *work) struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_work.work);unsigned int drop_refs =1 ; -if (test_and_clear_bit (GLF_REPLY_PENDING , &gl->gl_flags)) { +spin_lock (&gl->gl_lockref.lock); +if (test_bit (GLF_REPLY_PENDING , &gl->gl_flags)) { +clear_bit (GLF_REPLY_PENDING , &gl->gl_flags);finish_xmote (gl, gl->gl_reply); drop_refs++; } -spin_lock (&gl->gl_lockref.lock);if (test_bit (GLF_PENDING_DEMOTE , &gl->gl_flags) && gl->gl_state !=LM_ST_UNLOCKED && gl->gl_demote_state !=LM_ST_EXCLUSIVE ) {
@@ -2144,8 +2146,11 @@ static void thaw_glock(struct gfs2_glock *gl)return ;if (!lockref_get_not_dead (&gl->gl_lockref))return ; + +spin_lock (&gl->gl_lockref.lock);set_bit (GLF_REPLY_PENDING , &gl->gl_flags); -gfs2_glock_queue_work (gl,0 ); +__gfs2_glock_queue_work (gl,0 ); +spin_unlock (&gl->gl_lockref.lock); }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/744 gfs2: do_xmote fixes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 9947a06d29c0a30da88cdc6376ca5fd87083e130 ]
Function do_xmote() is called with the glock spinlock held. Commit 86934198eefa added a 'goto skip_inval' statement at the beginning of the function to further below where the glock spinlock is expected not to be held anymore. Then it added code there that requires the glock spinlock to be held. This doesn't make sense; fix this up by dropping and retaking the spinlock where needed.
In addition, when ->lm_lock() returned an error, do_xmote() didn't fail the locking operation, and simply left the glock hanging; fix that as well. (This is a much older error.)
--- fs/gfs2/glock.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-)
fs/gfs2/glock.c +25 -19
@@ -696,6 +696,7 @@ __acquires(&gl->gl_lockref.lock) {const struct gfs2_glock_operations *glops = gl->gl_ops;struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; +struct lm_lockstruct *ls = &sdp->sd_lockstruct;unsigned int lck_flags = (unsigned int )(gh ? gh->gh_flags :0 );int ret;
@@ -724,6 +725,9 @@ __acquires(&gl->gl_lockref.lock) (gl->gl_state == LM_ST_EXCLUSIVE) || (lck_flags & (LM_FLAG_TRY|LM_FLAG_TRY_1CB)))clear_bit (GLF_BLOCKING , &gl->gl_flags); +if (!glops->go_inval && !glops->go_sync) + goto skip_inval; +spin_unlock (&gl->gl_lockref.lock);if (glops->go_sync) { ret = glops->go_sync (gl);
@@ -736,6 +740,7 @@ __acquires(&gl->gl_lockref.lock)fs_err (sdp,"Error %d syncing glock \n" , ret);gfs2_dump_glock (NULL , gl, true); } +spin_lock (&gl->gl_lockref.lock); goto skip_inval; } }
@@ -756,9 +761,10 @@ __acquires(&gl->gl_lockref.lock) glops->go_inval (gl, target ==LM_ST_DEFERRED ?0 :DIO_METADATA );clear_bit (GLF_INVALIDATE_IN_PROGRESS , &gl->gl_flags); } +spin_lock (&gl->gl_lockref.lock); skip_inval: -gfs2_glock_hold (gl); + gl->gl_lockref.count++;/* * Check for an error encountered since we called go_sync and go_inval. * If so, we can't withdraw from the glock code because the withdraw
@@ -800,37 +806,37 @@ __acquires(&gl->gl_lockref.lock)*/ clear_bit (GLF_LOCK , &gl->gl_flags);clear_bit (GLF_DEMOTE_IN_PROGRESS , &gl->gl_flags); -gfs2_glock_queue_work (gl,GL_GLOCK_DFT_HOLD ); - goto out; +__gfs2_glock_queue_work (gl,GL_GLOCK_DFT_HOLD ); +return ; }else {clear_bit (GLF_INVALIDATE_IN_PROGRESS , &gl->gl_flags); } } -if (sdp->sd_lockstruct.ls_ops->lm_lock) { -struct lm_lockstruct *ls = &sdp->sd_lockstruct; +if (ls->ls_ops->lm_lock) { +spin_unlock (&gl->gl_lockref.lock); + ret = ls->ls_ops->lm_lock (gl, target, lck_flags); +spin_lock (&gl->gl_lockref.lock); -/* lock_dlm */ - ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret == -EINVAL && gl->gl_target ==LM_ST_UNLOCKED && target ==LM_ST_UNLOCKED &&test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) { -spin_lock (&gl->gl_lockref.lock); -finish_xmote (gl, target); -__gfs2_glock_queue_work (gl,0 ); -spin_unlock (&gl->gl_lockref.lock); +/* +* The lockspace has been released and the lock has +* been unlocked implicitly. +*/ }else if (ret) {fs_err (sdp,"lm_lock ret %d\n" , ret); -GLOCK_BUG_ON (gl, !gfs2_withdrawing_or_withdrawn (sdp)); + target = gl->gl_state |LM_OUT_ERROR ; + }else { +/* The operation will be completed asynchronously. */ +return ; } - }else {/* lock_nolock */ -spin_lock (&gl->gl_lockref.lock); -finish_xmote (gl, target); -__gfs2_glock_queue_work (gl,0 ); -spin_unlock (&gl->gl_lockref.lock); } -out: -spin_lock (&gl->gl_lockref.lock); + +/* Complete the operation now. */ +finish_xmote (gl, target); +__gfs2_glock_queue_work (gl,0 ); }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/744 selftests/bpf: Fix a fd leak in error paths in open_netns
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 151f7442436658ee84076681d8f52e987fe147ea ]
As Martin mentioned in review comment, there is an existing bug that orig_netns_fd will be leaked in the later "goto fail;" case after open("/proc/self/ns/net") in open_netns() in network_helpers.c. This patch adds "close(token->orig_netns_fd);" before "free(token);" to fix it.
--- tools/testing/selftests/bpf/network_helpers.c | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +2 -0
@@ -427,6 +427,8 @@ struct nstoken *open_netns(const char *name)return token; fail: +if (token->orig_netns_fd !=-1 ) +close (token->orig_netns_fd);free (token);return NULL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/744 scsi: ufs: core: mcq: Fix ufshcd_mcq_sqe_search()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 3c5d0dce8ce0a2781ac306b9ad1492b005ecbab5 ]
Fix the calculation of the utrd pointer. This patch addresses the following Coverity complaint:
CID 1538170: (#1 of 1): Extra sizeof expression (SIZEOF_MISMATCH) suspicious_pointer_arithmetic: Adding sq_head_slot * 32UL /* sizeof (struct utp_transfer_req_desc) */ to pointer hwq->sqe_base_addr of type struct utp_transfer_req_desc * is suspicious because adding an integral value to this pointer automatically scales that value by the size, 32 bytes, of the pointed-to type, struct utp_transfer_req_desc. Most likely, the multiplication by sizeof (struct utp_transfer_req_desc) in this expression is extraneous and should be eliminated.
--- drivers/ufs/core/ufs-mcq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ufs/core/ufs-mcq.c +1 -2
@@ -597,8 +597,7 @@ static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba, addr =le64_to_cpu (cmd_desc_base_addr) &CQE_UCD_BA ;while (sq_head_slot != hwq->sq_tail_slot) { - utrd = hwq->sqe_base_addr + - sq_head_slot *sizeof (struct utp_transfer_req_desc ); + utrd = hwq->sqe_base_addr + sq_head_slot; match =le64_to_cpu (utrd->command_desc_base_addr) &CQE_UCD_BA ;if (addr == match) {ufshcd_mcq_nullify_sqe (utrd);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/744 cpufreq: brcmstb-avs-cpufreq: ISO C90 forbids mixed declarations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Portia Stephens <[email protected]>
[ Upstream commit fa7bd98f3c8b33fb68c6b2bc69cff32b63db69f8 ]
There is a compile warning because a NULL pointer check was added before a struct was declared. This moves the NULL pointer check to after the struct is declared and moves the struct assignment to after the NULL pointer check.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +4 -1
@@ -481,9 +481,12 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)static unsigned int brcm_avs_cpufreq_get (unsigned int cpu) {struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); +struct private_data *priv; +if (!policy)return 0 ; -struct private_data *priv = policy->driver_data; + + priv = policy->driver_data;cpufreq_cpu_put (policy);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/744 wifi: ath10k: populate board data for WCN3990
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 f1f1b5b055c9f27a2f90fd0f0521f5920e9b3c18 ]
Specify board data size (and board.bin filename) for the WCN3990 platform.
--- drivers/net/wireless/ath/ath10k/core.c | 3 +++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/targaddrs.h | 3 +++ 3 files changed, 7 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +3 -0
@@ -704,6 +704,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .max_spatial_stream = 4, .fw = { .dir = WCN3990_HW_1_0_FW_DIR, + .board = WCN3990_HW_1_0_BOARD_DATA_FILE, + .board_size = WCN3990_BOARD_DATA_SZ, + .board_ext_size = WCN3990_BOARD_EXT_DATA_SZ, }, .sw_decrypt_mcast_mgmt = true, .rx_desc_ops = &wcn3990_rx_desc_ops,
drivers/net/wireless/ath/ath10k/hw.h +1 -0
@@ -132,6 +132,7 @@ enum qca9377_chip_id_rev {/* WCN3990 1.0 definitions */ #define WCN3990_HW_1_0_DEV_VERSION ATH10K_HW_WCN3990#define WCN3990_HW_1_0_FW_DIR ATH10K_FW_DIR "/WCN3990/hw1.0" +#define WCN3990_HW_1_0_BOARD_DATA_FILE "board.bin"#define ATH10K_FW_FILE_BASE "firmware"#define ATH10K_FW_API_MAX 6
drivers/net/wireless/ath/ath10k/targaddrs.h +3 -0
@@ -491,4 +491,7 @@ struct host_interest {#define QCA4019_BOARD_DATA_SZ 12064#define QCA4019_BOARD_EXT_DATA_SZ 0 +#define WCN3990_BOARD_DATA_SZ 26328 +#define WCN3990_BOARD_EXT_DATA_SZ 0 +#endif /* __TARGADDRS_H__ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/744 net: dsa: mv88e6xxx: Add support for model-specific pre- and post-reset handlers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Schiffer <[email protected]>
[ Upstream commit 0fdd27b9d6d7c60bd319d3497ad797934bab13cb ]
Instead of calling mv88e6xxx_g2_eeprom_wait() directly from mv88e6xxx_hardware_reset(), add configurable pre- and post-reset hard reset handlers. Initially, the handlers are set to mv88e6xxx_g2_eeprom_wait() for all families that have get/set_eeprom() to match the existing behavior. No functional change intended (except for additional error messages on failure).
--- drivers/net/dsa/mv88e6xxx/chip.c | 50 +++++++++++++++++++++++++++++--- drivers/net/dsa/mv88e6xxx/chip.h | 6 ++++ 2 files changed, 52 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +46 -4
@@ -3021,6 +3021,7 @@ static int mv88e6xxx_software_reset(struct mv88e6xxx_chip *chip)static void mv88e6xxx_hardware_reset (struct mv88e6xxx_chip *chip) {struct gpio_desc *gpiod = chip->reset; +int err;/* If there is a GPIO connected to the reset pin, toggle it */ if (gpiod) {
@@ -3029,17 +3030,26 @@ static void mv88e6xxx_hardware_reset(struct mv88e6xxx_chip *chip)* mid-byte, causing the first EEPROM read after the reset * from the wrong location resulting in the switch booting * to wrong mode and inoperable. +* For this reason, switch families with EEPROM support +* generally wait for EEPROM loads to complete as their pre- +* and post-reset handlers. */ -if (chip->info->ops->get_eeprom) -mv88e6xxx_g2_eeprom_wait (chip); +if (chip->info->ops->hardware_reset_pre) { + err = chip->info->ops->hardware_reset_pre (chip); +if (err) +dev_err (chip->dev,"pre-reset error: %d\n" , err); + }gpiod_set_value_cansleep (gpiod,1 );usleep_range (10000 ,20000 );gpiod_set_value_cansleep (gpiod,0 );usleep_range (10000 ,20000 ); -if (chip->info->ops->get_eeprom) -mv88e6xxx_g2_eeprom_wait (chip); +if (chip->info->ops->hardware_reset_post) { + err = chip->info->ops->hardware_reset_post (chip); +if (err) +dev_err (chip->dev,"post-reset error: %d\n" , err); + } } }
@@ -4266,6 +4276,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4456,6 +4468,8 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4556,6 +4570,8 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4650,6 +4666,8 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4708,6 +4726,8 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4764,6 +4784,8 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4823,6 +4845,8 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4876,6 +4900,8 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { .watchdog_ops = &mv88e6250_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6250_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -4923,6 +4949,8 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4982,6 +5010,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -5028,6 +5058,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -5078,6 +5110,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5233,6 +5267,8 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5295,6 +5331,8 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5357,6 +5395,8 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5422,6 +5462,8 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .watchdog_ops = &mv88e6393x_watchdog_ops, .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
drivers/net/dsa/mv88e6xxx/chip.h +6 -0
@@ -476,6 +476,12 @@ struct mv88e6xxx_ops {int (*ppu_enable)(struct mv88e6xxx_chip *chip);int (*ppu_disable)(struct mv88e6xxx_chip *chip); +/* Additional handlers to run before and after hard reset, to make sure +* that the switch and EEPROM are in a good state. +*/ +int (*hardware_reset_pre)(struct mv88e6xxx_chip *chip); +int (*hardware_reset_post)(struct mv88e6xxx_chip *chip); +/* Switch Software Reset */ int (*reset)(struct mv88e6xxx_chip *chip);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/744 net: dsa: mv88e6xxx: Avoid EEPROM timeout without EEPROM on 88E6250-family switches
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Schiffer <[email protected]>
[ Upstream commit e44894e2aa4eb311ceda134de8b6f51ff979211b ]
88E6250-family switches have the quirk that the EEPROM Running flag can get stuck at 1 when no EEPROM is connected, causing mv88e6xxx_g2_eeprom_wait() to time out. We still want to wait for the EEPROM however, to avoid interrupting a transfer and leaving the EEPROM in an invalid state.
The condition to wait for recommended by the hardware spec is the EEInt flag, however this flag is cleared on read, so before the hardware reset, is may have been cleared already even though the EEPROM has been read successfully.
For this reason, we revive the mv88e6xxx_g1_wait_eeprom_done() function that was removed in commit 6ccf50d4d474
("net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent") in a slightly refactored form, and introduce a new mv88e6xxx_g1_wait_eeprom_done_prereset() that additionally handles this case by triggering another EEPROM reload that can be waited on.
On other switch models without this quirk, mv88e6xxx_g2_eeprom_wait() is kept, as it avoids the additional reload.
--- drivers/net/dsa/mv88e6xxx/chip.c | 4 +- drivers/net/dsa/mv88e6xxx/global1.c | 89 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/global1.h | 2 + 3 files changed, 93 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +2 -2
@@ -4900,8 +4900,8 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { .watchdog_ops = &mv88e6250_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, - .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, - .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_pre = mv88e6250_g1_wait_eeprom_done_prereset, + .hardware_reset_post = mv88e6xxx_g1_wait_eeprom_done, .reset = mv88e6250_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
drivers/net/dsa/mv88e6xxx/global1.c +89 -0
95 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -282,6 +282,8 @@ int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);int mv88e6185_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6352_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6250_g1_reset (struct mv88e6xxx_chip *chip); +int mv88e6xxx_g1_wait_eeprom_done (struct mv88e6xxx_chip *chip); +int mv88e6250_g1_wait_eeprom_done_prereset (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_enable (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_disable (struct mv88e6xxx_chip *chip);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/744 tcp: avoid premature drops in tcp_add_backlog()
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 ec00ed472bdb7d0af840da68c8c11bff9f4d9caa ]
While testing TCP performance with latest trees,
I saw suspect SOCKET_BACKLOG drops.
tcp_add_backlog() computes its limit with :
limit = (u32)READ_ONCE(sk->sk_rcvbuf) +
(u32)(READ_ONCE(sk->sk_sndbuf) >> 1);
limit += 64 * 1024;This does not take into account that sk->sk_backlog.len is reset only at the very end of __release_sock().
Both sk->sk_backlog.len and sk->sk_rmem_alloc could reach sk_rcvbuf in normal conditions.
We should double sk->sk_rcvbuf contribution in the formula to absorb bubbles in the backlog, which happen more often for very fast flows.
This change maintains decent protection against abuses.
--- net/ipv4/tcp_ipv4.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/ipv4/tcp_ipv4.c +11 -2
@@ -1822,7 +1822,7 @@ int tcp_v4_early_demux(struct sk_buff *skb)bool tcp_add_backlog (struct sock *sk,struct sk_buff *skb,enum skb_drop_reason *reason) { -u32 limit, tail_gso_size, tail_gso_segs; +u32 tail_gso_size, tail_gso_segs;struct skb_shared_info *shinfo;const struct tcphdr *th;struct tcphdr *thtail;
@@ -1831,6 +1831,7 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,bool fragstolen;u32 gso_segs;u32 gso_size; +u64 limit;int delta;/* In case all data was pulled from skb frags (in __pskb_pull_tail()),
@@ -1928,7 +1929,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,__skb_push (skb, hdrlen); no_coalesce: - limit = (u32 )READ_ONCE (sk->sk_rcvbuf) + (u32)(READ_ONCE (sk->sk_sndbuf) >>1 ); +/* sk->sk_backlog.len is reset only at the end of __release_sock(). +* Both sk->sk_backlog.len and sk->sk_rmem_alloc could reach +* sk_rcvbuf in normal conditions. +*/ + limit = ((u64 )READ_ONCE (sk->sk_rcvbuf)) <<1 ; + + limit += ((u32 )READ_ONCE (sk->sk_sndbuf)) >>1 ;/* Only socket owner can try to collapse/prune rx queues * to reduce memory overhead, so add a little headroom here.
@@ -1936,6 +1943,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,*/ limit +=64 *1024 ; + limit =min_t (u64, limit,UINT_MAX ); +if (unlikely (sk_add_backlog (sk, skb, limit))) {bh_unlock_sock (sk); *reason =SKB_DROP_REASON_SOCKET_BACKLOG ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/744 pwm: sti: Prepare removing pwm_chip from driver data
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 54272761ce7c475fa30a31b59b0cb89f7652b39e ]
This prepares the driver for further changes that will drop struct pwm_chip chip from struct sti_pwm_chip. Use the pwm_chip as driver data instead of the sti_pwm_chip to get access to the pwm_chip in sti_pwm_remove() without using pc->chip.
Stable-dep-of: 5bb0b194aeee ("pwm: sti: Simplify probe function using devm functions")
--- drivers/pwm/pwm-sti.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/pwm/pwm-sti.c +10 -7
@@ -571,6 +571,7 @@ static int sti_pwm_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct sti_pwm_compat_data *cdata; +struct pwm_chip *chip;struct sti_pwm_chip *pc;unsigned int i;int irq, ret;
@@ -578,6 +579,7 @@ static int sti_pwm_probe(struct platform_device *pdev) pc =devm_kzalloc (dev,sizeof (*pc),GFP_KERNEL );if (!pc)return -ENOMEM ; + chip = &pc->chip; cdata =devm_kzalloc (dev,sizeof (*cdata),GFP_KERNEL );if (!cdata)
@@ -654,9 +656,9 @@ static int sti_pwm_probe(struct platform_device *pdev)return -ENOMEM ; } - pc->chip.dev = dev; - pc->chip.ops = &sti_pwm_ops; - pc->chip.npwm =max (cdata->pwm_num_devs, cdata->cpt_num_devs); + chip->dev = dev; + chip->ops = &sti_pwm_ops; + chip->npwm =max (cdata->pwm_num_devs, cdata->cpt_num_devs);for (i =0 ; i < cdata->cpt_num_devs; i++) {struct sti_cpt_ddata *ddata = &cdata->ddata[i];
@@ -665,23 +667,24 @@ static int sti_pwm_probe(struct platform_device *pdev)mutex_init (&ddata->lock); } - ret =pwmchip_add (&pc->chip); + ret =pwmchip_add (chip);if (ret <0 ) {clk_unprepare (pc->pwm_clk);clk_unprepare (pc->cpt_clk);return ret; } -platform_set_drvdata (pdev, pc); +platform_set_drvdata (pdev, chip);return 0 ; }static void sti_pwm_remove (struct platform_device *pdev) { -struct sti_pwm_chip *pc =platform_get_drvdata (pdev); +struct pwm_chip *chip =platform_get_drvdata (pdev); +struct sti_pwm_chip *pc =to_sti_pwmchip (chip); -pwmchip_remove (&pc->chip); +pwmchip_remove (chip);clk_unprepare (pc->pwm_clk);clk_unprepare (pc->cpt_clk);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/744 pwm: sti: Simplify probe function using devm functions
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 5bb0b194aeee5d5da6881232f4e9989b35957c25 ]
Instead of of_clk_get_by_name() use devm_clk_get_prepared() which has several advantages:
- Combines getting the clock and a call to clk_prepare(). The latter can be dropped from sti_pwm_probe() accordingly.
- Cares for calling clk_put() which is missing in both probe's error path and the remove function.
- Cares for calling clk_unprepare() which can be dropped from the error paths and the remove function. (Note that not all error path got this right.)
With additionally using devm_pwmchip_add() instead of pwmchip_add() the remove callback can be dropped completely. With it the last user of platform_get_drvdata() goes away and so platform_set_drvdata() can be dropped from the probe function, too.
--- drivers/pwm/pwm-sti.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-)
drivers/pwm/pwm-sti.c +3 -36
@@ -625,32 +625,20 @@ static int sti_pwm_probe(struct platform_device *pdev)return ret;if (cdata->pwm_num_devs) { - pc->pwm_clk =of_clk_get_by_name (dev->of_node,"pwm" ); + pc->pwm_clk =devm_clk_get_prepared (dev,"pwm" );if (IS_ERR (pc->pwm_clk)) {dev_err (dev,"failed to get PWM clock\n" );return PTR_ERR (pc->pwm_clk); } - - ret =clk_prepare (pc->pwm_clk); -if (ret) { -dev_err (dev,"failed to prepare clock\n" ); -return ret; - } }if (cdata->cpt_num_devs) { - pc->cpt_clk =of_clk_get_by_name (dev->of_node,"capture" ); + pc->cpt_clk =devm_clk_get_prepared (dev,"capture" );if (IS_ERR (pc->cpt_clk)) {dev_err (dev,"failed to get PWM capture clock\n" );return PTR_ERR (pc->cpt_clk); } - ret =clk_prepare (pc->cpt_clk); -if (ret) { -dev_err (dev,"failed to prepare clock\n" ); -return ret; - } - cdata->ddata =devm_kzalloc (dev, cdata->cpt_num_devs *sizeof (*cdata->ddata),GFP_KERNEL );if (!cdata->ddata)return -ENOMEM ;
@@ -667,27 +655,7 @@ static int sti_pwm_probe(struct platform_device *pdev)mutex_init (&ddata->lock); } - ret =pwmchip_add (chip); -if (ret <0 ) { -clk_unprepare (pc->pwm_clk); -clk_unprepare (pc->cpt_clk); -return ret; - } - -platform_set_drvdata (pdev, chip); - -return 0 ; -} - -static void sti_pwm_remove (struct platform_device *pdev) -{ -struct pwm_chip *chip =platform_get_drvdata (pdev); -struct sti_pwm_chip *pc =to_sti_pwmchip (chip); - -pwmchip_remove (chip); - -clk_unprepare (pc->pwm_clk); -clk_unprepare (pc->cpt_clk); +return devm_pwmchip_add (dev, chip); }static const struct of_device_id sti_pwm_of_match[] = {
@@ -702,7 +670,6 @@ static struct platform_driver sti_pwm_driver = { .of_match_table = sti_pwm_of_match, }, .probe = sti_pwm_probe, - .remove_new = sti_pwm_remove, };module_platform_driver (sti_pwm_driver);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/744 drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhao He <[email protected]>
[ Upstream commit 77fce82678ea5fd51442e62febec2004f79e041b ]
The perf tool allows users to create event groups through following cmd [1], but the driver does not check whether the array index is out of bounds when writing data to the event_group array. If the number of events in an event_group is greater than HISI_PCIE_MAX_COUNTERS, the memory write overflow of event_group array occurs.
Add array index check to fix the possible array out of bounds violation, and return directly when write new events are written to array bounds.
There are 9 different events in an event_group.
[1] perf stat -e '{pmu/event1/, ... ,pmu/event9/}'
--- drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/perf/hisilicon/hisi_pcie_pmu.c +13 -1
@@ -337,15 +337,27 @@ static bool hisi_pcie_pmu_validate_event_group(struct perf_event *event)return false;for (num =0 ; num < counters; num++) { +/* +* If we find a related event, then it's a valid group +* since we don't need to allocate a new counter for it. +*/ if (hisi_pcie_pmu_cmp_event (event_group[num], sibling))break ; } +/* +* Otherwise it's a new event but if there's no available counter, +* fail the check since we cannot schedule all the events in +* the group simultaneously. +*/ +if (num ==HISI_PCIE_MAX_COUNTERS ) +return false; +if (num == counters) event_group[counters++] = sibling; } -return counters <=HISI_PCIE_MAX_COUNTERS ; +return true; }static int hisi_pcie_pmu_event_init (struct perf_event *event)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/744 drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhao He <[email protected]>
[ Upstream commit 81bdd60a3d1d3b05e6cc6674845afb1694dd3a0e ]
The perf tool allows users to create event groups through following cmd [1], but the driver does not check whether the array index is out of bounds when writing data to the event_group array. If the number of events in an event_group is greater than HNS3_PMU_MAX_HW_EVENTS, the memory write overflow of event_group array occurs.
Add array index check to fix the possible array out of bounds violation, and return directly when write new events are written to array bounds.
There are 9 different events in an event_group.
[1] perf stat -e '{pmu/event1/, ... ,pmu/event9/}
--- drivers/perf/hisilicon/hns3_pmu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/perf/hisilicon/hns3_pmu.c +13 -1
@@ -1085,15 +1085,27 @@ static bool hns3_pmu_validate_event_group(struct perf_event *event)return false;for (num =0 ; num < counters; num++) { +/* +* If we find a related event, then it's a valid group +* since we don't need to allocate a new counter for it. +*/ if (hns3_pmu_cmp_event (event_group[num], sibling))break ; } +/* +* Otherwise it's a new event but if there's no available counter, +* fail the check since we cannot schedule all the events in +* the group simultaneously. +*/ +if (num ==HNS3_PMU_MAX_HW_EVENTS ) +return false; +if (num == counters) event_group[counters++] = sibling; } -return counters <=HNS3_PMU_MAX_HW_EVENTS ; +return true; }static u32 hns3_pmu_get_filter_condition (struct perf_event *event)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/744 drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hao Chen <[email protected]>
[ Upstream commit 582c1aeee0a9e73010cf1c4cef338709860deeb0 ]
pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action() fails, the irq vector is not freed, which leads to a memory leak.
Replace the devm_add_action with devm_add_action_or_reset to ensure the irq vector can be destroyed when it fails.
--- drivers/perf/hisilicon/hns3_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/hisilicon/hns3_pmu.c +1 -1
@@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,return ret; } - ret =devm_add_action (&pdev->dev, hns3_pmu_free_irq, pdev); + ret =devm_add_action_or_reset (&pdev->dev, hns3_pmu_free_irq, pdev);if (ret) {pci_err (pdev,"failed to add free irq action, ret = %d.\n" , ret);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/744 net: give more chances to rcu in netdev_wait_allrefs_any()
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 cd42ba1c8ac9deb9032add6adf491110e7442040 ]
This came while reviewing commit c4e86b4363ac ("net: add two more call_rcu_hurry()").
Paolo asked if adding one synchronize_rcu() would help.
While synchronize_rcu() does not help, making sure to call rcu_barrier() before msleep(wait) is definitely helping to make sure lazy call_rcu() are completed.
Instead of waiting ~100 seconds in my tests, the ref_tracker splats occurs one time only, and netdev_wait_allrefs_any() latency is reduced to the strict minimum.
Ideally we should audit our call_rcu() users to make sure no refcount (or cascading call_rcu()) is held too long, because rcu_barrier() is quite expensive.
--- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/dev.c +2 -1
@@ -10430,8 +10430,9 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) rebroadcast_time = jiffies; } +rcu_barrier (); +if (!wait) { -rcu_barrier (); wait =WAIT_REFS_MIN_MSECS ; }else {msleep (wait);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/744 macintosh/via-macii: Fix "BUG: sleeping function called from invalid context"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Finn Thain <[email protected]>
[ Upstream commit d301a71c76ee4c384b4e03cdc320a55f5cf1df05 ]
The via-macii ADB driver calls request_irq() after disabling hard interrupts. But disabling interrupts isn't necessary here because the VIA shift register interrupt was masked during VIA1 initialization.
--- drivers/macintosh/via-macii.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/macintosh/via-macii.c +3 -8
@@ -140,24 +140,19 @@ static int macii_probe(void)/* Initialize the driver */ static int macii_init (void ) { -unsigned long flags;int err; -local_irq_save (flags); - err =macii_init_via ();if (err) - goto out; +return err; err =request_irq (IRQ_MAC_ADB , macii_interrupt,0 ,"ADB" , macii_interrupt);if (err) - goto out; +return err; macii_state = idle; -out: -local_irq_restore (flags); -return err; +return 0 ; }/* initialize the hardware */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/744 wifi: carl9170: add a proper sanity check for endpoints
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit b6dd09b3dac89b45d1ea3e3bd035a3859c0369a0 ]
Syzkaller reports [1] hitting a warning which is caused by presence of a wrong endpoint type at the URB sumbitting stage. While there was a check for a specific 4th endpoint, since it can switch types between bulk and interrupt, other endpoints are trusted implicitly. Similar warning is triggered in a couple of other syzbot issues [2].
Fix the issue by doing a comprehensive check of all endpoints taking into account difference between high- and full-speed configuration.
[1] Syzkaller report:
...
WARNING: CPU: 0 PID: 4721 at drivers/usb/core/urb.c:504 usb_submit_urb+0xed6/0x1880 drivers/usb/core/urb.c:504 ... Call Trace: <TASK> carl9170_usb_send_rx_irq_urb+0x273/0x340 drivers/net/wireless/ath/carl9170/usb.c:504 carl9170_usb_init_device drivers/net/wireless/ath/carl9170/usb.c:939 [inline] carl9170_usb_firmware_finish drivers/net/wireless/ath/carl9170/usb.c:999 [inline] carl9170_usb_firmware_step2+0x175/0x240 drivers/net/wireless/ath/carl9170/usb.c:1028 request_firmware_work_func+0x130/0x240 drivers/base/firmware_loader/main.c:1107 process_one_work+0x9bf/0x1710 kernel/workqueue.c:2289 worker_thread+0x669/0x1090 kernel/workqueue.c:2436 kthread+0x2e8/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:308 </TASK>
[2] Related syzkaller crashes:
--- drivers/net/wireless/ath/carl9170/usb.c | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/net/wireless/ath/carl9170/usb.c +32 -0
@@ -1069,6 +1069,38 @@ static int carl9170_usb_probe(struct usb_interface *intf, ar->usb_ep_cmd_is_bulk = true; } +/* Verify that all expected endpoints are present */ +if (ar->usb_ep_cmd_is_bulk) { +u8 bulk_ep_addr[] = { +AR9170_USB_EP_RX |USB_DIR_IN , +AR9170_USB_EP_TX |USB_DIR_OUT , +AR9170_USB_EP_CMD |USB_DIR_OUT , +0 }; +u8 int_ep_addr[] = { +AR9170_USB_EP_IRQ |USB_DIR_IN , +0 }; +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr) || + !usb_check_int_endpoints (intf, int_ep_addr)) + err = -ENODEV ; + }else { +u8 bulk_ep_addr[] = { +AR9170_USB_EP_RX |USB_DIR_IN , +AR9170_USB_EP_TX |USB_DIR_OUT , +0 }; +u8 int_ep_addr[] = { +AR9170_USB_EP_IRQ |USB_DIR_IN , +AR9170_USB_EP_CMD |USB_DIR_OUT , +0 }; +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr) || + !usb_check_int_endpoints (intf, int_ep_addr)) + err = -ENODEV ; + } + +if (err) { +carl9170_free (ar); +return err; + } +usb_set_intfdata (intf, ar);SET_IEEE80211_DEV (ar->hw, &intf->dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/744 bpf: Fix verifier assumptions about socket->sk
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit 0db63c0b86e981a1e97d2596d64ceceba1a5470e ]
The verifier assumes that 'sk' field in 'struct socket' is valid and non-NULL when 'socket' pointer itself is trusted and non-NULL. That may not be the case when socket was just created and passed to LSM socket_accept hook.
Fix this verifier assumption and adjust tests.
--- kernel/bpf/verifier.c | 23 +++++++++++++++---- .../bpf/progs/bench_local_storage_create.c | 5 ++-- .../selftests/bpf/progs/local_storage.c | 20 ++++++++-------- .../testing/selftests/bpf/progs/lsm_cgroup.c | 8 +++++-- 4 files changed, 38 insertions(+), 18 deletions(-)
kernel/bpf/verifier.c +18 -5
@@ -2539,6 +2539,8 @@ static void mark_btf_ld_reg(struct bpf_verifier_env *env, regs[regno].type =PTR_TO_BTF_ID | flag; regs[regno].btf = btf; regs[regno].btf_id = btf_id; +if (type_may_be_null (flag)) + regs[regno].id = ++env->id_gen; }#define DEF_NOT_SUBREG (0)
@@ -5373,8 +5375,6 @@ static int check_map_kptr_access(struct bpf_verifier_env *env, u32 regno,rcu_safe_kptr (kptr_field) &&in_rcu_cs (env) ?PTR_MAYBE_NULL |MEM_RCU : PTR_MAYBE_NULL | PTR_UNTRUSTED); -/* For mark_ptr_or_null_reg */ - val_reg->id = ++env->id_gen; }else if (class ==BPF_STX ) { val_reg =reg_state (env, value_regno); if (!register_is_null(val_reg) &&
@@ -5684,7 +5684,8 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)return true;/* Types listed in the reg2btf_ids are always trusted */ -if (reg2btf_ids[base_type (reg->type)]) +if (reg2btf_ids[base_type (reg->type)] && + !bpf_type_has_unsafe_modifiers (reg->type))return true;/* If a register is not referenced, it is trusted if it has the
@@ -6263,6 +6264,7 @@ static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val,#define BTF_TYPE_SAFE_RCU (__type) __PASTE(__type, __safe_rcu)#define BTF_TYPE_SAFE_RCU_OR_NULL (__type) __PASTE(__type, __safe_rcu_or_null)#define BTF_TYPE_SAFE_TRUSTED (__type) __PASTE(__type, __safe_trusted) +#define BTF_TYPE_SAFE_TRUSTED_OR_NULL (__type) __PASTE(__type, __safe_trusted_or_null)/* * Allow list few fields as RCU trusted or full trusted.
@@ -6326,7 +6328,7 @@ BTF_TYPE_SAFE_TRUSTED(struct dentry) {struct inode *d_inode; }; -BTF_TYPE_SAFE_TRUSTED(struct socket) { +BTF_TYPE_SAFE_TRUSTED_OR_NULL(struct socket) {struct sock *sk; };
@@ -6361,11 +6363,20 @@ static bool type_is_trusted(struct bpf_verifier_env *env,BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct linux_binprm ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct file ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct dentry )); -BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct socket ));return btf_nested_type_is_trusted (&env->log, reg, field_name, btf_id,"__safe_trusted" ); } +static bool type_is_trusted_or_null (struct bpf_verifier_env *env, +struct bpf_reg_state *reg, +const char *field_name,u32 btf_id) +{ +BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED_OR_NULL(struct socket )); + +return btf_nested_type_is_trusted (&env->log, reg, field_name, btf_id, +"__safe_trusted_or_null" ); +} + static int check_ptr_to_btf_access(struct bpf_verifier_env *env, struct bpf_reg_state *regs, int regno, int off, int size,
@@ -6474,6 +6485,8 @@ static int check_ptr_to_btf_access(struct bpf_verifier_env *env,*/ if (type_is_trusted (env, reg, field_name, btf_id)) { flag |=PTR_TRUSTED ; + }else if (type_is_trusted_or_null (env, reg, field_name, btf_id)) { + flag |=PTR_TRUSTED |PTR_MAYBE_NULL ; }else if (in_rcu_cs (env) && !type_may_be_null (reg->type)) {if (type_is_rcu (env, reg, field_name, btf_id)) {/* ignore __rcu tag and mark it MEM_RCU */
tools/testing/selftests/bpf/progs/bench_local_storage_create.c +3 -2
@@ -61,14 +61,15 @@ SEC("lsm.s/socket_post_create")int BPF_PROG (socket_post_create ,struct socket *sock,int family,int type,int protocol,int kern) { +struct sock *sk = sock->sk;struct storage *stg;__u32 pid; pid =bpf_get_current_pid_tgid () >>32 ; -if (pid != bench_pid) +if (pid != bench_pid || !sk)return 0 ; - stg =bpf_sk_storage_get (&sk_storage_map, sock->sk,NULL , + stg =bpf_sk_storage_get (&sk_storage_map, sk,NULL ,BPF_LOCAL_STORAGE_GET_F_CREATE );if (stg)
tools/testing/selftests/bpf/progs/local_storage.c +11 -9
@@ -140,11 +140,12 @@ int BPF_PROG(socket_bind, struct socket *sock, struct sockaddr *address, {__u32 pid =bpf_get_current_pid_tgid () >>32 ;struct local_storage *storage; +struct sock *sk = sock->sk; -if (pid != monitored_pid) +if (pid != monitored_pid || !sk)return 0 ; - storage =bpf_sk_storage_get (&sk_storage_map, sock->sk,0 ,0 ); + storage =bpf_sk_storage_get (&sk_storage_map, sk,0 ,0 );if (!storage)return 0 ;
@@ -155,24 +156,24 @@ int BPF_PROG(socket_bind, struct socket *sock, struct sockaddr *address,/* This tests that we can associate multiple elements * with the local storage. */ - storage =bpf_sk_storage_get (&sk_storage_map2, sock->sk,0 , + storage =bpf_sk_storage_get (&sk_storage_map2, sk,0 ,BPF_LOCAL_STORAGE_GET_F_CREATE );if (!storage)return 0 ; -if (bpf_sk_storage_delete (&sk_storage_map2, sock->sk)) +if (bpf_sk_storage_delete (&sk_storage_map2, sk))return 0 ; - storage =bpf_sk_storage_get (&sk_storage_map2, sock->sk,0 , + storage =bpf_sk_storage_get (&sk_storage_map2, sk,0 ,BPF_LOCAL_STORAGE_GET_F_CREATE );if (!storage)return 0 ; -if (bpf_sk_storage_delete (&sk_storage_map, sock->sk)) +if (bpf_sk_storage_delete (&sk_storage_map, sk))return 0 ;/* Ensure that the sk_storage_map is disconnected from the storage. */ -if (!sock->sk->sk_bpf_storage || sock->sk->sk_bpf_storage->smap) +if (!sk->sk_bpf_storage || sk->sk_bpf_storage->smap)return 0 ; sk_storage_result =0 ;
@@ -185,11 +186,12 @@ int BPF_PROG(socket_post_create, struct socket *sock, int family, int type, {__u32 pid =bpf_get_current_pid_tgid () >>32 ;struct local_storage *storage; +struct sock *sk = sock->sk; -if (pid != monitored_pid) +if (pid != monitored_pid || !sk)return 0 ; - storage =bpf_sk_storage_get (&sk_storage_map, sock->sk,0 , + storage =bpf_sk_storage_get (&sk_storage_map, sk,0 ,BPF_LOCAL_STORAGE_GET_F_CREATE );if (!storage)return 0 ;
tools/testing/selftests/bpf/progs/lsm_cgroup.c +6 -2
@@ -103,11 +103,15 @@ static __always_inline int real_bind(struct socket *sock, int addrlen) {struct sockaddr_ll sa = {}; +struct sock *sk = sock->sk; -if (sock->sk->__sk_common.skc_family !=AF_PACKET ) +if (!sk) +return 1 ; + +if (sk->__sk_common.skc_family !=AF_PACKET )return 1 ; -if (sock->sk->sk_kern_sock) +if (sk->sk_kern_sock)return 1 ;bpf_probe_read_kernel (&sa,sizeof (sa), address);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/744 wifi: ar5523: enable proper endpoint verification
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit e120b6388d7d88635d67dcae6483f39c37111850 ]
Syzkaller reports [1] hitting a warning about an endpoint in use not having an expected type to it.
Fix the issue by checking for the existence of all proper endpoints with their according types intact.
Sadly, this patch has not been tested on real hardware.
[1] Syzkaller report:
------------[ cut here ]------------ usb 1-1: BOGUS urb xfer, pipe 3 != type 1 WARNING: CPU: 0 PID: 3643 at drivers/usb/core/urb.c:504 usb_submit_urb+0xed6/0x1880 drivers/usb/core/urb.c:504 ... Call Trace: <TASK> ar5523_cmd+0x41b/0x780 drivers/net/wireless/ath/ar5523/ar5523.c:275 ar5523_cmd_read drivers/net/wireless/ath/ar5523/ar5523.c:302 [inline] ar5523_host_available drivers/net/wireless/ath/ar5523/ar5523.c:1376 [inline] ar5523_probe+0x14b0/0x1d10 drivers/net/wireless/ath/ar5523/ar5523.c:1655 usb_probe_interface+0x30f/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:560 [inline] really_probe+0x249/0xb90 drivers/base/dd.c:639 __driver_probe_device+0x1df/0x4d0 drivers/base/dd.c:778 driver_probe_device+0x4c/0x1a0 drivers/base/dd.c:808 __device_attach_driver+0x1d4/0x2e0 drivers/base/dd.c:936 bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:427 __device_attach+0x1e4/0x530 drivers/base/dd.c:1008 bus_probe_device+0x1e8/0x2a0 drivers/base/bus.c:487 device_add+0xbd9/0x1e90 drivers/base/core.c:3517 usb_set_configuration+0x101d/0x1900 drivers/usb/core/message.c:2170 usb_generic_driver_probe+0xbe/0x100 drivers/usb/core/generic.c:238 usb_probe_device+0xd8/0x2c0 drivers/usb/core/driver.c:293 call_driver_probe drivers/base/dd.c:560 [inline] really_probe+0x249/0xb90 drivers/base/dd.c:639 __driver_probe_device+0x1df/0x4d0 drivers/base/dd.c:778 driver_probe_device+0x4c/0x1a0 drivers/base/dd.c:808 __device_attach_driver+0x1d4/0x2e0 drivers/base/dd.c:936 bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:427 __device_attach+0x1e4/0x530 drivers/base/dd.c:1008 bus_probe_device+0x1e8/0x2a0 drivers/base/bus.c:487 device_add+0xbd9/0x1e90 drivers/base/core.c:3517 usb_new_device.cold+0x685/0x10ad drivers/usb/core/hub.c:2573 hub_port_connect drivers/usb/core/hub.c:5353 [inline] hub_port_connect_change drivers/usb/core/hub.c:5497 [inline] port_event drivers/usb/core/hub.c:5653 [inline] hub_event+0x26cb/0x45d0 drivers/usb/core/hub.c:5735 process_one_work+0x9bf/0x1710 kernel/workqueue.c:2289 worker_thread+0x669/0x1090 kernel/workqueue.c:2436 kthread+0x2e8/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 </TASK>
--- drivers/net/wireless/ath/ar5523/ar5523.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/wireless/ath/ar5523/ar5523.c +14 -0
@@ -1590,6 +1590,20 @@ static int ar5523_probe(struct usb_interface *intf,struct ar5523 *ar;int error = -ENOMEM ; +static const u8 bulk_ep_addr[] = { +AR5523_CMD_TX_PIPE |USB_DIR_OUT , +AR5523_DATA_TX_PIPE |USB_DIR_OUT , +AR5523_CMD_RX_PIPE |USB_DIR_IN , +AR5523_DATA_RX_PIPE |USB_DIR_IN , +0 }; + +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr)) { +dev_err (&dev->dev, +"Could not find all expected endpoints\n" ); + error = -ENODEV ; + goto out; + } +/* * Load firmware if the device requires it. This will return * -ENXIO on success and we'll get called back afer the usb
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/744 bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislav Fomichev <[email protected]>
[ Upstream commit 543576ec15b17c0c93301ac8297333c7b6e84ac7 ]
bpf_prog_attach uses attach_type_to_prog_type to enforce proper attach type for BPF_PROG_TYPE_CGROUP_SKB. link_create uses bpf_prog_get and relies on bpf_prog_attach_check_attach_type to properly verify prog_type <> attach_type association.
Add missing attach_type enforcement for the link_create case. Otherwise, it's currently possible to attach cgroup_skb prog types to other cgroup hooks.
--- kernel/bpf/syscall.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/syscall.c +5 -0
@@ -3809,6 +3809,11 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,* check permissions at attach time. */ return -EPERM ; + + ptype =attach_type_to_prog_type (attach_type); +if (prog->type != ptype) +return -EINVAL ; +return prog->enforce_expected_attach_type && prog->expected_attach_type != attach_type ? -EINVAL :0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/744 sh: kprobes: Merge arch_copy_kprobe() into arch_prepare_kprobe()
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 1422ae080b66134fe192082d9b721ab7bd93fcc5 ]
arch/sh/kernel/kprobes.c:52:16: warning: no previous prototype for 'arch_copy_kprobe' [-Wmissing-prototypes]
Although SH kprobes support was only merged in v2.6.28, it missed the earlier removal of the arch_copy_kprobe() callback in v2.6.15.
Based on the powerpc part of commit 49a2a1b83ba6fa40 ("[PATCH] kprobes:
changed from using spinlock to mutex").
--- arch/sh/kernel/kprobes.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
arch/sh/kernel/kprobes.c +1 -6
@@ -44,17 +44,12 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)if (OPCODE_RTE (opcode))return -EFAULT ;/* Bad breakpoint */ +memcpy (p->ainsn.insn, p->addr,MAX_INSN_SIZE *sizeof (kprobe_opcode_t)); p->opcode = opcode;return 0 ; } -void __kprobes arch_copy_kprobe (struct kprobe *p) -{ -memcpy (p->ainsn.insn, p->addr,MAX_INSN_SIZE *sizeof (kprobe_opcode_t)); - p->opcode = *p->addr; -} -void __kprobes arch_arm_kprobe (struct kprobe *p) { *p->addr =BREAKPOINT_INSTRUCTION ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/744 Revert "sh: Handle calling csum_partial with misaligned data"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit b5319c96292ff877f6b58d349acf0a9dc8d3b454 ]
This reverts commit cadc4e1a2b4d20d0cc0e81f2c6ba0588775e54e5.
Commit cadc4e1a2b4d ("sh: Handle calling csum_partial with misaligned data") causes bad checksum calculations on unaligned data. Reverting it fixes the problem.
# Subtest: checksum
# module: checksum_kunit
1..5
# test_csum_fixed_random_inputs: ASSERTION FAILED at lib/checksum_kunit.c:500 Expected ( u64)result == ( u64)expec, but
( u64)result == 53378 (0xd082)
( u64)expec == 33488 (0x82d0)
# test_csum_fixed_random_inputs: pass:0 fail:1 skip:0 total:1 not ok 1 test_csum_fixed_random_inputs
# test_csum_all_carry_inputs: ASSERTION FAILED at lib/checksum_kunit.c:525 Expected ( u64)result == ( u64)expec, but
( u64)result == 65281 (0xff01)
( u64)expec == 65280 (0xff00)
# test_csum_all_carry_inputs: pass:0 fail:1 skip:0 total:1
not ok 2 test_csum_all_carry_inputs
# test_csum_no_carry_inputs: ASSERTION FAILED at lib/checksum_kunit.c:573 Expected ( u64)result == ( u64)expec, but
( u64)result == 65535 (0xffff)
( u64)expec == 65534 (0xfffe)
# test_csum_no_carry_inputs: pass:0 fail:1 skip:0 total:1
not ok 3 test_csum_no_carry_inputs
# test_ip_fast_csum: pass:1 fail:0 skip:0 total:1
ok 4 test_ip_fast_csum
# test_csum_ipv6_magic: pass:1 fail:0 skip:0 total:1
ok 5 test_csum_ipv6_magic
# checksum: pass:2 fail:3 skip:0 total:5
# Totals: pass:2 fail:3 skip:0 total:5
not ok 22 checksum
--- arch/sh/lib/checksum.S | 67 ++++++++++++------------------------------ 1 file changed, 18 insertions(+), 49 deletions(-)
arch/sh/lib/checksum.S +18 -49
@@ -33,7 +33,8 @@ */ /* - * asmlinkage __wsum csum_partial(const void *buf, int len, __wsum sum); + * unsigned int csum_partial(const unsigned char *buf, int len, + * unsigned int sum); */ .text
@@ -45,31 +46,11 @@ ENTRY(csum_partial) * Fortunately, it is easy to convert 2-byte alignment to 4-byte * alignment for the unrolled loop. */ + mov r5, r1 mov r4, r0 - tst #3, r0 ! Check alignment. - bt/s 2f ! Jump if alignment is ok. - mov r4, r7 ! Keep a copy to check for alignment + tst #2, r0 ! Check alignment. + bt 2f ! Jump if alignment is ok. ! - tst #1, r0 ! Check alignment. - bt 21f ! Jump if alignment is boundary of 2bytes. - - ! buf is odd - tst r5, r5 - add #-1, r5 - bt 9f - mov.b @r4+, r0 - extu.b r0, r0 - addc r0, r6 ! t=0 from previous tst - mov r6, r0 - shll8 r6 - shlr16 r0 - shlr8 r0 - or r0, r6 - mov r4, r0 - tst #2, r0 - bt 2f -21: - ! buf is 2 byte aligned (len could be 0) add #-2, r5 ! Alignment uses up two bytes. cmp/pz r5 ! bt/s 1f ! Jump if we had at least two bytes.
@@ -77,17 +58,16 @@ ENTRY(csum_partial) bra 6f add #2, r5 ! r5 was < 2. Deal with it. 1: + mov r5, r1 ! Save new len for later use. mov.w @r4+, r0 extu.w r0, r0 addc r0, r6 bf 2f add #1, r6 2: - ! buf is 4 byte aligned (len could be 0) - mov r5, r1 mov #-5, r0 - shld r0, r1 - tst r1, r1 + shld r0, r5 + tst r5, r5 bt/s 4f ! if it's =0, go to 4f clrt .align 2
@@ -109,31 +89,30 @@ ENTRY(csum_partial) addc r0, r6 addc r2, r6 movt r0 - dt r1 + dt r5 bf/s 3b cmp/eq #1, r0 - ! here, we know r1==0 - addc r1, r6 ! add carry to r6 + ! here, we know r5==0 + addc r5, r6 ! add carry to r6 4: - mov r5, r0 + mov r1, r0 and #0x1c, r0 tst r0, r0 - bt 6f - ! 4 bytes or more remaining - mov r0, r1 - shlr2 r1 + bt/s 6f + mov r0, r5 + shlr2 r5 mov #0, r2 5: addc r2, r6 mov.l @r4+, r2 movt r0 - dt r1 + dt r5 bf/s 5b cmp/eq #1, r0 addc r2, r6 - addc r1, r6 ! r1==0 here, so it means add carry-bit + addc r5, r6 ! r5==0 here, so it means add carry-bit 6: - ! 3 bytes or less remaining + mov r1, r5 mov #3, r0 and r0, r5 tst r5, r5
@@ -159,16 +138,6 @@ ENTRY(csum_partial) mov #0, r0 addc r0, r6 9: - ! Check if the buffer was misaligned, if so realign sum - mov r7, r0 - tst #1, r0 - bt 10f - mov r6, r0 - shll8 r6 - shlr16 r0 - shlr8 r0 - or r0, r6 -10: rts mov r6, r0
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/744 wifi: mt76: mt7603: fix tx queue of loopback packets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
[ Upstream commit b473c0e47f04d3b4ee9d05d2e79234134aad14d5 ]
Use the correct WMM AC queue instead of the MGMT one to fix potential issues with aggregation sequence number tracking. Drop non-bufferable packets.
--- .../net/wireless/mediatek/mt76/mt7603/dma.c | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/dma.c +32 -14
@@ -4,6 +4,13 @@#include "mac.h" #include "../dma.h" +static const u8 wmm_queue_map[] = { + [IEEE80211_AC_BK ] =0 , + [IEEE80211_AC_BE ] =1 , + [IEEE80211_AC_VI ] =2 , + [IEEE80211_AC_VO ] =3 , +}; +static void mt7603_rx_loopback_skb (struct mt7603_dev *dev,struct sk_buff *skb) {
@@ -22,10 +29,10 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)struct ieee80211_sta *sta;struct mt7603_sta *msta;struct mt76_wcid *wcid; +u8 tid =0 , hwq =0 ;void *priv;int idx;u32 val; -u8 tid =0 ;if (skb->len <MT_TXD_SIZE +sizeof (struct ieee80211_hdr )) goto free;
@@ -42,19 +49,36 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) goto free; priv = msta = container_of(wcid, struct mt7603_sta, wcid); - val =le32_to_cpu (txd[0 ]); - val &= ~(MT_TXD0_P_IDX |MT_TXD0_Q_IDX ); - val |=FIELD_PREP (MT_TXD0_Q_IDX ,MT_TX_HW_QUEUE_MGMT ); - txd[0 ] =cpu_to_le32 (val); sta = container_of(priv, struct ieee80211_sta, drv_priv); hdr = (struct ieee80211_hdr *)&skb->data[MT_TXD_SIZE ]; -if (ieee80211_is_data_qos (hdr->frame_control)) + + hwq = wmm_queue_map[IEEE80211_AC_BE ]; +if (ieee80211_is_data_qos (hdr->frame_control)) { tid = *ieee80211_get_qos_ctl (hdr) & -IEEE80211_QOS_CTL_TAG1D_MASK ; -skb_set_queue_mapping (skb, tid_to_ac[tid]); +IEEE80211_QOS_CTL_TAG1D_MASK ; +u8 qid = tid_to_ac[tid]; + hwq = wmm_queue_map[qid]; +skb_set_queue_mapping (skb, qid); + }else if (ieee80211_is_data (hdr->frame_control)) { +skb_set_queue_mapping (skb,IEEE80211_AC_BE ); + hwq = wmm_queue_map[IEEE80211_AC_BE ]; + }else { +skb_pull (skb,MT_TXD_SIZE ); +if (!ieee80211_is_bufferable_mmpdu (skb)) + goto free; +skb_push (skb,MT_TXD_SIZE ); +skb_set_queue_mapping (skb,MT_TXQ_PSD ); + hwq =MT_TX_HW_QUEUE_MGMT ; + } +ieee80211_sta_set_buffered (sta, tid, true); + val =le32_to_cpu (txd[0 ]); + val &= ~(MT_TXD0_P_IDX |MT_TXD0_Q_IDX ); + val |=FIELD_PREP (MT_TXD0_Q_IDX , hwq); + txd[0 ] =cpu_to_le32 (val); +spin_lock_bh (&dev->ps_lock);__skb_queue_tail (&msta->psq, skb);if (skb_queue_len (&msta->psq) >=64 ) {
@@ -151,12 +175,6 @@ static int mt7603_poll_tx(struct napi_struct *napi, int budget)int mt7603_dma_init (struct mt7603_dev *dev) { -static const u8 wmm_queue_map[] = { - [IEEE80211_AC_BK ] =0 , - [IEEE80211_AC_BE ] =1 , - [IEEE80211_AC_VI ] =2 , - [IEEE80211_AC_VO ] =3 , - };int ret;int i;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/744 wifi: mt76: mt7603: add wpdma tx eof flag for PSE client reset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
[ Upstream commit 21de5f72260b4246e2415bc900c18139bc52ea80 ]
This flag is needed for the PSE client reset. Fixes watchdog reset issues.
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -0
@@ -1393,6 +1393,7 @@ void mt7603_pse_client_reset(struct mt7603_dev *dev) MT_CLIENT_RESET_TX_R_E_2_S);/* Start PSE client TX abort */ +mt76_set (dev,MT_WPDMA_GLO_CFG ,MT_WPDMA_GLO_CFG_FORCE_TX_EOF );mt76_set (dev, addr,MT_CLIENT_RESET_TX_R_E_1 );mt76_poll_msec (dev, addr,MT_CLIENT_RESET_TX_R_E_1_S ,MT_CLIENT_RESET_TX_R_E_1_S ,500 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/744 libbpf: Fix error message in attach_kprobe_multi
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 7c13ef16e87ac2e44d16c0468b1191bceb06f95c ]
We just failed to retrieve pattern, so we need to print spec instead.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -10985,7 +10985,7 @@ static int attach_kprobe_multi(const struct bpf_program *prog, long cookie, stru n =sscanf (spec,"%m[a-zA-Z0-9_.*?]" , &pattern);if (n <1 ) { -pr_warn ("kprobe multi pattern is invalid: %s\n" , pattern); +pr_warn ("kprobe multi pattern is invalid: %s\n" , spec);return -EINVAL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/744 wifi: nl80211: Avoid address calculations via out of bounds array indexing
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 838c7b8f1f278404d9d684c34a8cb26dc41aaaa1 ]
Before request->channels[] can be used, request->n_channels must be set. Additionally, address calculations for memory after the "channels" array need to be calculated from the allocation base ("request") rather than via the first "out of bounds" index of "channels", otherwise run-time bounds checking will throw a warning.
--- net/wireless/nl80211.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/wireless/nl80211.c +7 -7
@@ -9153,6 +9153,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)struct wiphy *wiphy;int err, tmp, n_ssids =0 , n_channels, i;size_t ie_len, size; +size_t ssids_offset, ie_offset; wiphy = &rdev->wiphy;
@@ -9198,21 +9199,20 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; size =struct_size (request, channels, n_channels); + ssids_offset = size; size =size_add (size,array_size (sizeof (*request->ssids), n_ssids)); + ie_offset = size; size =size_add (size, ie_len); request =kzalloc (size,GFP_KERNEL );if (!request)return -ENOMEM ; + request->n_channels = n_channels;if (n_ssids) - request->ssids = (void *)&request->channels[n_channels]; + request->ssids = (void *)request + ssids_offset; request->n_ssids = n_ssids; -if (ie_len) { -if (n_ssids) - request->ie = (void *)(request->ssids + n_ssids); -else - request->ie = (void *)(request->channels + n_channels); - } +if (ie_len) + request->ie = (void *)request + ie_offset; i =0 ;if (scan_freqs) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 220/744 selftests/binderfs: use the Makefiles rules, not Makes implicit rules
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Hubbard <[email protected]>
[ Upstream commit 019baf635eb6ffe8d6c1343f81788f02a7e0ed98 ]
First of all, in order to build with clang at all, one must first apply Valentin Obst's build fix for LLVM [1]. Once that is done, then when building with clang, via:
make LLVM=1 -C tools/testing/selftests
...the following error occurs:
clang: error: cannot specify -o when generating multiple output files
This is because clang, unlike gcc, won't accept invocations of this form:
clang file1.c header2.h
While trying to fix this, I noticed that:
a) selftests/lib.mk already avoids the problem, and
b) The binderfs Makefile indavertently bypasses the selftests/lib.mk build system, and quitely uses Make's implicit build rules for .c files instead.
The Makefile attempts to set up both a dependency and a source file, neither of which was needed, because lib.mk is able to automatically handle both. This line:
binderfs_test: binderfs_test.c
...causes Make's implicit rules to run, which builds binderfs_test without ever looking at lib.mk.
Fix this by simply deleting the "binderfs_test:" Makefile target and letting lib.mk handle it instead.
[1] https://lore.kernel.org/all/20240329-selftests-libmk-llvm-rfc-v1-1-2f9ed7d1c49f@valentinobst.de/
--- tools/testing/selftests/filesystems/binderfs/Makefile | 2 -- 1 file changed, 2 deletions(-)
tools/testing/selftests/filesystems/binderfs/Makefile +0 -2
@@ -3,6 +3,4 @@ CFLAGS += $(KHDR_INCLUDES) -pthread TEST_GEN_PROGS := binderfs_test -binderfs_test: binderfs_test.c ../../kselftest.h ../../kselftest_harness.h - include ../../lib.mk
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/744 selftests/resctrl: fix clang build failure: use LOCAL_HDRS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Hubbard <[email protected]>
[ Upstream commit d8171aa4ca72f1a67bf3c14c59441d63c1d2585f ]
First of all, in order to build with clang at all, one must first apply Valentin Obst's build fix for LLVM [1]. Once that is done, then when building with clang, via:
make LLVM=1 -C tools/testing/selftests
...the following error occurs:
clang: error: cannot specify -o when generating multiple output files
This is because clang, unlike gcc, won't accept invocations of this form:
clang file1.c header2.h
Fix this by using selftests/lib.mk facilities for tracking local header file dependencies: add them to LOCAL_HDRS, leaving only the .c files to be passed to the compiler.
[1] https://lore.kernel.org/all/20240329-selftests-libmk-llvm-rfc-v1-1-2f9ed7d1c49f@valentinobst.de/
--- tools/testing/selftests/resctrl/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/resctrl/Makefile +3 -1
@@ -5,6 +5,8 @@ CFLAGS += $(KHDR_INCLUDES) TEST_GEN_PROGS := resctrl_tests +LOCAL_HDRS += $(wildcard *.h) + include ../lib.mk -$(OUTPUT)/resctrl_tests: $(wildcard *.[ch]) +$(OUTPUT)/resctrl_tests: $(wildcard *.c)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/744 selftests: default to host arch for LLVM builds
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valentin Obst <[email protected]>
[ Upstream commit d4e6fbd245c48b272cc591d1c5e7c07aedd7f071 ]
Align the behavior for gcc and clang builds by interpreting unset ARCH and CROSS_COMPILE variables in LLVM builds as a sign that the user wants to build for the host architecture.
This patch preserves the properties that setting the ARCH variable to an unknown value will trigger an error that complains about insufficient information, and that a set CROSS_COMPILE variable will override the target triple that is determined based on presence/absence of ARCH.
When compiling with clang, i.e., LLVM is set, an unset ARCH variable in combination with an unset CROSS_COMPILE variable, i.e., compiling for the host architecture, leads to compilation failures since lib.mk can not determine the clang target triple. In this case, the following error message is displayed for each subsystem that does not set ARCH in its own Makefile before including lib.mk (lines wrapped at 75 chrs):
make[1]: Entering directory '/mnt/build/linux/tools/testing/selftests/
sysctl'
../lib.mk:33: *** Specify CROSS_COMPILE or add '--target=' option to
lib.mk. Stop.
make[1]: Leaving directory '/mnt/build/linux/tools/testing/selftests/
sysctl'
In the same scenario a gcc build would default to the host architecture, i.e., it would use plain gcc.
--- tools/testing/selftests/lib.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
tools/testing/selftests/lib.mk +10 -2
@@ -7,6 +7,8 @@ else ifneq ($(filter -%,$(LLVM)),) LLVM_SUFFIX := $(LLVM) endif +CLANG := $(LLVM_PREFIX)clang$(LLVM_SUFFIX) + CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu CLANG_TARGET_FLAGS_hexagon := hexagon-linux-musl
@@ -18,7 +20,13 @@ CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu CLANG_TARGET_FLAGS_x86_64 := x86_64-linux-gnu -CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) + +# Default to host architecture if ARCH is not explicitly given. +ifeq ($(ARCH),) +CLANG_TARGET_FLAGS := $(shell $(CLANG) -print-target-triple) +else +CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) +endif ifeq ($(CROSS_COMPILE),) ifeq ($(CLANG_TARGET_FLAGS),)
@@ -30,7 +38,7 @@ else CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%)) endif # CROSS_COMPILE -CC := $(LLVM_PREFIX)clang$(LLVM_SUFFIX) $(CLANG_FLAGS) -fintegrated-as +CC := $(CLANG) $(CLANG_FLAGS) -fintegrated-as else CC := $(CROSS_COMPILE)gcc endif # LLVM
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/744 kunit: Fix kthread reference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mickaël Salaün <[email protected]>
[ Upstream commit f8aa1b98ce40184521ed95ec26cc115a255183b2 ]
There is a race condition when a kthread finishes after the deadline and before the call to kthread_stop(), which may lead to use after free.
--- lib/kunit/try-catch.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
lib/kunit/try-catch.c +6 -3
@@ -11,6 +11,7 @@#include <linux/completion.h> #include <linux/kernel.h> #include <linux/kthread.h> +#include <linux/sched/task.h> #include "try-catch-impl.h"
@@ -65,13 +66,14 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) try_catch->context = context; try_catch->try_completion = &try_completion; try_catch->try_result =0 ; - task_struct =kthread_run (kunit_generic_run_threadfn_adapter, - try_catch, -"kunit_try_catch_thread" ); + task_struct =kthread_create (kunit_generic_run_threadfn_adapter, + try_catch,"kunit_try_catch_thread" );if (IS_ERR (task_struct)) { try_catch->catch (try_catch->context);return ; } +get_task_struct (task_struct); +wake_up_process (task_struct); time_remaining =wait_for_completion_timeout (&try_completion,kunit_test_timeout ());
@@ -81,6 +83,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)kthread_stop (task_struct); } +put_task_struct (task_struct); exit_code = try_catch->try_result;if (!exit_code)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 224/744 selftests/bpf: Fix pointer arithmetic in test_xdp_do_redirect
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Schmidt <[email protected]>
[ Upstream commit e549b39a0ab8880d7ae6c6495b00fc1cb8f36174 ]
Cast operation has a higher precedence than addition. The code here wants to zero the 2nd half of the 64-bit metadata, but due to a pointer arithmetic mistake, it writes the zero at offset 16 instead.
Just adding parentheses around "data + 4" would fix this, but I think this will be slightly better readable with array syntax.
I was unable to test this with tools/testing/selftests/bpf/vmtest.sh, because my glibc is newer than glibc in the provided VM image. So I just checked the difference in the compiled code. objdump -S tools/testing/selftests/bpf/xdp_do_redirect.test.o:
- *((__u32 *)data) = 0x42; /* metadata test value */
+ ((__u32 *)data)[0] = 0x42; /* metadata test value */
be7: 48 8d 85 30 fc ff ff lea -0x3d0(%rbp),%rax
bee: c7 00 42 00 00 00 movl $0x42,(%rax)
- *((__u32 *)data + 4) = 0;
+ ((__u32 *)data)[1] = 0;
bf4: 48 8d 85 30 fc ff ff lea -0x3d0(%rbp),%rax
- bfb: 48 83 c0 10 add $0x10,%rax
+ bfb: 48 83 c0 04 add $0x4,%rax
bff: c7 00 00 00 00 00 movl $0x0,(%rax)--- tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +2 -2
@@ -107,8 +107,8 @@ void test_xdp_do_redirect(void) .attach_point = BPF_TC_INGRESS);memcpy (&data[sizeof (__u64)], &pkt_udp,sizeof (pkt_udp)); - *((__u32 *)data) =0x42 ;/* metadata test value */ - *((__u32 *)data +4 ) =0 ; + ((__u32 *)data)[0 ] =0x42 ;/* metadata test value */ + ((__u32 *)data)[1 ] =0 ; skel =test_xdp_do_redirect__open ();if (!ASSERT_OK_PTR (skel,"skel" ))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/744 HID: intel-ish-hid: ipc: Add check for pci_alloc_irq_vectors
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 6baa4524027fd64d7ca524e1717c88c91a354b93 ]
Add a check for the return value of pci_alloc_irq_vectors() and return error if it fails.
--- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/intel-ish-hid/ipc/pci-ish.c +5 -0
@@ -216,6 +216,11 @@ static int ish_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* request and enable interrupt */ ret =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_ALL_TYPES ); +if (ret <0 ) { +dev_err (dev,"ISH: Failed to allocate IRQ vectors\n" ); +return ret; + } +if (!pdev->msi_enabled && !pdev->msix_enabled) irq_flag =IRQF_SHARED ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/744 scsi: bfa: Ensure the copied buf is NUL terminated
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bui Quang Minh <[email protected]>
[ Upstream commit 13d0cecb4626fae67c00c84d3c7851f6b62f7df3 ]
Currently, we allocate a nbytes-sized kernel buffer and copy nbytes from userspace to that buffer. Later, we use sscanf on this buffer but we don't ensure that the string is terminated inside the buffer, this can lead to OOB read when using sscanf. Fix this issue by using memdup_user_nul instead of memdup_user.
--- drivers/scsi/bfa/bfad_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfad_debugfs.c +2 -2
@@ -250,7 +250,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,unsigned long flags;void *kern_buf; - kern_buf =memdup_user (buf, nbytes); + kern_buf =memdup_user_nul (buf, nbytes);if (IS_ERR (kern_buf))return PTR_ERR (kern_buf);
@@ -317,7 +317,7 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,unsigned long flags;void *kern_buf; - kern_buf =memdup_user (buf, nbytes); + kern_buf =memdup_user_nul (buf, nbytes);if (IS_ERR (kern_buf))return PTR_ERR (kern_buf);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/744 scsi: qedf: Ensure the copied buf is NUL terminated
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bui Quang Minh <[email protected]>
[ Upstream commit d0184a375ee797eb657d74861ba0935b6e405c62 ]
Currently, we allocate a count-sized kernel buffer and copy count from userspace to that buffer. Later, we use kstrtouint on this buffer but we don't ensure that the string is terminated inside the buffer, this can lead to OOB read when using kstrtouint. Fix this issue by using memdup_user_nul instead of memdup_user.
--- drivers/scsi/qedf/qedf_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qedf/qedf_debugfs.c +1 -1
@@ -170,7 +170,7 @@ qedf_dbg_debug_cmd_write(struct file *filp, const char __user *buffer,if (!count || *ppos)return 0 ; - kern_buf =memdup_user (buffer, count); + kern_buf =memdup_user_nul (buffer, count);if (IS_ERR (kern_buf))return PTR_ERR (kern_buf);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/744 scsi: qla2xxx: Fix debugfs output for fw_resource_count
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Himanshu Madhani <[email protected]>
[ Upstream commit 998d09c5ef6183bd8137d1a892ba255b15978bb4 ]
DebugFS output for fw_resource_count shows:
estimate exchange used[0] high water limit [1945] n estimate iocb2 used [0] high water limit [5141]
estimate exchange2 used[0] high water limit [1945]
Which shows incorrect display due to missing newline in seq_print().
[mkp: fix checkpatch warning about space before newline]
--- drivers/scsi/qla2xxx/qla_dfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_dfs.c +1 -1
@@ -274,7 +274,7 @@ qla_dfs_fw_resource_cnt_show(struct seq_file *s, void *unused)seq_printf (s,"Driver: estimate iocb used [%d] high water limit [%d]\n" , iocbs_used, ha->base_qpair->fwres.iocbs_limit); -seq_printf (s,"estimate exchange used[%d] high water limit [%d] n" , +seq_printf (s,"estimate exchange used[%d] high water limit [%d]\n" , exch_used, ha->base_qpair->fwres.exch_limit);if (ql2xenforce_iocb_limit ==2 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/744 kernel/numa.c: Move logging out of numa.h
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
[ Upstream commit d7a73e3f089204aee3393687e23fd45a22657b08 ]
Moving these stub functions to a .c file means we can kill a sched.h dependency on printk.h.
Stable-dep-of: f9f67e5adc8d ("x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()")
--- include/linux/numa.h | 19 ++++++------------- kernel/Makefile | 1 + kernel/numa.c | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 kernel/numa.c
include/linux/numa.h +6 -13
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_NUMA_H#define _LINUX_NUMA_H +#include <linux/init.h> #include <linux/types.h> #ifdef CONFIG_NODES_SHIFT
@@ -22,34 +23,26 @@#endif #ifdef CONFIG_NUMA -#include <linux/printk.h> #include <asm/sparsemem.h> /* Generic implementation available */ int numa_nearest_node (int node,unsigned int state);#ifndef memory_add_physaddr_to_nid -static inline int memory_add_physaddr_to_nid (u64 start) -{ -pr_info_once ("Unknown online node for memory at 0x%llx, assuming node 0\n" , - start); -return 0 ; -} +int memory_add_physaddr_to_nid (u64 start);#endif +#ifndef phys_to_target_node -static inline int phys_to_target_node (u64 start) -{ -pr_info_once ("Unknown target node for memory at 0x%llx, assuming node 0\n" , - start); -return 0 ; -} +int phys_to_target_node (u64 start);#endif +#ifndef numa_fill_memblksstatic inline int __init numa_fill_memblks (u64 start,u64 end) {return NUMA_NO_MEMBLK ; }#endif +#else /* !CONFIG_NUMA */ static inline int numa_nearest_node (int node,unsigned int state) {
kernel/Makefile +1 -0
@@ -114,6 +114,7 @@ obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call_inline.o obj-$(CONFIG_CFI_CLANG) += cfi.o +obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_PERF_EVENTS) += events/
kernel/numa.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include <linux/printk.h> +#include <linux/numa.h> + +/* Stub functions: */ + +#ifndef memory_add_physaddr_to_nid +int memory_add_physaddr_to_nid (u64 start) +{ +pr_info_once ("Unknown online node for memory at 0x%llx, assuming node 0\n" , + start); +return 0 ; +} +EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); +#endif + +#ifndef phys_to_target_node +int phys_to_target_node (u64 start) +{ +pr_info_once ("Unknown target node for memory at 0x%llx, assuming node 0\n" , + start); +return 0 ; +} +EXPORT_SYMBOL_GPL (phys_to_target_node); +#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/744 x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Richter <[email protected]>
[ Upstream commit f9f67e5adc8dc2e1cc51ab2d3d6382fa97f074d4 ]
For configurations that have the kconfig option NUMA_KEEP_MEMINFO disabled, numa_fill_memblks() only returns with NUMA_NO_MEMBLK (-1). SRAT lookup fails then because an existing SRAT memory range cannot be found for a CFMWS address range. This causes the addition of a duplicate numa_memblk with a different node id and a subsequent page fault and kernel crash during boot.
Fix this by making numa_fill_memblks() always available regardless of NUMA_KEEP_MEMINFO.
As Dan suggested, the fix is implemented to remove numa_fill_memblks() from sparsemem.h and alos using __weak for the function.
Note that the issue was initially introduced with [1]. But since phys_to_target_node() was originally used that returned the valid node 0, an additional numa_memblk was not added. Though, the node id was wrong too, a message is seen then in the logs:
kernel/numa.c: pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n",
[1] commit fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT")
--- arch/x86/include/asm/sparsemem.h | 2 -- arch/x86/mm/numa.c | 4 ++-- drivers/acpi/numa/srat.c | 5 +++++ include/linux/numa.h | 7 +------ 4 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/include/asm/sparsemem.h +0 -2
@@ -37,8 +37,6 @@ extern int phys_to_target_node(phys_addr_t start);#define phys_to_target_node phys_to_target_nodeextern int memory_add_physaddr_to_nid (u64 start);#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid -extern int numa_fill_memblks (u64 start,u64 end); -#define numa_fill_memblks numa_fill_memblks#endif #endif /* __ASSEMBLY__ */
arch/x86/mm/numa.c +2 -2
@@ -956,6 +956,8 @@ int memory_add_physaddr_to_nid(u64 start) }EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); +#endif +static int __init cmp_memblk (const void *a,const void *b) {const struct numa_memblk *ma = *(const struct numa_memblk **)a;
@@ -1028,5 +1030,3 @@ int __init numa_fill_memblks(u64 start, u64 end) }return 0 ; } - -#endif
drivers/acpi/numa/srat.c +5 -0
@@ -206,6 +206,11 @@ int __init srat_disabled(void)return acpi_numa <0 ; } +__weak int __init numa_fill_memblks (u64 start,u64 end) +{ +return NUMA_NO_MEMBLK ; +} +#if defined(CONFIG_X86 ) || defined(CONFIG_ARM64 ) || defined(CONFIG_LOONGARCH )/* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for
include/linux/numa.h +1 -6
@@ -36,12 +36,7 @@ int memory_add_physaddr_to_nid(u64 start);int phys_to_target_node (u64 start);#endif -#ifndef numa_fill_memblks -static inline int __init numa_fill_memblks (u64 start,u64 end) -{ -return NUMA_NO_MEMBLK ; -} -#endif +int numa_fill_memblks (u64 start,u64 end);#else /* !CONFIG_NUMA */ static inline int numa_nearest_node (int node,unsigned int state)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/744 wifi: mwl8k: initialize cmd->addr[] properly
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 1d60eabb82694e58543e2b6366dae3e7465892a5 ]
This loop is supposed to copy the mac address to cmd->addr but the i++ increment is missing so it copies everything to cmd->addr[0] and only the last address is recorded.
--- drivers/net/wireless/marvell/mwl8k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwl8k.c +1 -1
@@ -2718,7 +2718,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, cmd->action |=cpu_to_le16 (MWL8K_ENABLE_RX_MULTICAST ); cmd->numaddr =cpu_to_le16 (mc_count);netdev_hw_addr_list_for_each (ha, mc_list) { -memcpy (cmd->addr[i], ha->addr,ETH_ALEN ); +memcpy (cmd->addr[i++], ha->addr,ETH_ALEN ); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/744 HID: amd_sfh: Handle "no sensors" in PM operations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Basavaraj Natikar <[email protected]>
[ Upstream commit 077e3e3bc84a51891e732507bbbd9acf6e0e4c8b ]
Resume or suspend each sensor device based on the num_hid_devices. Therefore, add a check to handle the special case where no sensors are present.
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +10 -0
@@ -210,6 +210,11 @@ static void amd_sfh_resume(struct amd_mp2_dev *mp2)struct amd_mp2_sensor_info info;int i, status; +if (!cl_data->is_any_sensor_enabled) { +amd_sfh_clear_intr (mp2); +return ; + } +for (i =0 ; i < cl_data->num_hid_devices; i++) {if (cl_data->sensor_sts[i] ==SENSOR_DISABLED ) { info.sensor_idx = cl_data->sensor_idx[i];
@@ -235,6 +240,11 @@ static void amd_sfh_suspend(struct amd_mp2_dev *mp2)struct amdtp_cl_data *cl_data = mp2->cl_data;int i, status; +if (!cl_data->is_any_sensor_enabled) { +amd_sfh_clear_intr (mp2); +return ; + } +for (i =0 ; i < cl_data->num_hid_devices; i++) {if (cl_data->sensor_idx[i] !=HPD_IDX && cl_data->sensor_sts[i] ==SENSOR_ENABLED ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/744 usb: aqc111: stop lying about skb->truesize
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 9aad6e45c4e7d16b2bb7c3794154b828fb4384b4 ]
Some usb drivers try to set small skb->truesize and break core networking stacks.
I replace one skb_clone() by an allocation of a fresh and small skb, to get minimally sized skbs, like we did in commit 1e2c61172342 ("net: cdc_ncm: reduce skb truesize in rx path") and 4ce62d5b2f7a ("net: usb: ax88179_178a:
stop lying about skb->truesize")
--- drivers/net/usb/aqc111.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/usb/aqc111.c +3 -5
@@ -1141,17 +1141,15 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb)continue ; } -/* Clone SKB */ - new_skb =skb_clone (skb,GFP_ATOMIC ); + new_skb =netdev_alloc_skb_ip_align (dev->net, pkt_len);if (!new_skb) goto err; - new_skb->len = pkt_len; +skb_put (new_skb, pkt_len); +memcpy (new_skb->data, skb->data, pkt_len);skb_pull (new_skb,AQ_RX_HW_PAD ); -skb_set_tail_pointer (new_skb, new_skb->len); - new_skb->truesize =SKB_TRUESIZE (new_skb->len);if (aqc111_data->rx_checksum)aqc111_rx_checksum (new_skb, pkt_desc);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/744 net: usb: sr9700: stop lying about skb->truesize
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 05417aa9c0c038da2464a0c504b9d4f99814a23b ]
Some usb drivers set small skb->truesize and break core networking stacks.
In this patch, I removed one of the skb->truesize override.
I also replaced one skb_clone() by an allocation of a fresh and small skb, to get minimally sized skbs, like we did in commit 1e2c61172342 ("net: cdc_ncm: reduce skb truesize in rx path") and 4ce62d5b2f7a ("net: usb: ax88179_178a:
stop lying about skb->truesize")
--- drivers/net/usb/sr9700.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/net/usb/sr9700.c +3 -7
@@ -421,19 +421,15 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)skb_pull (skb,3 ); skb->len = len;skb_set_tail_pointer (skb, len); - skb->truesize = len +sizeof (struct sk_buff );return 2 ; } -/* skb_clone is used for address align */ - sr_skb =skb_clone (skb,GFP_ATOMIC ); + sr_skb =netdev_alloc_skb_ip_align (dev->net, len);if (!sr_skb)return 0 ; - sr_skb->len = len; - sr_skb->data = skb->data +3 ; -skb_set_tail_pointer (sr_skb, len); - sr_skb->truesize = len +sizeof (struct sk_buff ); +skb_put (sr_skb, len); +memcpy (sr_skb->data, skb->data +3 , len);usbnet_skb_return (dev, sr_skb);skb_pull (skb, len +SR_RX_OVERHEAD );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/744 m68k: Fix spinlock race in kernel thread creation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Schmitz <[email protected]>
[ Upstream commit da89ce46f02470ef08f0f580755d14d547da59ed ]
Context switching does take care to retain the correct lock owner across the switch from 'prev' to 'next' tasks. This does rely on interrupts remaining disabled for the entire duration of the switch.
This condition is guaranteed for normal process creation and context switching between already running processes, because both 'prev' and 'next' already have interrupts disabled in their saved copies of the status register.
The situation is different for newly created kernel threads. The status register is set to PS_S in copy_thread(), which does leave the IPL at 0. Upon restoring the 'next' thread's status register in switch_to() aka resume(), interrupts then become enabled prematurely. resume() then returns via ret_from_kernel_thread() and schedule_tail() where run queue lock is released (see finish_task_switch() and finish_lock_switch()).
A timer interrupt calling scheduler_tick() before the lock is released in finish_task_switch() will find the lock already taken, with the current task as lock owner. This causes a spinlock recursion warning as reported by Guenter Roeck.
As far as I can ascertain, this race has been opened in commit 533e6903bea0 ("m68k: split ret_from_fork(), simplify kernel_thread()") but I haven't done a detailed study of kernel history so it may well predate that commit.
Interrupts cannot be disabled in the saved status register copy for kernel threads (init will complain about interrupts disabled when finally starting user space). Disable interrupts temporarily when switching the tasks' register sets in resume().
Note that a simple oriw 0x700,%sr after restoring sr is not enough here
- this leaves enough of a race for the 'spinlock recursion' warning to still be observed.
Tested on ARAnyM and qemu (Quadra 800 emulation).
--- arch/m68k/kernel/entry.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/m68k/kernel/entry.S +3 -1
@@ -433,7 +433,9 @@ resume: movec %a0,%dfc /* restore status register */ - movew %a1@(TASK_THREAD+THREAD_SR),%sr + movew %a1@(TASK_THREAD+THREAD_SR),%d0 + oriw #0x0700,%d0 + movew %d0,%sr rts
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/744 m68k: mac: Fix reboot hang on Mac IIci
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Finn Thain <[email protected]>
[ Upstream commit 265a3b322df9a973ff1fc63da70af456ab6ae1d6 ]
Calling mac_reset() on a Mac IIci does reset the system, but what follows is a POST failure that requires a manual reset to resolve. Avoid that by using the 68030 asm implementation instead of the C implementation.
Apparently the SE/30 has a similar problem as it has used the asm implementation since before git. This patch extends that solution to other systems with a similar ROM.
After this patch, the only systems still using the C implementation are 68040 systems where adb_type is either MAC_ADB_IOP or MAC_ADB_II. This implies a 1 MiB Quadra ROM.
This now includes the Quadra 900/950, which previously fell through to the "should never get here" catch-all.
--- arch/m68k/mac/misc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
arch/m68k/mac/misc.c +18 -18
@@ -451,30 +451,18 @@ void mac_poweroff(void)void mac_reset (void ) { -if (macintosh_config->adb_type ==MAC_ADB_II && - macintosh_config->ident !=MAC_MODEL_SE30 ) { -/* need ROMBASE in booter */ -/* indeed, plus need to MAP THE ROM !! */ - -if (mac_bi_data.rombase ==0 ) - mac_bi_data.rombase =0x40800000 ; - -/* works on some */ - rom_reset = (void *) (mac_bi_data.rombase +0xa ); - -local_irq_disable (); -rom_reset ();#ifdef CONFIG_ADB_CUDA - }else if (macintosh_config->adb_type ==MAC_ADB_EGRET || - macintosh_config->adb_type ==MAC_ADB_CUDA ) { +if (macintosh_config->adb_type ==MAC_ADB_EGRET || + macintosh_config->adb_type ==MAC_ADB_CUDA ) {cuda_restart (); + } else#endif #ifdef CONFIG_ADB_PMU - }else if (macintosh_config->adb_type ==MAC_ADB_PB2 ) { +if (macintosh_config->adb_type ==MAC_ADB_PB2 ) {pmu_restart (); + } else#endif - }else if (CPU_IS_030 ) { - +if (CPU_IS_030 ) {/* 030-specific reset routine. The idea is general, but the * specific registers to reset are '030-specific. Until I * have a non-030 machine, I can't test anything else.
@@ -522,6 +510,18 @@ void mac_reset(void) "jmp %/a0@\n\t" /* jump to the reset vector */ ".chip 68k" : : "r" (offset), "a" (rombase) : "a0"); + }else { +/* need ROMBASE in booter */ +/* indeed, plus need to MAP THE ROM !! */ + +if (mac_bi_data.rombase ==0 ) + mac_bi_data.rombase =0x40800000 ; + +/* works on some */ + rom_reset = (void *)(mac_bi_data.rombase +0xa ); + +local_irq_disable (); +rom_reset (); }/* should never get here */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/744 net: ipv6: fix wrong start position when receive hop-by-hop fragment
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: gaoxingwang <[email protected]>
[ Upstream commit 1cd354fe1e4864eeaff62f66ee513080ec946f20 ]
In IPv6, ipv6_rcv_core will parse the hop-by-hop type extension header and increase skb->transport_header by one extension header length. But if there are more other extension headers like fragment header at this time, the skb->transport_header points to the second extension header, not the transport layer header or the first extension header.
This will result in the start and nexthdrp variable not pointing to the same position in ipv6frag_thdr_trunced,
and ipv6_skip_exthdr returning incorrect offset and frag_off.Sometimes,the length of the last sharded packet is smaller than the calculated incorrect offset, resulting in packet loss. We can use network header to offset and calculate the correct position to solve this problem.
--- net/ipv6/reassembly.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/reassembly.c +1 -1
@@ -369,7 +369,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)* the source of the fragment, with the Pointer field set to zero. */ nexthdr = hdr->nexthdr; -if (ipv6frag_thdr_truncated (skb,skb_transport_offset (skb), &nexthdr)) { +if (ipv6frag_thdr_truncated (skb,skb_network_offset (skb) +sizeof (struct ipv6hdr ), &nexthdr)) {__IP6_INC_STATS (net,__in6_dev_get_safely (skb->dev),IPSTATS_MIB_INHDRERRORS );icmpv6_param_prob (skb,ICMPV6_HDR_INCOMP ,0 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/744 eth: sungem: remove .ndo_poll_controller to avoid deadlocks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit ac0a230f719b02432d8c7eba7615ebd691da86f4 ]
Erhard reports netpoll warnings from sungem:
netpoll_send_skb_on_dev(): eth0 enabled interrupts in poll (gem_start_xmit+0x0/0x398)
WARNING: CPU: 1 PID: 1 at net/core/netpoll.c:370 netpoll_send_skb+0x1fc/0x20c
gem_poll_controller() disables interrupts, which may sleep. We can't sleep in netpoll, it has interrupts disabled completely. Strangely, gem_poll_controller() doesn't even poll the completions, and instead acts as if an interrupt has fired so it just schedules NAPI and exits. None of this has been necessary for years, since netpoll invokes NAPI directly.
--- drivers/net/ethernet/sun/sungem.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/net/ethernet/sun/sungem.c +0 -14
@@ -949,17 +949,6 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -#ifdef CONFIG_NET_POLL_CONTROLLER -static void gem_poll_controller (struct net_device *dev) -{ -struct gem *gp =netdev_priv (dev); - -disable_irq (gp->pdev->irq); -gem_interrupt (gp->pdev->irq, dev); -enable_irq (gp->pdev->irq); -} -#endif -static void gem_tx_timeout (struct net_device *dev,unsigned int txqueue) {struct gem *gp =netdev_priv (dev);
@@ -2839,9 +2828,6 @@ static const struct net_device_ops gem_netdev_ops = { .ndo_change_mtu = gem_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = gem_set_mac_address, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = gem_poll_controller, -#endif };static int gem_init_one (struct pci_dev *pdev,const struct pci_device_id *ent)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/744 selftests: net: add more missing kernel config
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 02d9009f4e8c27dcf10c3e39bc0666436686a219 ]
The reuseport_addr_any.sh is currently skipping DCCP tests and pmtu.sh is skipping all the FOU/GUE related cases: add the missing options.
Stable-dep-of: c499fe96d3f7 ("selftests: net: add missing config for amt.sh")
--- tools/testing/selftests/net/config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/testing/selftests/net/config +5 -1
@@ -24,10 +24,14 @@ CONFIG_IFB=y CONFIG_INET_DIAG=y CONFIG_INET_ESP=y CONFIG_INET_ESP_OFFLOAD=y +CONFIG_NET_FOU=y +CONFIG_NET_FOU_IP_TUNNELS=y CONFIG_IP_GRE=m CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y CONFIG_NF_CONNTRACK=m +CONFIG_IPV6_SIT=y +CONFIG_IP_DCCP=m CONFIG_NF_NAT=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP_NF_IPTABLES=m
@@ -62,6 +66,7 @@ CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_U32=m CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE=m +CONFIG_NET_IPIP=y CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_FQ=m
@@ -78,7 +83,6 @@ CONFIG_TLS=m CONFIG_TRACEPOINTS=y CONFIG_NET_DROP_MONITOR=m CONFIG_NETDEVSIM=m -CONFIG_NET_FOU=m CONFIG_MPLS_ROUTING=m CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_SCH_INGRESS=m
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/744 selftests: net: add missing config for amt.sh
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c499fe96d3f75a5cf50de6089dd8f1cddd1301a9 ]
Test needs IPv6 multicast. smcroute currently crashes when trying to install a route in a kernel without IPv6 multicast.
--- tools/testing/selftests/net/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/config +1 -0
@@ -30,6 +30,7 @@ CONFIG_IP_GRE=m CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y CONFIG_NF_CONNTRACK=m +CONFIG_IPV6_MROUTE=y CONFIG_IPV6_SIT=y CONFIG_IP_DCCP=m CONFIG_NF_NAT=m
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/744 selftests: net: move amt to socat for better compatibility
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 4c639b6a7b9db236c0907aca8e92d1537076f2cd ]
The test seems to expect that nc will exit after the first received message. This is not the case with Ncat 7.94. There are multiple versions of nc out there, switch to socat for better compatibility.
Tell socat to exit after 128 bytes and pad the message.
Since the test sets -e make sure we don't set exit code (|| true) and print the pass / fail rather then silently moving over the test and just setting non-zero exit code with no output indicating what failed.
--- tools/testing/selftests/net/amt.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/net/amt.sh +6 -6
@@ -210,8 +210,8 @@ check_features() test_ipv4_forward() { - RESULT4=$(ip netns exec "${LISTENER}" nc -w 1 -l -u 239.0.0.1 4000) - if [ "$RESULT4" == "172.17.0.2" ]; then + RESULT4=$(ip netns exec "${LISTENER}" timeout 15 socat - UDP4-LISTEN:4000,readbytes=128 || true) + if echo "$RESULT4" | grep -q "172.17.0.2"; then printf "TEST: %-60s [ OK ]\n" "IPv4 amt multicast forwarding" exit 0 else
@@ -222,8 +222,8 @@ test_ipv4_forward() test_ipv6_forward() { - RESULT6=$(ip netns exec "${LISTENER}" nc -w 1 -l -u ff0e::5:6 6000) - if [ "$RESULT6" == "2001:db8:3::2" ]; then + RESULT6=$(ip netns exec "${LISTENER}" timeout 15 socat - UDP6-LISTEN:6000,readbytes=128 || true) + if echo "$RESULT6" | grep -q "2001:db8:3::2"; then printf "TEST: %-60s [ OK ]\n" "IPv6 amt multicast forwarding" exit 0 else
@@ -236,14 +236,14 @@ send_mcast4() { sleep 2 ip netns exec "${SOURCE}" bash -c \ - 'echo 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' & + 'printf "%s %128s" 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' & } send_mcast6() { sleep 2 ip netns exec "${SOURCE}" bash -c \ - 'echo 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' & + 'printf "%s %128s" 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' & } check_features
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/744 net: ethernet: cortina: Locking fixes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 812552808f7ff71133fc59768cdc253c5b8ca1bf ]
This fixes a probably long standing problem in the Cortina Gemini ethernet driver: there are some paths in the code where the IRQ registers are written without taking the proper locks.
--- drivers/net/ethernet/cortina/gemini.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/cortina/gemini.c +10 -2
@@ -1108,10 +1108,13 @@ static void gmac_tx_irq_enable(struct net_device *netdev, {struct gemini_ethernet_port *port =netdev_priv (netdev);struct gemini_ethernet *geth = port->geth; +unsigned long flags;u32 val, mask;netdev_dbg (netdev,"%s device %d\n" , __func__, netdev->dev_id); +spin_lock_irqsave (&geth->irq_lock, flags); + mask =GMAC0_IRQ0_TXQ0_INTS << (6 * netdev->dev_id + txq);if (en)
@@ -1120,6 +1123,8 @@ static void gmac_tx_irq_enable(struct net_device *netdev, val =readl (geth->base +GLOBAL_INTERRUPT_ENABLE_0_REG ); val = en ? val | mask : val & ~mask;writel (val, geth->base +GLOBAL_INTERRUPT_ENABLE_0_REG ); + +spin_unlock_irqrestore (&geth->irq_lock, flags); }static void gmac_tx_irq (struct net_device *netdev,unsigned int txq_num)
@@ -1426,15 +1431,19 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget)union gmac_rxdesc_3 word3;struct page *page =NULL ;unsigned int page_offs; +unsigned long flags;unsigned short r, w;union dma_rwptr rw;dma_addr_t mapping;int frag_nr =0 ; +spin_lock_irqsave (&geth->irq_lock, flags); rw.bits32 =readl (ptr_reg);/* Reset interrupt as all packages until here are taken into account */ writel (DEFAULT_Q0_INT_BIT << netdev->dev_id, geth->base +GLOBAL_INTERRUPT_STATUS_1_REG ); +spin_unlock_irqrestore (&geth->irq_lock, flags); + r = rw.bits.rptr; w = rw.bits.wptr;
@@ -1737,10 +1746,9 @@ static irqreturn_t gmac_irq(int irq, void *data)gmac_update_hw_stats (netdev);if (val & (GMAC0_RX_OVERRUN_INT_BIT << (netdev->dev_id *8 ))) { +spin_lock (&geth->irq_lock);writel (GMAC0_RXDERR_INT_BIT << (netdev->dev_id *8 ), geth->base +GLOBAL_INTERRUPT_STATUS_4_REG ); - -spin_lock (&geth->irq_lock);u64_stats_update_begin (&port->ir_stats_syncp); ++port->stats.rx_fifo_errors;u64_stats_update_end (&port->ir_stats_syncp);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/744 af_unix: Fix data races in unix_release_sock/unix_stream_sendmsg
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 540bf24fba16b88c1b3b9353927204b4f1074e25 ]
A data-race condition has been identified in af_unix. In one data path, the write function unix_release_sock() atomically writes to sk->sk_shutdown using WRITE_ONCE. However, on the reader side, unix_stream_sendmsg() does not read it atomically. Consequently, this issue is causing the following KCSAN splat to occur:
BUG: KCSAN: data-race in unix_release_sock / unix_stream_sendmsg
write (marked) to 0xffff88867256ddbb of 1 bytes by task 7270 on cpu 28: unix_release_sock (net/unix/af_unix.c:640) unix_release (net/unix/af_unix.c:1050) sock_close (net/socket.c:659 net/socket.c:1421) __fput (fs/file_table.c:422) __fput_sync (fs/file_table.c:508) __se_sys_close (fs/open.c:1559 fs/open.c:1541) __x64_sys_close (fs/open.c:1541) x64_sys_call (arch/x86/entry/syscall_64.c:33) do_syscall_64 (arch/x86/entry/common.c:?) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) read to 0xffff88867256ddbb of 1 bytes by task 989 on cpu 14: unix_stream_sendmsg (net/unix/af_unix.c:2273) __sock_sendmsg (net/socket.c:730 net/socket.c:745) ____sys_sendmsg (net/socket.c:2584) __sys_sendmmsg (net/socket.c:2638 net/socket.c:2724) __x64_sys_sendmmsg (net/socket.c:2753 net/socket.c:2750 net/socket.c:2750) x64_sys_call (arch/x86/entry/syscall_64.c:33) do_syscall_64 (arch/x86/entry/common.c:?) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) value changed: 0x01 -> 0x03
The line numbers are related to commit dd5a440a31fa ("Linux 6.9-rc7").
Commit e1d09c2c2f57 ("af_unix: Fix data races around sk->sk_shutdown.") addressed a comparable issue in the past regarding sk->sk_shutdown. However, it overlooked resolving this particular data path. This patch only offending unix_stream_sendmsg() function, since the other reads seem to be protected by unix_state_lock() as discussed in
--- net/unix/af_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/unix/af_unix.c +1 -1
@@ -2199,7 +2199,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, goto out_err; } -if (sk->sk_shutdown &SEND_SHUTDOWN ) +if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN ) goto pipe_err;while (sent < len) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/744 net: usb: smsc95xx: stop lying about skb->truesize
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 d50729f1d60bca822ef6d9c1a5fb28d486bd7593 ]
Some usb drivers try to set small skb->truesize and break core networking stacks.
In this patch, I removed one of the skb->truesize override.
I also replaced one skb_clone() by an allocation of a fresh and small skb, to get minimally sized skbs, like we did in commit 1e2c61172342 ("net: cdc_ncm: reduce skb truesize in rx path") and 4ce62d5b2f7a ("net: usb: ax88179_178a:
stop lying about skb->truesize")
v3: also fix a sparse error ( https://lore.kernel.org/oe-kbuild-all/[email protected]/ )
v2: leave the skb_trim() game because smsc95xx_rx_csum_offload()
needs the csum part. (Jakub)
While we are it, use get_unaligned() in smsc95xx_rx_csum_offload().
--- drivers/net/usb/smsc95xx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/usb/smsc95xx.c +7 -8
@@ -1810,9 +1810,11 @@ static int smsc95xx_reset_resume(struct usb_interface *intf)static void smsc95xx_rx_csum_offload (struct sk_buff *skb) { - skb->csum = *(u16 *)(skb_tail_pointer (skb) -2 ); +u16 *csum_ptr = (u16 *)(skb_tail_pointer (skb) -2 ); + + skb->csum = (__force __wsum )get_unaligned (csum_ptr); skb->ip_summed =CHECKSUM_COMPLETE ; -skb_trim (skb, skb->len -2 ); +skb_trim (skb, skb->len -2 );/* remove csum */ }static int smsc95xx_rx_fixup (struct usbnet *dev,struct sk_buff *skb)
@@ -1870,25 +1872,22 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)if (dev->net->features &NETIF_F_RXCSUM )smsc95xx_rx_csum_offload (skb);skb_trim (skb, skb->len -4 );/* remove fcs */ - skb->truesize = size +sizeof (struct sk_buff );return 1 ; } - ax_skb =skb_clone (skb,GFP_ATOMIC ); + ax_skb =netdev_alloc_skb_ip_align (dev->net, size);if (unlikely (!ax_skb)) {netdev_warn (dev->net,"Error allocating skb\n" );return 0 ; } - ax_skb->len = size; - ax_skb->data = packet; -skb_set_tail_pointer (ax_skb, size); +skb_put (ax_skb, size); +memcpy (ax_skb->data, packet, size);if (dev->net->features &NETIF_F_RXCSUM )smsc95xx_rx_csum_offload (ax_skb);skb_trim (ax_skb, ax_skb->len -4 );/* remove fcs */ - ax_skb->truesize = size +sizeof (struct sk_buff );usbnet_skb_return (dev, ax_skb); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/744 net: openvswitch: fix overwriting ct original tuple for ICMPv6
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Maximets <[email protected]>
[ Upstream commit 7c988176b6c16c516474f6fceebe0f055af5eb56 ]
OVS_PACKET_CMD_EXECUTE has 3 main attributes:
- OVS_PACKET_ATTR_KEY - Packet metadata in a netlink format.
- OVS_PACKET_ATTR_PACKET - Binary packet content.
- OVS_PACKET_ATTR_ACTIONS - Actions to execute on the packet.
OVS_PACKET_ATTR_KEY is parsed first to populate sw_flow_key structure with the metadata like conntrack state, input port, recirculation id, etc. Then the packet itself gets parsed to populate the rest of the keys from the packet headers.
Whenever the packet parsing code starts parsing the ICMPv6 header, it first zeroes out fields in the key corresponding to Neighbor Discovery information even if it is not an ND packet.
It is an 'ipv6.nd' field. However, the 'ipv6' is a union that shares the space between 'nd' and 'ct_orig' that holds the original tuple conntrack metadata parsed from the OVS_PACKET_ATTR_KEY.
ND packets should not normally have conntrack state, so it's fine to share the space, but normal ICMPv6 Echo packets or maybe other types of ICMPv6 can have the state attached and it should not be overwritten.
The issue results in all but the last 4 bytes of the destination address being wiped from the original conntrack tuple leading to incorrect packet matching and potentially executing wrong actions in case this packet recirculates within the datapath or goes back to userspace.
ND fields should not be accessed in non-ND packets, so not clearing them should be fine. Executing memset() only for actual ND packets to avoid the issue.
Initializing the whole thing before parsing is needed because ND packet may not contain all the options.
The issue only affects the OVS_PACKET_CMD_EXECUTE path and doesn't affect packets entering OVS datapath from network interfaces, because in this case CT metadata is populated from skb after the packet is already parsed.
--- net/openvswitch/flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/openvswitch/flow.c +2 -1
@@ -561,7 +561,6 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,*/ key->tp.src =htons (icmp->icmp6_type); key->tp.dst =htons (icmp->icmp6_code); -memset (&key->ipv6.nd,0 ,sizeof (key->ipv6.nd)); if (icmp->icmp6_code == 0 && (icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
@@ -570,6 +569,8 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,struct nd_msg *nd;int offset; +memset (&key->ipv6.nd,0 ,sizeof (key->ipv6.nd)); +/* In order to process neighbor discovery options, we need the * entire packet. */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/744 ipv6: sr: add missing seg6_local_exit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 3321687e321307629c71b664225b861ebf3e5753 ]
Currently, we only call seg6_local_exit() in seg6_init() if seg6_local_init() failed. But forgot to call it in seg6_exit().
--- net/ipv6/seg6.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/seg6.c +1 -0
@@ -564,6 +564,7 @@ void seg6_exit(void)seg6_hmac_exit ();#endif #ifdef CONFIG_IPV6_SEG6_LWTUNNEL +seg6_local_exit ();seg6_iptunnel_exit ();#endif unregister_pernet_subsys (&ip6_segments_ops);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/744 ipv6: sr: fix incorrect unregister order
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 6e370a771d2985107e82d0f6174381c1acb49c20 ]
Commit 5559cea2d5aa ("ipv6: sr: fix possible use-after-free and null-ptr-deref") changed the register order in seg6_init(). But the unregister order in seg6_exit() is not updated.
--- net/ipv6/seg6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/seg6.c +1 -1
@@ -567,6 +567,6 @@ void seg6_exit(void)seg6_local_exit ();seg6_iptunnel_exit ();#endif -unregister_pernet_subsys (&ip6_segments_ops);genl_unregister_family (&seg6_genl_family); +unregister_pernet_subsys (&ip6_segments_ops); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/744 ipv6: sr: fix invalid unregister error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 160e9d2752181fcf18c662e74022d77d3164cd45 ]
The error path of seg6_init() is wrong in case CONFIG_IPV6_SEG6_LWTUNNEL is not defined. In that case if seg6_hmac_init() fails, the genl_unregister_family() isn't called.
This issue exist since commit 46738b1317e1 ("ipv6: sr: add option to control lwtunnel support"), and commit 5559cea2d5aa ("ipv6: sr: fix possible use-after-free and null-ptr-deref") replaced unregister_pernet_subsys() with genl_unregister_family() in this error path.
--- net/ipv6/seg6.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/seg6.c +2 -0
@@ -551,6 +551,8 @@ int __init seg6_init(void)#endif #ifdef CONFIG_IPV6_SEG6_LWTUNNEL out_unregister_genl: +#endif +#if IS_ENABLED (CONFIG_IPV6_SEG6_LWTUNNEL ) ||IS_ENABLED (CONFIG_IPV6_SEG6_HMAC )genl_unregister_family (&seg6_genl_family);#endif out_unregister_pernet:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/744 net/mlx5: Enable 4 ports multiport E-switch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Drory <[email protected]>
[ Upstream commit e738e355045237ee8802cb2b31a8ed6f4b7ac534 ]
enable_mpesw() assumed only 2 ports are available, fix this by removing that assumption and looping through the existing lag ports to enable multi-port E-switch for cards with more than 2 ports.
Stable-dep-of: 0f06228d4a2d ("net/mlx5: Reload only IB representors upon lag disable/enable")
--- .../ethernet/mellanox/mlx5/core/lag/mpesw.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c +9 -9
@@ -65,12 +65,12 @@ static int mlx5_mpesw_metadata_set(struct mlx5_lag *ldev)return err; } -#define MLX5_LAG_MPESW_OFFLOADS_SUPPORTED_PORTS 2 +#define MLX5_LAG_MPESW_OFFLOADS_SUPPORTED_PORTS 4static int enable_mpesw (struct mlx5_lag *ldev) {struct mlx5_core_dev *dev0 = ldev->pf[MLX5_LAG_P1 ].dev; -struct mlx5_core_dev *dev1 = ldev->pf[MLX5_LAG_P2 ].dev;int err; +int i;if (ldev->mode !=MLX5_LAG_MODE_NONE )return -EINVAL ;
@@ -98,11 +98,11 @@ static int enable_mpesw(struct mlx5_lag *ldev) dev0->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ;mlx5_rescan_drivers_locked (dev0); - err =mlx5_eswitch_reload_reps (dev0->priv.eswitch); -if (!err) - err =mlx5_eswitch_reload_reps (dev1->priv.eswitch); -if (err) - goto err_rescan_drivers; +for (i =0 ; i < ldev->ports; i++) { + err =mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); +if (err) + goto err_rescan_drivers; + }return 0 ;
@@ -112,8 +112,8 @@ static int enable_mpesw(struct mlx5_lag *ldev)mlx5_deactivate_lag (ldev); err_add_devices:mlx5_lag_add_devices (ldev); -mlx5_eswitch_reload_reps (dev0->priv.eswitch); -mlx5_eswitch_reload_reps (dev1->priv.eswitch); +for (i =0 ; i < ldev->ports; i++) +mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch);mlx5_mpesw_metadata_cleanup (ldev);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/744 net/mlx5: Reload only IB representors upon lag disable/enable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maher Sanalla <[email protected]>
[ Upstream commit 0f06228d4a2dcc1fca5b3ddb0eefa09c05b102c4 ]
On lag disable, the bond IB device along with all of its representors are destroyed, and then the slaves' representors get reloaded.
In case the slave IB representor load fails, the eswitch error flow unloads all representors, including ethernet representors, where the netdevs get detached and removed from lag bond. Such flow is inaccurate as the lag driver is not responsible for loading/unloading ethernet representors. Furthermore, the flow described above begins by holding lag lock to prevent bond changes during disable flow. However, when reaching the ethernet representors detachment from lag, the lag lock is required again, triggering the following deadlock:
Call trace: __switch_to+0xf4/0x148 __schedule+0x2c8/0x7d0 schedule+0x50/0xe0 schedule_preempt_disabled+0x18/0x28 __mutex_lock.isra.13+0x2b8/0x570 __mutex_lock_slowpath+0x1c/0x28 mutex_lock+0x4c/0x68 mlx5_lag_remove_netdev+0x3c/0x1a0 [mlx5_core] mlx5e_uplink_rep_disable+0x70/0xa0 [mlx5_core] mlx5e_detach_netdev+0x6c/0xb0 [mlx5_core] mlx5e_netdev_change_profile+0x44/0x138 [mlx5_core] mlx5e_netdev_attach_nic_profile+0x28/0x38 [mlx5_core] mlx5e_vport_rep_unload+0x184/0x1b8 [mlx5_core] mlx5_esw_offloads_rep_load+0xd8/0xe0 [mlx5_core] mlx5_eswitch_reload_reps+0x74/0xd0 [mlx5_core] mlx5_disable_lag+0x130/0x138 [mlx5_core] mlx5_lag_disable_change+0x6c/0x70 [mlx5_core] // hold ldev->lock mlx5_devlink_eswitch_mode_set+0xc0/0x410 [mlx5_core] devlink_nl_cmd_eswitch_set_doit+0xdc/0x180 genl_family_rcv_msg_doit.isra.17+0xe8/0x138 genl_rcv_msg+0xe4/0x220 netlink_rcv_skb+0x44/0x108 genl_rcv+0x40/0x58 netlink_unicast+0x198/0x268 netlink_sendmsg+0x1d4/0x418 sock_sendmsg+0x54/0x60 __sys_sendto+0xf4/0x120 __arm64_sys_sendto+0x30/0x40 el0_svc_common+0x8c/0x120 do_el0_svc+0x30/0xa0 el0_svc+0x20/0x30 el0_sync_handler+0x90/0xb8 el0_sync+0x160/0x180
Thus, upon lag enable/disable, load and unload only the IB representors of the slaves preventing the deadlock mentioned above.
While at it, refactor the mlx5_esw_offloads_rep_load() function to have a static helper method for its internal logic, in symmetry with the representor unload design.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +-- .../mellanox/mlx5/core/eswitch_offloads.c | 28 ++++++++++++------- .../net/ethernet/mellanox/mlx5/core/lag/lag.c | 6 ++-- .../ethernet/mellanox/mlx5/core/lag/mpesw.c | 4 +-- 4 files changed, 25 insertions(+), 17 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +2 -2
@@ -840,7 +840,7 @@ int mlx5_eswitch_offloads_single_fdb_add_one(struct mlx5_eswitch *master_esw, struct mlx5_eswitch *slave_esw, int max_slaves);void mlx5_eswitch_offloads_single_fdb_del_one (struct mlx5_eswitch *master_esw,struct mlx5_eswitch *slave_esw); -int mlx5_eswitch_reload_reps (struct mlx5_eswitch *esw); +int mlx5_eswitch_reload_ib_reps (struct mlx5_eswitch *esw);bool mlx5_eswitch_block_encap (struct mlx5_core_dev *dev);void mlx5_eswitch_unblock_encap (struct mlx5_core_dev *dev);
@@ -932,7 +932,7 @@ mlx5_eswitch_offloads_single_fdb_del_one(struct mlx5_eswitch *master_esw,static inline int mlx5_eswitch_get_npeers (struct mlx5_eswitch *esw) {return 0 ; }static inline int -mlx5_eswitch_reload_reps (struct mlx5_eswitch *esw) +mlx5_eswitch_reload_ib_reps (struct mlx5_eswitch *esw) {return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +18 -10
@@ -2501,6 +2501,16 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw)esw_offloads_cleanup_reps (esw); } +static int __esw_offloads_load_rep (struct mlx5_eswitch *esw, +struct mlx5_eswitch_rep *rep,u8 rep_type) +{ +if (atomic_cmpxchg (&rep->rep_data[rep_type].state, +REP_REGISTERED ,REP_LOADED ) ==REP_REGISTERED ) +return esw->offloads.rep_ops[rep_type]->load (esw->dev, rep); + +return 0 ; +} +static void __esw_offloads_unload_rep (struct mlx5_eswitch *esw,struct mlx5_eswitch_rep *rep,u8 rep_type) {
@@ -2525,13 +2535,11 @@ static int mlx5_esw_offloads_rep_load(struct mlx5_eswitch *esw, u16 vport_num)int err; rep =mlx5_eswitch_get_rep (esw, vport_num); -for (rep_type =0 ; rep_type <NUM_REP_TYPES ; rep_type++) -if (atomic_cmpxchg (&rep->rep_data[rep_type].state, -REP_REGISTERED ,REP_LOADED ) ==REP_REGISTERED ) { - err = esw->offloads.rep_ops[rep_type]->load (esw->dev, rep); -if (err) - goto err_reps; - } +for (rep_type =0 ; rep_type <NUM_REP_TYPES ; rep_type++) { + err =__esw_offloads_load_rep (esw, rep, rep_type); +if (err) + goto err_reps; + }return 0 ;
@@ -3276,7 +3284,7 @@ static void esw_destroy_offloads_acl_tables(struct mlx5_eswitch *esw)esw_vport_destroy_offloads_acl_tables (esw, vport); } -int mlx5_eswitch_reload_reps (struct mlx5_eswitch *esw) +int mlx5_eswitch_reload_ib_reps (struct mlx5_eswitch *esw) {struct mlx5_eswitch_rep *rep;unsigned long i;
@@ -3289,13 +3297,13 @@ int mlx5_eswitch_reload_reps(struct mlx5_eswitch *esw)if (atomic_read (&rep->rep_data[REP_ETH ].state) !=REP_LOADED )return 0 ; - ret =mlx5_esw_offloads_rep_load (esw,MLX5_VPORT_UPLINK ); + ret =__esw_offloads_load_rep (esw, rep,REP_IB );if (ret)return ret;mlx5_esw_for_each_rep (esw, i, rep) {if (atomic_read (&rep->rep_data[REP_ETH ].state) ==REP_LOADED ) -mlx5_esw_offloads_rep_load (esw, rep->vport); +__esw_offloads_load_rep (esw, rep,REP_IB ); }return 0 ;
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +3 -3
@@ -814,7 +814,7 @@ void mlx5_disable_lag(struct mlx5_lag *ldev)if (shared_fdb)for (i =0 ; i < ldev->ports; i++)if (!(ldev->pf[i].dev->priv.flags &MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV )) -mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); +mlx5_eswitch_reload_ib_reps (ldev->pf[i].dev->priv.eswitch); }static bool mlx5_shared_fdb_supported (struct mlx5_lag *ldev)
@@ -922,7 +922,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)mlx5_rescan_drivers_locked (dev0);for (i =0 ; i < ldev->ports; i++) { - err =mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); + err =mlx5_eswitch_reload_ib_reps (ldev->pf[i].dev->priv.eswitch);if (err)break ; }
@@ -933,7 +933,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)mlx5_deactivate_lag (ldev);mlx5_lag_add_devices (ldev);for (i =0 ; i < ldev->ports; i++) -mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); +mlx5_eswitch_reload_ib_reps (ldev->pf[i].dev->priv.eswitch);mlx5_core_err (dev0,"Failed to enable lag\n" );return ; }
drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c +2 -2
@@ -99,7 +99,7 @@ static int enable_mpesw(struct mlx5_lag *ldev) dev0->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ;mlx5_rescan_drivers_locked (dev0);for (i =0 ; i < ldev->ports; i++) { - err =mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); + err =mlx5_eswitch_reload_ib_reps (ldev->pf[i].dev->priv.eswitch);if (err) goto err_rescan_drivers; }
@@ -113,7 +113,7 @@ static int enable_mpesw(struct mlx5_lag *ldev) err_add_devices:mlx5_lag_add_devices (ldev);for (i =0 ; i < ldev->ports; i++) -mlx5_eswitch_reload_reps (ldev->pf[i].dev->priv.eswitch); +mlx5_eswitch_reload_ib_reps (ldev->pf[i].dev->priv.eswitch);mlx5_mpesw_metadata_cleanup (ldev);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/744 net/mlx5: Add a timeout to acquire the command queue semaphore
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akiva Goldberger <[email protected]>
[ Upstream commit 485d65e1357123a697c591a5aeb773994b247ad7 ]
Prevent forced completion handling on an entry that has not yet been assigned an index, causing an out of bounds access on idx = -22. Instead of waiting indefinitely for the sem, blocking flow now waits for index to be allocated or a sem acquisition timeout before beginning the timer for FW completion.
Kernel log example:mlx5_core 0000:06:00.0: wait_func_handle_exec_timeout:1128:(pid 185911): cmd[-22]: CREATE_UCTX(0xa04) No done completion
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 41 +++++++++++++++---- include/linux/mlx5/driver.h | 1 + 2 files changed, 33 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +32 -9
@@ -967,19 +967,32 @@ static void cmd_work_handler(struct work_struct *work)bool poll_cmd = ent->polling;struct mlx5_cmd_layout *lay;struct mlx5_core_dev *dev; -unsigned long cb_timeout; -struct semaphore *sem; +unsigned long timeout;unsigned long flags;int alloc_ret;int cmd_mode; +complete (&ent->handling); + dev = container_of(cmd, struct mlx5_core_dev, cmd); - cb_timeout =msecs_to_jiffies (mlx5_tout_ms (dev,CMD )); + timeout =msecs_to_jiffies (mlx5_tout_ms (dev,CMD )); -complete (&ent->handling); - sem = ent->page_queue ? &cmd->vars.pages_sem : &cmd->vars.sem; -down (sem);if (!ent->page_queue) { +if (down_timeout (&cmd->vars.sem, timeout)) { +mlx5_core_warn (dev,"%s(0x%x) timed out while waiting for a slot.\n" , +mlx5_command_str (ent->op), ent->op); +if (ent->callback) { + ent->callback (-EBUSY , ent->context); +mlx5_free_cmd_msg (dev, ent->out); +free_msg (dev, ent->in); +cmd_ent_put (ent); + }else { + ent->ret = -EBUSY ; +complete (&ent->done); + } +complete (&ent->slotted); +return ; + } alloc_ret =cmd_alloc_index (cmd, ent);if (alloc_ret <0 ) {mlx5_core_err_rl (dev,"failed to allocate command entry\n" );
@@ -992,10 +1005,11 @@ static void cmd_work_handler(struct work_struct *work) ent->ret = -EAGAIN ;complete (&ent->done); } -up (sem); +up (&cmd->vars.sem);return ; } }else { +down (&cmd->vars.pages_sem); ent->idx = cmd->vars.max_reg_cmds;spin_lock_irqsave (&cmd->alloc_lock, flags);clear_bit (ent->idx, &cmd->vars.bitmask);
@@ -1003,6 +1017,8 @@ static void cmd_work_handler(struct work_struct *work)spin_unlock_irqrestore (&cmd->alloc_lock, flags); } +complete (&ent->slotted); + lay =get_inst (cmd, ent->idx); ent->lay = lay;memset (lay,0 ,sizeof (*lay));
@@ -1021,7 +1037,7 @@ static void cmd_work_handler(struct work_struct *work) ent->ts1 =ktime_get_ns (); cmd_mode = cmd->mode; -if (ent->callback &&schedule_delayed_work (&ent->cb_timeout_work, cb_timeout)) +if (ent->callback &&schedule_delayed_work (&ent->cb_timeout_work, timeout))cmd_ent_get (ent);set_bit (MLX5_CMD_ENT_STATE_PENDING_COMP , &ent->state);
@@ -1141,6 +1157,9 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent) ent->ret = -ECANCELED ; goto out_err; } + +wait_for_completion (&ent->slotted); +if (cmd->mode ==CMD_MODE_POLLING || ent->polling)wait_for_completion (&ent->done);else if (!wait_for_completion_timeout (&ent->done, timeout))
@@ -1155,6 +1174,9 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent) }else if (err == -ECANCELED ) {mlx5_core_warn (dev,"%s(0x%x) canceled on out of queue timeout.\n" ,mlx5_command_str (ent->op), ent->op); + }else if (err == -EBUSY ) { +mlx5_core_warn (dev,"%s(0x%x) timeout while waiting for command semaphore.\n" , +mlx5_command_str (ent->op), ent->op); }mlx5_core_dbg (dev,"err %d, delivery status %s(%d)\n" , err,deliv_status_to_str (ent->status), ent->status);
@@ -1206,6 +1228,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, ent->polling = force_polling;init_completion (&ent->handling); +init_completion (&ent->slotted);if (!callback)init_completion (&ent->done);
@@ -1223,7 +1246,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,return 0 ;/* mlx5_cmd_comp_handler() will put(ent) */ err =wait_func (dev, ent); -if (err == -ETIMEDOUT || err == -ECANCELED ) +if (err == -ETIMEDOUT || err == -ECANCELED || err == -EBUSY ) goto out_free; ds = ent->ts2 - ent->ts1;
include/linux/mlx5/driver.h +1 -0
@@ -852,6 +852,7 @@ struct mlx5_cmd_work_ent {void *context;int idx;struct completion handling; +struct completion slotted;struct completion done;struct mlx5_cmd *cmd;struct work_struct work;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/744 net/mlx5: Discard command completions in internal error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akiva Goldberger <[email protected]>
[ Upstream commit db9b31aa9bc56ff0d15b78f7e827d61c4a096e40 ]
Fix use after free when FW completion arrives while device is in internal error state. Avoid calling completion handler in this case, since the device will flush the command interface and trigger all completions manually.
Kernel log:
------------[ cut here ]------------ refcount_t: underflow; use-after-free. ... RIP: 0010:refcount_warn_saturate+0xd8/0xe0 ... Call Trace: <IRQ> ? __warn+0x79/0x120 ? refcount_warn_saturate+0xd8/0xe0 ? report_bug+0x17c/0x190 ? handle_bug+0x3c/0x60 ? exc_invalid_op+0x14/0x70 ? asm_exc_invalid_op+0x16/0x20 ? refcount_warn_saturate+0xd8/0xe0 cmd_ent_put+0x13b/0x160 [mlx5_core] mlx5_cmd_comp_handler+0x5f9/0x670 [mlx5_core] cmd_comp_notifier+0x1f/0x30 [mlx5_core] notifier_call_chain+0x35/0xb0 atomic_notifier_call_chain+0x16/0x20 mlx5_eq_async_int+0xf6/0x290 [mlx5_core] notifier_call_chain+0x35/0xb0 atomic_notifier_call_chain+0x16/0x20 irq_int_handler+0x19/0x30 [mlx5_core] __handle_irq_event_percpu+0x4b/0x160 handle_irq_event+0x2e/0x80 handle_edge_irq+0x98/0x230 __common_interrupt+0x3b/0xa0 common_interrupt+0x7b/0xa0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +3 -0
@@ -1632,6 +1632,9 @@ static int cmd_comp_notifier(struct notifier_block *nb, dev = container_of(cmd, struct mlx5_core_dev, cmd); eqe = data; +if (dev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR ) +return NOTIFY_DONE ; +mlx5_cmd_comp_handler (dev,be32_to_cpu (eqe->data.cmd.vector), false);return NOTIFY_OK ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/744 s390/bpf: Emit a barrier for BPF_FETCH instructions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Leoshkevich <[email protected]>
[ Upstream commit 68378982f0b21de02ac3c6a11e2420badefcb4bc ]
BPF_ATOMIC_OP() macro documentation states that "BPF_ADD | BPF_FETCH" should be the same as atomic_fetch_add(), which is currently not the case on s390x: the serialization instruction "bcr 14,0" is missing. This applies to "and", "or" and "xor" variants too.
s390x is allowed to reorder stores with subsequent fetches from different addresses, so code relying on BPF_FETCH acting as a barrier, for example:
stw [%r0], 1
afadd [%r1], %r2
ldxw %r3, [%r4]
may be broken. Fix it by emitting "bcr 14,0".
Note that a separate serialization instruction is not needed for BPF_XCHG and BPF_CMPXCHG, because COMPARE AND SWAP performs serialization itself.
--- arch/s390/net/bpf_jit_comp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/net/bpf_jit_comp.c +6 -2
@@ -1311,8 +1311,12 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp,EMIT6_DISP_LH (0xeb000000 , is32 ? (op32) : (op64), \ (insn->imm &BPF_FETCH ) ? src_reg :REG_W0 , \ src_reg, dst_reg, off); \ -if (is32 && (insn->imm &BPF_FETCH )) \ -EMIT_ZERO (src_reg); \ +if (insn->imm &BPF_FETCH ) { \ +/* bcr 14,0 - see atomic_fetch_{add,and,or,xor}() */ \ +_EMIT2 (0x07e0 ); \ +if (is32) \ +EMIT_ZERO (src_reg); \ + } \ }while (0 )case BPF_ADD :case BPF_ADD |BPF_FETCH :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/744 riscv, bpf: make some atomic operations fully ordered
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puranjay Mohan <[email protected]>
[ Upstream commit 20a759df3bba35bf5c3ddec0c02ad69b603b584c ]
The BPF atomic operations with the BPF_FETCH modifier along with BPF_XCHG and BPF_CMPXCHG are fully ordered but the RISC-V JIT implements all atomic operations except BPF_CMPXCHG with relaxed ordering.
Section 8.1 of the "The RISC-V Instruction Set Manual Volume I:
Unprivileged ISA" [1], titled, "Specifying Ordering of Atomic Instructions" says:
| To provide more efficient support for release consistency [5], each | atomic instruction has two bits, aq and rl, used to specify additional | memory ordering constraints as viewed by other RISC-V harts.
and
| If only the aq bit is set, the atomic memory operation is treated as | an acquire access. | If only the rl bit is set, the atomic memory operation is treated as a | release access. | | If both the aq and rl bits are set, the atomic memory operation is | sequentially consistent.
Fix this by setting both aq and rl bits as 1 for operations with BPF_FETCH and BPF_XCHG.
[1] https://riscv.org/wp-content/uploads/2017/05/riscv-spec-v2.2.pdf
--- arch/riscv/net/bpf_jit_comp64.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +10 -10
@@ -516,33 +516,33 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64,break ;/* src_reg = atomic_fetch_<op>(dst_reg + off16, src_reg) */ case BPF_ADD |BPF_FETCH : -emit (is64 ?rv_amoadd_d (rs, rs, rd,0 ,0 ) : -rv_amoadd_w (rs, rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_amoadd_d (rs, rs, rd,1 ,1 ) : +rv_amoadd_w (rs, rs, rd,1 ,1 ), ctx);if (!is64)emit_zext_32 (rs, ctx);break ;case BPF_AND |BPF_FETCH : -emit (is64 ?rv_amoand_d (rs, rs, rd,0 ,0 ) : -rv_amoand_w (rs, rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_amoand_d (rs, rs, rd,1 ,1 ) : +rv_amoand_w (rs, rs, rd,1 ,1 ), ctx);if (!is64)emit_zext_32 (rs, ctx);break ;case BPF_OR |BPF_FETCH : -emit (is64 ?rv_amoor_d (rs, rs, rd,0 ,0 ) : -rv_amoor_w (rs, rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_amoor_d (rs, rs, rd,1 ,1 ) : +rv_amoor_w (rs, rs, rd,1 ,1 ), ctx);if (!is64)emit_zext_32 (rs, ctx);break ;case BPF_XOR |BPF_FETCH : -emit (is64 ?rv_amoxor_d (rs, rs, rd,0 ,0 ) : -rv_amoxor_w (rs, rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_amoxor_d (rs, rs, rd,1 ,1 ) : +rv_amoxor_w (rs, rs, rd,1 ,1 ), ctx);if (!is64)emit_zext_32 (rs, ctx);break ;/* src_reg = atomic_xchg(dst_reg + off16, src_reg); */ case BPF_XCHG : -emit (is64 ?rv_amoswap_d (rs, rs, rd,0 ,0 ) : -rv_amoswap_w (rs, rs, rd,0 ,0 ), ctx); +emit (is64 ?rv_amoswap_d (rs, rs, rd,1 ,1 ) : +rv_amoswap_w (rs, rs, rd,1 ,1 ), ctx);if (!is64)emit_zext_32 (rs, ctx);break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/744 ax25: Use kernel universal linked list to implement ax25_dev_list
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 a7d6e36b9ad052926ba2ecba3a59d8bb67dabcb4 ]
The origin ax25_dev_list implements its own single linked list, which is complicated and error-prone. For example, when deleting the node of ax25_dev_list in ax25_dev_device_down(), we have to operate on the head node and other nodes separately.
This patch uses kernel universal linked list to replace original ax25_dev_list, which make the operation of ax25_dev_list easier.
We should do "dev->ax25_ptr = ax25_dev;" and "dev->ax25_ptr = NULL;" while holding the spinlock, otherwise the ax25_dev_device_up() and ax25_dev_device_down() could race.
Stable-dep-of: b505e0319852 ("ax25: Fix reference count leak issues of ax25_dev")
--- include/net/ax25.h | 3 +-- net/ax25/ax25_dev.c | 40 +++++++++++++++------------------------- 2 files changed, 16 insertions(+), 27 deletions(-)
include/net/ax25.h +1 -2
@@ -216,7 +216,7 @@ typedef struct {struct ctl_table ; typedef struct ax25_dev { - struct ax25_dev *next; + struct list_head list; struct net_device *dev; netdevice_tracker dev_tracker;
@@ -330,7 +330,6 @@ int ax25_addr_size(const ax25_digi *);void ax25_digi_invert (const ax25_digi *,ax25_digi *);/* ax25_dev.c */ -extern ax25_dev *ax25_dev_list;extern spinlock_t ax25_dev_lock;#if IS_ENABLED (CONFIG_AX25 )
net/ax25/ax25_dev.c +15 -25
@@ -22,11 +22,12 @@#include <net/sock.h> #include <linux/uaccess.h> #include <linux/fcntl.h> +#include <linux/list.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/init.h> -ax25_dev *ax25_dev_list; +static LIST_HEAD (ax25_dev_list);DEFINE_SPINLOCK (ax25_dev_lock);ax25_dev *ax25_addr_ax25dev (ax25_address *addr)
@@ -34,7 +35,7 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr)ax25_dev *ax25_dev, *res =NULL ;spin_lock_bh (&ax25_dev_lock); -for (ax25_dev = ax25_dev_list; ax25_dev !=NULL ; ax25_dev = ax25_dev->next) +list_for_each_entry (ax25_dev, &ax25_dev_list, list)if (ax25cmp (addr, (const ax25_address *)ax25_dev->dev->dev_addr) ==0 ) { res = ax25_dev;ax25_dev_hold (ax25_dev);
@@ -59,7 +60,6 @@ void ax25_dev_device_up(struct net_device *dev) }refcount_set (&ax25_dev->refcount,1 ); - dev->ax25_ptr = ax25_dev; ax25_dev->dev = dev;netdev_hold (dev, &ax25_dev->dev_tracker,GFP_KERNEL ); ax25_dev->forward =NULL ;
@@ -85,8 +85,8 @@ void ax25_dev_device_up(struct net_device *dev)#endif spin_lock_bh (&ax25_dev_lock); - ax25_dev->next = ax25_dev_list; - ax25_dev_list = ax25_dev; +list_add (&ax25_dev->list, &ax25_dev_list); + dev->ax25_ptr = ax25_dev;spin_unlock_bh (&ax25_dev_lock);ax25_dev_hold (ax25_dev);
@@ -111,32 +111,25 @@ void ax25_dev_device_down(struct net_device *dev)/* * Remove any packet forwarding that points to this device. */ -for (s = ax25_dev_list; s !=NULL ; s = s->next) +list_for_each_entry (s, &ax25_dev_list, list)if (s->forward == dev) s->forward =NULL ; -if ((s = ax25_dev_list) == ax25_dev) { - ax25_dev_list = s->next; - goto unlock_put; - } - -while (s !=NULL && s->next !=NULL ) { -if (s->next == ax25_dev) { - s->next = ax25_dev->next; +list_for_each_entry (s, &ax25_dev_list, list) { +if (s == ax25_dev) { +list_del (&s->list); goto unlock_put; } - - s = s->next; } -spin_unlock_bh (&ax25_dev_lock); dev->ax25_ptr =NULL ; +spin_unlock_bh (&ax25_dev_lock);ax25_dev_put (ax25_dev);return ; unlock_put: + dev->ax25_ptr =NULL ;spin_unlock_bh (&ax25_dev_lock);ax25_dev_put (ax25_dev); - dev->ax25_ptr =NULL ;netdev_put (dev, &ax25_dev->dev_tracker);ax25_dev_put (ax25_dev); }
@@ -200,16 +193,13 @@ struct net_device *ax25_fwd_dev(struct net_device *dev)*/ void __exit ax25_dev_free(void) { -ax25_dev *s, *ax25_dev; +ax25_dev *s, *n;spin_lock_bh (&ax25_dev_lock); - ax25_dev = ax25_dev_list; -while (ax25_dev !=NULL ) { - s = ax25_dev; -netdev_put (ax25_dev->dev, &ax25_dev->dev_tracker); - ax25_dev = ax25_dev->next; +list_for_each_entry_safe (s, n, &ax25_dev_list, list) { +netdev_put (s->dev, &s->dev_tracker); +list_del (&s->list);kfree (s); } - ax25_dev_list =NULL ;spin_unlock_bh (&ax25_dev_lock); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/744 ax25: Fix reference count leak issues of ax25_dev
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 b505e0319852b08a3a716b64620168eab21f4ced ]
The ax25_addr_ax25dev() and ax25_dev_device_down() exist a reference count leak issue of the object "ax25_dev".
Memory leak issue in ax25_addr_ax25dev():
The reference count of the object "ax25_dev" can be increased multiple times in ax25_addr_ax25dev(). This will cause a memory leak.
Memory leak issues in ax25_dev_device_down():
The reference count of ax25_dev is set to 1 in ax25_dev_device_up() and then increase the reference count when ax25_dev is added to ax25_dev_list. As a result, the reference count of ax25_dev is 2. But when the device is shutting down. The ax25_dev_device_down() drops the reference count once or twice depending on if we goto unlock_put or not, which will cause memory leak.
As for the issue of ax25_addr_ax25dev(), it is impossible for one pointer to be on a list twice. So add a break in ax25_addr_ax25dev(). As for the issue of ax25_dev_device_down(), increase the reference count of ax25_dev once in ax25_dev_device_up() and decrease the reference count of ax25_dev after it is removed from the ax25_dev_list.
--- net/ax25/ax25_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ax25/ax25_dev.c +1 -2
@@ -39,6 +39,7 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr)if (ax25cmp (addr, (const ax25_address *)ax25_dev->dev->dev_addr) ==0 ) { res = ax25_dev;ax25_dev_hold (ax25_dev); +break ; }spin_unlock_bh (&ax25_dev_lock);
@@ -88,7 +89,6 @@ void ax25_dev_device_up(struct net_device *dev)list_add (&ax25_dev->list, &ax25_dev_list); dev->ax25_ptr = ax25_dev;spin_unlock_bh (&ax25_dev_lock); -ax25_dev_hold (ax25_dev);ax25_register_dev_sysctl (ax25_dev); }
@@ -129,7 +129,6 @@ void ax25_dev_device_down(struct net_device *dev) unlock_put: dev->ax25_ptr =NULL ;spin_unlock_bh (&ax25_dev_lock); -ax25_dev_put (ax25_dev);netdev_put (dev, &ax25_dev->dev_tracker);ax25_dev_put (ax25_dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/744 ax25: Fix reference count leak issue of net_device
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 36e56b1b002bb26440403053f19f9e1a8bc075b2 ]
There is a reference count leak issue of the object "net_device" in ax25_dev_device_down(). When the ax25 device is shutting down, the ax25_dev_device_down() drops the reference count of net_device one or zero times depending on if we goto unlock_put or not, which will cause memory leak.
In order to solve the above issue, decrease the reference count of net_device after dev->ax25_ptr is set to null.
--- net/ax25/ax25_dev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
net/ax25/ax25_dev.c +1 -6
@@ -118,15 +118,10 @@ void ax25_dev_device_down(struct net_device *dev)list_for_each_entry (s, &ax25_dev_list, list) {if (s == ax25_dev) {list_del (&s->list); - goto unlock_put; +break ; } } - dev->ax25_ptr =NULL ; -spin_unlock_bh (&ax25_dev_lock); -ax25_dev_put (ax25_dev); -return ; -unlock_put: dev->ax25_ptr =NULL ;spin_unlock_bh (&ax25_dev_lock);netdev_put (dev, &ax25_dev->dev_tracker);
Signature · 1 line
2.43.0