Commit 82aa4671 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) BPF verifier fixes from Daniel Borkmann.

 2) HNS driver fixes from Huazhong Tan.

 3) FDB only works for ethernet devices, reject attempts to install FDB
    rules for others. From Ido Schimmel.

 4) Fix spectre V1 in vhost, from Jason Wang.

 5) Don't pass on-stack object to irq_set_affinity_hint() in mvpp2
    driver, from Marc Zyngier.

 6) Fix mlx5e checksum handling when RXFCS is enabled, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (49 commits)
  openvswitch: Fix push/pop ethernet validation
  net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules
  bpf: test make sure to run unpriv test cases in test_verifier
  bpf: add various test cases to test_verifier
  bpf: don't set id on after map lookup with ptr_to_map_val return
  bpf: fix partial copy of map_ptr when dst is scalar
  libbpf: Fix compile error in libbpf_attach_type_by_name
  kselftests/bpf: use ping6 as the default ipv6 ping binary if it exists
  selftests: mlxsw: qos_mc_aware: Add a test for UC awareness
  selftests: mlxsw: qos_mc_aware: Tweak for min shaper
  mlxsw: spectrum: Set minimum shaper on MC TCs
  mlxsw: reg: QEEC: Add minimum shaper fields
  net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset()
  net: hns3: bugfix for rtnl_lock's range in the hclge_reset()
  net: hns3: bugfix for handling mailbox while the command queue reinitialized
  net: hns3: fix incorrect return value/type of some functions
  net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read
  net: hns3: bugfix for is_valid_csq_clean_head()
  net: hns3: remove unnecessary queue reset in the hns3_uninit_all_ring()
  net: hns3: bugfix for the initialization of command queue's spin lock
  ...
parents ffb845db 46ebe283

Documentation/networking/ip-sysctl.txt

+11 −0
Original line number Diff line number Diff line
@@ -316,6 +316,17 @@ tcp_frto - INTEGER 


	By default it's enabled with a non-zero value. 0 disables F-RTO.



tcp_fwmark_accept - BOOLEAN

	If set, incoming connections to listening sockets that do not have a

	socket mark will set the mark of the accepting socket to the fwmark of

	the incoming SYN packet. This will cause all packets on that connection

	(starting from the first SYNACK) to be sent with that fwmark. The

	listening socket's mark is unchanged. Listening sockets that already

	have a fwmark set via setsockopt(SOL_SOCKET, SO_MARK, ...) are

	unaffected.



	Default: 0



tcp_invalid_ratelimit - INTEGER

	Limit the maximal rate for sending duplicate acknowledgments

	in response to incoming TCP packets that are for an existing

drivers/net/bonding/bond_netlink.c

+1 −2
Original line number Diff line number Diff line
@@ -638,8 +638,7 @@ static int bond_fill_info(struct sk_buff *skb, 
				goto nla_put_failure;



			if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM,

				    sizeof(bond->params.ad_actor_system),

				    &bond->params.ad_actor_system))

				    ETH_ALEN, &bond->params.ad_actor_system))

				goto nla_put_failure;

		}

		if (!bond_3ad_get_active_agg_info(bond, &info)) {

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct hnae3_ae_ops { 
	int (*set_loopback)(struct hnae3_handle *handle,

			    enum hnae3_loop loop_mode, bool en);



	void (*set_promisc_mode)(struct hnae3_handle *handle, bool en_uc_pmc,

	int (*set_promisc_mode)(struct hnae3_handle *handle, bool en_uc_pmc,

				bool en_mc_pmc);

	int (*set_mtu)(struct hnae3_handle *handle, int new_mtu);
@@ -391,7 +391,7 @@ struct hnae3_ae_ops { 
				      int vector_num,

				      struct hnae3_ring_chain_node *vr_chain);



	void (*reset_queue)(struct hnae3_handle *handle, u16 queue_id);

	int (*reset_queue)(struct hnae3_handle *handle, u16 queue_id);

	u32 (*get_fw_version)(struct hnae3_handle *handle);

	void (*get_mdix_mode)(struct hnae3_handle *handle,

			      u8 *tp_mdix_ctrl, u8 *tp_mdix);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+85 −32
Original line number Diff line number Diff line
@@ -509,16 +509,18 @@ static void hns3_nic_set_rx_mode(struct net_device *netdev) 
	h->netdev_flags = new_flags;

}



void hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags)

int hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;



	if (h->ae_algo->ops->set_promisc_mode) {

		h->ae_algo->ops->set_promisc_mode(h,

		return h->ae_algo->ops->set_promisc_mode(h,

						promisc_flags & HNAE3_UPE,

						promisc_flags & HNAE3_MPE);

	}



	return 0;

}



void hns3_enable_vlan_filter(struct net_device *netdev, bool enable)
@@ -1494,18 +1496,22 @@ static int hns3_vlan_rx_kill_vid(struct net_device *netdev, 
	return ret;

}



static void hns3_restore_vlan(struct net_device *netdev)

static int hns3_restore_vlan(struct net_device *netdev)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	int ret = 0;

	u16 vid;

	int ret;



	for_each_set_bit(vid, priv->active_vlans, VLAN_N_VID) {

		ret = hns3_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);

		if (ret)

			netdev_warn(netdev, "Restore vlan: %d filter, ret:%d\n",

		if (ret) {

			netdev_err(netdev, "Restore vlan: %d filter, ret:%d\n",

				   vid, ret);

			return ret;

		}

	}



	return ret;

}



