WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [xen/stable-2.6.32.x PATCH 4/5] rtnetlink: Add VF config cod

To: "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [xen/stable-2.6.32.x PATCH 4/5] rtnetlink: Add VF config code to rtnetlink
From: "Rose, Gregory V" <gregory.v.rose@xxxxxxxxx>
Date: Wed, 14 Jul 2010 13:59:52 -0700
Accept-language: en-US
Acceptlanguage: en-US
Delivery-date: Wed, 14 Jul 2010 14:04:35 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: Acsjl4EAnpZzNkJxRrikYW+MXzZzWw==
Thread-topic: [xen/stable-2.6.32.x PATCH 4/5] rtnetlink: Add VF config code to rtnetlink
Add code to allow rtnetlink clients to query and set VF information through
the PF driver.

Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
CC: Mitch Williams <mitch.a.williams@xxxxxxxxx>

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d4fd895..b8541e4 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -35,6 +35,7 @@
 #include <linux/security.h>
 #include <linux/mutex.h>
 #include <linux/if_addr.h>
+#include <linux/pci.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -582,6 +583,15 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
        a->tx_compressed = b->tx_compressed;
 };
 
+static inline int rtnl_vfinfo_size(const struct net_device *dev)
+{
+       if (dev->dev.parent && dev_is_pci(dev->dev.parent))
+               return dev_num_vf(dev->dev.parent) *
+                       sizeof(struct ifla_vf_info);
+       else
+               return 0;
+}
+
 static inline size_t if_nlmsg_size(const struct net_device *dev)
 {
        return NLMSG_ALIGN(sizeof(struct ifinfomsg))
@@ -599,6 +609,8 @@ static inline size_t if_nlmsg_size(const struct net_device 
*dev)
               + nla_total_size(4) /* IFLA_MASTER */
               + nla_total_size(1) /* IFLA_OPERSTATE */
               + nla_total_size(1) /* IFLA_LINKMODE */
+              + nla_total_size(4) /* IFLA_NUM_VF */
+              + nla_total_size(rtnl_vfinfo_size(dev)) /* IFLA_VFINFO */
               + rtnl_link_get_size(dev); /* IFLA_LINKINFO */
 }
 
@@ -667,6 +679,17 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct 
net_device *dev,
        stats = dev_get_stats(dev);
        copy_rtnl_link_stats(nla_data(attr), stats);
 
+       if (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent) {
+               int i;
+               struct ifla_vf_info ivi;
+
+               NLA_PUT_U32(skb, IFLA_NUM_VF, dev_num_vf(dev->dev.parent));
+               for (i = 0; i < dev_num_vf(dev->dev.parent); i++) {
+                       if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi))
+                               break;
+                       NLA_PUT(skb, IFLA_VFINFO, sizeof(ivi), &ivi);
+               }
+       }
        if (dev->rtnl_link_ops) {
                if (rtnl_link_fill(skb, dev) < 0)
                        goto nla_put_failure;
@@ -716,6 +739,12 @@ const struct nla_policy ifla_policy[IFLA_MAX+1] = {
        [IFLA_LINKINFO]         = { .type = NLA_NESTED },
        [IFLA_NET_NS_PID]       = { .type = NLA_U32 },
        [IFLA_IFALIAS]          = { .type = NLA_STRING, .len = IFALIASZ-1 },
+       [IFLA_VF_MAC]           = { .type = NLA_BINARY,
+                                   .len = sizeof(struct ifla_vf_mac) },
+       [IFLA_VF_VLAN]          = { .type = NLA_BINARY,
+                                   .len = sizeof(struct ifla_vf_vlan) },
+       [IFLA_VF_TX_RATE]       = { .type = NLA_BINARY,
+                                   .len = sizeof(struct ifla_vf_tx_rate) },
 };
 
 static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
@@ -875,6 +904,44 @@ static int do_setlink(struct net_device *dev, struct 
ifinfomsg *ifm,
                write_unlock_bh(&dev_base_lock);
        }
 
+       if (tb[IFLA_VF_MAC]) {
+               struct ifla_vf_mac *ivm;
+               ivm = nla_data(tb[IFLA_VF_MAC]);
+               write_lock_bh(&dev_base_lock);
+               if (ops->ndo_set_vf_mac)
+                       err = ops->ndo_set_vf_mac(dev, ivm->vf, ivm->mac);
+               write_unlock_bh(&dev_base_lock);
+               if (err < 0)
+                       goto errout;
+               modified = 1;
+       }
+
+       if (tb[IFLA_VF_VLAN]) {
+               struct ifla_vf_vlan *ivv;
+               ivv = nla_data(tb[IFLA_VF_VLAN]);
+               write_lock_bh(&dev_base_lock);
+               if (ops->ndo_set_vf_vlan)
+                       err = ops->ndo_set_vf_vlan(dev, ivv->vf,
+                                                  (u16)ivv->vlan,
+                                                  (u8)ivv->qos);
+               write_unlock_bh(&dev_base_lock);
+               if (err < 0)
+                       goto errout;
+               modified = 1;
+       }
+       err = 0;
+
+       if (tb[IFLA_VF_TX_RATE]) {
+               struct ifla_vf_tx_rate *ivt;
+               ivt = nla_data(tb[IFLA_VF_TX_RATE]);
+               write_lock_bh(&dev_base_lock);
+               if (ops->ndo_set_vf_tx_rate)
+                       err = ops->ndo_set_vf_tx_rate(dev, ivt->vf, ivt->rate);
+               write_unlock_bh(&dev_base_lock);
+               if (err < 0)
+                       goto errout;
+               modified = 1;
+       }
        err = 0;
 
 errout:



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [xen/stable-2.6.32.x PATCH 4/5] rtnetlink: Add VF config code to rtnetlink, Rose, Gregory V <=