Commit 1b8f15b6 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Jeff Kirsher
Browse files

ice: refactor filter functions 



Move filter functions to separate file.

Add functions that prepare suitable ice_fltr_info struct
depending on the filter type and add this struct to earlier created
list:
- ice_fltr_add_mac_to_list
- ice_fltr_add_vlan_to_list
- ice_fltr_add_eth_to_list
This functions are used in adding and removing filters.

Create wrappers for functions mentioned above that alloc list,
add suitable ice_fltr_info to it and call add or remove function.
- ice_fltr_prepare_mac
- ice_fltr_prepare_mac_and_broadcast
- ice_fltr_prepare_vlan
- ice_fltr_prepare_eth

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 857a4f0e

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ ice-y := ice_main.o \ 
	 ice_lib.o	\

	 ice_txrx_lib.o	\

	 ice_txrx.o	\

	 ice_fltr.o	\

	 ice_flex_pipe.o \

	 ice_flow.o	\

	 ice_devlink.o	\

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

+3 −10
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include "ice.h"

#include "ice_flow.h"

#include "ice_fltr.h"

#include "ice_lib.h"

#include "ice_dcb_lib.h"
@@ -676,7 +677,6 @@ static u64 ice_loopback_test(struct net_device *netdev) 
	struct ice_ring *tx_ring, *rx_ring;

	u8 broadcast[ETH_ALEN], ret = 0;

	int num_frames, valid_frames;

	LIST_HEAD(tmp_list);

	struct device *dev;

	u8 *tx_frame;

	int i;
