net: Update API for VF vlan protocol 802.1ad support

Introduce new rtnl UAPI that exposes a list of vlans per VF, giving
the ability for user-space application to specify it for the VF, as an
option to support 802.1ad.
We adjusted IP Link tool to support this option.

For future use cases, the new UAPI supports multiple vlans. For now we
limit the list size to a single vlan in kernel.
Add IFLA_VF_VLAN_LIST in addition to IFLA_VF_VLAN to keep backward
compatibility with older versions of IP Link tool.

Add a vlan protocol parameter to the ndo_set_vf_vlan callback.
We kept 802.1Q as the drivers' default vlan protocol.
Suitable ip link tool command examples:
  Set vf vlan protocol 802.1ad:
    ip link set eth0 vf 1 vlan 100 proto 802.1ad
  Set vf to VST (802.1Q) mode:
    ip link set eth0 vf 1 vlan 100 proto 802.1Q
  Or by omitting the new parameter
    ip link set eth0 vf 1 vlan 100

Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

23 files changed, 161 insertions, 42 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 0e68fadecfdb..243cb9748d35 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -492,7 +492,8 @@ int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
 int bnx2x_get_vf_config(struct net_device *dev, int vf,
                         struct ifla_vf_info *ivi);
 int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);
-int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos);
+int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,
+                      __be16 vlan_proto);
 
 /* select_queue callback */
 u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 6c586b045d1d..3f77d0863543 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2521,7 +2521,8 @@ void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp)
         for_each_vf(bp, vfidx) {
                 bulletin = BP_VF_BULLETIN(bp, vfidx);
                 if (bulletin->valid_bitmap & (1 << VLAN_VALID))
-                        bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0);
+                        bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0,
+                                          htons(ETH_P_8021Q));
         }
 }
 
@@ -2781,7 +2782,8 @@ static int bnx2x_set_vf_vlan_filter(struct bnx2x *bp, struct bnx2x_virtf *vf,
         return 0;
 }
 
-int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
+int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos,
+                      __be16 vlan_proto)
 {
         struct pf_vf_bulletin_content *bulletin = NULL;
         struct bnx2x *bp = netdev_priv(dev);
@@ -2796,6 +2798,9 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
                 return -EINVAL;
         }
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         DP(BNX2X_MSG_IOV, "configuring VF %d with VLAN %d qos %d\n",
            vfidx, vlan, 0);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 8be718508600..ec6cd18842c3 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -174,7 +174,8 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac)
         return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
 }
 
-int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos)
+int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,
+                     __be16 vlan_proto)
 {
         struct hwrm_func_cfg_input req = {0};
         struct bnxt *bp = netdev_priv(dev);
@@ -185,6 +186,9 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos)
         if (bp->hwrm_spec_code < 0x10201)
                 return -ENOTSUPP;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         rc = bnxt_vf_ndo_prep(bp, vf_id);
         if (rc)
                 return rc;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
index 0392670ab49c..1ab72e4820af 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
@@ -12,7 +12,7 @@
 
 int bnxt_get_vf_config(struct net_device *, int, struct ifla_vf_info *);
 int bnxt_set_vf_mac(struct net_device *, int, u8 *);
-int bnxt_set_vf_vlan(struct net_device *, int, u16, u8);
+int bnxt_set_vf_vlan(struct net_device *, int, u16, u8, __be16);
 int bnxt_set_vf_bw(struct net_device *, int, int, int);
 int bnxt_set_vf_link_state(struct net_device *, int, int);
 int bnxt_set_vf_spoofchk(struct net_device *, int, bool);
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 9a94840c5757..ac513e6627d1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1895,7 +1895,8 @@ static int be_clear_vf_tvt(struct be_adapter *adapter, int vf)
         return 0;
 }
 
-static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
+static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,
+                          __be16 vlan_proto)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
         struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];
@@ -1907,6 +1908,9 @@ static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
         if (vf >= adapter->num_vfs || vlan > 4095 || qos > 7)
                 return -EINVAL;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         if (vlan || qos) {
                 vlan |= qos << VLAN_PRIO_SHIFT;
                 status = be_set_vf_tvt(adapter, vf, vlan);
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h
index 67ff01aeb11a..4d19e46f7c55 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
@@ -507,7 +507,7 @@ int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs);
 s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid);
 int fm10k_ndo_set_vf_mac(struct net_device *netdev, int vf_idx, u8 *mac);
 int fm10k_ndo_set_vf_vlan(struct net_device *netdev,
-                          int vf_idx, u16 vid, u8 qos);
+                          int vf_idx, u16 vid, u8 qos, __be16 vlan_proto);
 int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx, int rate,
                         int unused);
 int fm10k_ndo_get_vf_config(struct net_device *netdev,
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index d9dec81f6b6d..5f4dac0d36ef 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -445,7 +445,7 @@ int fm10k_ndo_set_vf_mac(struct net_device *netdev, int vf_idx, u8 *mac)
 }
 
 int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid,
-                          u8 qos)
+                          u8 qos, __be16 vlan_proto)
 {
         struct fm10k_intfc *interface = netdev_priv(netdev);
         struct fm10k_iov_data *iov_data = interface->iov_data;
@@ -460,6 +460,10 @@ int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid,
         if (qos || (vid > (VLAN_VID_MASK - 1)))
                 return -EINVAL;
 
+        /* VF VLAN Protocol part to default is unsupported */
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         vf_info = &iov_data->vf_info[vf_idx];
 
         /* exit if there is nothing to do */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index da3423561b3a..724d8740d4cc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2747,11 +2747,12 @@ error_param:
  * @vf_id: VF identifier
  * @vlan_id: mac address
  * @qos: priority setting
+ * @vlan_proto: vlan protocol
  *
  * program VF vlan id and/or qos
  **/
-int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
-                              int vf_id, u16 vlan_id, u8 qos)
+int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,
+                              u16 vlan_id, u8 qos, __be16 vlan_proto)
 {
         u16 vlanprio = vlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT);
         struct i40e_netdev_priv *np = netdev_priv(netdev);
@@ -2774,6 +2775,12 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
                 goto error_pvid;
         }
 
+        if (vlan_proto != htons(ETH_P_8021Q)) {
+                dev_err(&pf->pdev->dev, "VF VLAN protocol is not supported\n");
+                ret = -EPROTONOSUPPORT;
+                goto error_pvid;
+        }
+
         vf = &(pf->vf[vf_id]);
         vsi = pf->vsi[vf->lan_vsi_idx];
         if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index 875174141451..4012d069939a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -129,8 +129,8 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf);
 
 /* VF configuration related iplink handlers */
 int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);
-int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
-                              int vf_id, u16 vlan_id, u8 qos);
+int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,
+                              u16 vlan_id, u8 qos, __be16 vlan_proto);
 int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
                        int max_tx_rate);
 int i40e_ndo_set_vf_trust(struct net_device *netdev, int vf_id, bool setting);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index af75eac5fa16..a83aa13a5bf4 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -169,7 +169,7 @@ static int igb_set_vf_mac(struct igb_adapter *, int, unsigned char *);
 static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
 static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
 static int igb_ndo_set_vf_vlan(struct net_device *netdev,
-                               int vf, u16 vlan, u8 qos);
+                               int vf, u16 vlan, u8 qos, __be16 vlan_proto);
 static int igb_ndo_set_vf_bw(struct net_device *, int, int, int);
 static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
                                    bool setting);
@@ -6222,14 +6222,17 @@ static int igb_disable_port_vlan(struct igb_adapter *adapter, int vf)
         return 0;
 }
 
-static int igb_ndo_set_vf_vlan(struct net_device *netdev,
-                               int vf, u16 vlan, u8 qos)
+static int igb_ndo_set_vf_vlan(struct net_device *netdev, int vf,
+                               u16 vlan, u8 qos, __be16 vlan_proto)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
 
         if ((vf >= adapter->vfs_allocated_count) || (vlan > 4095) || (qos > 7))
                 return -EINVAL;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         return (vlan || qos) ? igb_enable_port_vlan(adapter, vf, vlan, qos) :
                                igb_disable_port_vlan(adapter, vf);
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 8618599dfd6f..b18590a995db 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -1354,13 +1354,16 @@ static int ixgbe_disable_port_vlan(struct ixgbe_adapter *adapter, int vf)
         return err;
 }
 
-int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)
+int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
+                          u8 qos, __be16 vlan_proto)
 {
         int err = 0;
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         if ((vf >= adapter->num_vfs) || (vlan > 4095) || (qos > 7))
                 return -EINVAL;
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
         if (vlan || qos) {
                 /* Check if there is already a port VLAN set, if so
                  * we have to delete the old one first before we
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 47e65e2f886a..0c7977d27b71 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -43,7 +43,7 @@ void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);
 void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
 int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);
 int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
-                           u8 qos);
+                           u8 qos, __be16 vlan_proto);
 int ixgbe_link_mbps(struct ixgbe_adapter *adapter);
 int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate,
                         int max_tx_rate);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index a94f8a3f026c..132eeeafcdc4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2400,11 +2400,15 @@ static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
         return mlx4_set_vf_mac(mdev->dev, en_priv->port, queue, mac_u64);
 }
 
-static int mlx4_en_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos)
+static int mlx4_en_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos,
+                               __be16 vlan_proto)
 {
         struct mlx4_en_priv *en_priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = en_priv->mdev;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         return mlx4_set_vf_vlan(mdev->dev, en_priv->port, vf, vlan, qos);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index c12792314be7..b58cfe37dead 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2917,11 +2917,15 @@ static int mlx5e_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
         return mlx5_eswitch_set_vport_mac(mdev->priv.eswitch, vf + 1, mac);
 }
 
-static int mlx5e_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos)
+static int mlx5e_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos,
+                             __be16 vlan_proto)
 {
         struct mlx5e_priv *priv = netdev_priv(dev);
         struct mlx5_core_dev *mdev = priv->mdev;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         return mlx5_eswitch_set_vport_vlan(mdev->priv.eswitch, vf + 1,
                                            vlan, qos);
 }
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index cd23a2946db7..0e198fe89d1a 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -100,7 +100,8 @@ static int qede_alloc_rx_buffer(struct qede_dev *edev,
 static void qede_link_update(void *dev, struct qed_link_output *link);
 
 #ifdef CONFIG_QED_SRIOV
-static int qede_set_vf_vlan(struct net_device *ndev, int vf, u16 vlan, u8 qos)
+static int qede_set_vf_vlan(struct net_device *ndev, int vf, u16 vlan, u8 qos,
+                            __be16 vlan_proto)
 {
         struct qede_dev *edev = netdev_priv(ndev);
 
@@ -109,6 +110,9 @@ static int qede_set_vf_vlan(struct net_device *ndev, int vf, u16 vlan, u8 qos)
                 return -EINVAL;
         }
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         DP_VERBOSE(edev, QED_MSG_IOV, "Setting Vlan 0x%04x to VF [%d]\n",
                    vlan, vf);
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
index 24061b9b92e8..5f327659efa7 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
@@ -238,7 +238,7 @@ int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *);
 int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int, int);
 int qlcnic_sriov_get_vf_config(struct net_device *, int ,
                                struct ifla_vf_info *);
-int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8);
+int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8, __be16);
 int qlcnic_sriov_set_vf_spoofchk(struct net_device *, int, bool);
 #else
 static inline void qlcnic_sriov_pf_disable(struct qlcnic_adapter *adapter) {}
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
index afd687e5e779..50eaafa3eaba 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@ -1915,7 +1915,7 @@ int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf,
 }
 
 int qlcnic_sriov_set_vf_vlan(struct net_device *netdev, int vf,
-                             u16 vlan, u8 qos)
+                             u16 vlan, u8 qos, __be16 vlan_proto)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_sriov *sriov = adapter->ahw->sriov;
@@ -1928,6 +1928,9 @@ int qlcnic_sriov_set_vf_vlan(struct net_device *netdev, int vf,
         if (vf >= sriov->num_vfs || qos > 7)
                 return -EINVAL;
 
+        if (vlan_proto != htons(ETH_P_8021Q))
+                return -EPROTONOSUPPORT;
+
         if (vlan > MAX_VLAN_ID) {
                 netdev_err(netdev,
                            "Invalid VLAN ID, allowed range is [0 - %d]\n",
diff --git a/drivers/net/ethernet/sfc/sriov.c b/drivers/net/ethernet/sfc/sriov.c
index 816c44689e67..9abcf4aded30 100644
--- a/drivers/net/ethernet/sfc/sriov.c
+++ b/drivers/net/ethernet/sfc/sriov.c
@@ -22,7 +22,7 @@ int efx_sriov_set_vf_mac(struct net_device *net_dev, int vf_i, u8 *mac)
 }
 
 int efx_sriov_set_vf_vlan(struct net_device *net_dev, int vf_i, u16 vlan,
-                          u8 qos)
+                          u8 qos, __be16 vlan_proto)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
@@ -31,6 +31,9 @@ int efx_sriov_set_vf_vlan(struct net_device *net_dev, int vf_i, u16 vlan,
                     (qos & ~(VLAN_PRIO_MASK >> VLAN_PRIO_SHIFT)))
                         return -EINVAL;
 
+                if (vlan_proto != htons(ETH_P_8021Q))
+                        return -EPROTONOSUPPORT;
+
                 return efx->type->sriov_set_vf_vlan(efx, vf_i, vlan, qos);
         } else {
                 return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/sfc/sriov.h b/drivers/net/ethernet/sfc/sriov.h
index 400df526586d..ba1762e7f216 100644
--- a/drivers/net/ethernet/sfc/sriov.h
+++ b/drivers/net/ethernet/sfc/sriov.h
@@ -16,7 +16,7 @@
 
 int efx_sriov_set_vf_mac(struct net_device *net_dev, int vf_i, u8 *mac);
 int efx_sriov_set_vf_vlan(struct net_device *net_dev, int vf_i, u16 vlan,
-                          u8 qos);
+                          u8 qos, __be16 vlan_proto);
 int efx_sriov_set_vf_spoofchk(struct net_device *net_dev, int vf_i,
                               bool spoofchk);
 int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index f923d15b432c..0b17c585b5cd 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -25,5 +25,6 @@ struct ifla_vf_info {
         __u32 max_tx_rate;
         __u32 rss_query_en;
         __u32 trusted;
+        __be16 vlan_proto;
 };
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 69f242c71865..1e8a5c734d72 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -946,7 +946,8 @@ struct netdev_xdp {
  *
  *      SR-IOV management functions.
  * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
- * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
+ * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan,
+ *                        u8 qos, __be16 proto);
  * int (*ndo_set_vf_rate)(struct net_device *dev, int vf, int min_tx_rate,
  *                        int max_tx_rate);
  * int (*ndo_set_vf_spoofchk)(struct net_device *dev, int vf, bool setting);
@@ -1187,7 +1188,8 @@ struct net_device_ops {
         int                     (*ndo_set_vf_mac)(struct net_device *dev,
                                                   int queue, u8 *mac);
         int                     (*ndo_set_vf_vlan)(struct net_device *dev,
-                                                   int queue, u16 vlan, u8 qos);
+                                                   int queue, u16 vlan,
+                                                   u8 qos, __be16 proto);
         int                     (*ndo_set_vf_rate)(struct net_device *dev,
                                                    int vf, int min_tx_rate,
                                                    int max_tx_rate);
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 7ec9e99d5491..b4fba662cd32 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -619,7 +619,7 @@ enum {
 enum {
         IFLA_VF_UNSPEC,
         IFLA_VF_MAC,            /* Hardware queue specific attributes */
-        IFLA_VF_VLAN,
+        IFLA_VF_VLAN,           /* VLAN ID and QoS */
         IFLA_VF_TX_RATE,        /* Max TX Bandwidth Allocation */
         IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
         IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
@@ -631,6 +631,7 @@ enum {
         IFLA_VF_TRUST,          /* Trust VF */
         IFLA_VF_IB_NODE_GUID,   /* VF Infiniband node GUID */
         IFLA_VF_IB_PORT_GUID,   /* VF Infiniband port GUID */
+        IFLA_VF_VLAN_LIST,      /* nested list of vlans, option for QinQ */
         __IFLA_VF_MAX,
 };
 
@@ -647,6 +648,22 @@ struct ifla_vf_vlan {
         __u32 qos;
 };
 
+enum {
+        IFLA_VF_VLAN_INFO_UNSPEC,
+        IFLA_VF_VLAN_INFO,      /* VLAN ID, QoS and VLAN protocol */
+        __IFLA_VF_VLAN_INFO_MAX,
+};
+
+#define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
+#define MAX_VLAN_LIST_LEN 1
+
+struct ifla_vf_vlan_info {
+        __u32 vf;
+        __u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
+        __u32 qos;
+        __be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
+};
+
 struct ifla_vf_tx_rate {
         __u32 vf;
         __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 0dbae4244a89..3ac8946bf244 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -843,7 +843,10 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,
                 size += nla_total_size(num_vfs * sizeof(struct nlattr));
                 size += num_vfs *
                         (nla_total_size(sizeof(struct ifla_vf_mac)) +
-                         nla_total_size(sizeof(struct ifla_vf_vlan)) +
+                         nla_total_size(MAX_VLAN_LIST_LEN *
+                                        sizeof(struct nlattr)) +
+                         nla_total_size(MAX_VLAN_LIST_LEN *
+                                        sizeof(struct ifla_vf_vlan_info)) +
                          nla_total_size(sizeof(struct ifla_vf_spoofchk)) +
                          nla_total_size(sizeof(struct ifla_vf_rate)) +
                          nla_total_size(sizeof(struct ifla_vf_link_state)) +
@@ -1111,14 +1114,15 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
                                                struct nlattr *vfinfo)
 {
         struct ifla_vf_rss_query_en vf_rss_query_en;
+        struct nlattr *vf, *vfstats, *vfvlanlist;
         struct ifla_vf_link_state vf_linkstate;
+        struct ifla_vf_vlan_info vf_vlan_info;
         struct ifla_vf_spoofchk vf_spoofchk;
         struct ifla_vf_tx_rate vf_tx_rate;
         struct ifla_vf_stats vf_stats;
         struct ifla_vf_trust vf_trust;
         struct ifla_vf_vlan vf_vlan;
         struct ifla_vf_rate vf_rate;
-        struct nlattr *vf, *vfstats;
         struct ifla_vf_mac vf_mac;
         struct ifla_vf_info ivi;
 
@@ -1135,11 +1139,14 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
          * IFLA_VF_LINK_STATE_AUTO which equals zero
          */
         ivi.linkstate = 0;
+        /* VLAN Protocol by default is 802.1Q */
+        ivi.vlan_proto = htons(ETH_P_8021Q);
         if (dev->netdev_ops->ndo_get_vf_config(dev, vfs_num, &ivi))
                 return 0;
 
         vf_mac.vf =
                 vf_vlan.vf =
+                vf_vlan_info.vf =
                 vf_rate.vf =
                 vf_tx_rate.vf =
                 vf_spoofchk.vf =
@@ -1150,6 +1157,9 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
         memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac));
         vf_vlan.vlan = ivi.vlan;
         vf_vlan.qos = ivi.qos;
+        vf_vlan_info.vlan = ivi.vlan;
+        vf_vlan_info.qos = ivi.qos;
+        vf_vlan_info.vlan_proto = ivi.vlan_proto;
         vf_tx_rate.rate = ivi.max_tx_rate;
         vf_rate.min_tx_rate = ivi.min_tx_rate;
         vf_rate.max_tx_rate = ivi.max_tx_rate;
@@ -1158,10 +1168,8 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
         vf_rss_query_en.setting = ivi.rss_query_en;
         vf_trust.setting = ivi.trusted;
         vf = nla_nest_start(skb, IFLA_VF_INFO);
-        if (!vf) {
-                nla_nest_cancel(skb, vfinfo);
-                return -EMSGSIZE;
-        }
+        if (!vf)
+                goto nla_put_vfinfo_failure;
         if (nla_put(skb, IFLA_VF_MAC, sizeof(vf_mac), &vf_mac) ||
             nla_put(skb, IFLA_VF_VLAN, sizeof(vf_vlan), &vf_vlan) ||
             nla_put(skb, IFLA_VF_RATE, sizeof(vf_rate),
@@ -1177,17 +1185,23 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
                     &vf_rss_query_en) ||
             nla_put(skb, IFLA_VF_TRUST,
                     sizeof(vf_trust), &vf_trust))
-                return -EMSGSIZE;
+                goto nla_put_vf_failure;
+        vfvlanlist = nla_nest_start(skb, IFLA_VF_VLAN_LIST);
+        if (!vfvlanlist)
+                goto nla_put_vf_failure;
+        if (nla_put(skb, IFLA_VF_VLAN_INFO, sizeof(vf_vlan_info),
+                    &vf_vlan_info)) {
+                nla_nest_cancel(skb, vfvlanlist);
+                goto nla_put_vf_failure;
+        }
+        nla_nest_end(skb, vfvlanlist);
         memset(&vf_stats, 0, sizeof(vf_stats));
         if (dev->netdev_ops->ndo_get_vf_stats)
                 dev->netdev_ops->ndo_get_vf_stats(dev, vfs_num,
                                                 &vf_stats);
         vfstats = nla_nest_start(skb, IFLA_VF_STATS);
-        if (!vfstats) {
-                nla_nest_cancel(skb, vf);
-                nla_nest_cancel(skb, vfinfo);
-                return -EMSGSIZE;
-        }
+        if (!vfstats)
+                goto nla_put_vf_failure;
         if (nla_put_u64_64bit(skb, IFLA_VF_STATS_RX_PACKETS,
                               vf_stats.rx_packets, IFLA_VF_STATS_PAD) ||
             nla_put_u64_64bit(skb, IFLA_VF_STATS_TX_PACKETS,
@@ -1199,11 +1213,19 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
             nla_put_u64_64bit(skb, IFLA_VF_STATS_BROADCAST,
                               vf_stats.broadcast, IFLA_VF_STATS_PAD) ||
             nla_put_u64_64bit(skb, IFLA_VF_STATS_MULTICAST,
-                              vf_stats.multicast, IFLA_VF_STATS_PAD))
-                return -EMSGSIZE;
+                              vf_stats.multicast, IFLA_VF_STATS_PAD)) {
+                nla_nest_cancel(skb, vfstats);
+                goto nla_put_vf_failure;
+        }
         nla_nest_end(skb, vfstats);
         nla_nest_end(skb, vf);
         return 0;
+
+nla_put_vf_failure:
+        nla_nest_cancel(skb, vf);
+nla_put_vfinfo_failure:
+        nla_nest_cancel(skb, vfinfo);
+        return -EMSGSIZE;
 }
 
 static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
