Commit 934291ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Current release regressions:

   - r8169: fix forced threading conflicting with other shared
     interrupts; we tried to fix the use of raise_softirq_irqoff from an
     IRQ handler on RT by forcing hard irqs, but this driver shares
     legacy PCI IRQs so drop the _irqoff() instead

   - tipc: fix memory leak caused by a recent syzbot report fix to
     tipc_buf_append()

  Current release - bugs in new features:

   - devlink: Unlock on error in dumpit() and fix some error codes

   - net/smc: fix null pointer dereference in smc_listen_decline()

  Previous release - regressions:

   - tcp: Prevent low rmem stalls with SO_RCVLOWAT.

   - net: protect tcf_block_unbind with block lock

   - ibmveth: Fix use of ibmveth in a bridge; the self-imposed filtering
     to only send legal frames to the hypervisor was too strict

   - net: hns3: Clear the CMDQ registers before unmapping BAR region;
     incorrect cleanup order was leading to a crash

   - bnxt_en - handful of fixes to fixes:
      - Send HWRM_FUNC_RESET fw command unconditionally, even if there
        are PCIe errors being reported
      - Check abort error state in bnxt_open_nic().
      - Invoke cancel_delayed_work_sync() for PFs also.
      - Fix regression in workqueue cleanup logic in bnxt_remove_one().

   - mlxsw: Only advertise link modes supported by both driver and
     device, after removal of 56G support from the driver 56G was not
     cleared from advertised modes

   - net/smc: fix suppressed return code

  Previous release - always broken:

   - netem: fix zero division in tabledist, caused by integer overflow

   - bnxt_en: Re-write PCI BARs after PCI fatal error.

   - cxgb4: set up filter action after rewrites

   - net: ipa: command payloads already mapped

  Misc:

   - s390/ism: fix incorrect system EID, it's okay to change since it
     was added in current release

   - vsock: use ns_capable_noaudit() on socket create to suppress false
     positive audit messages"

* tag 'net-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (36 commits)
  r8169: fix issue with forced threading in combination with shared interrupts
  netem: fix zero division in tabledist
  ibmvnic: fix ibmvnic_set_mac
  mptcp: add missing memory scheduling in the rx path
  tipc: fix memory leak caused by tipc_buf_append()
  gtp: fix an use-before-init in gtp_newlink()
  net: protect tcf_block_unbind with block lock
  ibmveth: Fix use of ibmveth in a bridge.
  net/sched: act_mpls: Add softdep on mpls_gso.ko
  ravb: Fix bit fields checking in ravb_hwtstamp_get()
  devlink: Unlock on error in dumpit()
  devlink: Fix some error codes
  chelsio/chtls: fix memory leaks in CPL handlers
  chelsio/chtls: fix deadlock issue
  net: hns3: Clear the CMDQ registers before unmapping BAR region
  bnxt_en: Send HWRM_FUNC_RESET fw command unconditionally.
  bnxt_en: Check abort error state in bnxt_open_nic().
  bnxt_en: Re-write PCI BARs after PCI fatal error.
  bnxt_en: Invoke cancel_delayed_work_sync() for PFs also.
  bnxt_en: Fix regression in workqueue cleanup logic in bnxt_remove_one().
  ...
parents b9c0f4bd 2734a24e

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+31 −18
Original line number Diff line number Diff line
@@ -1160,16 +1160,6 @@ static void bnxt_queue_sp_work(struct bnxt *bp) 
		schedule_work(&bp->sp_task);

}



static void bnxt_cancel_sp_work(struct bnxt *bp)

{

	if (BNXT_PF(bp)) {

		flush_workqueue(bnxt_pf_wq);

	} else {

		cancel_work_sync(&bp->sp_task);

		cancel_delayed_work_sync(&bp->fw_reset_task);

	}

}



static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)