@@ -712,16 +712,11 @@ static u64 ice_loopback_test(struct net_device *netdev) 


	/* Test VSI needs to receive broadcast packets */

	eth_broadcast_addr(broadcast);

	if (ice_add_mac_to_list(test_vsi, &tmp_list, broadcast)) {

	if (ice_fltr_add_mac(test_vsi, broadcast, ICE_FWD_TO_VSI)) {

		ret = 5;

		goto lbtest_mac_dis;

	}



	if (ice_add_mac(&pf->hw, &tmp_list)) {

		ret = 6;

		goto free_mac_list;

	}



	if (ice_lbtest_create_frame(pf, &tx_frame, ICE_LB_FRAME_SIZE)) {

		ret = 7;

		goto remove_mac_filters;
@@ -744,10 +739,8 @@ static u64 ice_loopback_test(struct net_device *netdev) 
lbtest_free_frame:

	devm_kfree(dev, tx_frame);

remove_mac_filters:

	if (ice_remove_mac(&pf->hw, &tmp_list))

	if (ice_fltr_remove_mac(test_vsi, broadcast, ICE_FWD_TO_VSI))

		netdev_err(netdev, "Could not remove MAC filter for the test VSI\n");

free_mac_list:

	ice_free_fltr_list(dev, &tmp_list);

lbtest_mac_dis:

	/* Disable MAC loopback after the test is completed. */

	if (ice_aq_set_mac_loopback(&pf->hw, false, NULL))

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

0 → 100644
+397 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (C) 2018-2020, Intel Corporation. */



#include "ice.h"

#include "ice_fltr.h"



/**

 * ice_fltr_free_list - free filter lists helper

 * @dev: pointer to the device struct

 * @h: pointer to the list head to be freed

 *

 * Helper function to free filter lists previously created using

 * ice_fltr_add_mac_to_list

 */

void ice_fltr_free_list(struct device *dev, struct list_head *h)

{

	struct ice_fltr_list_entry *e, *tmp;



	list_for_each_entry_safe(e, tmp, h, list_entry) {

		list_del(&e->list_entry);

		devm_kfree(dev, e);

	}

}



/**

 * ice_fltr_add_entry_to_list - allocate and add filter entry to list

 * @dev: pointer to device needed by alloc function

 * @info: filter info struct that gets added to the passed in list

 * @list: pointer to the list which contains MAC filters entry

 */

static int

ice_fltr_add_entry_to_list(struct device *dev, struct ice_fltr_info *info,

			   struct list_head *list)

{

	struct ice_fltr_list_entry *entry;



	entry = devm_kzalloc(dev, sizeof(*entry), GFP_ATOMIC);

	if (!entry)

		return -ENOMEM;



	entry->fltr_info = *info;



	INIT_LIST_HEAD(&entry->list_entry);

	list_add(&entry->list_entry, list);



	return 0;

}



/**

 * ice_fltr_add_mac_list - add list of MAC filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

enum ice_status

ice_fltr_add_mac_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_add_mac(&vsi->back->hw, list);

}



/**

 * ice_fltr_remove_mac_list - remove list of MAC filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

enum ice_status

ice_fltr_remove_mac_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_remove_mac(&vsi->back->hw, list);

}



/**

 * ice_fltr_add_vlan_list - add list of VLAN filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

static enum ice_status

ice_fltr_add_vlan_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_add_vlan(&vsi->back->hw, list);

}



/**

 * ice_fltr_remove_vlan_list - remove list of VLAN filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

static enum ice_status

ice_fltr_remove_vlan_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_remove_vlan(&vsi->back->hw, list);

}



/**

 * ice_fltr_add_eth_list - add list of ethertype filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

static enum ice_status

ice_fltr_add_eth_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_add_eth_mac(&vsi->back->hw, list);

}



/**

 * ice_fltr_remove_eth_list - remove list of ethertype filters

 * @vsi: pointer to VSI struct

 * @list: list of filters

 */

static enum ice_status

ice_fltr_remove_eth_list(struct ice_vsi *vsi, struct list_head *list)

{

	return ice_remove_eth_mac(&vsi->back->hw, list);

}



/**

 * ice_fltr_remove_all - remove all filters associated with VSI

 * @vsi: pointer to VSI struct

 */

void ice_fltr_remove_all(struct ice_vsi *vsi)

{

	ice_remove_vsi_fltr(&vsi->back->hw, vsi->idx);

}



/**

 * ice_fltr_add_mac_to_list - add MAC filter info to exsisting list

 * @vsi: pointer to VSI struct

 * @list: list to add filter info to

 * @mac: MAC address to add

 * @action: filter action

 */

int

ice_fltr_add_mac_to_list(struct ice_vsi *vsi, struct list_head *list,

			 const u8 *mac, enum ice_sw_fwd_act_type action)

{

	struct ice_fltr_info info = { 0 };



	info.flag = ICE_FLTR_TX;

	info.src_id = ICE_SRC_ID_VSI;

	info.lkup_type = ICE_SW_LKUP_MAC;

	info.fltr_act = action;

	info.vsi_handle = vsi->idx;



	ether_addr_copy(info.l_data.mac.mac_addr, mac);



	return ice_fltr_add_entry_to_list(ice_pf_to_dev(vsi->back), &info,

					  list);

}



/**

 * ice_fltr_add_vlan_to_list - add VLAN filter info to exsisting list

 * @vsi: pointer to VSI struct

 * @list: list to add filter info to

 * @vlan_id: VLAN ID to add

 * @action: filter action

 */

static int

ice_fltr_add_vlan_to_list(struct ice_vsi *vsi, struct list_head *list,

			  u16 vlan_id, enum ice_sw_fwd_act_type action)

{

	struct ice_fltr_info info = { 0 };



	info.flag = ICE_FLTR_TX;

	info.src_id = ICE_SRC_ID_VSI;

	info.lkup_type = ICE_SW_LKUP_VLAN;

	info.fltr_act = action;

	info.vsi_handle = vsi->idx;

	info.l_data.vlan.vlan_id = vlan_id;



	return ice_fltr_add_entry_to_list(ice_pf_to_dev(vsi->back), &info,

					  list);

}



/**

 * ice_fltr_add_eth_to_list - add ethertype filter info to exsisting list

 * @vsi: pointer to VSI struct

 * @list: list to add filter info to

 * @ethertype: ethertype of packet that matches filter

 * @flag: filter direction, Tx or Rx

 * @action: filter action

 */

static int

ice_fltr_add_eth_to_list(struct ice_vsi *vsi, struct list_head *list,

			 u16 ethertype, u16 flag,

			 enum ice_sw_fwd_act_type action)

{

	struct ice_fltr_info info = { 0 };



	info.flag = flag;

	info.lkup_type = ICE_SW_LKUP_ETHERTYPE;

	info.fltr_act = action;

	info.vsi_handle = vsi->idx;

	info.l_data.ethertype_mac.ethertype = ethertype;



	if (flag == ICE_FLTR_TX)

		info.src_id = ICE_SRC_ID_VSI;

	else

		info.src_id = ICE_SRC_ID_LPORT;



	return ice_fltr_add_entry_to_list(ice_pf_to_dev(vsi->back), &info,

					  list);

}



/**

 * ice_fltr_prepare_mac - add or remove MAC rule

 * @vsi: pointer to VSI struct

 * @mac: MAC address to add

 * @action: action to be performed on filter match

 * @mac_action: pointer to add or remove MAC function

 */

static enum ice_status

ice_fltr_prepare_mac(struct ice_vsi *vsi, const u8 *mac,

		     enum ice_sw_fwd_act_type action,

		     enum ice_status (*mac_action)(struct ice_vsi *,

						   struct list_head *))

{

	enum ice_status result;

	LIST_HEAD(tmp_list);



	if (ice_fltr_add_mac_to_list(vsi, &tmp_list, mac, action)) {

		ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

		return ICE_ERR_NO_MEMORY;

	}



	result = mac_action(vsi, &tmp_list);

	ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

	return result;

}



/**

 * ice_fltr_prepare_mac_and_broadcast - add or remove MAC and broadcast filter

 * @vsi: pointer to VSI struct

 * @mac: MAC address to add

 * @action: action to be performed on filter match

 * @mac_action: pointer to add or remove MAC function

 */

static enum ice_status

ice_fltr_prepare_mac_and_broadcast(struct ice_vsi *vsi, const u8 *mac,

				   enum ice_sw_fwd_act_type action,

				   enum ice_status(*mac_action)

				   (struct ice_vsi *, struct list_head *))

{

	u8 broadcast[ETH_ALEN];

	enum ice_status result;

	LIST_HEAD(tmp_list);



	eth_broadcast_addr(broadcast);

	if (ice_fltr_add_mac_to_list(vsi, &tmp_list, mac, action) ||

	    ice_fltr_add_mac_to_list(vsi, &tmp_list, broadcast, action)) {

		ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

		return ICE_ERR_NO_MEMORY;

	}



	result = mac_action(vsi, &tmp_list);

	ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

	return result;

}



/**

 * ice_fltr_prepare_vlan - add or remove VLAN filter

 * @vsi: pointer to VSI struct

 * @vlan_id: VLAN ID to add

 * @action: action to be performed on filter match

 * @vlan_action: pointer to add or remove VLAN function

 */

static enum ice_status

ice_fltr_prepare_vlan(struct ice_vsi *vsi, u16 vlan_id,

		      enum ice_sw_fwd_act_type action,

		      enum ice_status (*vlan_action)(struct ice_vsi *,

						     struct list_head *))

{

	enum ice_status result;

	LIST_HEAD(tmp_list);



	if (ice_fltr_add_vlan_to_list(vsi, &tmp_list, vlan_id, action))

		return ICE_ERR_NO_MEMORY;



	result = vlan_action(vsi, &tmp_list);

	ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

	return result;

}



/**

 * ice_fltr_prepare_eth - add or remove ethertype filter

 * @vsi: pointer to VSI struct

 * @ethertype: ethertype of packet to be filtered

 * @flag: direction of packet, Tx or Rx

 * @action: action to be performed on filter match

 * @eth_action: pointer to add or remove ethertype function

 */

static enum ice_status

ice_fltr_prepare_eth(struct ice_vsi *vsi, u16 ethertype, u16 flag,

		     enum ice_sw_fwd_act_type action,

		     enum ice_status (*eth_action)(struct ice_vsi *,

						   struct list_head *))

{

	enum ice_status result;

	LIST_HEAD(tmp_list);



	if (ice_fltr_add_eth_to_list(vsi, &tmp_list, ethertype, flag, action))

		return ICE_ERR_NO_MEMORY;



	result = eth_action(vsi, &tmp_list);

	ice_fltr_free_list(ice_pf_to_dev(vsi->back), &tmp_list);

	return result;

}



/**

 * ice_fltr_add_mac - add single MAC filter

 * @vsi: pointer to VSI struct

 * @mac: MAC to add

 * @action: action to be performed on filter match

 */

enum ice_status ice_fltr_add_mac(struct ice_vsi *vsi, const u8 *mac,

				 enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_mac(vsi, mac, action, ice_fltr_add_mac_list);

}



/**

 * ice_fltr_add_mac_and_broadcast - add single MAC and broadcast

 * @vsi: pointer to VSI struct

 * @mac: MAC to add

 * @action: action to be performed on filter match

 */

enum ice_status

ice_fltr_add_mac_and_broadcast(struct ice_vsi *vsi, const u8 *mac,

			       enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_mac_and_broadcast(vsi, mac, action,

						  ice_fltr_add_mac_list);

}



/**

 * ice_fltr_remove_mac - remove MAC filter

 * @vsi: pointer to VSI struct

 * @mac: filter MAC to remove

 * @action: action to remove

 */

enum ice_status ice_fltr_remove_mac(struct ice_vsi *vsi, const u8 *mac,

				    enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_mac(vsi, mac, action, ice_fltr_remove_mac_list);

}



/**

 * ice_fltr_add_vlan - add single VLAN filter

 * @vsi: pointer to VSI struct

 * @vlan_id: VLAN ID to add

 * @action: action to be performed on filter match

 */

enum ice_status ice_fltr_add_vlan(struct ice_vsi *vsi, u16 vlan_id,

				  enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_vlan(vsi, vlan_id, action,

				     ice_fltr_add_vlan_list);

}



/**

 * ice_fltr_remove_vlan - remove VLAN filter

 * @vsi: pointer to VSI struct

 * @vlan_id: filter VLAN to remove

 * @action: action to remove

 */

enum ice_status ice_fltr_remove_vlan(struct ice_vsi *vsi, u16 vlan_id,

				     enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_vlan(vsi, vlan_id, action,

				     ice_fltr_remove_vlan_list);

}



/**

 * ice_fltr_add_eth - add specyfic ethertype filter

 * @vsi: pointer to VSI struct

 * @ethertype: ethertype of filter

 * @flag: direction of packet to be filtered, Tx or Rx

 * @action: action to be performed on filter match

 */

enum ice_status ice_fltr_add_eth(struct ice_vsi *vsi, u16 ethertype, u16 flag,

				 enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_eth(vsi, ethertype, flag, action,

				    ice_fltr_add_eth_list);

}



/**

 * ice_fltr_remove_eth - remove ethertype filter

 * @vsi: pointer to VSI struct

 * @ethertype: ethertype of filter

 * @flag: direction of filter

 * @action: action to remove

 */

enum ice_status ice_fltr_remove_eth(struct ice_vsi *vsi, u16 ethertype,

				    u16 flag, enum ice_sw_fwd_act_type action)

{

	return ice_fltr_prepare_eth(vsi, ethertype, flag, action,

				    ice_fltr_remove_eth_list);

}

drivers/net/ethernet/intel/ice/ice_fltr.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2018-2020, Intel Corporation. */



#ifndef _ICE_FLTR_H_

#define _ICE_FLTR_H_



void ice_fltr_free_list(struct device *dev, struct list_head *h);

enum ice_status

ice_fltr_add_mac_to_list(struct ice_vsi *vsi, struct list_head *list,

			 const u8 *mac, enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_add_mac(struct ice_vsi *vsi, const u8 *mac,

		 enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_add_mac_and_broadcast(struct ice_vsi *vsi, const u8 *mac,

			       enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_add_mac_list(struct ice_vsi *vsi, struct list_head *list);

enum ice_status

ice_fltr_remove_mac(struct ice_vsi *vsi, const u8 *mac,

		    enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_remove_mac_list(struct ice_vsi *vsi, struct list_head *list);



enum ice_status

ice_fltr_add_vlan(struct ice_vsi *vsi, u16 vid,

		  enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_remove_vlan(struct ice_vsi *vsi, u16 vid,

		     enum ice_sw_fwd_act_type action);



enum ice_status

ice_fltr_add_eth(struct ice_vsi *vsi, u16 ethertype, u16 flag,

		 enum ice_sw_fwd_act_type action);

enum ice_status

ice_fltr_remove_eth(struct ice_vsi *vsi, u16 ethertype, u16 flag,

		    enum ice_sw_fwd_act_type action);

void ice_fltr_remove_all(struct ice_vsi *vsi);

#endif

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

+19 −193
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "ice_base.h"

#include "ice_flow.h"

#include "ice_lib.h"

#include "ice_fltr.h"

#include "ice_dcb_lib.h"



/**
@@ -1339,40 +1340,6 @@ static void ice_vsi_set_rss_flow_fld(struct ice_vsi *vsi) 
			vsi_num, ice_stat_str(status));

}



/**

 * ice_add_mac_to_list - Add a MAC address filter entry to the list

 * @vsi: the VSI to be forwarded to

 * @add_list: pointer to the list which contains MAC filter entries

 * @macaddr: the MAC address to be added.

 *

 * Adds MAC address filter entry to the temp list

 *

 * Returns 0 on success or ENOMEM on failure.

 */

int

ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list,

		    const u8 *macaddr)

{

	struct ice_fltr_list_entry *tmp;

	struct ice_pf *pf = vsi->back;



	tmp = devm_kzalloc(ice_pf_to_dev(pf), sizeof(*tmp), GFP_ATOMIC);

	if (!tmp)

		return -ENOMEM;



	tmp->fltr_info.flag = ICE_FLTR_TX;

	tmp->fltr_info.src_id = ICE_SRC_ID_VSI;

	tmp->fltr_info.lkup_type = ICE_SW_LKUP_MAC;

	tmp->fltr_info.fltr_act = ICE_FWD_TO_VSI;

	tmp->fltr_info.vsi_handle = vsi->idx;

	ether_addr_copy(tmp->fltr_info.l_data.mac.mac_addr, macaddr);



	INIT_LIST_HEAD(&tmp->list_entry);

	list_add(&tmp->list_entry, add_list);



	return 0;

}



/**

 * ice_update_eth_stats - Update VSI-specific ethernet statistics counters

 * @vsi: the VSI to be updated
@@ -1419,55 +1386,22 @@ void ice_update_eth_stats(struct ice_vsi *vsi) 
	vsi->stat_offsets_loaded = true;

}



/**

 * ice_free_fltr_list - free filter lists helper

 * @dev: pointer to the device struct

 * @h: pointer to the list head to be freed

 *

 * Helper function to free filter lists previously created using

 * ice_add_mac_to_list

 */

void ice_free_fltr_list(struct device *dev, struct list_head *h)

{

	struct ice_fltr_list_entry *e, *tmp;



	list_for_each_entry_safe(e, tmp, h, list_entry) {

		list_del(&e->list_entry);

		devm_kfree(dev, e);

	}

}



/**

 * ice_vsi_add_vlan - Add VSI membership for given VLAN

 * @vsi: the VSI being configured

 * @vid: VLAN ID to be added

 * @action: filter action to be performed on match

 */

int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)

int

ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid, enum ice_sw_fwd_act_type action)

{

	struct ice_fltr_list_entry *tmp;

	struct ice_pf *pf = vsi->back;

	LIST_HEAD(tmp_add_list);

	enum ice_status status;

	struct device *dev;

	int err = 0;



	dev = ice_pf_to_dev(pf);

	tmp = devm_kzalloc(dev, sizeof(*tmp), GFP_KERNEL);

	if (!tmp)

		return -ENOMEM;



	tmp->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;

	tmp->fltr_info.fltr_act = ICE_FWD_TO_VSI;

	tmp->fltr_info.flag = ICE_FLTR_TX;

	tmp->fltr_info.src_id = ICE_SRC_ID_VSI;

	tmp->fltr_info.vsi_handle = vsi->idx;

	tmp->fltr_info.l_data.vlan.vlan_id = vid;



	INIT_LIST_HEAD(&tmp->list_entry);

	list_add(&tmp->list_entry, &tmp_add_list);



	status = ice_add_vlan(&pf->hw, &tmp_add_list);

	if (!status) {

	if (!ice_fltr_add_vlan(vsi, vid, action)) {

		vsi->num_vlan++;

	} else {

		err = -ENODEV;
@@ -1475,7 +1409,6 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid) 
			vsi->vsi_num);

	}



	ice_free_fltr_list(dev, &tmp_add_list);

	return err;

}
@@ -1488,29 +1421,14 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid) 
 */

int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)

{

	struct ice_fltr_list_entry *list;

	struct ice_pf *pf = vsi->back;

	LIST_HEAD(tmp_add_list);

	enum ice_status status;

	struct device *dev;

	int err = 0;



	dev = ice_pf_to_dev(pf);

	list = devm_kzalloc(dev, sizeof(*list), GFP_KERNEL);

	if (!list)

		return -ENOMEM;



	list->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;

	list->fltr_info.vsi_handle = vsi->idx;

	list->fltr_info.fltr_act = ICE_FWD_TO_VSI;

	list->fltr_info.l_data.vlan.vlan_id = vid;

	list->fltr_info.flag = ICE_FLTR_TX;

	list->fltr_info.src_id = ICE_SRC_ID_VSI;



	INIT_LIST_HEAD(&list->list_entry);

	list_add(&list->list_entry, &tmp_add_list);



	status = ice_remove_vlan(&pf->hw, &tmp_add_list);

	status = ice_fltr_remove_vlan(vsi, vid, ICE_FWD_TO_VSI);

	if (!status) {

		vsi->num_vlan--;

	} else if (status == ICE_ERR_DOES_NOT_EXIST) {
@@ -1522,7 +1440,6 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid) 
		err = -EIO;

	}



	ice_free_fltr_list(dev, &tmp_add_list);

	return err;

}
@@ -1998,47 +1915,6 @@ clear_reg_idx: 
	return -EINVAL;

}



/**

 * ice_vsi_add_rem_eth_mac - Program VSI ethertype based filter with rule

 * @vsi: the VSI being configured

 * @add_rule: boolean value to add or remove ethertype filter rule

 */

static void

ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule)

{

	struct ice_fltr_list_entry *list;

	struct ice_pf *pf = vsi->back;

	LIST_HEAD(tmp_add_list);

	enum ice_status status;

	struct device *dev;



	dev = ice_pf_to_dev(pf);

	list = devm_kzalloc(dev, sizeof(*list), GFP_KERNEL);

	if (!list)

		return;



	list->fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE;

	list->fltr_info.fltr_act = ICE_DROP_PACKET;

	list->fltr_info.flag = ICE_FLTR_TX;

	list->fltr_info.src_id = ICE_SRC_ID_VSI;

	list->fltr_info.vsi_handle = vsi->idx;

	list->fltr_info.l_data.ethertype_mac.ethertype = vsi->ethtype;



	INIT_LIST_HEAD(&list->list_entry);

	list_add(&list->list_entry, &tmp_add_list);



	if (add_rule)

		status = ice_add_eth_mac(&pf->hw, &tmp_add_list);

	else

		status = ice_remove_eth_mac(&pf->hw, &tmp_add_list);



	if (status)

		dev_err(dev, "Failure Adding or Removing Ethertype on VSI %i error: %s\n",

			vsi->vsi_num, ice_stat_str(status));



	ice_free_fltr_list(dev, &tmp_add_list);

}



/**

 * ice_cfg_sw_lldp - Config switch rules for LLDP packet handling

 * @vsi: the VSI being configured
@@ -2047,45 +1923,25 @@ ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule) 
 */

void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)

{

	struct ice_fltr_list_entry *list;

	enum ice_status (*eth_fltr)(struct ice_vsi *v, u16 type, u16 flag,

				    enum ice_sw_fwd_act_type act);

	struct ice_pf *pf = vsi->back;

	LIST_HEAD(tmp_add_list);

	enum ice_status status;

	struct device *dev;



	dev = ice_pf_to_dev(pf);

	list = devm_kzalloc(dev, sizeof(*list), GFP_KERNEL);

	if (!list)

		return;

	eth_fltr = create ? ice_fltr_add_eth : ice_fltr_remove_eth;



	list->fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE;

	list->fltr_info.vsi_handle = vsi->idx;

	list->fltr_info.l_data.ethertype_mac.ethertype = ETH_P_LLDP;



	if (tx) {

		list->fltr_info.fltr_act = ICE_DROP_PACKET;

		list->fltr_info.flag = ICE_FLTR_TX;

		list->fltr_info.src_id = ICE_SRC_ID_VSI;

	} else {

		list->fltr_info.fltr_act = ICE_FWD_TO_VSI;

		list->fltr_info.flag = ICE_FLTR_RX;

		list->fltr_info.src_id = ICE_SRC_ID_LPORT;

	}



	INIT_LIST_HEAD(&list->list_entry);

	list_add(&list->list_entry, &tmp_add_list);



	if (create)

		status = ice_add_eth_mac(&pf->hw, &tmp_add_list);

	if (tx)

		status = eth_fltr(vsi, ETH_P_LLDP, ICE_FLTR_TX,

				  ICE_DROP_PACKET);

	else

		status = ice_remove_eth_mac(&pf->hw, &tmp_add_list);

		status = eth_fltr(vsi, ETH_P_LLDP, ICE_FLTR_RX, ICE_FWD_TO_VSI);



	if (status)

		dev_err(dev, "Fail %s %s LLDP rule on VSI %i error: %s\n",

			create ? "adding" : "removing", tx ? "TX" : "RX",

			vsi->vsi_num, ice_stat_str(status));



	ice_free_fltr_list(dev, &tmp_add_list);

}