@@ -1448,6 +1470,7 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
 static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
         [IFLA_VF_MAC]           = { .len = sizeof(struct ifla_vf_mac) },
         [IFLA_VF_VLAN]          = { .len = sizeof(struct ifla_vf_vlan) },
+        [IFLA_VF_VLAN_LIST]     = { .type = NLA_NESTED },
         [IFLA_VF_TX_RATE]       = { .len = sizeof(struct ifla_vf_tx_rate) },
         [IFLA_VF_SPOOFCHK]      = { .len = sizeof(struct ifla_vf_spoofchk) },
         [IFLA_VF_RATE]          = { .len = sizeof(struct ifla_vf_rate) },
@@ -1704,7 +1727,34 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)
                 err = -EOPNOTSUPP;
                 if (ops->ndo_set_vf_vlan)
                         err = ops->ndo_set_vf_vlan(dev, ivv->vf, ivv->vlan,
-                                                   ivv->qos);
+                                                   ivv->qos,
+                                                   htons(ETH_P_8021Q));
+                if (err < 0)
+                        return err;
+        }
+
+        if (tb[IFLA_VF_VLAN_LIST]) {
+                struct ifla_vf_vlan_info *ivvl[MAX_VLAN_LIST_LEN];
+                struct nlattr *attr;
+                int rem, len = 0;
+
+                err = -EOPNOTSUPP;
+                if (!ops->ndo_set_vf_vlan)
+                        return err;
+
+                nla_for_each_nested(attr, tb[IFLA_VF_VLAN_LIST], rem) {
+                        if (nla_type(attr) != IFLA_VF_VLAN_INFO ||
+                            nla_len(attr) < NLA_HDRLEN) {
+                                return -EINVAL;
+                        }
+                        if (len >= MAX_VLAN_LIST_LEN)
+                                return -EOPNOTSUPP;
+                        ivvl[len] = nla_data(attr);
+
+                        len++;
+                }
+                err = ops->ndo_set_vf_vlan(dev, ivvl[0]->vf, ivvl[0]->vlan,
+                                           ivvl[0]->qos, ivvl[0]->vlan_proto);
                 if (err < 0)
                         return err;
         }