{

	if (!rxr->bnapi->in_reset) {
@@ -4362,7 +4352,8 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len, 
	u32 bar_offset = BNXT_GRCPF_REG_CHIMP_COMM;

	u16 dst = BNXT_HWRM_CHNL_CHIMP;



	if (BNXT_NO_FW_ACCESS(bp))

	if (BNXT_NO_FW_ACCESS(bp) &&

	    le16_to_cpu(req->req_type) != HWRM_FUNC_RESET)

		return -EBUSY;



	if (msg_len > BNXT_HWRM_MAX_REQ_LEN) {
@@ -9789,6 +9780,9 @@ int bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) 
{

	int rc = 0;



	if (test_bit(BNXT_STATE_ABORT_ERR, &bp->state))

		rc = -EIO;

	if (!rc)

		rc = __bnxt_open_nic(bp, irq_re_init, link_re_init);

	if (rc) {

		netdev_err(bp->dev, "nic open fail (rc: %x)\n", rc);
@@ -12108,15 +12102,17 @@ static void bnxt_remove_one(struct pci_dev *pdev) 
	if (BNXT_PF(bp))

		bnxt_sriov_disable(bp);



	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);

	bnxt_cancel_sp_work(bp);

	bp->sp_event = 0;



	bnxt_dl_fw_reporters_destroy(bp, true);

	if (BNXT_PF(bp))

		devlink_port_type_clear(&bp->dl_port);

	pci_disable_pcie_error_reporting(pdev);

	unregister_netdev(dev);

	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);

	/* Flush any pending tasks */

	cancel_work_sync(&bp->sp_task);

	cancel_delayed_work_sync(&bp->fw_reset_task);

	bp->sp_event = 0;



	bnxt_dl_fw_reporters_destroy(bp, true);

	bnxt_dl_unregister(bp);

	bnxt_shutdown_tc(bp);
@@ -12860,6 +12856,9 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev, 
		return PCI_ERS_RESULT_DISCONNECT;

	}



	if (state == pci_channel_io_frozen)

		set_bit(BNXT_STATE_PCI_CHANNEL_IO_FROZEN, &bp->state);



	if (netif_running(netdev))

		bnxt_close(netdev);
@@ -12886,7 +12885,7 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct bnxt *bp = netdev_priv(netdev);

	int err = 0;

	int err = 0, off;

	pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;



	netdev_info(bp->dev, "PCI Slot Reset\n");
@@ -12898,6 +12897,20 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
			"Cannot re-enable PCI device after reset.\n");

	} else {

		pci_set_master(pdev);

		/* Upon fatal error, our device internal logic that latches to

		 * BAR value is getting reset and will restore only upon

		 * rewritting the BARs.

		 *

		 * As pci_restore_state() does not re-write the BARs if the

		 * value is same as saved value earlier, driver needs to

		 * write the BARs to 0 to force restore, in case of fatal error.

		 */

		if (test_and_clear_bit(BNXT_STATE_PCI_CHANNEL_IO_FROZEN,

				       &bp->state)) {

			for (off = PCI_BASE_ADDRESS_0;

			     off <= PCI_BASE_ADDRESS_5; off += 4)

				pci_write_config_dword(bp->pdev, off, 0);

		}

		pci_restore_state(pdev);

		pci_save_state(pdev);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,7 @@ struct bnxt { 
#define BNXT_STATE_ABORT_ERR	5

#define BNXT_STATE_FW_FATAL_COND	6

#define BNXT_STATE_DRV_REGISTERED	7

#define BNXT_STATE_PCI_CHANNEL_IO_FROZEN	8



#define BNXT_NO_FW_ACCESS(bp)					\

	(test_bit(BNXT_STATE_FW_FATAL_COND, &(bp)->state) ||	\

drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c

+27 −29
Original line number Diff line number Diff line
@@ -145,13 +145,13 @@ static int configure_filter_smac(struct adapter *adap, struct filter_entry *f) 
	int err;



	/* do a set-tcb for smac-sel and CWR bit.. */

	err = set_tcb_tflag(adap, f, f->tid, TF_CCTRL_CWR_S, 1, 1);

	if (err)

		goto smac_err;



	err = set_tcb_field(adap, f, f->tid, TCB_SMAC_SEL_W,

			    TCB_SMAC_SEL_V(TCB_SMAC_SEL_M),

			    TCB_SMAC_SEL_V(f->smt->idx), 1);

	if (err)

		goto smac_err;



	err = set_tcb_tflag(adap, f, f->tid, TF_CCTRL_CWR_S, 1, 1);

	if (!err)

		return 0;
@@ -862,6 +862,7 @@ int set_filter_wr(struct adapter *adapter, int fidx) 
		      FW_FILTER_WR_DIRSTEERHASH_V(f->fs.dirsteerhash) |

		      FW_FILTER_WR_LPBK_V(f->fs.action == FILTER_SWITCH) |

		      FW_FILTER_WR_DMAC_V(f->fs.newdmac) |

		      FW_FILTER_WR_SMAC_V(f->fs.newsmac) |

		      FW_FILTER_WR_INSVLAN_V(f->fs.newvlan == VLAN_INSERT ||

					     f->fs.newvlan == VLAN_REWRITE) |

		      FW_FILTER_WR_RMVLAN_V(f->fs.newvlan == VLAN_REMOVE ||
@@ -879,7 +880,7 @@ int set_filter_wr(struct adapter *adapter, int fidx) 
		 FW_FILTER_WR_OVLAN_VLD_V(f->fs.val.ovlan_vld) |

		 FW_FILTER_WR_IVLAN_VLDM_V(f->fs.mask.ivlan_vld) |

		 FW_FILTER_WR_OVLAN_VLDM_V(f->fs.mask.ovlan_vld));

	fwr->smac_sel = 0;

	fwr->smac_sel = f->smt->idx;

	fwr->rx_chan_rx_rpl_iq =

		htons(FW_FILTER_WR_RX_CHAN_V(0) |

		      FW_FILTER_WR_RX_RPL_IQ_V(adapter->sge.fw_evtq.abs_id));
@@ -1323,11 +1324,8 @@ static void mk_act_open_req6(struct filter_entry *f, struct sk_buff *skb, 
			    TX_QUEUE_V(f->fs.nat_mode) |

			    T5_OPT_2_VALID_F |

			    RX_CHANNEL_V(cxgb4_port_e2cchan(f->dev)) |

			    CONG_CNTRL_V((f->fs.action == FILTER_DROP) |

					 (f->fs.dirsteer << 1)) |

			    PACE_V((f->fs.maskhash) |

				   ((f->fs.dirsteerhash) << 1)) |

			    CCTRL_ECN_V(f->fs.action == FILTER_SWITCH));

				   ((f->fs.dirsteerhash) << 1)));

}



