aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVlad Zolotarov <vladz@cloudius-systems.com>2015-03-30 14:35:23 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-04-11 00:57:22 -0400
commit01a3d796813d6302af9f828f34b73d21a4b96c9a (patch)
tree44165af986242ee8da953ad85da4037a443699e0 /net
parent7f276efb45f8b022eeb9a0453240937806dc27e3 (diff)
if_link: Add an additional parameter to ifla_vf_info for RSS querying
Add configuration setting for drivers to allow/block an RSS Redirection Table and a Hash Key querying for discrete VFs. On some devices VF share the mentioned above information with PF and querying it may adduce a theoretical security risk. We want to let a system administrator to decide if he/she wants to take this risk or not. Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c32
1 files changed, 26 insertions, 6 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 7a836152359b..358d52a38533 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -818,7 +818,8 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,
818 nla_total_size(sizeof(struct ifla_vf_vlan)) + 818 nla_total_size(sizeof(struct ifla_vf_vlan)) +
819 nla_total_size(sizeof(struct ifla_vf_spoofchk)) + 819 nla_total_size(sizeof(struct ifla_vf_spoofchk)) +
820 nla_total_size(sizeof(struct ifla_vf_rate)) + 820 nla_total_size(sizeof(struct ifla_vf_rate)) +
821 nla_total_size(sizeof(struct ifla_vf_link_state))); 821 nla_total_size(sizeof(struct ifla_vf_link_state)) +
822 nla_total_size(sizeof(struct ifla_vf_rss_query_en)));
822 return size; 823 return size;
823 } else 824 } else
824 return 0; 825 return 0;
@@ -1132,14 +1133,16 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
1132 struct ifla_vf_tx_rate vf_tx_rate; 1133 struct ifla_vf_tx_rate vf_tx_rate;
1133 struct ifla_vf_spoofchk vf_spoofchk; 1134 struct ifla_vf_spoofchk vf_spoofchk;
1134 struct ifla_vf_link_state vf_linkstate; 1135 struct ifla_vf_link_state vf_linkstate;
1136 struct ifla_vf_rss_query_en vf_rss_query_en;
1135 1137
1136 /* 1138 /*
1137 * Not all SR-IOV capable drivers support the 1139 * Not all SR-IOV capable drivers support the
1138 * spoofcheck query. Preset to -1 so the user 1140 * spoofcheck and "RSS query enable" query. Preset to
1139 * space tool can detect that the driver didn't 1141 * -1 so the user space tool can detect that the driver
1140 * report anything. 1142 * didn't report anything.
1141 */ 1143 */
1142 ivi.spoofchk = -1; 1144 ivi.spoofchk = -1;
1145 ivi.rss_query_en = -1;
1143 memset(ivi.mac, 0, sizeof(ivi.mac)); 1146 memset(ivi.mac, 0, sizeof(ivi.mac));
1144 /* The default value for VF link state is "auto" 1147 /* The default value for VF link state is "auto"
1145 * IFLA_VF_LINK_STATE_AUTO which equals zero 1148 * IFLA_VF_LINK_STATE_AUTO which equals zero
@@ -1152,7 +1155,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
1152 vf_rate.vf = 1155 vf_rate.vf =
1153 vf_tx_rate.vf = 1156 vf_tx_rate.vf =
1154 vf_spoofchk.vf = 1157 vf_spoofchk.vf =
1155 vf_linkstate.vf = ivi.vf; 1158 vf_linkstate.vf =
1159 vf_rss_query_en.vf = ivi.vf;
1156 1160
1157 memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac)); 1161 memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac));
1158 vf_vlan.vlan = ivi.vlan; 1162 vf_vlan.vlan = ivi.vlan;
@@ -1162,6 +1166,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
1162 vf_rate.max_tx_rate = ivi.max_tx_rate; 1166 vf_rate.max_tx_rate = ivi.max_tx_rate;
1163 vf_spoofchk.setting = ivi.spoofchk; 1167 vf_spoofchk.setting = ivi.spoofchk;
1164 vf_linkstate.link_state = ivi.linkstate; 1168 vf_linkstate.link_state = ivi.linkstate;
1169 vf_rss_query_en.setting = ivi.rss_query_en;
1165 vf = nla_nest_start(skb, IFLA_VF_INFO); 1170 vf = nla_nest_start(skb, IFLA_VF_INFO);
1166 if (!vf) { 1171 if (!vf) {
1167 nla_nest_cancel(skb, vfinfo); 1172 nla_nest_cancel(skb, vfinfo);
@@ -1176,7 +1181,10 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
1176 nla_put(skb, IFLA_VF_SPOOFCHK, sizeof(vf_spoofchk), 1181 nla_put(skb, IFLA_VF_SPOOFCHK, sizeof(vf_spoofchk),
1177 &vf_spoofchk) || 1182 &vf_spoofchk) ||
1178 nla_put(skb, IFLA_VF_LINK_STATE, sizeof(vf_linkstate), 1183 nla_put(skb, IFLA_VF_LINK_STATE, sizeof(vf_linkstate),
1179 &vf_linkstate)) 1184 &vf_linkstate) ||
1185 nla_put(skb, IFLA_VF_RSS_QUERY_EN,
1186 sizeof(vf_rss_query_en),
1187 &vf_rss_query_en))
1180 goto nla_put_failure; 1188 goto nla_put_failure;
1181 nla_nest_end(skb, vf); 1189 nla_nest_end(skb, vf);
1182 } 1190 }
@@ -1290,6 +1298,7 @@ static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
1290 [IFLA_VF_SPOOFCHK] = { .len = sizeof(struct ifla_vf_spoofchk) }, 1298 [IFLA_VF_SPOOFCHK] = { .len = sizeof(struct ifla_vf_spoofchk) },
1291 [IFLA_VF_RATE] = { .len = sizeof(struct ifla_vf_rate) }, 1299 [IFLA_VF_RATE] = { .len = sizeof(struct ifla_vf_rate) },
1292 [IFLA_VF_LINK_STATE] = { .len = sizeof(struct ifla_vf_link_state) }, 1300 [IFLA_VF_LINK_STATE] = { .len = sizeof(struct ifla_vf_link_state) },
1301 [IFLA_VF_RSS_QUERY_EN] = { .len = sizeof(struct ifla_vf_rss_query_en) },
1293}; 1302};
1294 1303
1295static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = { 1304static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
@@ -1500,6 +1509,17 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr *attr)
1500 ivl->link_state); 1509 ivl->link_state);
1501 break; 1510 break;
1502 } 1511 }
1512 case IFLA_VF_RSS_QUERY_EN: {
1513 struct ifla_vf_rss_query_en *ivrssq_en;
1514
1515 ivrssq_en = nla_data(vf);
1516 err = -EOPNOTSUPP;
1517 if (ops->ndo_set_vf_rss_query_en)
1518 err = ops->ndo_set_vf_rss_query_en(dev,
1519 ivrssq_en->vf,
1520 ivrssq_en->setting);
1521 break;
1522 }
1503 default: 1523 default:
1504 err = -EINVAL; 1524 err = -EINVAL;
1505 break; 1525 break;