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

Commit bf795860 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-10-23

This series contains updates to i40e, i40evf, if_link, ixgbe and ixgbevf.

Anjali adds a workaround to drop any flow control frames from being
transmitted from any VSI, so that a malicious VF cannot send flow control
or PFC packets out on the wire.  Also fixed a bug in debugfs by grabbing
the filter list lock before adding or deleting a filter.

Akeem fixes an issue where we were unconditionally returning VEB bridge
mode before allowing LB in the add VSI routine, resolve by checking if
the bridge is actually in VEB mode first.

Mitch fixed an issue where the incorrect structure was being used for
VLAN filter list, which meant the VLAN filter list did not get
processed correctly and VLAN filters would not be re-enabled after any
kind of reset.

Helin fixed a problem of possibly getting inconsistent flow control
status after a PF reset.  The issue was requested_mode was being set
with a default value during probe, but the hardware state could be a
different value from this mode.

Carolyn fixed a problem where the driver output of the OEM version
string varied from the other tools.

Jean Sacren fixes up kernel documentation by fixing function header
comments to match actual variables used in the functions.  Also
cleaned up variable initialization, when the variable would be
over-written immediately.

Hiroshi Shimanoto provides three patches to add "trusted" VF by adding
netlink directives and an NDO entry.  Then implement these new controls
in ixgbe and ixgbevf.  This series has gone through several iterations
to address all the suggested community changes and concerns.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e74f5105 8443c1a4

drivers/net/ethernet/intel/i40e/i40e.h

+13 −4
Original line number Diff line number Diff line
@@ -109,8 +109,10 @@ 
#define I40E_NVM_VERSION_LO_MASK   (0xff << I40E_NVM_VERSION_LO_SHIFT)

#define I40E_NVM_VERSION_HI_SHIFT  12

#define I40E_NVM_VERSION_HI_MASK   (0xf << I40E_NVM_VERSION_HI_SHIFT)

#define I40E_OEM_VER_BUILD_MASK    0xff00

#define I40E_OEM_VER_BUILD_MASK    0xffff

#define I40E_OEM_VER_PATCH_MASK    0xff

#define I40E_OEM_VER_BUILD_SHIFT   8

#define I40E_OEM_VER_SHIFT         24



/* The values in here are decimal coded as hex as is the case in the NVM map*/

#define I40E_CURRENT_NVM_VERSION_HI 0x2
@@ -594,6 +596,15 @@ struct i40e_device { 
static inline char *i40e_nvm_version_str(struct i40e_hw *hw)

{

	static char buf[32];

	u32 full_ver;

	u8 ver, patch;

	u16 build;



	full_ver = hw->nvm.oem_ver;

	ver = (u8)(full_ver >> I40E_OEM_VER_SHIFT);

	build = (u16)((full_ver >> I40E_OEM_VER_BUILD_SHIFT)

		 & I40E_OEM_VER_BUILD_MASK);

	patch = (u8)(full_ver & I40E_OEM_VER_PATCH_MASK);



	snprintf(buf, sizeof(buf),

		 "%x.%02x 0x%x %d.%d.%d",
@@ -601,9 +612,7 @@ static inline char *i40e_nvm_version_str(struct i40e_hw *hw) 
			I40E_NVM_VERSION_HI_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_LO_MASK) >>

			I40E_NVM_VERSION_LO_SHIFT,

		 hw->nvm.eetrack, (hw->nvm.oem_ver >> 24),

		 (hw->nvm.oem_ver & I40E_OEM_VER_BUILD_MASK) >> 8,

		 hw->nvm.oem_ver & I40E_OEM_VER_PATCH_MASK);

		 hw->nvm.eetrack, ver, build, patch);



	return buf;

}

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