static void mk_act_open_req(struct filter_entry *f, struct sk_buff *skb,
@@ -1363,11 +1361,8 @@ static void mk_act_open_req(struct filter_entry *f, struct sk_buff *skb, 
			    TX_QUEUE_V(f->fs.nat_mode) |

			    T5_OPT_2_VALID_F |

			    RX_CHANNEL_V(cxgb4_port_e2cchan(f->dev)) |

			    CONG_CNTRL_V((f->fs.action == FILTER_DROP) |

					 (f->fs.dirsteer << 1)) |

			    PACE_V((f->fs.maskhash) |

				   ((f->fs.dirsteerhash) << 1)) |

			    CCTRL_ECN_V(f->fs.action == FILTER_SWITCH));

				   ((f->fs.dirsteerhash) << 1)));

}



static int cxgb4_set_hash_filter(struct net_device *dev,
@@ -2039,6 +2034,20 @@ void hash_filter_rpl(struct adapter *adap, const struct cpl_act_open_rpl *rpl) 
			}

			return;

		}

		switch (f->fs.action) {

		case FILTER_PASS:

			if (f->fs.dirsteer)

				set_tcb_tflag(adap, f, tid,

					      TF_DIRECT_STEER_S, 1, 1);

			break;

		case FILTER_DROP:

			set_tcb_tflag(adap, f, tid, TF_DROP_S, 1, 1);

			break;

		case FILTER_SWITCH:

			set_tcb_tflag(adap, f, tid, TF_LPBK_S, 1, 1);

			break;

		}



		break;



	default:
@@ -2106,23 +2115,12 @@ void filter_rpl(struct adapter *adap, const struct cpl_set_tcb_rpl *rpl) 
			if (ctx)

				ctx->result = 0;

		} else if (ret == FW_FILTER_WR_FLT_ADDED) {

			int err = 0;



			if (f->fs.newsmac)

				err = configure_filter_smac(adap, f);



			if (!err) {

			f->pending = 0;  /* async setup completed */

			f->valid = 1;

			if (ctx) {

				ctx->result = 0;

				ctx->tid = idx;

			}

			} else {

				clear_filter(adap, f);

				if (ctx)

					ctx->result = err;

			}

		} else {

			/* Something went wrong.  Issue a warning about the

			 * problem and clear everything out.

drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
#define TCB_T_FLAGS_M		0xffffffffffffffffULL

#define TCB_T_FLAGS_V(x)	((__u64)(x) << TCB_T_FLAGS_S)



#define TF_DROP_S		22

#define TF_DIRECT_STEER_S	23

#define TF_LPBK_S		59



#define TF_CCTRL_ECE_S		60

#define TF_CCTRL_CWR_S		61

#define TF_CCTRL_RFR_S		62

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c

+12 −17
Original line number Diff line number Diff line
@@ -772,14 +772,13 @@ static int chtls_pass_open_rpl(struct chtls_dev *cdev, struct sk_buff *skb) 
	if (rpl->status != CPL_ERR_NONE) {

		pr_info("Unexpected PASS_OPEN_RPL status %u for STID %u\n",

			rpl->status, stid);

		return CPL_RET_BUF_DONE;

	}

	} else {

		cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family);

		sock_put(listen_ctx->lsk);

		kfree(listen_ctx);

		module_put(THIS_MODULE);



	return 0;

	}

	return CPL_RET_BUF_DONE;

}



static int chtls_close_listsrv_rpl(struct chtls_dev *cdev, struct sk_buff *skb)
@@ -796,15 +795,13 @@ static int chtls_close_listsrv_rpl(struct chtls_dev *cdev, struct sk_buff *skb) 
	if (rpl->status != CPL_ERR_NONE) {

		pr_info("Unexpected CLOSE_LISTSRV_RPL status %u for STID %u\n",

			rpl->status, stid);

		return CPL_RET_BUF_DONE;

	}



	} else {

		cxgb4_free_stid(cdev->tids, stid, listen_ctx->lsk->sk_family);

		sock_put(listen_ctx->lsk);

		kfree(listen_ctx);

		module_put(THIS_MODULE);



	return 0;

	}

	return CPL_RET_BUF_DONE;

}



static void chtls_purge_wr_queue(struct sock *sk)
@@ -1514,7 +1511,6 @@ static void add_to_reap_list(struct sock *sk) 
	struct chtls_sock *csk = sk->sk_user_data;



	local_bh_disable();

	bh_lock_sock(sk);

	release_tcp_port(sk); /* release the port immediately */



	spin_lock(&reap_list_lock);
@@ -1523,7 +1519,6 @@ static void add_to_reap_list(struct sock *sk) 
	if (!csk->passive_reap_next)

		schedule_work(&reap_task);

	spin_unlock(&reap_list_lock);

	bh_unlock_sock(sk);

	local_bh_enable();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE