Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/tnguy/net-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-04-03 (ice, idpf)

This series contains updates to ice and idpf drivers.

Dan Carpenter initializes some pointer declarations to NULL as needed for
resource cleanup on ice driver.

Petr Oros corrects assignment of VLAN operators to fix Rx VLAN filtering
in legacy mode for ice.

Joshua calls eth_type_trans() on unknown packets to prevent possible
kernel panic on idpf.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  idpf: fix kernel panic on unknown packet types
  ice: fix enabling RX VLAN filtering
  ice: Fix freeing uninitialized pointers
====================

Link: https://lore.kernel.org/r/20240403201929.1945116-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/intel/ice/ice_common.c

@@ -1002,8 +1002,8 @@ static void ice_get_itr_intrl_gran(struct ice_hw *hw)
  */
 int ice_init_hw(struct ice_hw *hw)
 {
- struct ice_aqc_get_phy_caps_data *pcaps __free(kfree);
- void *mac_buf __free(kfree);
+ struct ice_aqc_get_phy_caps_data *pcaps __free(kfree) = NULL;
+ void *mac_buf __free(kfree) = NULL;
  u16 mac_buf_len;
  int status;
 
@@ -3272,7 +3272,7 @@ int ice_update_link_info(struct ice_port_info *pi)
  return status;
 
  if (li->link_info & ICE_AQ_MEDIA_AVAILABLE) {
- struct ice_aqc_get_phy_caps_data *pcaps __free(kfree);
+ struct ice_aqc_get_phy_caps_data *pcaps __free(kfree) = NULL;
 
  pcaps = kzalloc(sizeof(*pcaps), GFP_KERNEL);
  if (!pcaps)
@@ -3420,7 +3420,7 @@ ice_cfg_phy_fc(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,
 int
 ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)
 {
- struct ice_aqc_get_phy_caps_data *pcaps __free(kfree);
+ struct ice_aqc_get_phy_caps_data *pcaps __free(kfree) = NULL;
  struct ice_aqc_set_phy_cfg_data cfg = { 0 };
  struct ice_hw *hw;
  int status;
@@ -3561,7 +3561,7 @@ int
 ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,
  enum ice_fec_mode fec)
 {
- struct ice_aqc_get_phy_caps_data *pcaps __free(kfree);
+ struct ice_aqc_get_phy_caps_data *pcaps __free(kfree) = NULL;
  struct ice_hw *hw;
  int status;
 

drivers/net/ethernet/intel/ice/ice_ethtool.c

@@ -941,11 +941,11 @@ static u64 ice_loopback_test(struct net_device *netdev)
  struct ice_netdev_priv *np = netdev_priv(netdev);
  struct ice_vsi *orig_vsi = np->vsi, *test_vsi;
  struct ice_pf *pf = orig_vsi->back;
+ u8 *tx_frame __free(kfree) = NULL;
  u8 broadcast[ETH_ALEN], ret = 0;
  int num_frames, valid_frames;
  struct ice_tx_ring *tx_ring;
  struct ice_rx_ring *rx_ring;
- u8 *tx_frame __free(kfree);
  int i;
 
  netdev_info(netdev, "loopback test\n");

drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c

@@ -26,24 +26,22 @@ static void ice_port_vlan_on(struct ice_vsi *vsi)
  struct ice_vsi_vlan_ops *vlan_ops;
  struct ice_pf *pf = vsi->back;
 
- if (ice_is_dvm_ena(&pf->hw)) {
- vlan_ops = &vsi->outer_vlan_ops;
-
- /* setup outer VLAN ops */
- vlan_ops->set_port_vlan = ice_vsi_set_outer_port_vlan;
- vlan_ops->clear_port_vlan = ice_vsi_clear_outer_port_vlan;
+ /* setup inner VLAN ops */
+ vlan_ops = &vsi->inner_vlan_ops;
 
- /* setup inner VLAN ops */
- vlan_ops = &vsi->inner_vlan_ops;
+ if (ice_is_dvm_ena(&pf->hw)) {
  vlan_ops->add_vlan = noop_vlan_arg;
  vlan_ops->del_vlan = noop_vlan_arg;
  vlan_ops->ena_stripping = ice_vsi_ena_inner_stripping;
  vlan_ops->dis_stripping = ice_vsi_dis_inner_stripping;
  vlan_ops->ena_insertion = ice_vsi_ena_inner_insertion;
  vlan_ops->dis_insertion = ice_vsi_dis_inner_insertion;
- } else {
- vlan_ops = &vsi->inner_vlan_ops;
 
+ /* setup outer VLAN ops */
+ vlan_ops = &vsi->outer_vlan_ops;
+ vlan_ops->set_port_vlan = ice_vsi_set_outer_port_vlan;
+ vlan_ops->clear_port_vlan = ice_vsi_clear_outer_port_vlan;
+ } else {
  vlan_ops->set_port_vlan = ice_vsi_set_inner_port_vlan;
  vlan_ops->clear_port_vlan = ice_vsi_clear_inner_port_vlan;
  }

drivers/net/ethernet/intel/idpf/idpf_txrx.c

@@ -2941,6 +2941,8 @@ static int idpf_rx_process_skb_fields(struct idpf_queue *rxq,
  rx_ptype = le16_get_bits(rx_desc->ptype_err_fflags0,
  VIRTCHNL2_RX_FLEX_DESC_ADV_PTYPE_M);
 
+ skb->protocol = eth_type_trans(skb, rxq->vport->netdev);
+
  decoded = rxq->vport->rx_ptype_lkup[rx_ptype];
  /* If we don't know the ptype we can't do anything else with it. Just
  * pass it up the stack as-is.
@@ -2951,8 +2953,6 @@ static int idpf_rx_process_skb_fields(struct idpf_queue *rxq,
  /* process RSS/hash */
  idpf_rx_hash(rxq, skb, rx_desc, &decoded);
 
- skb->protocol = eth_type_trans(skb, rxq->vport->netdev);
-
  if (le16_get_bits(rx_desc->hdrlen_flags,
  VIRTCHNL2_RX_FLEX_DESC_ADV_RSC_M))
  return idpf_rx_rsc(rxq, skb, rx_desc, &decoded);