+26 −18
Original line number Diff line number Diff line
@@ -331,25 +331,11 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
			len = buf_len;

		/* write the full 16-byte chunks */

		for (i = 0; i < (len - 16); i += 16)

			i40e_debug(hw, mask,

				   "\t0x%04X  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",

				   i, buf[i], buf[i + 1], buf[i + 2],

				   buf[i + 3], buf[i + 4], buf[i + 5],

				   buf[i + 6], buf[i + 7], buf[i + 8],

				   buf[i + 9], buf[i + 10], buf[i + 11],

				   buf[i + 12], buf[i + 13], buf[i + 14],

				   buf[i + 15]);

			i40e_debug(hw, mask, "\t0x%04X  %16ph\n", i, buf + i);

		/* write whatever's left over without overrunning the buffer */

		if (i < len) {

			char d_buf[80];

			int j = 0;



			memset(d_buf, 0, sizeof(d_buf));

			j += sprintf(d_buf, "\t0x%04X ", i);

			while (i < len)

				j += sprintf(&d_buf[j], " %02X", buf[i++]);

			i40e_debug(hw, mask, "%s\n", d_buf);

		}

		if (i < len)

			i40e_debug(hw, mask, "\t0x%04X  %*ph\n",

					     i, len - i, buf + i);

	}

}
@@ -3828,6 +3814,28 @@ i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_add_filter_to_drop_tx_flow_control_frames- filter to drop flow control

 * @hw: pointer to the hw struct

 * @seid: VSI seid to add ethertype filter from

 **/

#define I40E_FLOW_CONTROL_ETHTYPE 0x8808

void i40e_add_filter_to_drop_tx_flow_control_frames(struct i40e_hw *hw,

						    u16 seid)

{

	u16 flag = I40E_AQC_ADD_CONTROL_PACKET_FLAGS_IGNORE_MAC |

		   I40E_AQC_ADD_CONTROL_PACKET_FLAGS_DROP |

		   I40E_AQC_ADD_CONTROL_PACKET_FLAGS_TX;

	u16 ethtype = I40E_FLOW_CONTROL_ETHTYPE;

	i40e_status status;



	status = i40e_aq_add_rem_control_packet_filter(hw, NULL, ethtype, flag,

						       seid, 0, true, NULL,

						       NULL);

	if (status)

		hw_dbg(hw, "Ethtype Filter Add failed: Error pruning Tx flow control frames\n");

}



/**

 * i40e_aq_alternate_read

 * @hw: pointer to the hardware structure

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

+4 −0
Original line number Diff line number Diff line
@@ -1137,7 +1137,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
			goto command_write_done;

		}



		spin_lock_bh(&vsi->mac_filter_list_lock);

		f = i40e_add_filter(vsi, ma, vlan, false, false);

		spin_unlock_bh(&vsi->mac_filter_list_lock);

		ret = i40e_sync_vsi_filters(vsi, true);

		if (f && !ret)

			dev_info(&pf->pdev->dev,
@@ -1174,7 +1176,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
			goto command_write_done;

		}



		spin_lock_bh(&vsi->mac_filter_list_lock);

		i40e_del_filter(vsi, ma, vlan, false, false);

		spin_unlock_bh(&vsi->mac_filter_list_lock);

		ret = i40e_sync_vsi_filters(vsi, true);

		if (!ret)

			dev_info(&pf->pdev->dev,

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

+52 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_BUILD 38

#define DRV_VERSION_BUILD 46

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -6837,6 +6837,15 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) 
	if (pf->flags & I40E_FLAG_MSIX_ENABLED)

		ret = i40e_setup_misc_vector(pf);



	/* Add a filter to drop all Flow control frames from any VSI from being

	 * transmitted. By doing so we stop a malicious VF from sending out

	 * PAUSE or PFC frames and potentially controlling traffic for other

	 * PF/VF VSIs.

	 * The FW can still send Flow control frames if enabled.

	 */

	i40e_add_filter_to_drop_tx_flow_control_frames(&pf->hw,

						       pf->main_vsi_seid);



	/* restart the VSIs that were rebuilt and running before the reset */

	i40e_pf_unquiesce_all_vsi(pf);
