media: ov6650: Fix control handler not freed on init error
Subsystems (41)
Sasha Levin
maintainerPATCH 338/350 ice: Only disable VF state when freeing each VF resources
In reply to Sasha LevinFrom: Akeem G Abodunrin <[email protected]>
[ Upstream commit 1f9639d2fb9188a59acafae9dea626391c442a8d ]
It is wrong to set PF disable state flag for all VFs when freeing VF resources - Instead, we should set VF disable state flag for each VF with its resources being returned to the device. Right now, all VF opcodes, mailbox communication to clear its resources as well fails - since we already indicate that PF is in disable state, with all VFs not active. In addition, we don't need to notify VF that PF is intending to reset it, if it is already in disabled state.
--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +8 -4
@@ -317,8 +317,9 @@ void ice_free_vfs(struct ice_pf *pf) pf->num_alloc_vfs =0 ;for (i =0 ; i < tmp; i++) {if (test_bit (ICE_VF_STATE_INIT , pf->vf[i].vf_states)) { -/* disable VF qp mappings */ +/* disable VF qp mappings and set VF disable state */ ice_dis_vf_mappings (&pf->vf[i]); +set_bit (ICE_VF_STATE_DIS , pf->vf[i].vf_states);ice_free_vf_res (&pf->vf[i]); } }
@@ -1287,9 +1288,12 @@ static void ice_vc_notify_vf_reset(struct ice_vf *vf)if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs)return ; -/* verify if the VF is in either init or active before proceeding */ -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states) && - !test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) +/* Bail out if VF is in disabled state, neither initialized, nor active +* state - otherwise proceed with notifications +*/ +if ((!test_bit (ICE_VF_STATE_INIT , vf->vf_states) && + !test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) || +test_bit (ICE_VF_STATE_DIS , vf->vf_states))return ; pfe.event =VIRTCHNL_EVENT_RESET_IMPENDING ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 339/350 ice: Fix setting coalesce to handle DCB configuration
In reply to Sasha LevinFrom: Brett Creeley <[email protected]>
[ Upstream commit e25f9152bc07de534b2b590ce6c052ea25dd8900 ]
Currently there can be a case where a DCB map is applied and there are more interrupt vectors (vsi->num_q_vectors) than Rx queues (vsi->num_rxq) and Tx queues (vsi->num_txq). If we try to set coalesce settings in this case it will report a false failure. Fix this by checking if vector index is valid with respect to the number of Tx and Rx queues configured.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +10 -3
@@ -3368,10 +3368,17 @@ __ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,struct ice_vsi *vsi = np->vsi;if (q_num <0 ) { -int i; +int v_idx; + +ice_for_each_q_vector (vsi, v_idx) { +/* In some cases if DCB is configured the num_[rx|tx]q +* can be less than vsi->num_q_vectors. This check +* accounts for that so we don't report a false failure +*/ +if (v_idx >= vsi->num_rxq && v_idx >= vsi->num_txq) + goto set_complete; -ice_for_each_q_vector (vsi, i) { -if (ice_set_q_coalesce (vsi, ec, i)) +if (ice_set_q_coalesce (vsi, ec, v_idx))return -EINVAL ; } goto set_complete;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 340/350 perf intel-bts: Does not support AUX area sampling
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ]
Add an error message because Intel BTS does not support AUX area sampling.
--- tools/perf/arch/x86/util/auxtrace.c | 2 ++ tools/perf/arch/x86/util/intel-bts.c | 5 +++++ 2 files changed, 7 insertions(+)
tools/perf/arch/x86/util/auxtrace.c +2 -0
@@ -27,6 +27,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, intel_pt_pmu =perf_pmu__find (INTEL_PT_PMU_NAME ); intel_bts_pmu =perf_pmu__find (INTEL_BTS_PMU_NAME ); +if (intel_bts_pmu) + intel_bts_pmu->auxtrace = true;evlist__for_each_entry (evlist, evsel) {if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type)
tools/perf/arch/x86/util/intel-bts.c +5 -0
@@ -113,6 +113,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,const struct perf_cpu_map *cpus = evlist->core.cpus;bool privileged =perf_event_paranoid_check (-1 ); +if (opts->auxtrace_sample_mode) { +pr_err ("Intel BTS does not support AUX area sampling\n" ); +return -EINVAL ; + } + btsr->evlist = evlist; btsr->snapshot_mode = opts->auxtrace_snapshot_mode;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 341/350 perf record: Add a function to test for kernel support for AUX area sampling
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 9bca1a4ef5034f0a82861ac0375eb0272c5ce04e ]
Architectures are expected to know if AUX area sampling is supported by the hardware. Add a function perf_can_aux_sample() which will determine whether the kernel supports it.
Committer notes:
I reported that this message was taking place on a kernel without the required bits:
# perf record --aux-sample -e '{intel_pt//u,branch-misses:u}'
Error:
The sys_perf_event_open() syscall returned with 7 (Argument list too long) for event (branch-misses:u).
/bin/dmesg | grep -i perf may provide additional information.Adrian sent a patch addressing it, with this explanation:
----
perf_can_aux_sample_size() always returned true because it did not pass the attribute size to sys_perf_event_open, nor correctly check the return value and errno.
----
After applying it I get, later in the series, when --aux-sample is added:
# perf record --aux-sample -e '{intel_pt//u,branch-misses:u}'
AUX area sampling is not supported by kernel--- tools/perf/util/evlist.h | 1 + tools/perf/util/record.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
tools/perf/util/evlist.h +1 -0
@@ -164,6 +164,7 @@ void perf_evlist__set_id_pos(struct evlist *evlist);bool perf_can_sample_identifier (void );bool perf_can_record_switch_events (void );bool perf_can_record_cpu_wide (void ); +bool perf_can_aux_sample (void );void perf_evlist__config (struct evlist *evlist,struct record_opts *opts,struct callchain_param *callchain);int record_opts__config (struct record_opts *opts);
tools/perf/util/record.c +31 -0
@@ -136,6 +136,37 @@ bool perf_can_record_cpu_wide(void)return true; } +/* +* Architectures are expected to know if AUX area sampling is supported by the +* hardware. Here we check for kernel support. +*/ +bool perf_can_aux_sample (void ) +{ +struct perf_event_attr attr = { + .size =sizeof (struct perf_event_attr ), + .exclude_kernel =1 , +/* +* Non-zero value causes the kernel to calculate the effective +* attribute size up to that byte. +*/ + .aux_sample_size =1 , + }; +int fd; + + fd =sys_perf_event_open (&attr,-1 ,0 ,-1 ,0 ); +/* +* If the kernel attribute is big enough to contain aux_sample_size +* then we assume that it is supported. We are relying on the kernel to +* validate the attribute size before anything else that could be wrong. +*/ +if (fd <0 && errno ==E2BIG ) +return false; +if (fd >=0 ) +close (fd); + +return true; +} +void perf_evlist__config (struct evlist *evlist,struct record_opts *opts,struct callchain_param *callchain) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 342/350 net: phy: initialise phydev speed and duplex sanely
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit a5d66f810061e2dd70fb7a108dcd14e535bc639f ]
When a phydev is created, the speed and duplex are set to zero and -1 respectively, rather than using the predefined SPEED_UNKNOWN and DUPLEX_UNKNOWN constants.
There is a window at initialisation time where we may report link down using the 0/-1 values. Tidy this up and use the predefined constants, so debug doesn't complain with:
"Unsupported (update phy-core.c)/Unsupported (update phy-core.c)"
when the speed and duplex settings are printed.
--- drivers/net/phy/phy_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +2 -2
@@ -596,8 +596,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, mdiodev->device_free = phy_mdio_device_free; mdiodev->device_remove = phy_mdio_device_remove; - dev->speed =0 ; - dev->duplex =-1 ; + dev->speed =SPEED_UNKNOWN ; + dev->duplex =DUPLEX_UNKNOWN ; dev->pause =0 ; dev->asym_pause =0 ; dev->link =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 343/350 tools, bpf: Fix build for 'make -s tools/bpf O=<dir>'
In reply to Sasha LevinFrom: Quentin Monnet <[email protected]>
[ Upstream commit a89b2cbf71d64b61e79bbe5cb7ff4664797eeaaf ]
Building selftests with 'make TARGETS=bpf kselftest' was fixed in commit 55d554f5d140 ("tools: bpf: Use !building_out_of_srctree to determine srctree"). However, by updating $(srctree) in tools/bpf/Makefile for in-tree builds only, we leave out the case where we pass an output directory to build BPF tools, but $(srctree) is not set. This typically happens for:
$ make -s tools/bpf O=/tmp/foo
Makefile:40: /tools/build/Makefile.feature: No such file or directoryFix it by updating $(srctree) in the Makefile not only for out-of-tree builds, but also if $(srctree) is empty.
Detected with test_bpftool_build.sh.
--- tools/bpf/Makefile | 6 ++++++ 1 file changed, 6 insertions(+)
tools/bpf/Makefile +6 -0
@@ -16,7 +16,13 @@ CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/include/uapi -I$(srctree)/include # isn't set and when invoked from selftests build, where srctree # is set to ".". building_out_of_srctree is undefined for in srctree # builds +ifeq ($(srctree),) +update_srctree := 1 +endif ifndef building_out_of_srctree +update_srctree := 1 +endif +ifeq ($(update_srctree),1) srctree := $(patsubst %/,%,$(dir $(CURDIR))) srctree := $(patsubst %/,%,$(dir $(srctree))) endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 344/350 RDMA/bnxt_re: Fix missing le16_to_cpu
In reply to Sasha LevinFrom: Devesh Sharma <[email protected]>
[ Upstream commit fca5b9dc0986aa49b3f0a7cfe24b6c82422ac1d7 ]
From sparse:
drivers/infiniband/hw/bnxt_re/main.c:1274:18: warning: cast from restricted __le16 drivers/infiniband/hw/bnxt_re/main.c:1275:18: warning: cast from restricted __le16 drivers/infiniband/hw/bnxt_re/main.c:1276:18: warning: cast from restricted __le16 drivers/infiniband/hw/bnxt_re/main.c:1277:21: warning: restricted __le16 degrades to integer
--- drivers/infiniband/hw/bnxt_re/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +4 -4
@@ -1270,10 +1270,10 @@ static void bnxt_re_query_hwrm_intf_version(struct bnxt_re_dev *rdev)return ; } rdev->qplib_ctx.hwrm_intf_ver = - (u64 )resp.hwrm_intf_major <<48 | - (u64 )resp.hwrm_intf_minor <<32 | - (u64 )resp.hwrm_intf_build <<16 | - resp.hwrm_intf_patch; + (u64 )le16_to_cpu (resp.hwrm_intf_major) <<48 | + (u64 )le16_to_cpu (resp.hwrm_intf_minor) <<32 | + (u64 )le16_to_cpu (resp.hwrm_intf_build) <<16 | +le16_to_cpu (resp.hwrm_intf_patch); }static void bnxt_re_ib_unreg (struct bnxt_re_dev *rdev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 345/350 RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices
In reply to Sasha LevinFrom: Devesh Sharma <[email protected]>
[ Upstream commit 98998ffe5216c7fa2c0225bb5b049ca5cdf8d195 ]
Due to recent advances in the firmware for Broadcom's gen p5 series of adaptors the driver code to report hardware counters has been broken w.r.t. roce devices.
The new firmware command expects dma length to be specified during stat dma buffer allocation.
--- drivers/infiniband/hw/bnxt_re/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/bnxt_re/main.c +1 -0
@@ -477,6 +477,7 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev,bnxt_re_init_hwrm_hdr (rdev, (void *)&req,HWRM_STAT_CTX_ALLOC ,-1 ,-1 ); req.update_period_ms =cpu_to_le32 (1000 ); req.stats_dma_addr =cpu_to_le64 (dma_map); + req.stats_dma_length =cpu_to_le16 (sizeof (struct ctx_hw_stats_ext )); req.stat_ctx_flags =STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_ROCE ;bnxt_re_fill_fw_msg (&fw_msg, (void *)&req,sizeof (req), (void *)&resp,sizeof (resp),DFLT_HWRM_CMD_TIMEOUT );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 346/350 bpf: Provide better register bounds after jmp32 instructions
In reply to Sasha LevinFrom: Yonghong Song <[email protected]>
[ Upstream commit 581738a681b6faae5725c2555439189ca81c0f1f ]
With latest llvm (trunk https://github.com/llvm/llvm-project),test_progs, which has +alu32 enabled, failed for strobemeta.o. The verifier output looks like below with edit to replace large decimal numbers with hex ones.
193: (85) call bpf_probe_read_user_str#114
R0=inv(id=0)
194: (26) if w0 > 0x1 goto pc+4
R0_w=inv(id=0,umax_value=0xffffffff00000001)
195: (6b) *(u16 *)(r7 +80) = r0
196: (bc) w6 = w0
R6_w=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
197: (67) r6 <<= 32
R6_w=inv(id=0,smax_value=0x7fffffff00000000,umax_value=0xffffffff00000000,
var_off=(0x0; 0xffffffff00000000))
198: (77) r6 >>= 32
R6=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
201: (79) r8 = *(u64 *)(r10 -416)
R8_w=map_value(id=0,off=40,ks=4,vs=13872,imm=0)
202: (0f) r8 += r6
R8_w=map_value(id=0,off=40,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
203: (07) r8 += 9696
R8_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
255: (bf) r1 = r8
R1_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=0xffffffff,var_off=(0x0; 0xffffffff))
...
257: (85) call bpf_probe_read_user_str#114
R1 unbounded memory access, make sure to bounds check any array access into a map
The value range for register r6 at insn 198 should be really just 0/1. The umax_value=0xffffffff caused later verification failure.
After jmp instructions, the current verifier already tried to use just obtained information to get better register range. The current mechanism is for 64bit register only. This patch implemented to tighten the range for 32bit sub-registers after jmp32 instructions.
With the patch, we have the below range ranges for the
above code sequence:
193: (85) call bpf_probe_read_user_str#114
R0=inv(id=0)
194: (26) if w0 > 0x1 goto pc+4
R0_w=inv(id=0,smax_value=0x7fffffff00000001,umax_value=0xffffffff00000001,
var_off=(0x0; 0xffffffff00000001))
195: (6b) *(u16 *)(r7 +80) = r0
196: (bc) w6 = w0
R6_w=inv(id=0,umax_value=0xffffffff,var_off=(0x0; 0x1))
197: (67) r6 <<= 32
R6_w=inv(id=0,umax_value=0x100000000,var_off=(0x0; 0x100000000))
198: (77) r6 >>= 32
R6=inv(id=0,umax_value=1,var_off=(0x0; 0x1))
...
201: (79) r8 = *(u64 *)(r10 -416)
R8_w=map_value(id=0,off=40,ks=4,vs=13872,imm=0)
202: (0f) r8 += r6
R8_w=map_value(id=0,off=40,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
203: (07) r8 += 9696
R8_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
...
255: (bf) r1 = r8
R1_w=map_value(id=0,off=9736,ks=4,vs=13872,umax_value=1,var_off=(0x0; 0x1))
...
257: (85) call bpf_probe_read_user_str#114
...
At insn 194, the register R0 has better var_off.mask and smax_value. Especially, the var_off.mask ensures later lshift and rshift maintains proper value range.
--- kernel/bpf/verifier.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
kernel/bpf/verifier.c +19 -0
@@ -978,6 +978,17 @@ static void __reg_bound_offset(struct bpf_reg_state *reg) reg->umax_value)); } +static void __reg_bound_offset32 (struct bpf_reg_state *reg) +{ +u64 mask =0xffffFFFF ; +struct tnum range =tnum_range (reg->umin_value & mask, + reg->umax_value & mask); +struct tnum lo32 =tnum_cast (reg->var_off,4 ); +struct tnum hi32 =tnum_lshift (tnum_rshift (reg->var_off,32 ),32 ); + + reg->var_off =tnum_or (hi32,tnum_intersect (lo32, range)); +} +/* Reset the min/max bounds of a register */ static void __mark_reg_unbounded (struct bpf_reg_state *reg) {
@@ -5433,6 +5444,10 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); +if (is_jmp32) { +__reg_bound_offset32 (false_reg); +__reg_bound_offset32 (true_reg); + }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.
@@ -5542,6 +5557,10 @@ static void reg_set_min_max_inv(struct bpf_reg_state *true_reg,/* We might have learned some bits from the bounds. */ __reg_bound_offset (false_reg);__reg_bound_offset (true_reg); +if (is_jmp32) { +__reg_bound_offset32 (false_reg); +__reg_bound_offset32 (true_reg); + }/* Intersecting with the old var_off might have improved our bounds * slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), * then new var_off is (0; 0x7f...fc) which improves our umax.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 347/350 RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series
In reply to Sasha LevinFrom: Luke Starrett <[email protected]>
[ Upstream commit e284b159c6881c8bec9713daba2653268f4c4948 ]
In the first version of Gen P5 ASIC, chip-id was always set to 0x1750 for all adaptor port configurations. This has been fixed in the new chip rev.
Due to this missing fix users are not able to use adaptors based on latest chip rev of Broadcom's Gen P5 adaptors.
--- drivers/infiniband/hw/bnxt_re/qplib_res.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_res.h +6 -2
@@ -186,7 +186,9 @@ struct bnxt_qplib_chip_ctx {u8 chip_metal; }; -#define CHIP_NUM_57500 0x1750 +#define CHIP_NUM_57508 0x1750 +#define CHIP_NUM_57504 0x1751 +#define CHIP_NUM_57502 0x1752struct bnxt_qplib_res {struct pci_dev *pdev;
@@ -203,7 +205,9 @@ struct bnxt_qplib_res {static inline bool bnxt_qplib_is_chip_gen_p5 (struct bnxt_qplib_chip_ctx *cctx) { -return (cctx->chip_num ==CHIP_NUM_57500 ); +return (cctx->chip_num ==CHIP_NUM_57508 || + cctx->chip_num ==CHIP_NUM_57504 || + cctx->chip_num ==CHIP_NUM_57502 ); }static inline u8 bnxt_qplib_get_hwq_type (struct bnxt_qplib_res *res)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 348/350 ibmvnic: Fix completion structure initialization
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit 070eca955c4af1248cb78a216463ff757a5dc511 ]
Fix multiple calls to init_completion for device completion structures. Instead, initialize them during device probe and reinitialize them later as needed.
--- drivers/net/ethernet/ibm/ibmvnic.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +11 -8
@@ -176,7 +176,7 @@ static int alloc_long_term_buff(struct ibmvnic_adapter *adapter, ltb->map_id = adapter->map_id; adapter->map_id++; -init_completion (&adapter->fw_done); +reinit_completion (&adapter->fw_done); rc =send_request_map (adapter, ltb->addr, ltb->size, ltb->map_id);if (rc) {
@@ -215,7 +215,7 @@ static int reset_long_term_buff(struct ibmvnic_adapter *adapter,memset (ltb->buff,0 , ltb->size); -init_completion (&adapter->fw_done); +reinit_completion (&adapter->fw_done); rc =send_request_map (adapter, ltb->addr, ltb->size, ltb->map_id);if (rc)return rc;
@@ -943,7 +943,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)if (adapter->vpd->buff) len = adapter->vpd->len; -init_completion (&adapter->fw_done); +reinit_completion (&adapter->fw_done); crq.get_vpd_size.first =IBMVNIC_CRQ_CMD ; crq.get_vpd_size.cmd =GET_VPD_SIZE ; rc =ibmvnic_send_crq (adapter, &crq);
@@ -1689,7 +1689,7 @@ static int __ibmvnic_set_mac(struct net_device *netdev, u8 *dev_addr) crq.change_mac_addr.cmd =CHANGE_MAC_ADDR ;ether_addr_copy (&crq.change_mac_addr.mac_addr[0 ], dev_addr); -init_completion (&adapter->fw_done); +reinit_completion (&adapter->fw_done); rc =ibmvnic_send_crq (adapter, &crq);if (rc) { rc = -EIO ;
@@ -2316,7 +2316,7 @@ static int wait_for_reset(struct ibmvnic_adapter *adapter) adapter->fallback.rx_entries = adapter->req_rx_add_entries_per_subcrq; adapter->fallback.tx_entries = adapter->req_tx_entries_per_subcrq; -init_completion (&adapter->reset_done); +reinit_completion (&adapter->reset_done); adapter->wait_for_reset = true; rc =ibmvnic_reset (adapter,VNIC_RESET_CHANGE_PARAM );if (rc)
@@ -2332,7 +2332,7 @@ static int wait_for_reset(struct ibmvnic_adapter *adapter) adapter->desired.rx_entries = adapter->fallback.rx_entries; adapter->desired.tx_entries = adapter->fallback.tx_entries; -init_completion (&adapter->reset_done); +reinit_completion (&adapter->reset_done); adapter->wait_for_reset = true; rc =ibmvnic_reset (adapter,VNIC_RESET_CHANGE_PARAM );if (rc)
@@ -2603,7 +2603,7 @@ static void ibmvnic_get_ethtool_stats(struct net_device *dev,cpu_to_be32 (sizeof (struct ibmvnic_statistics ));/* Wait for data to be written */ -init_completion (&adapter->stats_done); +reinit_completion (&adapter->stats_done); rc =ibmvnic_send_crq (adapter, &crq);if (rc)return ;
@@ -4408,7 +4408,7 @@ static int send_query_phys_parms(struct ibmvnic_adapter *adapter)memset (&crq,0 ,sizeof (crq)); crq.query_phys_parms.first =IBMVNIC_CRQ_CMD ; crq.query_phys_parms.cmd =QUERY_PHYS_PARMS ; -init_completion (&adapter->fw_done); +reinit_completion (&adapter->fw_done); rc =ibmvnic_send_crq (adapter, &crq);if (rc)return rc;
@@ -4960,6 +4960,9 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)INIT_LIST_HEAD (&adapter->rwi_list);spin_lock_init (&adapter->rwi_lock);init_completion (&adapter->init_done); +init_completion (&adapter->fw_done); +init_completion (&adapter->reset_done); +init_completion (&adapter->stats_done);clear_bit (0 , &adapter->resetting); do {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 349/350 net: wireless: intel: iwlwifi: fix GRO_NORMAL packet stalling
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit b167191e2a851cb2e4c6ef8b91c83ff73ef41872 ]
Commit 6570bc79c0df ("net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()") has applied batched GRO_NORMAL packets processing to all napi_gro_receive() users, including mac80211-based drivers.
However, this change has led to a regression in iwlwifi driver [1][2] as it is required for NAPI users to call napi_complete_done() or napi_complete() and the end of every polling iteration, whilst iwlwifi doesn't use NAPI scheduling at all and just calls napi_gro_flush(). In that particular case, packets which have not been already flushed from napi->rx_list stall in it until at least next Rx cycle.
Fix this by adding a manual flushing of the list to iwlwifi driver right before napi_gro_flush() call to mimic napi_complete() logics.
I prefer to open-code gro_normal_list() rather than exporting it for 2 reasons:
* to prevent from using it and napi_gro_flush() in any new drivers, as it is the *really* bad way to use NAPI that should be avoided;
* to keep gro_normal_list() static and don't lose any CC optimizations.
I also don't add the "Fixes:" tag as the mentioned commit was only a trigger that only exposed an improper usage of NAPI in this particular driver.
[1] https://lore.kernel.org/netdev/PSXP216MB04388962C411CD0B17A86F47804A0@PSXP216MB0438.KORP216.PROD.OUTLOOK.COM
[2] https://bugzilla.kernel.org/show_bug.cgi?id=205647
--- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +11 -2
@@ -1429,6 +1429,7 @@ static struct iwl_rx_mem_buffer *iwl_pcie_get_rxb(struct iwl_trans *trans,static void iwl_pcie_rx_handle (struct iwl_trans *trans,int queue) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans); +struct napi_struct *napi;struct iwl_rxq *rxq;u32 r, i, count =0 ;bool emergency = false;
@@ -1534,8 +1535,16 @@ static void iwl_pcie_rx_handle(struct iwl_trans *trans, int queue)if (unlikely (emergency && count))iwl_pcie_rxq_alloc_rbs (trans,GFP_ATOMIC , rxq); -if (rxq->napi.poll) -napi_gro_flush (&rxq->napi, false); + napi = &rxq->napi; +if (napi->poll) { +if (napi->rx_count) { +netif_receive_skb_list (&napi->rx_list); +INIT_LIST_HEAD (&napi->rx_list); + napi->rx_count =0 ; + } + +napi_gro_flush (napi, false); + }iwl_pcie_rxq_restock (trans, rxq); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 350/350 MIPS: futex: Restore \n after sync instructions
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit fd7710cb491f900eb63d2ce5aac0e682003e84e9 ]
Commit 3c1d3f097972 ("MIPS: futex: Emit Loongson3 sync workarounds within asm") inadvertently removed the newlines following __WEAK_LLSC_MB, which causes build failures for configurations in which __WEAK_LLSC_MB expands to a sync instruction:
{standard input}: Assembler messages:
{standard input}:9346: Error: symbol sync3' is already defined {standard input}:9380: Error: symbol sync3' is already defined
...
Fix this by restoring the newlines to separate the sync instruction from anything following it (such as the 3: label), preventing inadvertent concatenation.
--- arch/mips/include/asm/futex.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mips/include/asm/futex.h +3 -3
@@ -33,7 +33,7 @@" .set arch=r4000 \n" \"2: sc $1, %2 \n" \" beqzl $1, 1b \n" \ - __stringify(__WEAK_LLSC_MB) \ + __stringify(__WEAK_LLSC_MB) " \n" \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -63,7 +63,7 @@" .set " MIPS_ISA_ARCH_LEVEL " \n" \ "2: "user_sc("$1", "%2")" \n" \" beqz $1, 1b \n" \ - __stringify(__WEAK_LLSC_MB) \ + __stringify(__WEAK_LLSC_MB) " \n" \"3: \n" \" .insn \n" \" .set pop \n" \
@@ -148,7 +148,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr," .set arch=r4000 \n" "2: sc $1, %2 \n" " beqzl $1, 1b \n" - __stringify(__WEAK_LLSC_MB) + __stringify(__WEAK_LLSC_MB) " \n""3: \n" " .insn \n" " .set pop \n"
Signature · 1 line
2.20.1