[Intel-wired-lan] [PATCH net-next v1] i40e: Add placeholder for ndo set VLANs
Karen Sornek
karen.sornek at intel.com
Tue Nov 9 07:23:31 UTC 2021
VLANs set by ndo, were not accounted.
Implement placeholder, by which driver can account VLANs set by
ndo. Ensure that once PF changes trunk, every guest filter
is removed from the list 'vm_vlan_list'.
Implement logic for deletion/addition of guest(from VM) filters.
Signed-off-by: Przemyslaw Patynowski <przemyslawx.patynowski at intel.com>
Signed-off-by: Karen Sornek <karen.sornek at intel.com>
---
.../ethernet/intel/i40e/i40e_virtchnl_pf.c | 102 ++++++++++++++++--
.../ethernet/intel/i40e/i40e_virtchnl_pf.h | 10 ++
2 files changed, 102 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 5a488ce545..cf19e118ee 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -986,6 +986,81 @@ static void i40e_disable_vf_mappings(struct i40e_vf *vf)
i40e_flush(hw);
}
+/**
+ * i40e_add_vmvlan_to_list
+ * @vf: pointer to the VF info
+ * @vfl: pointer to the VF VLAN tag filters list
+ * @vlan_idx: vlan_id index in VLAN tag filters list
+ *
+ * add VLAN tag into the VLAN list for VM
+ **/
+static i40e_status
+i40e_add_vmvlan_to_list(struct i40e_vf *vf,
+ struct virtchnl_vlan_filter_list *vfl,
+ u16 vlan_idx)
+{
+ struct i40e_vm_vlan *vlan_elem;
+
+ vlan_elem = kzalloc(sizeof(*vlan_elem), GFP_KERNEL);
+ if (!vlan_elem)
+ return I40E_ERR_NO_MEMORY;
+ vlan_elem->vlan = vfl->vlan_id[vlan_idx];
+ vlan_elem->vsi_id = vfl->vsi_id;
+ INIT_LIST_HEAD(&vlan_elem->list);
+ vf->num_vlan++;
+ list_add(&vlan_elem->list, &vf->vm_vlan_list);
+ return I40E_SUCCESS;
+}
+
+/**
+ * i40e_del_vmvlan_from_list
+ * @vsi: pointer to the VSI structure
+ * @vf: pointer to the VF info
+ * @vlan: VLAN tag to be removed from the list
+ *
+ * delete VLAN tag from the VLAN list for VM
+ **/
+static void i40e_del_vmvlan_from_list(struct i40e_vsi *vsi,
+ struct i40e_vf *vf, u16 vlan)
+{
+ struct i40e_vm_vlan *entry, *tmp;
+
+ list_for_each_entry_safe(entry, tmp,
+ &vf->vm_vlan_list, list) {
+ if (vlan == entry->vlan) {
+ i40e_vsi_kill_vlan(vsi, vlan);
+ vf->num_vlan--;
+ list_del(&entry->list);
+ kfree(entry);
+ break;
+ }
+ }
+}
+
+/**
+ * i40e_free_vmvlan_list
+ * @vsi: pointer to the VSI structure
+ * @vf: pointer to the VF info
+ *
+ * remove whole list of VLAN tags for VM
+ **/
+static void i40e_free_vmvlan_list(struct i40e_vsi *vsi, struct i40e_vf *vf)
+{
+ struct i40e_vm_vlan *entry, *tmp;
+
+ if (list_empty(&vf->vm_vlan_list))
+ return;
+
+ list_for_each_entry_safe(entry, tmp,
+ &vf->vm_vlan_list, list) {
+ if (vsi)
+ i40e_vsi_kill_vlan(vsi, entry->vlan);
+ list_del(&entry->list);
+ kfree(entry);
+ }
+ vf->num_vlan = 0;
+}
+
/**
* i40e_free_vf_res
* @vf: pointer to the VF info
@@ -1061,6 +1136,9 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
wr32(hw, reg_idx, reg);
i40e_flush(hw);
}
+
+ i40e_free_vmvlan_list(NULL, vf);
+
/* reset some of the state variables keeping track of the resources */
vf->num_queue_pairs = 0;
clear_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states);
@@ -1766,6 +1844,7 @@ int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
set_bit(I40E_VF_STATE_PRE_ENABLE, &vfs[i].vf_states);
+ INIT_LIST_HEAD(&vfs[i].vm_vlan_list);
}
pf->num_alloc_vfs = num_alloc_vfs;
@@ -3027,15 +3106,16 @@ static int i40e_vc_add_vlan_msg(struct i40e_vf *vf, u8 *msg)
{
struct virtchnl_vlan_filter_list *vfl =
(struct virtchnl_vlan_filter_list *)msg;
+ i40e_status aq_ret = I40E_SUCCESS;
struct i40e_pf *pf = vf->pf;
struct i40e_vsi *vsi = NULL;
- i40e_status aq_ret = 0;
- int i;
+ u16 i;
- if ((vf->num_vlan >= I40E_VC_MAX_VLAN_PER_VF) &&
+ if ((vf->num_vlan + vfl->num_elements > I40E_VC_MAX_VLAN_PER_VF) &&
!test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps)) {
dev_err(&pf->pdev->dev,
"VF is not trusted, switch the VF to trusted to add more VLAN addresses\n");
+ aq_ret = I40E_ERR_CONFIG;
goto error_param;
}
if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||
@@ -3059,11 +3139,14 @@ static int i40e_vc_add_vlan_msg(struct i40e_vf *vf, u8 *msg)
}
i40e_vlan_stripping_enable(vsi);
+
for (i = 0; i < vfl->num_elements; i++) {
- /* add new VLAN filter */
int ret = i40e_vsi_add_vlan(vsi, vfl->vlan_id[i]);
- if (!ret)
- vf->num_vlan++;
+ if (!ret && vfl->vlan_id[i]) {
+ aq_ret = i40e_add_vmvlan_to_list(vf, vfl, i);
+ if (aq_ret)
+ goto error_param;
+ }
if (test_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states))
i40e_aq_set_vsi_uc_promisc_on_vlan(&pf->hw, vsi->seid,
@@ -3098,10 +3181,10 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg)
{
struct virtchnl_vlan_filter_list *vfl =
(struct virtchnl_vlan_filter_list *)msg;
+ i40e_status aq_ret = I40E_SUCCESS;
struct i40e_pf *pf = vf->pf;
struct i40e_vsi *vsi = NULL;
- i40e_status aq_ret = 0;
- int i;
+ u16 i;
if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) ||
!i40e_vc_isvalid_vsi_id(vf, vfl->vsi_id)) {
@@ -3124,8 +3207,7 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg)
}
for (i = 0; i < vfl->num_elements; i++) {
- i40e_vsi_kill_vlan(vsi, vfl->vlan_id[i]);
- vf->num_vlan--;
+ i40e_del_vmvlan_from_list(vsi, vf, vfl->vlan_id[i]);
if (test_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states))
i40e_aq_set_vsi_uc_promisc_on_vlan(&pf->hw, vsi->seid,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 49575a640a..182604bd9a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -62,6 +62,13 @@ struct i40evf_channel {
u64 max_tx_rate; /* bandwidth rate allocation for VSIs */
};
+/* used for VLAN list 'vm_vlan_list' by VM for trusted and untrusted VF */
+struct i40e_vm_vlan {
+ struct list_head list;
+ s16 vlan;
+ u16 vsi_id;
+};
+
/* VF information structure */
struct i40e_vf {
struct i40e_pf *pf;
@@ -103,6 +110,9 @@ struct i40e_vf {
bool spoofchk;
u16 num_vlan;
+ /* VLAN list created by VM for trusted and untrusted VF */
+ struct list_head vm_vlan_list;
+
/* ADq related variables */
bool adq_enabled; /* flag to enable adq */
u8 num_tc;
--
2.27.0
More information about the Intel-wired-lan
mailing list