[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1572463033-26368-3-git-send-email-lariel@mellanox.com>
Date: Wed, 30 Oct 2019 19:17:32 +0000
From: Ariel Levkovich <lariel@...lanox.com>
To: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: Jiri Pirko <jiri@...lanox.com>,
Ariel Levkovich <lariel@...lanox.com>
Subject: [PATCH 2/3] ip: Present the VF VLAN tagging mode
The change prints the VLAN tagging mode per VF on
link query.
The possible modes are:
1) VGT - Virtual Guest tagging mode.
2) VST - Virtual Switch tagging mode.
3) Trunk - Guest tagging mode with specific allowed VLAN access list.
For the full VLAN ids list in Trunk mode, it is required to
query the specific VF.
Signed-off-by: Ariel Levkovich <lariel@...lanox.com>
---
include/uapi/linux/if_link.h | 14 ++++++++++++++
ip/ipaddress.c | 21 ++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index d39017b..6304add 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -697,6 +697,7 @@ enum {
IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */
IFLA_VF_BROADCAST, /* VF broadcast */
+ IFLA_VF_VLAN_MODE, /* vlan tagging mode */
__IFLA_VF_MAX,
};
@@ -711,6 +712,19 @@ struct ifla_vf_broadcast {
__u8 broadcast[32];
};
+enum {
+ IFLA_VF_VLAN_MODE_UNSPEC,
+ IFLA_VF_VLAN_MODE_VGT,
+ IFLA_VF_VLAN_MODE_VST,
+ IFLA_VF_VLAN_MODE_TRUNK,
+ __IFLA_VF_VLAN_MODE_MAX,
+};
+
+struct ifla_vf_vlan_mode {
+ __u32 vf;
+ __u32 mode; /* The VLAN tagging mode */
+};
+
struct ifla_vf_vlan {
__u32 vf;
__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 0521fdc..a66ca02 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -357,7 +357,6 @@ static void print_vfinfo(FILE *fp, struct ifinfomsg *ifi, struct rtattr *vfinfo)
struct ifla_vf_broadcast *vf_broadcast;
struct ifla_vf_tx_rate *vf_tx_rate;
struct rtattr *vf[IFLA_VF_MAX + 1] = {};
-
SPRINT_BUF(b1);
if (vfinfo->rta_type != IFLA_VF_INFO) {
@@ -404,6 +403,26 @@ static void print_vfinfo(FILE *fp, struct ifinfomsg *ifi, struct rtattr *vfinfo)
b1, sizeof(b1)));
}
+ if (vf[IFLA_VF_VLAN_MODE]) {
+ struct ifla_vf_vlan_mode *vlan_mode = RTA_DATA(vf[IFLA_VF_VLAN_MODE]);
+
+ if (vlan_mode->mode == IFLA_VF_VLAN_MODE_TRUNK)
+ print_string(PRINT_ANY,
+ "vlan-mode",
+ ", vlan-mode %s",
+ "trunk");
+ else if (vlan_mode->mode == IFLA_VF_VLAN_MODE_VST)
+ print_string(PRINT_ANY,
+ "vlan-mode",
+ ", vlan_mode %s",
+ "vst");
+ else if (vlan_mode->mode == IFLA_VF_VLAN_MODE_VGT)
+ print_string(PRINT_ANY,
+ "vlan-mode",
+ ", vlan-mode %s",
+ "vgt");
+ }
+
if (vf[IFLA_VF_VLAN_LIST]) {
struct rtattr *i, *vfvlanlist = vf[IFLA_VF_VLAN_LIST];
int rem = RTA_PAYLOAD(vfvlanlist);
--
1.8.3.1
Powered by blists - more mailing lists