/**
@@ -2172,7 +2028,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, 
		 * so this handles those cases (i.e. adding the PF to a bridge

		 * without the 8021q module loaded).

		 */

		ret = ice_vsi_add_vlan(vsi, 0);

		ret = ice_vsi_add_vlan(vsi, 0, ICE_FWD_TO_VSI);

		if (ret)

			goto unroll_clear_rings;
@@ -2247,9 +2103,8 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, 
	 */

	if (!ice_is_safe_mode(pf))

		if (vsi->type == ICE_VSI_PF) {

			ice_vsi_add_rem_eth_mac(vsi, true);



			/* Tx LLDP packets */

			ice_fltr_add_eth(vsi, ETH_P_PAUSE, ICE_FLTR_TX,

					 ICE_DROP_PACKET);

			ice_cfg_sw_lldp(vsi, true, true);

		}
@@ -2566,7 +2421,8 @@ int ice_vsi_release(struct ice_vsi *vsi) 


	if (!ice_is_safe_mode(pf)) {

		if (vsi->type == ICE_VSI_PF) {

			ice_vsi_add_rem_eth_mac(vsi, false);

			ice_fltr_remove_eth(vsi, ETH_P_PAUSE, ICE_FLTR_TX,

					    ICE_DROP_PACKET);

			ice_cfg_sw_lldp(vsi, true, false);

			/* The Rx rule will only exist to remove if the LLDP FW

			 * engine is currently stopped
@@ -2576,7 +2432,7 @@ int ice_vsi_release(struct ice_vsi *vsi) 
		}

	}



	ice_remove_vsi_fltr(&pf->hw, vsi->idx);

	ice_fltr_remove_all(vsi);

	ice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);

	ice_vsi_delete(vsi);

	ice_vsi_free_q_vectors(vsi);
@@ -2992,36 +2848,6 @@ void ice_update_rx_ring_stats(struct ice_ring *rx_ring, u64 pkts, u64 bytes) 
	u64_stats_update_end(&rx_ring->syncp);

}



/**

 * ice_vsi_cfg_mac_fltr - Add or remove a MAC address filter for a VSI

 * @vsi: the VSI being configured MAC filter

 * @macaddr: the MAC address to be added.

 * @set: Add or delete a MAC filter

 *

 * Adds or removes MAC address filter entry for VF VSI

 */

enum ice_status

ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set)

{

	LIST_HEAD(tmp_add_list);

	enum ice_status status;



	 /* Update MAC filter list to be added or removed for a VSI */

	if (ice_add_mac_to_list(vsi, &tmp_add_list, macaddr)) {

		status = ICE_ERR_NO_MEMORY;

		goto cfg_mac_fltr_exit;

	}



	if (set)

		status = ice_add_mac(&vsi->back->hw, &tmp_add_list);

	else

		status = ice_remove_mac(&vsi->back->hw, &tmp_add_list);



cfg_mac_fltr_exit:

	ice_free_fltr_list(ice_pf_to_dev(vsi->back), &tmp_add_list);

	return status;

}



/**

 * ice_is_dflt_vsi_in_use - check if the default forwarding VSI is being used

 * @sw: switch to check if its default forwarding VSI is free

CRA Git | Maintained and supported by SUSTech CRA and CCSE