Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edaf3825 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

1) Fix 64-bit division in mlx5 IPSEC offload support, from Ilan Tayari
   and Arnd Bergmann.

2) Fix race in statistics gathering in bnxt_en driver, from Michael
   Chan.

3) Can't use a mutex in RCU reader protected section on tap driver, from
   Cong WANG.

4) Fix mdb leak in bridging code, from Eduardo Valentin.

5) Fix free of wrong pointer variable in nfp driver, from Dan Carpenter.

6) Buffer overflow in brcmfmac driver, from Arend van SPriel.

7) ioremap_nocache() return value needs to be checked in smsc911x
   driver, from Alexey Khoroshilov.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
  net: stmmac: revert "support future possible different internal phy mode"
  sfc: don't read beyond unicast address list
  datagram: fix kernel-doc comments
  socket: add documentation for missing elements
  smsc911x: Add check for ioremap_nocache() return code
  brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
  net: hns: Bugfix for Tx timeout handling in hns driver
  net: ipmr: ipmr_get_table() returns NULL
  nfp: freeing the wrong variable
  mlxsw: spectrum_switchdev: Check status of memory allocation
  mlxsw: spectrum_switchdev: Remove unused variable
  mlxsw: spectrum_router: Fix use-after-free in route replace
  mlxsw: spectrum_router: Add missing rollback
  samples/bpf: fix a build issue
  bridge: mdb: fix leak on complete_info ptr on fail path
  tap: convert a mutex to a spinlock
  cxgb4: fix BUG() on interrupt deallocating path of ULD
  qed: Fix printk option passed when printing ipv6 addresses
  net: Fix minor code bug in timestamping.txt
  net: stmmac: Make 'alloc_dma_[rt]x_desc_resources()' look even closer
  ...
parents bd664f6b d93b07f8

Documentation/networking/timestamping.txt

+2 −4
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ timeval of SO_TIMESTAMP (ms). 
Supports multiple types of timestamp requests. As a result, this

socket option takes a bitmap of flags, not a boolean. In



  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, (void *) val,

                   sizeof(val));

  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, &val, sizeof(val));



val is an integer with any of the following bits set. Setting other

bit returns EINVAL and does not change the current state.
@@ -249,8 +248,7 @@ setsockopt to receive timestamps: 


  __u32 val = SOF_TIMESTAMPING_SOFTWARE |

	      SOF_TIMESTAMPING_OPT_ID /* or any other flag */;

  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, (void *) val,

                   sizeof(val));

  err = setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING, &val, sizeof(val));





1.4 Bytestream Timestamps

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

+29 −13
Original line number Diff line number Diff line
@@ -3458,13 +3458,18 @@ static int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp) 
	req.ver_upd = DRV_VER_UPD;



	if (BNXT_PF(bp)) {

		DECLARE_BITMAP(vf_req_snif_bmap, 256);

		u32 *data = (u32 *)vf_req_snif_bmap;

		u32 data[8];

		int i;



		memset(vf_req_snif_bmap, 0, sizeof(vf_req_snif_bmap));

		for (i = 0; i < ARRAY_SIZE(bnxt_vf_req_snif); i++)

			__set_bit(bnxt_vf_req_snif[i], vf_req_snif_bmap);

		memset(data, 0, sizeof(data));

		for (i = 0; i < ARRAY_SIZE(bnxt_vf_req_snif); i++) {

			u16 cmd = bnxt_vf_req_snif[i];

			unsigned int bit, idx;



			idx = cmd / 32;

			bit = cmd % 32;

			data[idx] |= 1 << bit;

		}



		for (i = 0; i < 8; i++)

			req.vf_req_fwd[i] = cpu_to_le32(data[i]);
@@ -6279,6 +6284,12 @@ static int bnxt_open(struct net_device *dev) 
	return __bnxt_open_nic(bp, true, true);

}



static bool bnxt_drv_busy(struct bnxt *bp)