static int hns3_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
@@ -2727,7 +2733,7 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector, 
			chain = devm_kzalloc(&pdev->dev, sizeof(*chain),

					     GFP_KERNEL);

			if (!chain)

				return -ENOMEM;

				goto err_free_chain;



			cur_chain->next = chain;

			chain->tqp_index = tx_ring->tqp->tqp_index;
@@ -2757,7 +2763,7 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector, 
	while (rx_ring) {

		chain = devm_kzalloc(&pdev->dev, sizeof(*chain), GFP_KERNEL);

		if (!chain)

			return -ENOMEM;

			goto err_free_chain;



		cur_chain->next = chain;

		chain->tqp_index = rx_ring->tqp->tqp_index;
@@ -2772,6 +2778,16 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector, 
	}



	return 0;



err_free_chain:

	cur_chain = head->next;

	while (cur_chain) {

		chain = cur_chain->next;

		devm_kfree(&pdev->dev, chain);

		cur_chain = chain;

	}



	return -ENOMEM;

}



static void hns3_free_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector,
@@ -2821,7 +2837,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) 
	struct hnae3_handle *h = priv->ae_handle;

	struct hns3_enet_tqp_vector *tqp_vector;

	int ret = 0;

	u16 i;

	int i;



	hns3_nic_set_cpumask(priv);
@@ -2868,13 +2884,19 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) 
		hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);



		if (ret)

			return ret;

			goto map_ring_fail;



		netif_napi_add(priv->netdev, &tqp_vector->napi,

			       hns3_nic_common_poll, NAPI_POLL_WEIGHT);

	}



	return 0;



map_ring_fail:

	while (i--)

		netif_napi_del(&priv->tqp_vector[i].napi);



	return ret;

}



static int hns3_nic_alloc_vector_data(struct hns3_nic_priv *priv)
@@ -3031,8 +3053,10 @@ static int hns3_queue_to_ring(struct hnae3_queue *tqp, 
		return ret;



	ret = hns3_ring_get_cfg(tqp, priv, HNAE3_RING_TYPE_RX);

	if (ret)

	if (ret) {

		devm_kfree(priv->dev, priv->ring_data[tqp->tqp_index].ring);

		return ret;

	}



	return 0;

}
@@ -3059,6 +3083,12 @@ static int hns3_get_ring_config(struct hns3_nic_priv *priv) 


	return 0;

err:

	while (i--) {

		devm_kfree(priv->dev, priv->ring_data[i].ring);

		devm_kfree(priv->dev,

			   priv->ring_data[i + h->kinfo.num_tqps].ring);

	}



	devm_kfree(&pdev->dev, priv->ring_data);

	return ret;

}
@@ -3226,9 +3256,6 @@ int hns3_uninit_all_ring(struct hns3_nic_priv *priv) 
	int i;



	for (i = 0; i < h->kinfo.num_tqps; i++) {

		if (h->ae_algo->ops->reset_queue)

			h->ae_algo->ops->reset_queue(h, i);



		hns3_fini_ring(priv->ring_data[i].ring);

		hns3_fini_ring(priv->ring_data[i + h->kinfo.num_tqps].ring);

	}