@@ -8732,14 +8741,24 @@ int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi) 
		return 1;



	veb = pf->veb[vsi->veb_idx];

	if (!veb) {

		dev_info(&pf->pdev->dev,

			 "There is no veb associated with the bridge\n");

		return -ENOENT;

	}



	/* Uplink is a bridge in VEPA mode */

	if (veb && (veb->bridge_mode & BRIDGE_MODE_VEPA))

	if (veb->bridge_mode & BRIDGE_MODE_VEPA) {

		return 0;



	} else {

		/* Uplink is a bridge in VEB mode */

		return 1;

	}



	/* VEPA is now default bridge, so return 0 */

	return 0;

}



/**

 * i40e_add_vsi - Add a VSI to the switch

 * @vsi: the VSI being configured
@@ -10164,6 +10183,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int err;

	u32 len;

	u32 i;

	u8 set_fc_aq_fail;



	err = pci_enable_device_mem(pdev);

	if (err)
@@ -10428,6 +10448,25 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_info(&pdev->dev, "setup_pf_switch failed: %d\n", err);

		goto err_vsis;

	}



	/* Make sure flow control is set according to current settings */

	err = i40e_set_fc(hw, &set_fc_aq_fail, true);

	if (set_fc_aq_fail & I40E_SET_FC_AQ_FAIL_GET)

		dev_dbg(&pf->pdev->dev,

			"Set fc with err %s aq_err %s on get_phy_cap\n",

			i40e_stat_str(hw, err),

			i40e_aq_str(hw, hw->aq.asq_last_status));

	if (set_fc_aq_fail & I40E_SET_FC_AQ_FAIL_SET)

		dev_dbg(&pf->pdev->dev,

			"Set fc with err %s aq_err %s on set_phy_config\n",

			i40e_stat_str(hw, err),

			i40e_aq_str(hw, hw->aq.asq_last_status));

	if (set_fc_aq_fail & I40E_SET_FC_AQ_FAIL_UPDATE)

		dev_dbg(&pf->pdev->dev,

			"Set fc with err %s aq_err %s on get_link_info\n",

			i40e_stat_str(hw, err),

			i40e_aq_str(hw, hw->aq.asq_last_status));



	/* if FDIR VSI was set up, start it now */

	for (i = 0; i < pf->num_alloc_vsi; i++) {

		if (pf->vsi[i] && pf->vsi[i]->type == I40E_VSI_FDIR) {
@@ -10585,6 +10624,15 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

	pf->hw.phy.phy_types = le32_to_cpu(abilities.phy_type);



	/* Add a filter to drop all Flow control frames from any VSI from being

	 * transmitted. By doing so we stop a malicious VF from sending out

	 * PAUSE or PFC frames and potentially controlling traffic for other

	 * PF/VF VSIs.

	 * The FW can still send Flow control frames if enabled.

	 */

	i40e_add_filter_to_drop_tx_flow_control_frames(&pf->hw,

						       pf->main_vsi_seid);



	/* print a string summarizing features */

	i40e_print_features(pf);

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

+5 −4
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static i40e_status i40e_write_nvm_aq(struct i40e_hw *hw, u8 module_pointer, 
static i40e_status i40e_calc_nvm_checksum(struct i40e_hw *hw,

						    u16 *checksum)

{

	i40e_status ret_code = 0;

	i40e_status ret_code;

	struct i40e_virt_mem vmem;

	u16 pcie_alt_module = 0;

	u16 checksum_local = 0;
@@ -564,15 +564,16 @@ static i40e_status i40e_calc_nvm_checksum(struct i40e_hw *hw, 
 **/

i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;

	i40e_status ret_code;

	u16 checksum;

	__le16 le_sum;



	ret_code = i40e_calc_nvm_checksum(hw, &checksum);

	if (!ret_code) {

		le_sum = cpu_to_le16(checksum);

	if (!ret_code)

		ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD,

					     1, &le_sum, true);

	}



	return ret_code;

}