{

	return (test_bit(BNXT_STATE_IN_SP_TASK, &bp->state) ||

		test_bit(BNXT_STATE_READ_STATS, &bp->state));

}



int bnxt_close_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)

{

	int rc = 0;
@@ -6297,7 +6308,7 @@ int bnxt_close_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) 


	clear_bit(BNXT_STATE_OPEN, &bp->state);

	smp_mb__after_atomic();

	while (test_bit(BNXT_STATE_IN_SP_TASK, &bp->state))

	while (bnxt_drv_busy(bp))

		msleep(20);



	/* Flush rings and and disable interrupts */
@@ -6358,8 +6369,15 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) 
	u32 i;

	struct bnxt *bp = netdev_priv(dev);



	if (!bp->bnapi)

	set_bit(BNXT_STATE_READ_STATS, &bp->state);

	/* Make sure bnxt_close_nic() sees that we are reading stats before

	 * we check the BNXT_STATE_OPEN flag.

	 */

	smp_mb__after_atomic();

	if (!test_bit(BNXT_STATE_OPEN, &bp->state)) {

		clear_bit(BNXT_STATE_READ_STATS, &bp->state);

		return;

	}



	/* TODO check if we need to synchronize with bnxt_close path */

	for (i = 0; i < bp->cp_nr_rings; i++) {
@@ -6406,6 +6424,7 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) 
		stats->tx_fifo_errors = le64_to_cpu(tx->tx_fifo_underruns);

		stats->tx_errors = le64_to_cpu(tx->tx_err);

	}

	clear_bit(BNXT_STATE_READ_STATS, &bp->state);

}



static bool bnxt_mc_list_updated(struct bnxt *bp, u32 *rx_mask)
@@ -6904,16 +6923,13 @@ static void bnxt_sp_task(struct work_struct *work) 
}



/* Under rtnl_lock */

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, int tcs, int tx_xdp)

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,

		       int tx_xdp)

{

	int max_rx, max_tx, tx_sets = 1;

	int tx_rings_needed;

	bool sh = true;

	int rc;



	if (!(bp->flags & BNXT_FLAG_SHARED_RINGS))

		sh = false;



	if (tcs)

		tx_sets = tcs;
@@ -7121,7 +7137,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc) 
		sh = true;



	rc = bnxt_reserve_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings,

				tc, bp->tx_nr_rings_xdp);

				sh, tc, bp->tx_nr_rings_xdp);

	if (rc)

		return rc;

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

+3 −1
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ struct bnxt { 
	unsigned long		state;

#define BNXT_STATE_OPEN		0

#define BNXT_STATE_IN_SP_TASK	1

#define BNXT_STATE_READ_STATS	2



	struct bnxt_irq	*irq_tbl;

	int			total_irqs;
@@ -1300,7 +1301,8 @@ int bnxt_open_nic(struct bnxt *, bool, bool); 
int bnxt_half_open_nic(struct bnxt *bp);

void bnxt_half_close_nic(struct bnxt *bp);

int bnxt_close_nic(struct bnxt *, bool, bool);

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, int tcs, int tx_xdp);

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,

		       int tx_xdp);

int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);

int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);

void bnxt_restore_pf_fw_resources(struct bnxt *bp);

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

+2 −1
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ static int bnxt_set_channels(struct net_device *dev, 
		}

		tx_xdp = req_rx_rings;

	}

	rc = bnxt_reserve_rings(bp, req_tx_rings, req_rx_rings, tcs, tx_xdp);

	rc = bnxt_reserve_rings(bp, req_tx_rings, req_rx_rings, sh, tcs,

				tx_xdp);

	if (rc) {

		netdev_warn(dev, "Unable to allocate the requested rings\n");

		return rc;

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

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) 
	if (!tc)

		tc = 1;

	rc = bnxt_reserve_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings,

				tc, tx_xdp);

				true, tc, tx_xdp);

	if (rc) {

		netdev_warn(dev, "Unable to reserve enough TX rings to support XDP.\n");

		return rc;