@@ -3236,11 +3263,12 @@ int hns3_uninit_all_ring(struct hns3_nic_priv *priv) 
}



/* Set mac addr if it is configured. or leave it to the AE driver */

static void hns3_init_mac_addr(struct net_device *netdev, bool init)

static int hns3_init_mac_addr(struct net_device *netdev, bool init)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;

	u8 mac_addr_temp[ETH_ALEN];

	int ret = 0;



	if (h->ae_algo->ops->get_mac_addr && init) {

		h->ae_algo->ops->get_mac_addr(h, mac_addr_temp);
@@ -3255,8 +3283,9 @@ static void hns3_init_mac_addr(struct net_device *netdev, bool init) 
	}



	if (h->ae_algo->ops->set_mac_addr)

		h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr, true);

		ret = h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr, true);



	return ret;

}



static int hns3_restore_fd_rules(struct net_device *netdev)
@@ -3469,20 +3498,29 @@ err_out: 
	return ret;

}



static void hns3_recover_hw_addr(struct net_device *ndev)

static int hns3_recover_hw_addr(struct net_device *ndev)

{

	struct netdev_hw_addr_list *list;

	struct netdev_hw_addr *ha, *tmp;

	int ret = 0;



	/* go through and sync uc_addr entries to the device */

	list = &ndev->uc;

	list_for_each_entry_safe(ha, tmp, &list->list, list)

		hns3_nic_uc_sync(ndev, ha->addr);

	list_for_each_entry_safe(ha, tmp, &list->list, list) {

		ret = hns3_nic_uc_sync(ndev, ha->addr);

		if (ret)

			return ret;

	}



	/* go through and sync mc_addr entries to the device */

	list = &ndev->mc;

	list_for_each_entry_safe(ha, tmp, &list->list, list)

		hns3_nic_mc_sync(ndev, ha->addr);

	list_for_each_entry_safe(ha, tmp, &list->list, list) {

		ret = hns3_nic_mc_sync(ndev, ha->addr);

		if (ret)

			return ret;

	}



	return ret;

}



static void hns3_remove_hw_addr(struct net_device *netdev)
@@ -3609,7 +3647,10 @@ int hns3_nic_reset_all_ring(struct hnae3_handle *h) 
	int ret;



	for (i = 0; i < h->kinfo.num_tqps; i++) {

		h->ae_algo->ops->reset_queue(h, i);

		ret = h->ae_algo->ops->reset_queue(h, i);

		if (ret)

			return ret;



		hns3_init_ring_hw(priv->ring_data[i].ring);



		/* We need to clear tx ring here because self test will
@@ -3701,18 +3742,30 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	bool vlan_filter_enable;

	int ret;



	hns3_init_mac_addr(netdev, false);

	hns3_recover_hw_addr(netdev);

	hns3_update_promisc_mode(netdev, handle->netdev_flags);

	ret = hns3_init_mac_addr(netdev, false);

	if (ret)

		return ret;



	ret = hns3_recover_hw_addr(netdev);

	if (ret)

		return ret;



	ret = hns3_update_promisc_mode(netdev, handle->netdev_flags);

	if (ret)

		return ret;



	vlan_filter_enable = netdev->flags & IFF_PROMISC ? false : true;

	hns3_enable_vlan_filter(netdev, vlan_filter_enable);





	/* Hardware table is only clear when pf resets */

	if (!(handle->flags & HNAE3_SUPPORT_VF))

		hns3_restore_vlan(netdev);

	if (!(handle->flags & HNAE3_SUPPORT_VF)) {

		ret = hns3_restore_vlan(netdev);

		return ret;

	}



	hns3_restore_fd_rules(netdev);

	ret = hns3_restore_fd_rules(netdev);

	if (ret)

		return ret;



	/* Carrier off reporting is important to ethtool even BEFORE open */

	netif_carrier_off(netdev);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ void hns3_set_vector_coalesce_rl(struct hns3_enet_tqp_vector *tqp_vector, 
				 u32 rl_value);



void hns3_enable_vlan_filter(struct net_device *netdev, bool enable);

void hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags);

int hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags);



#ifdef CONFIG_HNS3_DCB

void hns3_dcbnl_setup(struct hnae3_handle *handle);

CRA Git | Maintained and supported by SUSTech CRA and CCSE