Commit 8a5c2906 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2020-11-10

This series contains updates to i40e and igc drivers and the MAINTAINERS
file.

Slawomir fixes updating VF MAC addresses to fix various issues related
to reporting and setting of these addresses for i40e.

Dan Carpenter fixes a possible used before being initialized issue for
i40e.

Vinicius fixes reporting of netdev stats for igc.

Tony updates repositories for Intel Ethernet Drivers.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  MAINTAINERS: Update repositories for Intel Ethernet Drivers
  igc: Fix returning wrong statistics
  i40e, xsk: uninitialized variable in i40e_clean_rx_irq_zc()
  i40e: Fix MAC address setting for a VF via Host/VM
====================

Link: https://lore.kernel.org/r/20201111001955.533210-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9f73bd1c 5fb7f75b

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -8829,8 +8829,8 @@ S: Supported 
W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/

Q:	http://patchwork.ozlabs.org/project/intel-wired-lan/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git

F:	Documentation/networking/device_drivers/ethernet/intel/

F:	drivers/net/ethernet/intel/

F:	drivers/net/ethernet/intel/*/

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

+24 −2
Original line number Diff line number Diff line
@@ -2713,6 +2713,10 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
				spin_unlock_bh(&vsi->mac_filter_hash_lock);

				goto error_param;

			}

			if (is_valid_ether_addr(al->list[i].addr) &&

			    is_zero_ether_addr(vf->default_lan_addr.addr))

				ether_addr_copy(vf->default_lan_addr.addr,

						al->list[i].addr);

		}

	}

	spin_unlock_bh(&vsi->mac_filter_hash_lock);
@@ -2740,6 +2744,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
{

	struct virtchnl_ether_addr_list *al =

	    (struct virtchnl_ether_addr_list *)msg;

	bool was_unimac_deleted = false;

	struct i40e_pf *pf = vf->pf;

	struct i40e_vsi *vsi = NULL;

	i40e_status ret = 0;
@@ -2759,6 +2764,8 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
			ret = I40E_ERR_INVALID_MAC_ADDR;

			goto error_param;

		}

		if (ether_addr_equal(al->list[i].addr, vf->default_lan_addr.addr))

			was_unimac_deleted = true;

	}

	vsi = pf->vsi[vf->lan_vsi_idx];
@@ -2779,10 +2786,25 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
		dev_err(&pf->pdev->dev, "Unable to program VF %d MAC filters, error %d\n",

			vf->vf_id, ret);



	if (vf->trusted && was_unimac_deleted) {

		struct i40e_mac_filter *f;

		struct hlist_node *h;

		u8 *macaddr = NULL;

		int bkt;



		/* set last unicast mac address as default */

		spin_lock_bh(&vsi->mac_filter_hash_lock);

		hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {

			if (is_valid_ether_addr(f->macaddr))

				macaddr = f->macaddr;

		}

		if (macaddr)

			ether_addr_copy(vf->default_lan_addr.addr, macaddr);

		spin_unlock_bh(&vsi->mac_filter_hash_lock);

	}

error_param:

	/* send the response to the VF */

	return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_DEL_ETH_ADDR,

				       ret);

	return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_DEL_ETH_ADDR, ret);

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -281,8 +281,8 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget) 
	unsigned int total_rx_bytes = 0, total_rx_packets = 0;

	u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);

	unsigned int xdp_res, xdp_xmit = 0;

	bool failure = false;

	struct sk_buff *skb;

	bool failure;



	while (likely(total_rx_packets < (unsigned int)budget)) {

		union i40e_rx_desc *rx_desc;

drivers/net/ethernet/intel/igc/igc_main.c

+8 −6
Original line number Diff line number Diff line
@@ -3891,21 +3891,23 @@ static int igc_change_mtu(struct net_device *netdev, int new_mtu) 
}



/**

 * igc_get_stats - Get System Network Statistics

 * igc_get_stats64 - Get System Network Statistics

 * @netdev: network interface device structure

 * @stats: rtnl_link_stats64 pointer

 *

 * Returns the address of the device statistics structure.

 * The statistics are updated here and also from the timer callback.

 */

static struct net_device_stats *igc_get_stats(struct net_device *netdev)

static void igc_get_stats64(struct net_device *netdev,

			    struct rtnl_link_stats64 *stats)

{

	struct igc_adapter *adapter = netdev_priv(netdev);



	spin_lock(&adapter->stats64_lock);

	if (!test_bit(__IGC_RESETTING, &adapter->state))

		igc_update_stats(adapter);



	/* only return the current stats */

	return &netdev->stats;

	memcpy(stats, &adapter->stats64, sizeof(*stats));

	spin_unlock(&adapter->stats64_lock);

}



static netdev_features_t igc_fix_features(struct net_device *netdev,
@@ -4855,7 +4857,7 @@ static const struct net_device_ops igc_netdev_ops = { 
	.ndo_set_rx_mode	= igc_set_rx_mode,

	.ndo_set_mac_address	= igc_set_mac,

	.ndo_change_mtu		= igc_change_mtu,

	.ndo_get_stats		= igc_get_stats,

	.ndo_get_stats64	= igc_get_stats64,

	.ndo_fix_features	= igc_fix_features,

	.ndo_set_features	= igc_set_features,

	.ndo_features_check	= igc_features_check,

CRA Git | Maintained and supported by SUSTech CRA and CCSE