Commit c839682c 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) Make allocations less aggressive in x_tables, from Minchal Hocko.

 2) Fix netfilter flowtable Kconfig deps, from Pablo Neira Ayuso.

 3) Fix connection loss problems in rtlwifi, from Larry Finger.

 4) Correct DRAM dump length for some chips in ath10k driver, from Yu
    Wang.

 5) Fix ABORT handling in rxrpc, from David Howells.

 6) Add SPDX tags to Sun networking drivers, from Shannon Nelson.

 7) Some ipv6 onlink handling fixes, from David Ahern.

 8) Netem packet scheduler interval calcualtion fix from Md. Islam.

 9) Don't put crypto buffers on-stack in rxrpc, from David Howells.

10) Fix handling of error non-delivery status in netlink multicast
    delivery over multiple namespaces, from Nicolas Dichtel.

11) Missing xdp flush in tuntap driver, from Jason Wang.

12) Synchonize RDS protocol netns/module teardown with rds object
    management, from Sowini Varadhan.

13) Add nospec annotations to mpls, from Dan Williams.

14) Fix SKB truesize handling in TIPC, from Hoang Le.

15) Interrupt masking fixes in stammc from Niklas Cassel.

16) Don't allow ptr_ring objects to be sized outside of kmalloc's
    limits, from Jason Wang.

17) Don't allow SCTP chunks to be built which will have a length
    exceeding the chunk header's 16-bit length field, from Alexey
    Kodanev.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (82 commits)
  ibmvnic: Remove skb->protocol checks in ibmvnic_xmit
  bpf: fix rlimit in reuseport net selftest
  sctp: verify size of a new chunk in _sctp_make_chunk()
  s390/qeth: fix SETIP command handling
  s390/qeth: fix underestimated count of buffer elements
  ptr_ring: try vmalloc() when kmalloc() fails
  ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE
  net: stmmac: remove redundant enable of PMT irq
  net: stmmac: rename GMAC_INT_DEFAULT_MASK for dwmac4
  net: stmmac: discard disabled flags in interrupt status register
  ibmvnic: Reset long term map ID counter
  tools/libbpf: handle issues with bpf ELF objects containing .eh_frames
  selftests/bpf: add selftest that use test_libbpf_open
  selftests/bpf: add test program for loading BPF ELF files
  tools/libbpf: improve the pr_debug statements to contain section numbers
  bpf: Sync kernel ABI header with tooling header for bpf_common.h
  net: phy: fix phy_start to consider PHY_IGNORE_INTERRUPT
  net: thunder: change q_len's type to handle max ring size
  tipc: fix skb truesize/datasize ratio control
  net/sched: cls_u32: fix cls_u32 on filter replace
  ...
parents 82f0a41e 2fa56a49

drivers/atm/he.c

+4 −4
Original line number Diff line number Diff line
@@ -738,13 +738,13 @@ static int he_init_cs_block_rcm(struct he_dev *he_dev) 
#else

		/* this is pretty, but avoids _divdu3 and is mostly correct */

		mult = he_dev->atm_dev->link_rate / ATM_OC3_PCR;

		if (rate_cps > (272 * mult))

		if (rate_cps > (272ULL * mult))

			buf = 4;

		else if (rate_cps > (204 * mult))

		else if (rate_cps > (204ULL * mult))

			buf = 3;

		else if (rate_cps > (136 * mult))

		else if (rate_cps > (136ULL * mult))

			buf = 2;

		else if (rate_cps > (68 * mult))

		else if (rate_cps > (68ULL * mult))

			buf = 1;

		else

			buf = 0;

drivers/net/ethernet/cavium/thunder/nicvf_queues.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct rx_tx_queue_stats { 
struct q_desc_mem {

	dma_addr_t	dma;

	u64		size;

	u16		q_len;

	u32		q_len;

	dma_addr_t	phys_base;

	void		*base;

	void		*unalign_base;

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

+1 −1
Original line number Diff line number Diff line
@@ -5166,7 +5166,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adapter->regs = regs;

	err = t4_wait_dev_ready(regs);

	if (err < 0)

		goto out_unmap_bar0;

		goto out_free_adapter;



	/* We control everything through one PF */

	whoami = readl(regs + PL_WHOAMI_A);

drivers/net/ethernet/ibm/ibmvnic.c

+14 −6
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ static void release_stats_buffers(struct ibmvnic_adapter *adapter) 
{

	kfree(adapter->tx_stats_buffers);

	kfree(adapter->rx_stats_buffers);

	adapter->tx_stats_buffers = NULL;

	adapter->rx_stats_buffers = NULL;

}



static int init_stats_buffers(struct ibmvnic_adapter *adapter)
@@ -599,6 +601,8 @@ static void release_vpd_data(struct ibmvnic_adapter *adapter) 


	kfree(adapter->vpd->buff);

	kfree(adapter->vpd);



	adapter->vpd = NULL;

}



static void release_tx_pools(struct ibmvnic_adapter *adapter)
@@ -909,6 +913,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter) 
	if (dma_mapping_error(dev, adapter->vpd->dma_addr)) {

		dev_err(dev, "Could not map VPD buffer\n");

		kfree(adapter->vpd->buff);

		adapter->vpd->buff = NULL;

		return -ENOMEM;

	}
@@ -1414,10 +1419,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
		hdrs += 2;

	}

	/* determine if l2/3/4 headers are sent to firmware */

	if ((*hdrs >> 7) & 1 &&

	    (skb->protocol == htons(ETH_P_IP) ||

	     skb->protocol == htons(ETH_P_IPV6) ||

	     skb->protocol == htons(ETH_P_ARP))) {

	if ((*hdrs >> 7) & 1) {

		build_hdr_descs_arr(tx_buff, &num_entries, *hdrs);

		tx_crq.v1.n_crq_elem = num_entries;

		tx_buff->indir_arr[0] = tx_crq;
@@ -1639,6 +1641,7 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
				return rc;

		} else if (adapter->req_rx_queues != old_num_rx_queues ||

			   adapter->req_tx_queues != old_num_tx_queues) {

			adapter->map_id = 1;

			release_rx_pools(adapter);

			release_tx_pools(adapter);

			init_rx_pools(netdev);
@@ -1831,7 +1834,8 @@ restart_poll: 
		u16 offset;

		u8 flags = 0;



		if (unlikely(adapter->resetting)) {

		if (unlikely(adapter->resetting &&

			     adapter->reset_reason != VNIC_RESET_NON_FATAL)) {

			enable_scrq_irq(adapter, adapter->rx_scrq[scrq_num]);

			napi_complete_done(napi, frames_processed);

			return frames_processed;
@@ -2908,8 +2912,12 @@ static int ibmvnic_send_crq(struct ibmvnic_adapter *adapter, 
				cpu_to_be64(u64_crq[1]));



	if (rc) {

		if (rc == H_CLOSED)

		if (rc == H_CLOSED) {

			dev_warn(dev, "CRQ Queue closed\n");

			if (adapter->resetting)

				ibmvnic_reset(adapter, VNIC_RESET_FATAL);

		}



		dev_warn(dev, "Send error (rc=%d)\n", rc);

	}

drivers/net/ethernet/intel/i40e/i40e_main.c

+14 −13
Original line number Diff line number Diff line
@@ -1785,7 +1785,7 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi, 
	struct i40e_pf *pf = vsi->back;

	u16 sections = 0;

	u8 netdev_tc = 0;

	u16 numtc = 0;

	u16 numtc = 1;

	u16 qcount;

	u8 offset;

	u16 qmap;
@@ -1795,9 +1795,11 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi, 
	sections = I40E_AQ_VSI_PROP_QUEUE_MAP_VALID;

	offset = 0;



	/* Number of queues per enabled TC */

	num_tc_qps = vsi->alloc_queue_pairs;

	if (enabled_tc && (vsi->back->flags & I40E_FLAG_DCB_ENABLED)) {

		/* Find numtc from enabled TC bitmap */

		for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

		for (i = 0, numtc = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

			if (enabled_tc & BIT(i)) /* TC is enabled */

				numtc++;

		}
@@ -1805,18 +1807,13 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi, 
			dev_warn(&pf->pdev->dev, "DCB is enabled but no TC enabled, forcing TC0\n");

			numtc = 1;

		}

	} else {

		/* At least TC0 is enabled in non-DCB, non-MQPRIO case */

		numtc = 1;

		num_tc_qps = num_tc_qps / numtc;

		num_tc_qps = min_t(int, num_tc_qps,

				   i40e_pf_get_max_q_per_tc(pf));

	}



	vsi->tc_config.numtc = numtc;

	vsi->tc_config.enabled_tc = enabled_tc ? enabled_tc : 1;

	/* Number of queues per enabled TC */

	qcount = vsi->alloc_queue_pairs;



	num_tc_qps = qcount / numtc;

	num_tc_qps = min_t(int, num_tc_qps, i40e_pf_get_max_q_per_tc(pf));



	/* Do not allow use more TC queue pairs than MSI-X vectors exist */

	if (pf->flags & I40E_FLAG_MSIX_ENABLED)
@@ -1831,9 +1828,13 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi, 


			switch (vsi->type) {

			case I40E_VSI_MAIN:

				if (!(pf->flags & (I40E_FLAG_FD_SB_ENABLED |

				    I40E_FLAG_FD_ATR_ENABLED)) ||

				    vsi->tc_config.enabled_tc != 1) {

					qcount = min_t(int, pf->alloc_rss_size,

						       num_tc_qps);

					break;

				}

			case I40E_VSI_FDIR:

			case I40E_VSI_SRIOV:

			case I40E_VSI_VMDQ2:

CRA Git | Maintained and supported by SUSTech CRA and CCSE