* Re: getting warn once around skb_try_coalesce
From: Eric Dumazet @ 2012-07-10 11:22 UTC (permalink / raw)
To: Or Gerlitz
Cc: David Miller, netdev@vger.kernel.org, Shlomo Pongratz,
Erez Shitrit
In-Reply-To: <1341918848.3265.4853.camel@edumazet-glaptop>
On Tue, 2012-07-10 at 13:14 +0200, Eric Dumazet wrote:
> On Tue, 2012-07-10 at 12:18 +0200, Eric Dumazet wrote:
> > On Tue, 2012-07-10 at 12:54 +0300, Or Gerlitz wrote:
> > > Hi Dave, Eric,
> > >
> > > Another trace that I see here with net-next is this one-time warning. I
> > > get it always
> > > on the passive side of TCP, something that seems related to GRO, it
> > > happens only with
> > > IPoIB, not with mlx4_en and igb (when igb get to work on net-next...)
> > >
> > > The latest commit in this area is bad43ca8325f493dcaa0896c2f036276af059c7e
> > > "net: introduce skb_try_coalesce()" from Eric.
> > >
> > > Or.
> > >
> > > -----------[ cut here ]------------
> > > WARNING: at net/core/skbuff.c:3413 skb_try_coalesce+0x1f8/0x31d()
> >
> > This warning catch skb truesize offenders, most probably its a driver
> > issue.
> >
>
> By the way, this driver allocates not enough tailroom in skbs, so IP/TCP
> stacks need to reallocate skb head to pull IP/TCP headers. Thats not
> efficient.
>
> I suggest using following patch :
And of course we also can fix the truesize bug.
(Not sure it will fix the warning, but worth trying)
Since this driver allocates a full page, it must use the PAGE_SIZE, not
the used part in the fragment
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 5c1bc99..e611a924 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -123,7 +123,7 @@ static void ipoib_ud_skb_put_frags(struct ipoib_dev_priv *priv,
skb_frag_size_set(frag, size);
skb->data_len += size;
- skb->truesize += size;
+ skb->truesize += PAGE_SIZE;
} else
skb_put(skb, length);
@@ -159,7 +159,7 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)
u64 *mapping;
if (ipoib_ud_need_sg(priv->max_ib_mtu))
- buf_size = IPOIB_UD_HEAD_SIZE;
+ buf_size = IPOIB_UD_HEAD_SIZE + 128; /* reserve some tailroom for IP/TCP headers */
else
buf_size = IPOIB_UD_BUF_SIZE(priv->max_ib_mtu);
^ permalink raw reply related
* Re: [PATCH v2] net: cgroup: fix access the unallocated memory in netprio cgroup
From: Neil Horman @ 2012-07-10 11:32 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Gao feng, linux-kernel, netdev, lizefan, tj, Eric Dumazet
In-Reply-To: <1341918350.3265.4830.camel@edumazet-glaptop>
On Tue, Jul 10, 2012 at 01:05:50PM +0200, Eric Dumazet wrote:
> On Tue, 2012-07-10 at 18:44 +0800, Gao feng wrote:
> > there are some out of bound accesses in netprio cgroup.
>
> > - update_netdev_tables();
> > + ret = extend_netdev_table(dev, max_len);
> > + if (ret < 0)
> > + goto out_free_devname;
> > +
> > ret = 0;
> > rcu_read_lock();
> > map = rcu_dereference(dev->priomap);
>
> Its unfortunately adding a bug.
>
> extend_netdev_table() is protected by RTNL.
>
More specifically it needs to be protected by rtnl, and the call above isn't.
Other than that it looks pretty good to me.
Neil
^ permalink raw reply
* [PATCH net-next 0/9] Add Ethernet IPoIB driver
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Or Gerlitz
The eIPoIB driver provides a standard Ethernet netdevice over
the InfiniBand IPoIB interface .
Some services can run only on top of Ethernet L2 interfaces, and cannot be
bound to an IPoIB interface. With this new driver, these services can run
seamlessly.
Main use case of the driver is the Ethernet Virtual Switching used in
virtualized environments, where an eipoib netdevice can be used as a
Physical Interface (PIF) in the hypervisor domain, and allow other
guests Virtual Interfaces (VIF) connected to the same Virtual Switch
to run over the InfiniBand fabric.
This driver supports L2 Switching (Direct Bridging) as well as other L3
Switching modes (e.g. NAT).
Whenever an IPoIB interface is created, one eIPoIB PIF netdevice
will be created. The default naming scheme is as in other Ethernet
interfaces: ethX, for example, on a system with two IPoIB interfaces,
ib0 and ib1, two interfaces will be created ethX and ethX+1 When "X"
is the next free Ethernet number in the system.
Using "ethtool -i " over the new interface can tell on which IPoIB
PIF interface that interface is above. For example: driver: eth_ipoib:ib0
indicates that eth3 is the Ethernet interface over the ib0 IPoIB interface.
The driver can be used as independent interface or to serve in
virtualization environment as the physical layer for the virtual
interfaces on the virtual guest.
The driver interface (eipoib interface or which is also referred to as parent)
uses slave interfaces, IPoIB clones, which are the VIFs described above.
VIFs interfaces are enslaved/released from the eipoib driver on demand, according
to the management interface provided to user space.
The management interface for the driver uses sysfs entries. Via these sysfs
entries the driver gets details on new VIF's to manage. The driver can
enslave new VIF (IPoIB cloned interface) or detaches from it.
Here are few sysfs commands that are used in order to manage the driver,
according to few scenarios:
1. create new clone of IPoIB interface:
$ echo .Y > /sys/class/net/ibX/create_child
create new clone ibX.Y with the same pkey as ibX, for example:
$ echo .1 > /sys/class/net/ib0/create_child
will create new interface ib0.1
2. notify parent interface on new VIF to enslave:
$ echo +ibX.Y > /sys/class/net/ethZ/eth/slaves
where ethZ is the driver interface, for example:
$ echo +ib0.1 > /sys/class/net/eth4/eth/slaves
will enslave ib0.1 to eth4
3. notify parent interface interface on VIF details (mac and vlan)
$ echo +ibX.Y <MAC address> > /sys/class/net/ethZ/eth/vifs
for example:
$ echo +ib0.1 00:02:c9:43:3b:f1 > /sys/class/net/eth4/eth/vifs
4. notify parent to release VIF:
$ echo -ibX.Y > /sys/class/net/ethZ/eth/slaves
where ethZ is the driver interface, for example:
$ echo -ib0.1 > /sys/class/net/eth4/eth/slaves
will release ib0.1 from eth4
5. see the list of ipoib interfaces enslaved under eipoib interface,
$ cat /sys/class/net/ethX/eth/vifs
for example:
$ cat /sys/class/net/eth4/eth/vifs
SLAVE=ib0.1 MAC=9a:c2:1f:d7:3b:63 VLAN=N/A
SLAVE=ib0.2 MAC=52:54:00:60:55:88 VLAN=N/A
SLAVE=ib0.3 MAC=52:54:00:60:55:89 VLAN=N/A
Note: Each ethX interface has at least one ibX.Y slave to serve the PIF
itself, in the VIFs list of ethX you'll notice that ibX.1 is always created
to serve applications running from the Hypervisor on top of ethX interface directly.
For IB applications that require native IPoIB interfaces (e.g. RDMA-CM), the
original ipoib interfaces ibX can still be used. For example, RDMA-CM and
eth_ipoib drivers can co-exist and make use of IPoIB
The last patch of this series was made such that the series works as is over
net-next, in parallel to the submission of this driver, a patch to modify IPoIB
such that it doesn't assume dst/neighbour on the skb was posted.
The series is made against net-next commit 700db99d0 "ipoib: Need to do
dst_neigh_lookup_skb() outside of priv->lock" as of some issues with
net-next latest which were reported over netdev today.
Or.
Erez Shitrit (8):
include/linux: Add private flags for IPoIB interfaces
IB/ipoib: Add support for acting as VIF
net/eipoib: Add private header file
net/eipoib: Add ethtool file support
net/eipoib: Add sysfs support
net/eipoib: Add main driver functionality
net/eipoib: Add Makefile, Kconfig and MAINTAINERS entries
IB/ipoib: Add support for transmission of skbs w.o dst/neighbour
Or Gerlitz (1):
IB/ipoib: Add support for clones / multiple childs on the same
partition
Documentation/infiniband/ipoib.txt | 24 +
MAINTAINERS | 6 +
drivers/infiniband/ulp/ipoib/ipoib.h | 13 +-
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 9 +
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 83 +-
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +-
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 46 +-
drivers/net/Kconfig | 15 +
drivers/net/Makefile | 1 +
drivers/net/eipoib/Makefile | 4 +
drivers/net/eipoib/eth_ipoib.h | 224 ++++
drivers/net/eipoib/eth_ipoib_ethtool.c | 147 +++
drivers/net/eipoib/eth_ipoib_main.c | 1897 ++++++++++++++++++++++++++++
drivers/net/eipoib/eth_ipoib_sysfs.c | 640 ++++++++++
include/linux/if.h | 2 +
include/rdma/e_ipoib.h | 51 +
17 files changed, 3140 insertions(+), 33 deletions(-)
create mode 100644 drivers/net/eipoib/Makefile
create mode 100644 drivers/net/eipoib/eth_ipoib.h
create mode 100644 drivers/net/eipoib/eth_ipoib_ethtool.c
create mode 100644 drivers/net/eipoib/eth_ipoib_main.c
create mode 100644 drivers/net/eipoib/eth_ipoib_sysfs.c
create mode 100644 include/rdma/e_ipoib.h
^ permalink raw reply
* [PATCH net-next 2/9] include/linux: Add private flags for IPoIB interfaces
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The new 2 bits indicates whenever a device is considered PIF interface,
which means the "main" interfaces (ib0, ib1 etc), or cloned interfaces
(ib0.1, ib1.2 etc.) that is now in use by the eIPoIB driver.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
include/linux/if.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/linux/if.h b/include/linux/if.h
index 1ec407b..f50dbf2 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -84,6 +84,8 @@
#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
* change when it's running */
+#define IFF_EIPOIB_PIF 0x200000 /* IPoIB PIF intf (ib0, ib1 etc.) */
+#define IFF_EIPOIB_VIF 0x400000 /* IPoIB VIF intf (ib0.x, ib1.x etc.) */
#define IF_GET_IFACE 0x0001 /* for querying only */
#define IF_GET_PROTO 0x0002
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 4/9] net/eipoib: Add private header file
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The header file includes all structures, macros and non-static
functions which are of use by the driver.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib.h | 224 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 224 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib.h
diff --git a/drivers/net/eipoib/eth_ipoib.h b/drivers/net/eipoib/eth_ipoib.h
new file mode 100644
index 0000000..45871c9
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib.h
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _LINUX_ETH_IPOIB_H
+#define _LINUX_ETH_IPOIB_H
+
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <net/arp.h>
+#include <linux/if_vlan.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <rdma/e_ipoib.h>
+
+/* macros and definitions */
+#define DRV_VERSION "1.0.0"
+#define DRV_RELDATE "June 1, 2012"
+#define DRV_NAME "eth_ipoib"
+#define SDRV_NAME "ipoib"
+#define DRV_DESCRIPTION "IP-over-InfiniBand Para Virtualized Driver"
+#define EIPOIB_ABI_VER 1
+
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#define GID_LEN 16
+#define GUID_LEN 8
+
+#define PARENT_VLAN_FEATURES \
+ (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX | \
+ NETIF_F_HW_VLAN_FILTER)
+
+#define parent_for_each_slave(_parent, slave) \
+ list_for_each_entry(slave, &(_parent)->slave_list, list)\
+
+#define PARENT_IS_OK(_parent) \
+ (((_parent)->dev->flags & IFF_UP) && \
+ netif_running((_parent)->dev) && \
+ ((_parent)->slave_cnt > 0))
+
+#define IS_E_IPOIB_PROTO(_proto) \
+ (((_proto) == htons(ETH_P_ARP)) || \
+ ((_proto) == htons(ETH_P_RARP)) || \
+ ((_proto) == htons(ETH_P_IP)))
+
+enum eipoib_emac_guest_info {
+ VALID,
+ MIGRATED_OUT,
+ INVALID,
+};
+
+/* structs */
+struct eth_arp_data {
+ u8 arp_sha[ETH_ALEN];
+ __be32 arp_sip;
+ u8 arp_dha[ETH_ALEN];
+ __be32 arp_dip;
+} __packed;
+
+struct ipoib_arp_data {
+ u8 arp_sha[INFINIBAND_ALEN];
+ __be32 arp_sip;
+ u8 arp_dha[INFINIBAND_ALEN];
+ __be32 arp_dip;
+} __packed;
+
+/* live migration support structures: */
+struct ip_member {
+ __be32 ip;
+ struct list_head list;
+};
+
+/*
+ * for each slave (emac) saves all the ip over that mac.
+ * the parent keeps that list for live migration.
+ */
+struct guest_emac_info {
+ u8 emac[ETH_ALEN];
+ u16 vlan;
+ struct list_head ip_list;
+ struct list_head list;
+ enum eipoib_emac_guest_info rec_state;
+ int num_of_retries;
+};
+
+struct neigh {
+ struct list_head list;
+ u8 emac[ETH_ALEN];
+ u8 imac[INFINIBAND_ALEN];
+ /* this part is used for neigh_add_list */
+ char cmd[PAGE_SIZE];
+};
+
+struct slave {
+ struct net_device *dev;
+ struct slave *next;
+ struct slave *prev;
+ int index;
+ struct list_head list;
+ unsigned long jiffies;
+ s8 link;
+ s8 state;
+ u16 pkey;
+ u16 vlan;
+ u8 emac[ETH_ALEN];
+ u8 imac[INFINIBAND_ALEN];
+ struct list_head neigh_list;
+ /* this part is used for vif_add_list */
+ char cmd[PAGE_SIZE];
+};
+
+struct port_stats {
+ /* update PORT_STATS_LEN (number of stat fields)accordingly */
+ unsigned long tx_parent_dropped;
+ unsigned long tx_vif_miss;
+ unsigned long tx_neigh_miss;
+ unsigned long tx_vlan;
+ unsigned long tx_shared;
+ unsigned long tx_proto_errors;
+ unsigned long tx_skb_errors;
+ unsigned long tx_slave_err;
+
+ unsigned long rx_parent_dropped;
+ unsigned long rx_vif_miss;
+ unsigned long rx_neigh_miss;
+ unsigned long rx_vlan;
+ unsigned long rx_shared;
+ unsigned long rx_proto_errors;
+ unsigned long rx_skb_errors;
+ unsigned long rx_slave_err;
+};
+
+struct parent {
+ struct net_device *dev;
+ int index;
+ struct neigh_parms nparms;
+ struct list_head slave_list;
+ /* never change this value outside the attach/detach wrappers */
+ s32 slave_cnt;
+ rwlock_t lock;
+ struct net_device_stats stats;
+ struct port_stats port_stats;
+ struct list_head parent_list;
+ struct dev_mc_list *mc_list;
+ u16 flags;
+ struct list_head vlan_list;
+ struct workqueue_struct *wq;
+ s8 kill_timers;
+ struct delayed_work neigh_learn_work;
+ struct delayed_work vif_learn_work;
+ struct list_head neigh_add_list;
+ union ib_gid gid;
+ char ipoib_main_interface[IFNAMSIZ];
+ struct list_head emac_ip_list;
+ struct delayed_work emac_ip_work;
+ struct delayed_work migrate_out_work;
+};
+
+#define eipoib_slave_get_rcu(dev) \
+ ((struct slave *) rcu_dereference(dev->rx_handler_data))
+
+/* name space support for sys/fs */
+struct eipoib_net {
+ struct net *net; /* Associated network namespace */
+ struct class_attribute class_attr_eipoib_interfaces;
+};
+
+/* exported from main.c */
+extern int eipoib_net_id;
+extern struct list_head parent_dev_list;
+
+/* functions prototypes */
+int mod_create_sysfs(struct eipoib_net *eipoib_n);
+void mod_destroy_sysfs(struct eipoib_net *eipoib_n);
+void parent_destroy_sysfs_entry(struct parent *parent);
+int parent_create_sysfs_entry(struct parent *parent);
+int create_slave_symlinks(struct net_device *master,
+ struct net_device *slave);
+void destroy_slave_symlinks(struct net_device *master,
+ struct net_device *slave);
+int parent_enslave(struct net_device *parent_dev,
+ struct net_device *slave_dev);
+int parent_release_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev);
+struct neigh *parent_get_neigh_cmd(char op, char *ifname,
+ u8 *remac, u8 *rimac);
+struct slave *parent_get_vif_cmd(char op, char *ifname, u8 *lemac);
+ssize_t __parent_store_neighs(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count);
+void parent_set_ethtool_ops(struct net_device *dev);
+
+#endif /* _LINUX_ETH_IPOIB_H */
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 3/9] IB/ipoib: Add support for acting as VIF
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
When IPoIB interface acts as a VIF for an eIPoIB interface, it uses
the skb cb storage area on the RX flow, to place information which
can be of use to the upper layer device.
One such usage example, is when an eIPoIB inteface needs to generate
a source mac for incoming Ethernet frames.
The IPoIB code checks the VIF private flag on the RX path, and accoriding
to the value of the flag prepares the skb CB data, etc.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/infiniband/ulp/ipoib/ipoib.h | 6 +++
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 9 +++++
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 ++++-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 28 ++++++++++++++++
include/rdma/e_ipoib.h | 51 +++++++++++++++++++++++++++++
5 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644 include/rdma/e_ipoib.h
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index a57db27..1d28774 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -52,6 +52,7 @@
#include <rdma/ib_pack.h>
#include <rdma/ib_sa.h>
#include <linux/sched.h>
+#include <rdma/e_ipoib.h>
/* constants */
@@ -209,6 +210,7 @@ struct ipoib_cm_rx {
unsigned long jiffies;
enum ipoib_cm_state state;
int recv_count;
+ u32 qpn;
};
struct ipoib_cm_tx {
@@ -695,6 +697,10 @@ extern int ipoib_recvq_size;
extern struct ib_sa_client ipoib_sa_client;
+
+inline void set_skb_oob_cb_data(struct sk_buff *skb, struct ib_wc *wc,
+ struct napi_struct *napi);
+
#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
extern int ipoib_debug_level;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 014504d..dca7952 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -440,6 +440,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
struct net_device *dev = cm_id->context;
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_cm_rx *p;
+ struct ipoib_cm_data *data = event->private_data;
unsigned psn;
int ret;
@@ -452,6 +453,10 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
cm_id->context = p;
p->state = IPOIB_CM_RX_LIVE;
p->jiffies = jiffies;
+
+ /* used to keep track of base qpn in CM mode */
+ p->qpn = be32_to_cpu(data->qpn);
+
INIT_LIST_HEAD(&p->list);
p->qp = ipoib_cm_create_rx_qp(dev, p);
@@ -669,6 +674,10 @@ copied:
skb->dev = dev;
/* XXX get correct PACKET_ type here */
skb->pkt_type = PACKET_HOST;
+ /* if handler is registered on top of ipoib, set skb oob data. */
+ if (skb->dev->priv_flags & IFF_EIPOIB_VIF)
+ set_skb_oob_cb_data(skb, wc, NULL);
+
netif_receive_skb(skb);
repost:
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 5c1bc99..da28799 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -300,7 +300,13 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
likely(wc->wc_flags & IB_WC_IP_CSUM_OK))
skb->ip_summed = CHECKSUM_UNNECESSARY;
- napi_gro_receive(&priv->napi, skb);
+ /* if handler is registered on top of ipoib, set skb oob data */
+ if (dev->priv_flags & IFF_EIPOIB_VIF) {
+ set_skb_oob_cb_data(skb, wc, &priv->napi);
+ /* the registered handler will take care of the skb */
+ netif_receive_skb(skb);
+ } else
+ napi_gro_receive(&priv->napi, skb);
repost:
if (unlikely(ipoib_ib_post_receive(dev, wr_id)))
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 704d068..1ccd42f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -91,6 +91,31 @@ static struct ib_client ipoib_client = {
.remove = ipoib_remove_one
};
+inline void set_skb_oob_cb_data(struct sk_buff *skb, struct ib_wc *wc,
+ struct napi_struct *napi)
+{
+ struct ipoib_cm_rx *p_cm_ctx = NULL;
+ union skb_cb_data *data = NULL;
+ struct ib_grh *grh = NULL;
+
+ p_cm_ctx = wc->qp->qp_context;
+ data = IPOIB_HANDLER_CB(skb);
+
+ data->rx.slid = wc->slid;
+ data->rx.sqpn = wc->src_qp;
+ data->rx.napi = napi;
+
+ /* if dqpn is mcast, fetch the dgid */
+ grh = (struct ib_grh *)(skb->data - IB_GRH_BYTES - IPOIB_ENCAP_LEN);
+
+ if ((wc->wc_flags & IB_WC_GRH) && grh)
+ memcpy(data->rx.dgid, grh->dgid.raw, 16);
+
+ /* in CM mode, use the "base" qpn as sqpn */
+ if (p_cm_ctx)
+ data->rx.sqpn = p_cm_ctx->qpn;
+}
+
int ipoib_open(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -1277,6 +1302,9 @@ static struct net_device *ipoib_add_port(const char *format,
goto event_failed;
}
+ /* indicates pif port */
+ priv->dev->priv_flags |= IFF_EIPOIB_PIF;
+
result = register_netdev(priv->dev);
if (result) {
printk(KERN_WARNING "%s: couldn't register ipoib port %d; error %d\n",
diff --git a/include/rdma/e_ipoib.h b/include/rdma/e_ipoib.h
new file mode 100644
index 0000000..481514e
--- /dev/null
+++ b/include/rdma/e_ipoib.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _LINUX_ETH_IB_IPOIB_H
+#define _LINUX_ETH_IB_IPOIB_H
+#include <linux/skbuff.h>
+#include <linux/if_infiniband.h>
+#include <rdma/ib_verbs.h>
+
+/* must be <= 48 bytes */
+union skb_cb_data {
+ struct {
+ u32 sqpn;
+ u16 slid;
+ u8 dgid[16];
+ struct napi_struct *napi;
+ } rx;
+};
+
+#define IPOIB_HANDLER_CB(skb) ((union skb_cb_data *)(skb)->cb)
+
+#endif /* _LINUX_ETH_IB_IPOIB_H */
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 6/9] net/eipoib: Add sysfs support
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The management interface for the driver uses sysfs entries. Via these sysfs
entries the driver gets details on new VIF's to manage. The driver can
enslave new VIF (IPoIB cloned interface) or detaches from it.
Here are few sysfs commands that are used in order to manage the driver,
according to few scenarios:
1. create new clone of IPoIB interface:
$ echo .Y > /sys/class/net/ibX/create_child
create new clone ibX.Y with the same pkey as ibX, for example:
$ echo .1 > /sys/class/net/ib0/create_child
will create new interface ib0.1
2. notify parent interface on new VIF to enslave:
$ echo +ibX.Y > /sys/class/net/ethZ/eth/slaves
where ethZ is the driver interface, for example:
$ echo +ib0.1 > /sys/class/net/eth4/eth/slaves
will enslave ib0.1 to eth4
3. notify parent interface interface on VIF details (mac and vlan)
$ echo +ibX.Y <MAC address> > /sys/class/net/ethZ/eth/vifs
for example:
$ echo +ib0.1 00:02:c9:43:3b:f1 > /sys/class/net/eth4/eth/vifs
4. notify parent to release VIF:
$ echo -ibX.Y > /sys/class/net/ethZ/eth/slaves
where ethZ is the driver interface, for example:
$ echo -ib0.1 > /sys/class/net/eth4/eth/slaves
will release ib0.1 from eth4
5. see the list of ipoib interfaces enslaved under eipoib interface,
$ cat /sys/class/net/ethX/eth/vifs
for example:
$ cat /sys/class/net/eth4/eth/vifs
SLAVE=ib0.1 MAC=9a:c2:1f:d7:3b:63 VLAN=N/A
SLAVE=ib0.2 MAC=52:54:00:60:55:88 VLAN=N/A
SLAVE=ib0.3 MAC=52:54:00:60:55:89 VLAN=N/A
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib_sysfs.c | 640 ++++++++++++++++++++++++++++++++++
1 files changed, 640 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib_sysfs.c
diff --git a/drivers/net/eipoib/eth_ipoib_sysfs.c b/drivers/net/eipoib/eth_ipoib_sysfs.c
new file mode 100644
index 0000000..be1712e
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib_sysfs.c
@@ -0,0 +1,640 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/sched.h>
+#include <linux/fs.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/netdevice.h>
+#include <linux/inetdevice.h>
+#include <linux/in.h>
+#include <linux/sysfs.h>
+#include <linux/ctype.h>
+#include <linux/inet.h>
+#include <linux/rtnetlink.h>
+#include <linux/etherdevice.h>
+#include <net/net_namespace.h>
+
+#include "eth_ipoib.h"
+
+#define to_dev(obj) container_of(obj, struct device, kobj)
+#define to_parent(cd) ((struct parent *)(netdev_priv(to_net_dev(cd))))
+#define MOD_NA_STRING "N/A"
+
+#define _sprintf(p, buf, format, arg...) \
+((PAGE_SIZE - (int)(p - buf)) <= 0 ? 0 : \
+ scnprintf(p, PAGE_SIZE - (int)(p - buf), format, ## arg))\
+
+#define _end_of_line(_p, _buf) \
+do { if (_p - _buf) /* eat the leftover space */ \
+ buf[_p - _buf - 1] = '\n'; \
+} while (0)
+
+/* helper functions */
+static int get_emac(u8 *mac, char *s)
+{
+ if (sscanf(s, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+ mac + 0, mac + 1, mac + 2, mac + 3, mac + 4,
+ mac + 5) != 6)
+ return -1;
+
+ return 0;
+}
+
+static int get_imac(u8 *mac, char *s)
+{
+ if (sscanf(s, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:"
+ "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:"
+ "%hhx:%hhx:%hhx:%hhx",
+ mac + 0, mac + 1, mac + 2, mac + 3, mac + 4,
+ mac + 5, mac + 6, mac + 7, mac + 8, mac + 9,
+ mac + 10, mac + 11, mac + 12, mac + 13,
+ mac + 14, mac + 15, mac + 16, mac + 17,
+ mac + 18, mac + 19) != 20)
+ return -1;
+
+ return 0;
+}
+
+/* show/store functions per module (CLASS_ATTR) */
+static ssize_t show_parents(struct class *cls, struct class_attribute *attr,
+ char *buf)
+{
+ char *p = buf;
+ struct parent *parent;
+
+ rtnl_lock(); /* because of parent_dev_list */
+
+ list_for_each_entry(parent, &parent_dev_list, parent_list) {
+ p += _sprintf(p, buf, "%s over IB port: %s\n",
+ parent->dev->name,
+ parent->ipoib_main_interface);
+ }
+ _end_of_line(p, buf);
+
+ rtnl_unlock();
+ return (ssize_t)(p - buf);
+}
+
+/* show/store functions per parent (DEVICE_ATTR) */
+static ssize_t parent_show_neighs(struct device *d,
+ struct device_attribute *attr, char *buf)
+{
+ struct slave *slave;
+ struct neigh *neigh;
+ struct parent *parent = to_parent(d);
+ char *p = buf;
+
+ read_lock_bh(&parent->lock);
+ parent_for_each_slave(parent, slave) {
+ list_for_each_entry(neigh, &slave->neigh_list, list) {
+ p += _sprintf(p, buf, "SLAVE=%-10s EMAC=%pM IMAC=%pM:%pM:%pM:%.2x:%.2x\n",
+ slave->dev->name,
+ neigh->emac,
+ neigh->imac, neigh->imac + 6, neigh->imac + 12,
+ neigh->imac[18], neigh->imac[19]);
+ }
+ }
+
+ read_unlock_bh(&parent->lock);
+
+ _end_of_line(p, buf);
+
+ return (ssize_t)(p - buf);
+}
+
+struct neigh *parent_get_neigh_cmd(char op,
+ char *ifname, u8 *remac, u8 *rimac)
+{
+ struct neigh *neigh_cmd;
+
+ neigh_cmd = kzalloc(sizeof *neigh_cmd, GFP_ATOMIC);
+ if (!neigh_cmd) {
+ pr_err("%s cannot allocate neigh struct\n", ifname);
+ goto out;
+ }
+
+ /*
+ * populate emac field so it can be used easily
+ * in neigh_cmd_find_by_mac()
+ */
+ memcpy(neigh_cmd->emac, remac, ETH_ALEN);
+ memcpy(neigh_cmd->imac, rimac, INFINIBAND_ALEN);
+
+ /* prepare the command as a string */
+ sprintf(neigh_cmd->cmd, "%c%s %pM %pM:%pM:%pM:%.2x:%.2x",
+ op, ifname, remac, rimac, rimac + 6, rimac + 12, rimac[18], rimac[19]);
+out:
+ return neigh_cmd;
+}
+
+/* write_lock_bh(&parent->lock) must be held */
+ssize_t __parent_store_neighs(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count)
+{
+ char command[IFNAMSIZ + 1] = { 0, };
+ char emac_str[ETH_ALEN * 3] = { 0, };
+ u8 emac[ETH_ALEN];
+ char imac_str[INFINIBAND_ALEN * 3] = { 0, };
+ u8 imac[INFINIBAND_ALEN];
+ char *ifname;
+ int found = 0, ret = count;
+ struct slave *slave = NULL, *slave_tmp;
+ struct neigh *neigh;
+ struct parent *parent = to_parent(d);
+
+ sscanf(buffer, "%s %s %s", command, emac_str, imac_str);
+
+ /* check ifname */
+ ifname = command + 1;
+ if ((strlen(command) <= 1) || !dev_valid_name(ifname) ||
+ (command[0] != '+' && command[0] != '-'))
+ goto err_no_cmd;
+
+ /* check if ifname exist */
+ parent_for_each_slave(parent, slave_tmp) {
+ if (!strcmp(slave_tmp->dev->name, ifname)) {
+ found = 1;
+ slave = slave_tmp;
+ }
+ }
+
+ if (!found) {
+ pr_err("%s could not find slave\n", ifname);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (get_emac(emac, emac_str)) {
+ pr_err("%s bad emac %s\n", ifname, emac_str);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (get_imac(imac, imac_str)) {
+ pr_err("%s bad imac %s\n", ifname, imac_str);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* process command */
+ if (command[0] == '+') {
+ found = 0;
+ list_for_each_entry(neigh, &slave->neigh_list, list) {
+ if (!memcmp(neigh->emac, emac, ETH_ALEN))
+ found = 1;
+ }
+
+ if (found) {
+ pr_err("%s: cannot update neigh, slave already has "
+ "this neigh mac %pM\n",
+ slave->dev->name, emac);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ neigh = kzalloc(sizeof *neigh, GFP_KERNEL);
+ if (!neigh) {
+ pr_err("%s cannot allocate neigh struct\n",
+ slave->dev->name);
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ /* ready to go */
+ pr_info("%s: slave %s neigh mac is set to %pM\n",
+ ifname, parent->dev->name, emac);
+ memcpy(neigh->emac, emac, ETH_ALEN);
+ memcpy(neigh->imac, imac, INFINIBAND_ALEN);
+
+ list_add_tail(&neigh->list, &slave->neigh_list);
+
+ goto out;
+ }
+
+ if (command[0] == '-') {
+ found = 0;
+ list_for_each_entry(neigh, &slave->neigh_list, list) {
+ if (!memcmp(neigh->emac, emac, ETH_ALEN))
+ found = 1;
+ }
+
+ if (!found) {
+ pr_err("%s cannot delete neigh mac %pM\n",
+ ifname, emac);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ list_del(&neigh->list);
+ kfree(neigh);
+
+ goto out;
+ }
+
+err_no_cmd:
+ pr_err("%s USAGE: (-|+)ifname emac imac\n", DRV_NAME);
+ ret = -EPERM;
+
+out:
+ return ret;
+}
+
+static ssize_t parent_store_neighs(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count)
+{
+ struct parent *parent = to_parent(d);
+ ssize_t rc;
+
+ write_lock_bh(&parent->lock);
+ rc = __parent_store_neighs(d, attr, buffer, count);
+ write_unlock_bh(&parent->lock);
+
+ return rc;
+}
+
+static DEVICE_ATTR(neighs, S_IRUGO | S_IWUSR, parent_show_neighs,
+ parent_store_neighs);
+
+static ssize_t parent_show_vifs(struct device *d,
+ struct device_attribute *attr, char *buf)
+{
+ struct slave *slave;
+ struct parent *parent = to_parent(d);
+ char *p = buf;
+
+ read_lock_bh(&parent->lock);
+ parent_for_each_slave(parent, slave) {
+ if (is_zero_ether_addr(slave->emac)) {
+ p += _sprintf(p, buf, "SLAVE=%-10s MAC=%-17s "
+ "VLAN=%s\n", slave->dev->name,
+ MOD_NA_STRING, MOD_NA_STRING);
+ } else if (slave->vlan == VLAN_N_VID) {
+ p += _sprintf(p, buf, "SLAVE=%-10s MAC=%pM VLAN=%s\n",
+ slave->dev->name,
+ slave->emac,
+ MOD_NA_STRING);
+ } else {
+ p += _sprintf(p, buf, "SLAVE=%-10s MAC=%pM VLAN=%d\n",
+ slave->dev->name,
+ slave->emac,
+ slave->vlan);
+ }
+ }
+ read_unlock_bh(&parent->lock);
+
+ _end_of_line(p, buf);
+
+ return (ssize_t)(p - buf);
+}
+
+static ssize_t parent_store_vifs(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count)
+{
+ char command[IFNAMSIZ + 1] = { 0, };
+ char mac_str[ETH_ALEN * 3] = { 0, };
+ char *ifname;
+ u8 mac[ETH_ALEN];
+ int found = 0, ret = count;
+ struct slave *slave = NULL, *slave_tmp;
+ struct parent *parent = to_parent(d);
+
+ sscanf(buffer, "%s %s", command, mac_str);
+
+ write_lock_bh(&parent->lock);
+
+ /* check ifname */
+ ifname = command + 1;
+ if ((strlen(command) <= 1) || !dev_valid_name(ifname) ||
+ (command[0] != '+' && command[0] != '-'))
+ goto err_no_cmd;
+
+ /* check if ifname exist */
+ parent_for_each_slave(parent, slave_tmp) {
+ if (!strcmp(slave_tmp->dev->name, ifname)) {
+ found = 1;
+ slave = slave_tmp;
+ }
+ }
+
+ if (!found) {
+ pr_err("%s could not find slave\n", ifname);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* process command */
+ if (command[0] == '+') {
+ if (get_emac(mac, mac_str) || !is_valid_ether_addr(mac)) {
+ pr_err("%s invalid mac input\n", ifname);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (!is_zero_ether_addr(slave->emac)) {
+ pr_err("%s slave %s mac already set to %pM\n",
+ ifname, slave->dev->name, slave->emac);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* check another slave has this mac/vlan */
+ found = 0;
+ parent_for_each_slave(parent, slave_tmp) {
+ if (!memcmp(slave_tmp->emac, mac, ETH_ALEN) &&
+ slave_tmp->vlan == slave->vlan) {
+ pr_err("cannot update %s, slave %s already has"
+ " vlan 0x%x mac %pM\n",
+ parent->dev->name, slave->dev->name,
+ slave_tmp->vlan,
+ mac);
+ ret = -EINVAL;
+ goto out;
+ }
+ }
+
+ /* ready to go */
+ pr_info("slave %s mac is set to %pM\n",
+ ifname, mac);
+
+ memcpy(slave->emac, mac, ETH_ALEN);
+ goto out;
+ }
+
+ if (command[0] == '-') {
+ if (is_zero_ether_addr(slave->emac)) {
+ pr_err("%s slave mac already unset %pM\n",
+ ifname, slave->emac);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ pr_info("slave %s mac is unset (was %pM)\n",
+ ifname, slave->emac);
+
+ goto out;
+ }
+
+err_no_cmd:
+ pr_err("%s USAGE: (-|+)ifname [mac]\n", DRV_NAME);
+ ret = -EPERM;
+
+out:
+ write_unlock_bh(&parent->lock);
+
+ return ret;
+}
+
+static DEVICE_ATTR(vifs, S_IRUGO | S_IWUSR, parent_show_vifs,
+ parent_store_vifs);
+
+static ssize_t parent_show_slaves(struct device *d,
+ struct device_attribute *attr, char *buf)
+{
+ struct slave *slave;
+ struct parent *parent = to_parent(d);
+ char *p = buf;
+
+ read_lock_bh(&parent->lock);
+ parent_for_each_slave(parent, slave)
+ p += _sprintf(p, buf, "%s\n", slave->dev->name);
+ read_unlock_bh(&parent->lock);
+
+ _end_of_line(p, buf);
+
+ return (ssize_t)(p - buf);
+}
+
+static ssize_t parent_store_slaves(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count)
+{
+ char command[IFNAMSIZ + 1] = { 0, };
+ char *ifname;
+ int res, ret = count;
+ struct slave *slave;
+ struct net_device *dev = NULL;
+ struct parent *parent = to_parent(d);
+
+ /* Quick sanity check -- is the parent interface up? */
+ if (!(parent->dev->flags & IFF_UP)) {
+ pr_warn("%s: doing slave updates when "
+ "interface is down.\n", dev->name);
+ }
+
+ if (!rtnl_trylock()) /* because __dev_get_by_name */
+ return restart_syscall();
+
+ sscanf(buffer, "%16s", command);
+
+ ifname = command + 1;
+ if ((strlen(command) <= 1) || !dev_valid_name(ifname))
+ goto err_no_cmd;
+
+ if (command[0] == '+') {
+ /* Got a slave name in ifname. Is it already in the list? */
+ dev = __dev_get_by_name(&init_net, ifname);
+ if (!dev) {
+ pr_warn("%s: Interface %s does not exist!\n",
+ parent->dev->name, ifname);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ read_lock_bh(&parent->lock);
+ parent_for_each_slave(parent, slave) {
+ if (slave->dev == dev) {
+ pr_err("%s ERR- Interface %s is already enslaved!\n",
+ parent->dev->name, dev->name);
+ ret = -EPERM;
+ }
+ }
+ read_unlock_bh(&parent->lock);
+
+ if (ret < 0)
+ goto out;
+
+ pr_info("%s: adding slave %s\n",
+ parent->dev->name, ifname);
+
+ res = parent_enslave(parent->dev, dev);
+ if (res)
+ ret = res;
+
+ goto out;
+ }
+
+ if (command[0] == '-') {
+ dev = NULL;
+ parent_for_each_slave(parent, slave)
+ if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
+ dev = slave->dev;
+ break;
+ }
+
+ if (dev) {
+ pr_info("%s: removing slave %s\n",
+ parent->dev->name, dev->name);
+ res = parent_release_slave(parent->dev, dev);
+ if (res) {
+ ret = res;
+ goto out;
+ }
+ } else {
+ pr_warn("%s: unable to remove non-existent "
+ "slave for parent %s.\n",
+ ifname, parent->dev->name);
+ ret = -ENODEV;
+ }
+ goto out;
+ }
+
+err_no_cmd:
+ pr_err("%s USAGE: (-|+)ifname\n", DRV_NAME);
+ ret = -EPERM;
+
+out:
+ rtnl_unlock();
+ return ret;
+}
+
+static DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, parent_show_slaves,
+ parent_store_slaves);
+
+/* sysfs create/destroy functions */
+static struct attribute *per_parent_attrs[] = {
+ &dev_attr_slaves.attr, /* DEVICE_ATTR(slaves..) */
+ &dev_attr_vifs.attr,
+ &dev_attr_neighs.attr,
+ NULL,
+};
+
+/* name spcase support */
+static const void *eipoib_namespace(struct class *cls,
+ const struct class_attribute *attr)
+{
+ const struct eipoib_net *eipoib_n =
+ container_of(attr,
+ struct eipoib_net, class_attr_eipoib_interfaces);
+ return eipoib_n->net;
+}
+
+static struct attribute_group parent_group = {
+ /* per parent sysfs files under: /sys/class/net/<IF>/eth/.. */
+ .name = "eth",
+ .attrs = per_parent_attrs
+};
+
+int create_slave_symlinks(struct net_device *master,
+ struct net_device *slave)
+{
+ char linkname[IFNAMSIZ+7];
+ int ret = 0;
+
+ ret = sysfs_create_link(&(slave->dev.kobj), &(master->dev.kobj),
+ "eth_parent");
+ if (ret)
+ return ret;
+
+ sprintf(linkname, "slave_%s", slave->name);
+ ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
+ linkname);
+ return ret;
+
+}
+
+void destroy_slave_symlinks(struct net_device *master,
+ struct net_device *slave)
+{
+ char linkname[IFNAMSIZ+7];
+
+ sysfs_remove_link(&(slave->dev.kobj), "eth_parent");
+ sprintf(linkname, "slave_%s", slave->name);
+ sysfs_remove_link(&(master->dev.kobj), linkname);
+}
+
+static struct class_attribute class_attr_eth_ipoib_interfaces = {
+ .attr = {
+ .name = "eth_ipoib_interfaces",
+ .mode = S_IWUSR | S_IRUGO,
+ },
+ .show = show_parents,
+ .namespace = eipoib_namespace,
+};
+
+/* per module sysfs file under: /sys/class/net/eth_ipoib_interfaces */
+int mod_create_sysfs(struct eipoib_net *eipoib_n)
+{
+ int rc;
+ /* defined in CLASS_ATTR(eth_ipoib_interfaces..) */
+ eipoib_n->class_attr_eipoib_interfaces =
+ class_attr_eth_ipoib_interfaces;
+
+ sysfs_attr_init(&eipoib_n->class_attr_eipoib_interfaces.attr);
+
+ rc = netdev_class_create_file(&eipoib_n->class_attr_eipoib_interfaces);
+ if (rc)
+ pr_err("%s failed to create sysfs (rc %d)\n",
+ eipoib_n->class_attr_eipoib_interfaces.attr.name, rc);
+
+ return rc;
+}
+
+void mod_destroy_sysfs(struct eipoib_net *eipoib_n)
+{
+ netdev_class_remove_file(&eipoib_n->class_attr_eipoib_interfaces);
+}
+
+int parent_create_sysfs_entry(struct parent *parent)
+{
+ struct net_device *dev = parent->dev;
+ int rc;
+
+ rc = sysfs_create_group(&(dev->dev.kobj), &parent_group);
+ if (rc)
+ pr_info("failed to create sysfs group\n");
+
+ return rc;
+}
+
+void parent_destroy_sysfs_entry(struct parent *parent)
+{
+ struct net_device *dev = parent->dev;
+
+ sysfs_remove_group(&(dev->dev.kobj), &parent_group);
+}
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 1/9] IB/ipoib: Add support for clones / multiple childs on the same partition
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Or Gerlitz, Erez Shitrit
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
Allow creating "clone" child interfaces which further partition an
IPoIB interface to sub interfaces who either use the same pkey as
their parent or use the same pkey as already created child interface.
Each child now has a child index, which together with the pkey is
used as the identifier of the created network device.
All sorts of childs are still created/deleted through sysfs, in a
similar manner to the way legacy child interfaces are.
A major use case for clone childs is for virtualization purposes, where
a per VM NIC is desired at the hypervisor level, such as the solution
provided by the newly introduced Ethernet IPoIB driver.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
---
Documentation/infiniband/ipoib.txt | 24 ++++++++++++++
drivers/infiniband/ulp/ipoib/ipoib.h | 7 +++-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 48 +++++++++++++++++++++-------
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +-
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 46 ++++++++++++++++++--------
5 files changed, 99 insertions(+), 29 deletions(-)
diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/infiniband/ipoib.txt
index 64eeb55..b3a704d 100644
--- a/Documentation/infiniband/ipoib.txt
+++ b/Documentation/infiniband/ipoib.txt
@@ -24,6 +24,30 @@ Partitions and P_Keys
The P_Key for any interface is given by the "pkey" file, and the
main interface for a subinterface is in "parent."
+Clones
++
+ Its possible to further partition an IPoIB interfaces, and create
+ "clone" child interfaces which either use the same pkey as their
+ parent, or as an already created child interface. Each child now has
+ a child index, which together with the pkey is used as the identifier
+ of the created network device.
+
+ All sorts of childs are still created/deleted through sysfs, in a
+ similar manner to the way legacy child interfaces are, for example:
+
+ echo 0x8001.1 > /sys/class/net/ib0/create_child
+
+ will create an interface named ib0.8001.1 with P_Key 0x8001 and index 1
+
+ echo .1 > /sys/class/net/ib0/create_child
+
+ will create an interface named ib0.1 with same P_Key as ib0 and index 1
+
+ remove a subinterface, use the "delete_child" file:
+
+ echo 0x8001.1 > /sys/class/net/ib0/create_child
+ echo .1 > /sys/class/net/ib0/create_child
+
Datagram vs Connected modes
The IPoIB driver supports two modes of operation: datagram and
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 86df632..a57db27 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -332,6 +332,7 @@ struct ipoib_dev_priv {
struct net_device *parent;
struct list_head child_intfs;
struct list_head list;
+ int child_index;
#ifdef CONFIG_INFINIBAND_IPOIB_CM
struct ipoib_cm_dev_priv cm;
@@ -490,8 +491,10 @@ void ipoib_transport_dev_cleanup(struct net_device *dev);
void ipoib_event(struct ib_event_handler *handler,
struct ib_event *record);
-int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey);
-int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey);
+int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey,
+ unsigned char clone_index);
+int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey,
+ unsigned char clone_index);
void ipoib_pkey_poll(struct work_struct *work);
int ipoib_pkey_dev_delay_open(struct net_device *dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index bbee4b2..704d068 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1095,17 +1095,44 @@ int ipoib_add_umcast_attr(struct net_device *dev)
return device_create_file(&dev->dev, &dev_attr_umcast);
}
+int parse_child(struct device *dev, const char *buf, int *pkey,
+ int *child_index)
+{
+ int ret;
+ struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));
+
+ *pkey = *child_index = -1;
+
+ /* 'pkey' or 'pkey.child_index' or '.child_index' are allowed */
+ ret = sscanf(buf, "%i.%i", pkey, child_index);
+ if (ret == 1) /* just pkey, implicit child index is 0 */
+ *child_index = 0;
+ else if (ret != 2) { /* pkey same as parent, specified child index */
+ *pkey = priv->pkey;
+ ret = sscanf(buf, ".%i", child_index);
+ if (ret != 1 || *child_index == 0)
+ return -EINVAL;
+ }
+
+ if (*child_index < 0 || *child_index > 0xff)
+ return -EINVAL;
+
+ if (*pkey < 0 || *pkey > 0xffff)
+ return -EINVAL;
+
+ ipoib_dbg(priv, "parse_child inp %s out pkey %04x index %d\n",
+ buf, *pkey, *child_index);
+ return 0;
+}
+
static ssize_t create_child(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- int pkey;
+ int pkey, child_index;
int ret;
- if (sscanf(buf, "%i", &pkey) != 1)
- return -EINVAL;
-
- if (pkey < 0 || pkey > 0xffff)
+ if (parse_child(dev, buf, &pkey, &child_index))
return -EINVAL;
/*
@@ -1114,7 +1141,7 @@ static ssize_t create_child(struct device *dev,
*/
pkey |= 0x8000;
- ret = ipoib_vlan_add(to_net_dev(dev), pkey);
+ ret = ipoib_vlan_add(to_net_dev(dev), pkey, child_index);
return ret ? ret : count;
}
@@ -1124,16 +1151,13 @@ static ssize_t delete_child(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
- int pkey;
+ int pkey, child_index;
int ret;
- if (sscanf(buf, "%i", &pkey) != 1)
- return -EINVAL;
-
- if (pkey < 0 || pkey > 0xffff)
+ if (parse_child(dev, buf, &pkey, &child_index))
return -EINVAL;
- ret = ipoib_vlan_delete(to_net_dev(dev), pkey);
+ ret = ipoib_vlan_delete(to_net_dev(dev), pkey, child_index);
return ret ? ret : count;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 049a997..2131772 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -167,7 +167,8 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
size += ipoib_recvq_size * ipoib_max_conn_qp;
}
- priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size, 0);
+ priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size,
+ priv->child_index % priv->ca->num_comp_vectors);
if (IS_ERR(priv->recv_cq)) {
printk(KERN_WARNING "%s: failed to create receive CQ\n", ca->name);
goto out_free_mr;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index d7e9740..2d35cb4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -49,7 +49,8 @@ static ssize_t show_parent(struct device *d, struct device_attribute *attr,
}
static DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
-int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
+int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey,
+ unsigned char child_index)
{
struct ipoib_dev_priv *ppriv, *priv;
char intf_name[IFNAMSIZ];
@@ -65,25 +66,40 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
mutex_lock(&ppriv->vlan_mutex);
/*
- * First ensure this isn't a duplicate. We check the parent device and
- * then all of the child interfaces to make sure the Pkey doesn't match.
+ * First ensure this isn't a duplicate. We check all of the child
+ * interfaces to make sure the Pkey AND the child index
+ * don't match.
*/
- if (ppriv->pkey == pkey) {
- result = -ENOTUNIQ;
- priv = NULL;
- goto err;
- }
-
list_for_each_entry(priv, &ppriv->child_intfs, list) {
- if (priv->pkey == pkey) {
+ if (priv->pkey == pkey && priv->child_index == child_index) {
result = -ENOTUNIQ;
priv = NULL;
goto err;
}
}
- snprintf(intf_name, sizeof intf_name, "%s.%04x",
- ppriv->dev->name, pkey);
+ /*
+ * for the case of non-legacy and same pkey childs we wanted to use
+ * a notation of ibN.pkey:index and ibN:index but this is problematic
+ * with tools like ifconfig who treat devices with ":" in their names
+ * as aliases which are restriced, e.t w.r.t counters, etc
+ */
+ if (ppriv->pkey != pkey && child_index == 0) /* legacy child */
+ snprintf(intf_name, sizeof intf_name, "%s.%04x",
+ ppriv->dev->name, pkey);
+ else if (ppriv->pkey != pkey && child_index != 0) /* non-legacy child */
+ snprintf(intf_name, sizeof intf_name, "%s.%04x.%d",
+ ppriv->dev->name, pkey, child_index);
+ else if (ppriv->pkey == pkey && child_index != 0) /* same pkey child */
+ snprintf(intf_name, sizeof intf_name, "%s.%d",
+ ppriv->dev->name, child_index);
+ else {
+ ipoib_warn(ppriv, "wrong pkey/child_index pairing %04x %d\n",
+ pkey, child_index);
+ result = -EINVAL;
+ goto err;
+ }
+
priv = ipoib_intf_alloc(intf_name);
if (!priv) {
result = -ENOMEM;
@@ -101,6 +117,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
goto err;
priv->pkey = pkey;
+ priv->child_index = child_index;
memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr, INFINIBAND_ALEN);
priv->dev->broadcast[8] = pkey >> 8;
@@ -157,7 +174,8 @@ err:
return result;
}
-int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
+int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey,
+ unsigned char child_index)
{
struct ipoib_dev_priv *ppriv, *priv, *tpriv;
struct net_device *dev = NULL;
@@ -171,7 +189,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
return restart_syscall();
mutex_lock(&ppriv->vlan_mutex);
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
- if (priv->pkey == pkey) {
+ if (priv->pkey == pkey && priv->child_index == child_index) {
unregister_netdevice(priv->dev);
ipoib_dev_cleanup(priv->dev);
list_del(&priv->list);
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 5/9] net/eipoib: Add ethtool file support
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Via ethtool the driver describes its version, ABI version, on what PIF
interface it runs and various statistics.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib_ethtool.c | 147 ++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib_ethtool.c
diff --git a/drivers/net/eipoib/eth_ipoib_ethtool.c b/drivers/net/eipoib/eth_ipoib_ethtool.c
new file mode 100644
index 0000000..b5c20ec
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib_ethtool.c
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "eth_ipoib.h"
+
+static void parent_ethtool_get_drvinfo(struct net_device *parent_dev,
+ struct ethtool_drvinfo *drvinfo)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ if (strlen(DRV_NAME) + strlen(parent->ipoib_main_interface) > 31)
+ strncpy(drvinfo->driver, "driver name is too long", 32);
+ else
+ sprintf(drvinfo->driver, "%s:%s",
+ DRV_NAME, parent->ipoib_main_interface);
+
+ strncpy(drvinfo->version, DRV_VERSION, 32);
+
+ /* indicates ABI version */
+ snprintf(drvinfo->fw_version, 32, "%d", EIPOIB_ABI_VER);
+}
+
+static const char parent_strings[][ETH_GSTRING_LEN] = {
+ /* public statistics */
+ "rx_packets", "tx_packets", "rx_bytes",
+ "tx_bytes", "rx_errors", "tx_errors",
+ "rx_dropped", "tx_dropped", "multicast",
+ "collisions", "rx_length_errors", "rx_over_errors",
+ "rx_crc_errors", "rx_frame_errors", "rx_fifo_errors",
+ "rx_missed_errors", "tx_aborted_errors", "tx_carrier_errors",
+ "tx_fifo_errors", "tx_heartbeat_errors", "tx_window_errors",
+#define PUB_STATS_LEN 21
+
+ /* private statistics */
+ "tx_parent_dropped",
+ "tx_vif_miss",
+ "tx_neigh_miss",
+ "tx_vlan",
+ "tx_shared",
+ "tx_proto_errors",
+ "tx_skb_errors",
+ "tx_slave_err",
+
+ "rx_parent_dropped",
+ "rx_vif_miss",
+ "rx_neigh_miss",
+ "rx_vlan",
+ "rx_shared",
+ "rx_proto_errors",
+ "rx_skb_errors",
+ "rx_slave_err",
+#define PORT_STATS_LEN (8 * 2)
+
+};
+
+#define PARENT_STATS_LEN (sizeof(parent_strings) / ETH_GSTRING_LEN)
+
+static void parent_get_strings(struct net_device *parent_dev,
+ uint32_t stringset, uint8_t *data)
+{
+ int index = 0, stats_off = 0, i;
+
+ if (stringset != ETH_SS_STATS)
+ return;
+
+ /* Add main counters */
+ for (i = 0; i < PUB_STATS_LEN; i++)
+ strcpy(data + (index++) * ETH_GSTRING_LEN,
+ parent_strings[i + stats_off]);
+ stats_off += PUB_STATS_LEN;
+
+ for (i = 0; i < PORT_STATS_LEN; i++)
+ strcpy(data + (index++) * ETH_GSTRING_LEN,
+ parent_strings[i + stats_off]);
+ stats_off += PORT_STATS_LEN;
+
+}
+
+static void parent_get_ethtool_stats(struct net_device *parent_dev,
+ struct ethtool_stats *stats,
+ uint64_t *data)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ int index = 0, i;
+
+ read_lock(&parent->lock);
+
+ for (i = 0; i < PUB_STATS_LEN; i++)
+ data[index++] = ((unsigned long *) &parent->stats)[i];
+
+ for (i = 0; i < PORT_STATS_LEN; i++)
+ data[index++] = ((unsigned long *) &parent->port_stats)[i];
+
+ read_unlock(&parent->lock);
+}
+
+static int parent_get_sset_count(struct net_device *parent_dev, int sset)
+{
+ switch (sset) {
+ case ETH_SS_STATS:
+ return PARENT_STATS_LEN;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static const struct ethtool_ops parent_ethtool_ops = {
+ .get_drvinfo = parent_ethtool_get_drvinfo,
+ .get_strings = parent_get_strings,
+ .get_ethtool_stats = parent_get_ethtool_stats,
+ .get_sset_count = parent_get_sset_count,
+ .get_link = ethtool_op_get_link,
+};
+
+void parent_set_ethtool_ops(struct net_device *dev)
+{
+ SET_ETHTOOL_OPS(dev, &parent_ethtool_ops);
+}
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 8/9] net/eipoib: Add Makefile, Kconfig and MAINTAINERS entries
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Add Kconfig entry under drivers/net and MAINTAINERS entry for eIPoIB, also
add the driver makefile.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
MAINTAINERS | 6 ++++++
drivers/net/Kconfig | 15 +++++++++++++++
drivers/net/Makefile | 1 +
drivers/net/eipoib/Makefile | 4 ++++
4 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/Makefile
diff --git a/MAINTAINERS b/MAINTAINERS
index 8da1373..582f8de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2618,6 +2618,12 @@ L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/ibm/ehea/
+EIPoIB (Ethernet services over IPoIB) DRIVER
+M: Erez Shitrit <erezsh@mellanox.com>
+L: netdev@vger.kernel.org
+S: Supported
+F: drivers/net/eipoib/
+
EMBEDDED LINUX
M: Paul Gortmaker <paul.gortmaker@windriver.com>
M: Matt Mackall <mpm@selenic.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0c2bd80..09c0352 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -68,6 +68,21 @@ config DUMMY
To compile this driver as a module, choose M here: the module
will be called dummy.
+config E_IPOIB
+ tristate "Ethernet Services over IPoIB"
+ depends on INFINIBAND_IPOIB
+ ---help---
+ This driver supports Ethernet protocol over InfiniBand IPoIB devices.
+ Some services can run only on top of Ethernet L2 interfaces, and
+ cannot be bound to an IPoIB interface. With this new driver, these services
+ can run seamlessly.
+
+ Main use case of the driver is the Ethernet Virtual Switching used in
+ virtualized environments, where an eipoib netdevice can be used as a
+ Physical Interface (PIF) in the hypervisor domain, and allow other guests
+ Virtual Interfaces (VIF) connected to the same Virtual Switch to run over
+ the InfiniBand fabric.
+
config EQUALIZER
tristate "EQL (serial line load balancing) support"
---help---
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3d375ca..2c3409e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CAIF) += caif/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NET_DSA) += dsa/
+obj-$(CONFIG_E_IPOIB) += eipoib/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
diff --git a/drivers/net/eipoib/Makefile b/drivers/net/eipoib/Makefile
new file mode 100644
index 0000000..b64e96e
--- /dev/null
+++ b/drivers/net/eipoib/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_E_IPOIB) := eth_ipoib.o
+eth_ipoib-y := eth_ipoib_main.o \
+ eth_ipoib_sysfs.o \
+ eth_ipoib_ethtool.o
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 7/9] net/eipoib: Add main driver functionality
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The eipoib driver provides a standard Ethernet netdevice over
the InfiniBand IPoIB interface .
Some services can run only on top of Ethernet L2 interfaces, and cannot be
bound to an IPoIB interface. With this new driver, these services can run
seamlessly.
Main use case of the driver is the Ethernet Virtual Switching used in
virtualized environments, where an eipoib netdevice can be used as a
Physical Interface (PIF) in the hypervisor domain, and allow other
guests Virtual Interfaces (VIF) connected to the same Virtual Switch
to run over the InfiniBand fabric.
This driver supports L2 Switching (Direct Bridging) as well as other L3
Switching modes (e.g. NAT).
Whenever an IPoIB interface is created, one eIPoIB PIF netdevice
will be created. The default naming scheme is as in other Ethernet
interfaces: ethX, for example, on a system with two IPoIB interfaces,
ib0 and ib1, two interfaces will be created ethX and ethX+1 When "X"
is the next free Ethernet number in the system.
Using "ethtool -i " over the new interface can tell on which IPoIB
PIF interface that interface is above. For example: driver: eth_ipoib:ib0
indicates that eth3 is the Ethernet interface over the ib0 IPoIB interface.
The driver can be used as independent interface or to serve in
virtualization environment as the physical layer for the virtual
interfaces on the virtual guest.
The driver interface (eipoib interface or which is also referred to as parent)
uses slave interfaces, IPoIB clones, which are the VIFs described above.
VIFs interfaces are enslaved/released from the eipoib driver on demand, according
to the management interface provided to user space.
Note: Each ethX interface has at least one ibX.Y slave to serve the PIF
itself, in the VIFs list of ethX you'll notice that ibX.1 is always created
to serve applications running from the Hypervisor on top of ethX interface directly.
For IB applications that require native IPoIB interfaces (e.g. RDMA-CM), the
original ipoib interfaces ibX can still be used. For example, RDMA-CM and
eth_ipoib drivers can co-exist and make use of IPoIB
Support for Live migration:
The driver expose sysfs interface through which the manager can notify on
migrated out guests ("detached VIF"). The abandoned eIPoIB driver instance
sends ARP requests (defined number) to the network in order to triger the migrated
guest to publish its mac address of the new VIF that hosts it. When the guest
responds to that ARP, the eIPoIB driver on the host that owns that guest, sends
Gratuitous ARP in behalf of that guest such that all the peers on the network
which communicate with this VM are noticed on the new VIF address which is
used by the guest.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib_main.c | 1897 +++++++++++++++++++++++++++++++++++
1 files changed, 1897 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib_main.c
diff --git a/drivers/net/eipoib/eth_ipoib_main.c b/drivers/net/eipoib/eth_ipoib_main.c
new file mode 100644
index 0000000..e586e18
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib_main.c
@@ -0,0 +1,1897 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "eth_ipoib.h"
+#include <net/ip.h>
+
+#define EMAC_IP_GC_TIME (10 * HZ)
+
+#define MIG_OUT_ARP_REQ_ISSUE_TIME (0.5 * HZ)
+
+#define MIG_OUT_MAX_ARP_RETRIES 5
+
+#define LIVE_MIG_PACKET 1
+
+#define PARENT_MAC_MASK 0xe7
+
+/* forward declaration */
+static rx_handler_result_t eipoib_handle_frame(struct sk_buff **pskb);
+static int eipoib_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr);
+static void free_ip_mem_in_rec(struct guest_emac_info *emac_info);
+
+static const char * const version =
+ DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
+
+LIST_HEAD(parent_dev_list);
+
+
+/* ----------------------------- VLAN funcs ---------------------------------- */
+static int eth_ipoib_vlan_rx_add_vid(struct net_device *dev,
+ unsigned short vid)
+{
+ return 0;
+}
+
+static int eth_ipoib_vlan_rx_kill_vid(struct net_device *dev,
+ unsigned short vid)
+{
+ return 0;
+}
+
+/* name space sys/fs functions */
+int eipoib_net_id __read_mostly;
+
+static int __net_init eipoib_net_init(struct net *net)
+{
+ int rc;
+ struct eipoib_net *eipoib_n = net_generic(net, eipoib_net_id);
+
+ eipoib_n->net = net;
+ rc = mod_create_sysfs(eipoib_n);
+
+ return rc;
+}
+
+static void __net_exit eipoib_net_exit(struct net *net)
+{
+ struct eipoib_net *eipoib_n = net_generic(net, eipoib_net_id);
+
+ mod_destroy_sysfs(eipoib_n);
+}
+
+static struct pernet_operations eipoib_net_ops = {
+ .init = eipoib_net_init,
+ .exit = eipoib_net_exit,
+ .id = &eipoib_net_id,
+ .size = sizeof(struct eipoib_net),
+};
+
+/* set mac fields emac=<qpn><lid> */
+static inline
+void build_neigh_mac(u8 *_mac, u32 _qpn, u16 _lid)
+{
+ /* _qpn: 3B _lid: 2B */
+ *((__be32 *)(_mac)) = cpu_to_be32(_qpn);
+ *(u8 *)(_mac) = 0x2; /* set LG bit */
+ *(__be16 *)(_mac + sizeof(_qpn)) = cpu_to_be16(_lid);
+}
+
+static inline
+struct slave *get_slave_by_dev(struct parent *parent,
+ struct net_device *slave_dev)
+{
+ struct slave *slave, *slave_tmp;
+ int found = 0;
+
+ parent_for_each_slave(parent, slave_tmp) {
+ if (slave_tmp->dev == slave_dev) {
+ found = 1;
+ slave = slave_tmp;
+ break;
+ }
+ }
+
+ return found ? slave : NULL;
+}
+
+static inline
+struct slave *get_slave_by_mac_and_vlan(struct parent *parent, u8 *mac,
+ u16 vlan)
+{
+ struct slave *slave, *slave_tmp;
+ int found = 0;
+
+ parent_for_each_slave(parent, slave_tmp) {
+ if ((!memcmp(slave_tmp->emac, mac, ETH_ALEN)) &&
+ (slave_tmp->vlan == vlan)) {
+ found = 1;
+ slave = slave_tmp;
+ break;
+ }
+ }
+
+ return found ? slave : NULL;
+}
+
+
+static inline
+struct guest_emac_info *get_mac_ip_info_by_mac(struct parent *parent, u8 *mac,
+ u16 vlan)
+{
+ struct guest_emac_info *emac_info, *emac_info_ret;
+ int found = 0;
+
+ list_for_each_entry(emac_info, &parent->emac_ip_list, list) {
+ if ((!memcmp(emac_info->emac, mac, ETH_ALEN)) &&
+ vlan == emac_info->vlan) {
+ found = 1;
+ emac_info_ret = emac_info;
+ break;
+ }
+ }
+
+ return found ? emac_info_ret : NULL;
+}
+
+/*
+ * searches for the relevant guest_emac_info in the parent.
+ * if found it, check if it contains the required ip
+ * if no such guest_emac_info object or no ip return 0,
+ * otherwise return 1 and if exist set the guest_emac_info obj.
+ */
+static inline
+int is_mac_info_contain_ip(struct parent *parent, u8 *mac, __be32 ip,
+ struct guest_emac_info *emac_info, u16 vlan)
+{
+ struct ip_member *ipm;
+ int found = 0;
+
+ emac_info = get_mac_ip_info_by_mac(parent, mac, vlan);
+ if (!emac_info)
+ return 0;
+
+ list_for_each_entry(ipm, &emac_info->ip_list, list) {
+ if (ipm->ip == ip) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found;
+}
+
+static inline int netdev_set_parent_master(struct net_device *slave,
+ struct net_device *master)
+{
+ int err;
+
+ ASSERT_RTNL();
+
+ err = netdev_set_master(slave, master);
+ if (err)
+ return err;
+ if (master) {
+ slave->priv_flags |= IFF_EIPOIB_VIF;
+ /* deny bonding from enslaving it. */;
+ slave->flags |= IFF_SLAVE;
+ } else {
+ slave->priv_flags &= ~(IFF_EIPOIB_VIF);
+ slave->flags &= ~(IFF_SLAVE);
+ }
+
+ return 0;
+}
+
+static inline int is_driver_owner(struct net_device *dev, char *name)
+{
+ struct ethtool_drvinfo drvinfo;
+
+ if (dev->ethtool_ops && dev->ethtool_ops->get_drvinfo) {
+ memset(&drvinfo, 0, sizeof(drvinfo));
+ dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
+ if (!strstr(drvinfo.driver, name))
+ return 0;
+ } else
+ return 0;
+
+ return 1;
+}
+
+static inline int is_parent(struct net_device *dev)
+{
+ return (dev->priv_flags & IFF_EIPOIB_PIF) &&
+ is_driver_owner(dev, DRV_NAME);
+}
+
+static inline int is_parent_mac(struct net_device *dev, u8 *mac)
+{
+ return is_parent(dev) && !memcmp(mac, dev->dev_addr, dev->addr_len);
+}
+
+static inline int __is_slave(struct net_device *dev)
+{
+ return dev->master && is_parent(dev->master);
+}
+
+static inline int is_slave(struct net_device *dev)
+{
+ return (dev->priv_flags & IFF_EIPOIB_VIF) &&
+ is_driver_owner(dev, SDRV_NAME) && __is_slave(dev);
+}
+
+/*
+ * ------------------------------- Link status ------------------
+ * set parent carrier:
+ * link is up if at least one slave has link up
+ * otherwise, bring link down
+ * return 1 if parent carrier changed, zero otherwise
+ */
+static int parent_set_carrier(struct parent *parent)
+{
+ struct slave *slave;
+
+ if (parent->slave_cnt == 0)
+ goto down;
+
+ /* bring parent link up if one slave (at least) is up */
+ parent_for_each_slave(parent, slave) {
+ if (netif_carrier_ok(slave->dev)) {
+ if (!netif_carrier_ok(parent->dev)) {
+ netif_carrier_on(parent->dev);
+ return 1;
+ }
+ return 0;
+ }
+ }
+
+down:
+ if (netif_carrier_ok(parent->dev)) {
+ pr_info("bring down carrier\n");
+ netif_carrier_off(parent->dev);
+ return 1;
+ }
+ return 0;
+}
+
+static int parent_set_mtu(struct parent *parent)
+{
+ struct slave *slave, *f_slave;
+ unsigned int mtu;
+
+ if (parent->slave_cnt == 0)
+ return 0;
+
+ /* find min mtu */
+ f_slave = list_first_entry(&parent->slave_list, struct slave, list);
+ mtu = f_slave->dev->mtu;
+
+ parent_for_each_slave(parent, slave)
+ mtu = min(slave->dev->mtu, mtu);
+
+ if (parent->dev->mtu != mtu) {
+ dev_set_mtu(parent->dev, mtu);
+ return 1;
+ }
+
+ return 0;
+}
+
+/*
+ *--------------------------- slave list handling ------
+ *
+ * This function attaches the slave to the end of list.
+ * pay attention, the caller should held paren->lock
+ */
+static void parent_attach_slave(struct parent *parent,
+ struct slave *new_slave)
+{
+ list_add_tail(&new_slave->list, &parent->slave_list);
+ parent->slave_cnt++;
+}
+
+static void parent_detach_slave(struct parent *parent, struct slave *slave)
+{
+ list_del(&slave->list);
+ parent->slave_cnt--;
+}
+
+static int parent_compute_features(struct parent *parent)
+{
+ struct net_device *parent_dev = parent->dev;
+ unsigned long features = parent_dev->features;
+ struct slave *slave;
+
+ features &= ~(NETIF_F_ALL_CSUM);
+ features |= NETIF_F_GSO_MASK | NETIF_F_HW_CSUM;
+ /* start with the max set of features mask */
+ features &= ~NETIF_F_ONE_FOR_ALL;
+ features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
+ NETIF_F_GRO | NETIF_F_TSO | PARENT_VLAN_FEATURES |
+ NETIF_F_GSO_MASK | NETIF_F_HW_CSUM;
+ if (list_empty(&parent->slave_list))
+ goto done;
+
+ /* get the common features from all slaves */
+ parent_for_each_slave(parent, slave)
+ features &= slave->dev->features;
+
+done:
+ features |= (parent_dev->features & PARENT_VLAN_FEATURES);
+ parent_dev->features = features;
+ /* dealing with ipoib interface */
+ parent_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
+ if (parent_dev->netdev_ops->ndo_fix_features)
+ parent_dev->features =
+ parent_dev->netdev_ops->ndo_fix_features(parent_dev,
+ parent_dev->features);
+ pr_info("%s: %s: Features: 0x%llx\n",
+ __func__, parent_dev->name, parent_dev->features);
+ return 0;
+}
+
+static inline u16 slave_get_pkey(struct net_device *dev)
+{
+ u16 pkey = (dev->broadcast[8] << 8) + dev->broadcast[9];
+
+ return pkey;
+}
+
+static void parent_setup_by_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
+
+ parent_dev->mtu = slave_dev->mtu;
+ parent_dev->hard_header_len = slave_dev->hard_header_len;
+
+ slave_ops->ndo_neigh_setup(slave_dev, &parent->nparms);
+
+}
+
+/* enslave device <slave> to parent device <master> */
+int parent_enslave(struct net_device *parent_dev, struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *new_slave = NULL;
+ int old_features = parent_dev->features;
+ int res = 0;
+ /* slave must be claimed by ipoib */
+ if (!is_driver_owner(slave_dev, SDRV_NAME))
+ return -EOPNOTSUPP;
+
+ /* parent must be initialized by parent_open() before enslaving */
+ if (!(parent_dev->flags & IFF_UP)) {
+ pr_warn("%s parent is not up in "
+ "parent_enslave\n",
+ parent_dev->name);
+ return -EPERM;
+ }
+
+ /* already enslaved */
+ if ((slave_dev->flags & IFF_SLAVE) ||
+ (slave_dev->priv_flags & IFF_EIPOIB_VIF)) {
+ pr_err("%s was already enslaved!!!\n", slave_dev->name);
+ return -EBUSY;
+ }
+
+ /* mark it as ipoib clone vif */
+ slave_dev->priv_flags |= IFF_EIPOIB_VIF;
+
+ /* set parent netdev attributes */
+ if (parent->slave_cnt == 0)
+ parent_setup_by_slave(parent_dev, slave_dev);
+ else {
+ /* check netdev attr match */
+ if (slave_dev->hard_header_len != parent_dev->hard_header_len) {
+ pr_err("%s slave %s has different HDR len %d != %d\n",
+ parent_dev->name, slave_dev->name,
+ slave_dev->hard_header_len,
+ parent_dev->hard_header_len);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+
+ if (slave_dev->type != ARPHRD_INFINIBAND ||
+ slave_dev->addr_len != INFINIBAND_ALEN) {
+ pr_err("%s slave type/addr_len is invalid (%d/%d)\n",
+ parent_dev->name, slave_dev->type,
+ slave_dev->addr_len);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+ }
+ /*
+ * verfiy that this (slave) device belongs to the relevant PIF
+ * abort if the name of the slave is not as the regular way in ipoib
+ */
+ if (!strstr(slave_dev->name, parent->ipoib_main_interface)) {
+ pr_err("%s slave name (%s) doesn't contain parent name (%s) ",
+ parent_dev->name, slave_dev->name,
+ parent->ipoib_main_interface);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+
+ new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
+ if (!new_slave) {
+ res = -ENOMEM;
+ goto err_undo_flags;
+ }
+
+ INIT_LIST_HEAD(&new_slave->neigh_list);
+
+ /* save slave's vlan */
+ new_slave->pkey = slave_get_pkey(slave_dev);
+ new_slave->vlan = (new_slave->pkey != 0xffff) ?
+ (new_slave->pkey & 0x7fff) : VLAN_N_VID;
+
+ res = netdev_set_parent_master(slave_dev, parent_dev);
+ if (res) {
+ pr_err("%s %d calling netdev_set_master\n",
+ slave_dev->name, res);
+ goto err_free;
+ }
+
+ res = dev_open(slave_dev);
+ if (res) {
+ pr_info("open failed %s\n",
+ slave_dev->name);
+ goto err_unset_master;
+ }
+
+ new_slave->dev = slave_dev;
+
+ write_lock_bh(&parent->lock);
+
+ parent_attach_slave(parent, new_slave);
+
+ parent_compute_features(parent);
+
+ write_unlock_bh(&parent->lock);
+
+ read_lock(&parent->lock);
+
+ parent_set_carrier(parent);
+
+ read_unlock(&parent->lock);
+
+ res = create_slave_symlinks(parent_dev, slave_dev);
+ if (res)
+ goto err_close;
+
+ /* register handler */
+ res = netdev_rx_handler_register(slave_dev, eipoib_handle_frame,
+ new_slave);
+ if (res) {
+ pr_warn("%s %d calling netdev_rx_handler_register\n",
+ parent_dev->name, res);
+ goto err_close;
+ }
+
+ pr_info("%s: enslaving %s\n", parent_dev->name, slave_dev->name);
+
+ /* enslave is successful */
+ return 0;
+
+/* Undo stages on error */
+err_close:
+ dev_close(slave_dev);
+
+err_unset_master:
+ netdev_set_parent_master(slave_dev, NULL);
+
+err_free:
+ kfree(new_slave);
+
+err_undo_flags:
+ parent_dev->features = old_features;
+
+ return res;
+}
+
+static void slave_free(struct parent *parent, struct slave *slave)
+{
+ struct neigh *neigh, *neigh_tmp;
+
+ list_for_each_entry_safe(neigh, neigh_tmp, &slave->neigh_list, list) {
+ list_del(&neigh->list);
+ kfree(neigh);
+ }
+
+ netdev_rx_handler_unregister(slave->dev);
+
+ kfree(slave);
+}
+
+int parent_release_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *slave;
+ struct guest_emac_info *emac_info;
+ /* slave is not a slave or master is not master of this slave */
+ if (!(slave_dev->flags & IFF_SLAVE) ||
+ (slave_dev->master != parent_dev)) {
+ pr_err("%s cannot release %s.\n",
+ parent_dev->name, slave_dev->name);
+ return -EINVAL;
+ }
+
+ write_lock_bh(&parent->lock);
+
+ slave = get_slave_by_dev(parent, slave_dev);
+ if (!slave) {
+ /* not a slave of this parent */
+ pr_warn("%s not enslaved %s\n",
+ parent_dev->name, slave_dev->name);
+ write_unlock_bh(&parent->lock);
+ return -EINVAL;
+ }
+
+ pr_info("%s: releasing interface %s\n", parent_dev->name,
+ slave_dev->name);
+
+ /* for live migration, mark its mac_ip record as invalid */
+ emac_info = get_mac_ip_info_by_mac(parent, slave->emac, slave->vlan);
+ if (!emac_info)
+ pr_warn("%s %s didn't find emac: %pM\n",
+ parent_dev->name, slave_dev->name, slave->emac);
+ else {
+ emac_info->rec_state = MIGRATED_OUT;
+ /* start GC work */
+ pr_info("%s: sending clean task for slave mac: %pM\n",
+ __func__, slave->emac);
+ queue_delayed_work(parent->wq, &parent->migrate_out_work, 0);
+ queue_delayed_work(parent->wq, &parent->emac_ip_work,
+ EMAC_IP_GC_TIME);
+ }
+
+ /* release the slave from its parent */
+ parent_detach_slave(parent, slave);
+
+ parent_compute_features(parent);
+
+ if (parent->slave_cnt == 0)
+ parent_set_carrier(parent);
+
+ write_unlock_bh(&parent->lock);
+
+ /* must do this from outside any spinlocks */
+ destroy_slave_symlinks(parent_dev, slave_dev);
+
+ netdev_set_parent_master(slave_dev, NULL);
+
+ dev_close(slave_dev);
+
+ slave_free(parent, slave);
+
+ return 0; /* deletion OK */
+}
+
+static int parent_release_all(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *slave, *slave_tmp;
+ struct net_device *slave_dev;
+ struct neigh *neigh_cmd, *neigh_cmd_tmp;
+ struct guest_emac_info *emac_info, *emac_info_tmp;
+ struct slave;
+
+ write_lock_bh(&parent->lock);
+
+ netif_carrier_off(parent_dev);
+
+ if (parent->slave_cnt == 0)
+ goto out;
+
+ list_for_each_entry_safe(slave, slave_tmp, &parent->slave_list, list) {
+ slave_dev = slave->dev;
+
+ /* remove slave from parent's slave-list */
+ parent_detach_slave(parent, slave);
+
+ write_unlock_bh(&parent->lock);
+
+ parent_compute_features(parent);
+
+ destroy_slave_symlinks(parent_dev, slave_dev);
+
+ netdev_set_parent_master(slave_dev, NULL);
+
+ dev_close(slave_dev);
+
+ slave_free(parent, slave);
+
+ write_lock_bh(&parent->lock);
+ }
+
+ if (list_empty(&parent->vlan_list))
+ list_for_each_entry_safe(neigh_cmd, neigh_cmd_tmp,
+ &parent->neigh_add_list, list) {
+ list_del(&neigh_cmd->list);
+ kfree(neigh_cmd);
+ }
+
+ list_for_each_entry_safe(emac_info, emac_info_tmp,
+ &parent->emac_ip_list, list) {
+ free_ip_mem_in_rec(emac_info);
+ list_del(&emac_info->list);
+ kfree(emac_info);
+ }
+
+ pr_info("%s: released all slaves\n", parent_dev->name);
+
+out:
+ write_unlock_bh(&parent->lock);
+
+ return 0;
+}
+
+/* -------------------------- Device entry points --------------------------- */
+static struct net_device_stats *parent_get_stats(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct net_device_stats *stats = &parent->stats;
+ struct net_device_stats local_stats;
+ struct slave *slave;
+
+ struct rtnl_link_stats64 temp;
+
+ memset(&local_stats, 0, sizeof(struct net_device_stats));
+
+ read_lock_bh(&parent->lock);
+
+ parent_for_each_slave(parent, slave) {
+
+ const struct rtnl_link_stats64 *sstats =
+ dev_get_stats(slave->dev, &temp);
+
+ local_stats.rx_packets += sstats->rx_packets;
+ local_stats.rx_bytes += sstats->rx_bytes;
+ local_stats.rx_errors += sstats->rx_errors;
+ local_stats.rx_dropped += sstats->rx_dropped;
+
+ local_stats.tx_packets += sstats->tx_packets;
+ local_stats.tx_bytes += sstats->tx_bytes;
+ local_stats.tx_errors += sstats->tx_errors;
+ local_stats.tx_dropped += sstats->tx_dropped;
+
+ local_stats.multicast += sstats->multicast;
+ local_stats.collisions += sstats->collisions;
+
+ local_stats.rx_length_errors += sstats->rx_length_errors;
+ local_stats.rx_over_errors += sstats->rx_over_errors;
+ local_stats.rx_crc_errors += sstats->rx_crc_errors;
+ local_stats.rx_frame_errors += sstats->rx_frame_errors;
+ local_stats.rx_fifo_errors += sstats->rx_fifo_errors;
+ local_stats.rx_missed_errors += sstats->rx_missed_errors;
+
+ local_stats.tx_aborted_errors += sstats->tx_aborted_errors;
+ local_stats.tx_carrier_errors += sstats->tx_carrier_errors;
+ local_stats.tx_fifo_errors += sstats->tx_fifo_errors;
+ local_stats.tx_heartbeat_errors += sstats->tx_heartbeat_errors;
+ local_stats.tx_window_errors += sstats->tx_window_errors;
+ }
+
+ memcpy(stats, &local_stats, sizeof(struct net_device_stats));
+
+ read_unlock_bh(&parent->lock);
+
+ return stats;
+}
+
+/* ---------------------------- Main funcs ---------------------------------- */
+static struct neigh *neigh_cmd_find_by_mac(struct slave *slave, u8 *mac)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct neigh *neigh;
+ int found = 0;
+
+ list_for_each_entry(neigh, &parent->neigh_add_list, list) {
+ if (!memcmp(neigh->emac, mac, ETH_ALEN)) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found ? neigh : NULL;
+}
+
+static struct neigh *neigh_find_by_mac(struct slave *slave, u8 *mac)
+{
+ struct neigh *neigh;
+ int found = 0;
+
+ list_for_each_entry(neigh, &slave->neigh_list, list) {
+ if (!memcmp(neigh->emac, mac, ETH_ALEN)) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found ? neigh : NULL;
+}
+
+static int neigh_learn(struct slave *slave, struct sk_buff *skb, u8 *remac)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct neigh *neigh_cmd;
+ u8 *rimac;
+ int rc;
+
+ /* linearize to easy on reading the arp payload */
+ rc = skb_linearize(skb);
+ if (rc) {
+ pr_err("%s: skb_linearize failed rc %d\n", dev->name, rc);
+ goto out;
+ } else
+ rimac = skb->data + sizeof(struct arphdr);
+
+ /* check if entry is being processed or already exists */
+ if (neigh_find_by_mac(slave, remac))
+ goto out;
+
+ if (neigh_cmd_find_by_mac(slave, remac))
+ goto out;
+
+ neigh_cmd = parent_get_neigh_cmd('+', slave->dev->name, remac, rimac);
+ if (!neigh_cmd) {
+ pr_err("%s cannot build neigh cmd\n", slave->dev->name);
+ rc = -ENOMEM;
+ goto out;
+ }
+
+ list_add_tail(&neigh_cmd->list, &parent->neigh_add_list);
+
+ /* calls neigh_learn_task() */
+ queue_delayed_work(parent->wq, &parent->neigh_learn_work, 0);
+
+out:
+ return rc;
+}
+
+static void neigh_learn_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ neigh_learn_work.work);
+ struct neigh *neigh_cmd, *neigh_cmd_tmp;
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ list_for_each_entry_safe(neigh_cmd, neigh_cmd_tmp,
+ &parent->neigh_add_list, list) {
+ __parent_store_neighs(&parent->dev->dev, NULL,
+ neigh_cmd->cmd, PAGE_SIZE);
+ list_del(&neigh_cmd->list);
+ kfree(neigh_cmd);
+ }
+
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static void parent_work_cancel_all(struct parent *parent)
+{
+ write_lock_bh(&parent->lock);
+ parent->kill_timers = 1;
+ write_unlock_bh(&parent->lock);
+
+ if (delayed_work_pending(&parent->neigh_learn_work))
+ cancel_delayed_work(&parent->neigh_learn_work);
+
+ if (delayed_work_pending(&parent->emac_ip_work))
+ cancel_delayed_work(&parent->emac_ip_work);
+
+ if (delayed_work_pending(&parent->migrate_out_work))
+ cancel_delayed_work(&parent->migrate_out_work);
+}
+
+static struct parent *get_parent_by_pif_name(char *pif_name)
+{
+ struct parent *parent, *nxt;
+
+ list_for_each_entry_safe(parent, nxt, &parent_dev_list, parent_list) {
+ if (!strcmp(parent->ipoib_main_interface, pif_name))
+ return parent;
+ }
+ return NULL;
+}
+
+static void free_ip_mem_in_rec(struct guest_emac_info *emac_info)
+{
+ struct ip_member *ipm, *tmp_ipm;
+ list_for_each_entry_safe(ipm, tmp_ipm, &emac_info->ip_list, list) {
+ list_del(&ipm->list);
+ kfree(ipm);
+ }
+}
+
+static inline void free_invalid_emac_ip_det(struct parent *parent)
+{
+ struct guest_emac_info *emac_info, *emac_info_tmp;
+
+ list_for_each_entry_safe(emac_info, emac_info_tmp,
+ &parent->emac_ip_list, list) {
+ if (emac_info->rec_state == INVALID) {
+ free_ip_mem_in_rec(emac_info);
+ list_del(&emac_info->list);
+ kfree(emac_info);
+ }
+ }
+}
+
+static void emac_info_clean_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ emac_ip_work.work);
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ free_invalid_emac_ip_det(parent);
+
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static int migrate_out_gen_arp_req(struct parent *parent, u8 *emac,
+ u16 vlan)
+{
+ struct guest_emac_info *emac_info;
+ struct ip_member *ipm;
+ struct slave *slave;
+ struct sk_buff *nskb;
+ int ret = 0;
+
+ slave = get_slave_by_mac_and_vlan(parent, parent->dev->dev_addr, vlan);
+ if (unlikely(!slave)) {
+ pr_info("%s: Failed to find parent slave !!! %pM\n",
+ __func__, parent->dev->dev_addr);
+ return -ENODEV;
+ }
+
+ emac_info = get_mac_ip_info_by_mac(parent, emac, vlan);
+
+ if (!emac_info)
+ return 0;
+
+ /* go over all ip's attached to that mac */
+ list_for_each_entry(ipm, &emac_info->ip_list, list) {
+ /* create and send arp request to that ip.*/
+ pr_info("%s: Sending arp For migrate_out event, to %pI4 "
+ "from 0.0.0.0\n", parent->dev->name, &(ipm->ip));
+
+ nskb = arp_create(ARPOP_REQUEST,
+ ETH_P_ARP,
+ ipm->ip,
+ slave->dev,
+ 0,
+ slave->dev->broadcast,
+ slave->dev->broadcast,
+ slave->dev->broadcast);
+ if (nskb)
+ arp_xmit(nskb);
+ else {
+ pr_err("%s: %s failed creating skb\n",
+ __func__, slave->dev->name);
+ ret = -ENOMEM;
+ }
+ }
+ return ret;
+}
+
+static void migrate_out_work_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ migrate_out_work.work);
+ struct guest_emac_info *emac_info;
+ int is_reschedule = 0;
+ int ret;
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ list_for_each_entry(emac_info, &parent->emac_ip_list, list) {
+ if (emac_info->rec_state == MIGRATED_OUT) {
+ if (emac_info->num_of_retries <
+ MIG_OUT_MAX_ARP_RETRIES) {
+ ret = migrate_out_gen_arp_req(parent, emac_info->emac,
+ emac_info->vlan);
+ if (ret)
+ pr_err("%s: migrate_out_gen_arp failed: %d\n",
+ __func__, ret);
+
+ emac_info->num_of_retries =
+ emac_info->num_of_retries + 1;
+ is_reschedule = 1;
+ } else
+ emac_info->rec_state = INVALID;
+ }
+ }
+ /* issue arp request till the device removed that entry from list */
+ if (is_reschedule)
+ queue_delayed_work(parent->wq, &parent->migrate_out_work,
+ MIG_OUT_ARP_REQ_ISSUE_TIME);
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static inline int add_emac_ip_info(struct net_device *slave_dev, __be32 ip,
+ u8 *mac, u16 vlan)
+{
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct guest_emac_info *emac_info = NULL;
+ struct ip_member *ipm;
+ int ret;
+ int is_just_alloc_emac_info = 0;
+
+ ret = is_mac_info_contain_ip(parent, mac, ip, emac_info, vlan);
+ if (ret)
+ return 0;
+
+ /* new ip add it to the emc_ip obj */
+ if (!emac_info) {
+ emac_info = kzalloc(sizeof *emac_info, GFP_ATOMIC);
+ if (!emac_info) {
+ pr_err("%s: Failed allocating emac_info\n",
+ parent_dev->name);
+ return -ENOMEM;
+ }
+ memcpy(emac_info->emac, mac, ETH_ALEN);
+ INIT_LIST_HEAD(&emac_info->ip_list);
+ emac_info->rec_state = VALID;
+ emac_info->vlan = vlan;
+ emac_info->num_of_retries = 0;
+ list_add_tail(&emac_info->list, &parent->emac_ip_list);
+ is_just_alloc_emac_info = 1;
+ }
+
+ ipm = kzalloc(sizeof *ipm, GFP_ATOMIC);
+ if (!ipm) {
+ pr_err(" %s Failed allocating emac_info (ipm)\n",
+ parent_dev->name);
+ if (is_just_alloc_emac_info)
+ kfree(emac_info);
+ return -ENOMEM;
+ }
+
+ ipm->ip = ip;
+ list_add_tail(&ipm->list, &emac_info->ip_list);
+
+ return 0;
+}
+
+/* build ipoib arp/rarp request/reply packet */
+static struct sk_buff *get_slave_skb_arp(struct slave *slave,
+ struct sk_buff *skb,
+ u8 *rimac, int *ret)
+{
+ struct sk_buff *nskb;
+ struct arphdr *arphdr = (struct arphdr *)
+ (skb->data + sizeof(struct ethhdr));
+ struct eth_arp_data *arp_data = (struct eth_arp_data *)
+ (skb->data + sizeof(struct ethhdr) +
+ sizeof(struct arphdr));
+ u8 t_addr[ETH_ALEN] = {0};
+ int err = 0;
+ /* mark regular packet handling */
+ *ret = 0;
+
+ /*
+ * live-migration support: keeps the new mac/ip address:
+ * In that way each driver knows which mac/vlan - IP's where on the
+ * guests above, whenever migrate_out event comes it will send
+ * arp request for all these IP's.
+ */
+ if (skb->protocol == htons(ETH_P_ARP))
+ err = add_emac_ip_info(slave->dev, arp_data->arp_sip,
+ arp_data->arp_sha, slave->vlan);
+ if (err)
+ pr_warn("%s: Failed creating: emac_ip_info for ip: %pI4",
+ __func__, &arp_data->arp_sip);
+ /*
+ * live migration support:
+ * 1.checck if we are in live migration process
+ * 2.check if the arp response is for the parent
+ * 3.ignore local-administrated bit, which was set to make sure
+ * that the bridge will not drop it.(it's the same mac it has)
+ */
+ arp_data->arp_dha[0] = arp_data->arp_dha[0] & 0xFD;
+ if (ARPOP_REPLY == be16_to_cpu(arphdr->ar_op) &&
+ !memcmp(arp_data->arp_dha, slave->dev->master->dev_addr,
+ ETH_ALEN)) {
+ /*
+ * when the source is the parent interface, assumes
+ * that we are in the middle of live migration process,
+ * so, we will send gratuitous arp.
+ */
+ pr_info("%s: Arp packet for parent: %s",
+ __func__, slave->dev->master->name);
+
+ /* create gratuitous ARP on behalf of the guest */
+ nskb = arp_create(ARPOP_REQUEST,
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_sip,
+ slave->dev,
+ arp_data->arp_sip,
+ NULL,
+ slave->dev->dev_addr,
+ t_addr);
+ if (nskb)
+ arp_xmit(nskb);
+ else
+ pr_err("%s: %s cold_migration: failed creating skb\n",
+ __func__, slave->dev->name);
+ /* mark packet, to avoid error flow/message when returnning null */
+ *ret = LIVE_MIG_PACKET;
+ return NULL;
+ }
+
+ nskb = arp_create(be16_to_cpu(arphdr->ar_op),
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_dip,
+ slave->dev,
+ arp_data->arp_sip,
+ rimac,
+ slave->dev->dev_addr,
+ NULL);
+
+ return nskb;
+}
+
+/*
+ * build ipoib arp request packet according to ip header.
+ * uses for live-migration, or missing neigh for new vif.
+ */
+static struct sk_buff *get_slave_skb_arp_by_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+ struct sk_buff *nskb = NULL;
+ struct iphdr *iph = ip_hdr(skb);
+
+ pr_info("Sending arp on behalf of slave %s, from %pI4"
+ " to %pI4" , slave->dev->name, &(iph->saddr),
+ &(iph->daddr));
+
+ nskb = arp_create(ARPOP_REQUEST,
+ ETH_P_ARP,
+ iph->daddr,
+ slave->dev,
+ iph->saddr,
+ slave->dev->broadcast,
+ slave->dev->dev_addr,
+ NULL);
+ if (nskb)
+ arp_xmit(nskb);
+ else
+ pr_err("%s: %s failed creating skb\n",
+ __func__, slave->dev->name);
+
+ return NULL;
+}
+
+/* build ipoib ipv4/ipv6 packet */
+static struct sk_buff *get_slave_skb_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+
+ skb_pull(skb, ETH_HLEN);
+ skb_reset_network_header(skb);
+
+ return skb;
+}
+
+/*
+ * get_slave_skb -- called in TX flow
+ * get skb that can be sent thru slave xmit func,
+ * if skb was adjusted (cloned, pulled, etc..) successfully
+ * the old skb (if any) is freed here.
+ */
+static struct sk_buff *get_slave_skb(struct slave *slave, struct sk_buff *skb)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct sk_buff *nskb = NULL;
+ struct ethhdr *ethh = (struct ethhdr *)(skb->data);
+ struct neigh *neigh = NULL;
+ u8 rimac[INFINIBAND_ALEN];
+ int ret = 0;
+
+ /* set neigh mac */
+ if (is_multicast_ether_addr(ethh->h_dest)) {
+ memcpy(rimac, dev->broadcast, INFINIBAND_ALEN);
+ } else {
+ neigh = neigh_find_by_mac(slave, ethh->h_dest);
+ if (!neigh) {
+ ++parent->port_stats.tx_neigh_miss;
+ /*
+ * assume VIF migration, tries to get the neigh by
+ * issue arp request on behalf of the vif.
+ */
+ if (skb->protocol == htons(ETH_P_IP)) {
+ pr_info("Missed neigh for slave: %s,"
+ "issue ARP request\n",
+ slave->dev->name);
+ nskb = get_slave_skb_arp_by_ip(slave, skb);
+ goto err;
+ }
+ } else
+ memcpy(rimac, neigh->imac, INFINIBAND_ALEN);
+ }
+
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ skb->protocol == htons(ETH_P_RARP)) {
+ nskb = get_slave_skb_arp(slave, skb, rimac, &ret);
+ if (!nskb && LIVE_MIG_PACKET == ret) {
+ pr_info("%s: live migration packets\n", __func__);
+ goto err;
+ }
+ } else {
+ if (!neigh)
+ goto err;
+ /* pull ethernet header here */
+ nskb = get_slave_skb_ip(slave, skb);
+ }
+
+ /* if new skb could not be adjusted/allocated, abort */
+ if (!nskb) {
+ pr_err("%s get_slave_skb_ip/arp failed 0x%x\n",
+ dev->name, skb->protocol);
+ goto err;
+ }
+
+ if (neigh && nskb == skb) { /* ucast & non-arp/rarp */
+ /* dev_hard_header only for ucast, for arp done already.*/
+ if (dev_hard_header(nskb, dev, ntohs(skb->protocol), rimac,
+ dev->dev_addr, nskb->len) < 0) {
+ pr_warn("%s: dev_hard_header failed\n",
+ dev->name);
+ goto err;
+ }
+ }
+
+ /*
+ * new skb is ready to be sent, clean old skb if we hold a clone
+ * (old skb is not shared, already checked that.)
+ */
+ if ((nskb != skb))
+ dev_kfree_skb(skb);
+
+ nskb->dev = slave->dev;
+ return nskb;
+
+err:
+ /* got error after nskb was adjusted/allocated */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(nskb);
+
+ return NULL;
+}
+
+static struct sk_buff *get_parent_skb_arp(struct slave *slave,
+ struct sk_buff *skb,
+ u8 *remac)
+{
+ struct net_device *dev = slave->dev->master;
+ struct sk_buff *nskb;
+ struct arphdr *arphdr = (struct arphdr *)(skb->data);
+ struct ipoib_arp_data *arp_data = (struct ipoib_arp_data *)
+ (skb->data + sizeof(struct arphdr));
+ u8 *target_hw = slave->emac;
+ u8 *dst_hw = slave->emac;
+ u8 local_eth_addr[ETH_ALEN];
+
+ /* live migration: gets arp with broadcast src and dst */
+ if (!memcmp(arp_data->arp_sha, slave->dev->broadcast, INFINIBAND_ALEN) &&
+ !memcmp(arp_data->arp_dha, slave->dev->broadcast, INFINIBAND_ALEN)) {
+ pr_info("%s: ARP with bcast src and dest send from src_hw: %pM\n",
+ __func__, slave->dev->master->dev_addr);
+ /* replace the src with the parent src: */
+ memcpy(local_eth_addr, slave->dev->master->dev_addr, ETH_ALEN);
+ /*
+ * set local administrated bit,
+ * that way the bridge will not throws it
+ */
+ local_eth_addr[0] = local_eth_addr[0] | 0x2;
+ memcpy(remac, local_eth_addr, ETH_ALEN);
+ target_hw = NULL;
+ dst_hw = NULL;
+ }
+
+ nskb = arp_create(be16_to_cpu(arphdr->ar_op),
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_dip,
+ dev,
+ arp_data->arp_sip,
+ dst_hw,
+ remac,
+ target_hw);
+
+ /* prepare place for the headers. */
+ if (nskb)
+ skb_reserve(nskb, ETH_HLEN);
+
+ return nskb;
+}
+
+static struct sk_buff *get_parent_skb_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+ /* nop */
+ return skb;
+}
+
+/* get_parent_skb -- called in RX flow */
+static struct sk_buff *get_parent_skb(struct slave *slave,
+ struct sk_buff *skb, u8 *remac)
+{
+ struct net_device *dev = slave->dev->master;
+ struct sk_buff *nskb = NULL;
+ struct ethhdr *ethh;
+
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ skb->protocol == htons(ETH_P_RARP))
+ nskb = get_parent_skb_arp(slave, skb, remac);
+ else
+ nskb = get_parent_skb_ip(slave, skb);
+
+ /* if new skb could not be adjusted/allocated, abort */
+ if (!nskb)
+ goto err;
+
+ /* at this point, we can free old skb if it was cloned */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(skb);
+
+ skb = nskb;
+
+ /* build ethernet header */
+ ethh = (struct ethhdr *)skb_push(skb, ETH_HLEN);
+ ethh->h_proto = skb->protocol;
+ memcpy(ethh->h_source, remac, ETH_ALEN);
+ memcpy(ethh->h_dest, slave->emac, ETH_ALEN);
+
+ /* zero padding whenever is needed (arp for example).to ETH_ZLEN size */
+ if (unlikely((skb->len < ETH_ZLEN))) {
+ if ((skb->tail + (ETH_ZLEN - skb->len) > skb->end) ||
+ skb_is_nonlinear(skb))
+ /* nothing */;
+ else
+ memset(skb_put(skb, ETH_ZLEN - skb->len), 0,
+ ETH_ZLEN - skb->len);
+ }
+
+ /* set new skb fields */
+ skb->pkt_type = PACKET_HOST;
+ /*
+ * use master dev, to allow netpoll_receive_skb()
+ * in netif_receive_skb()
+ */
+ skb->dev = dev;
+
+ /* pull the Ethernet header and update other fields */
+ skb->protocol = eth_type_trans(skb, skb->dev);
+
+ return skb;
+
+err:
+ /* got error after nskb was adjusted/allocated */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(nskb);
+
+ return NULL;
+}
+
+static int parent_rx(struct sk_buff *skb, struct slave *slave)
+{
+ struct net_device *slave_dev = skb->dev;
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ union skb_cb_data *data = IPOIB_HANDLER_CB(skb);
+ struct napi_struct *napi = data->rx.napi;
+ struct sk_buff *nskb;
+ int rc = 0;
+ u8 remac[ETH_ALEN];
+ int vlan_tag;
+
+ build_neigh_mac(remac, data->rx.sqpn, data->rx.slid);
+
+ read_lock(&parent->lock);
+
+ if (unlikely(skb_headroom(skb) < ETH_HLEN)) {
+ pr_warn("%s: small headroom %d < %d\n",
+ skb->dev->name, skb_headroom(skb), ETH_HLEN);
+ ++parent->port_stats.rx_skb_errors;
+ goto drop;
+ }
+
+ /* learn neighs based on ARP snooping */
+ if (unlikely(ntohs(skb->protocol) == ETH_P_ARP)) {
+ read_unlock(&parent->lock);
+ write_lock(&parent->lock);
+ neigh_learn(slave, skb, remac);
+ write_unlock(&parent->lock);
+ read_lock(&parent->lock);
+ }
+
+ nskb = get_parent_skb(slave, skb, remac);
+ if (unlikely(!nskb)) {
+ ++parent->port_stats.rx_skb_errors;
+ pr_warn("%s: failed to create parent_skb\n",
+ skb->dev->name);
+ goto drop;
+ } else
+ skb = nskb;
+
+ vlan_tag = slave->vlan & 0xfff;
+ if (vlan_tag) {
+ skb = __vlan_hwaccel_put_tag(skb, vlan_tag);
+ if (!skb) {
+ pr_err("%s failed to insert VLAN tag\n",
+ skb->dev->name);
+ goto drop;
+ }
+ ++parent->port_stats.rx_vlan;
+ }
+
+ if (napi)
+ rc = napi_gro_receive(napi, skb);
+ else
+ rc = netif_receive_skb(skb);
+
+ read_unlock(&parent->lock);
+
+ return rc;
+
+drop:
+ dev_kfree_skb_any(skb);
+ read_unlock(&parent->lock);
+
+ return NET_RX_DROP;
+}
+
+static rx_handler_result_t eipoib_handle_frame(struct sk_buff **pskb)
+{
+ struct sk_buff *skb = *pskb;
+ struct slave *slave;
+
+ slave = eipoib_slave_get_rcu(skb->dev);
+
+ parent_rx(skb, slave);
+
+ return RX_HANDLER_CONSUMED;
+}
+
+static int parent_dev_queue_xmit(struct parent *parent,
+ struct sk_buff *skb,
+ struct net_device *slave_dev)
+{
+ /*
+ * We don't want that the slave will switch core.
+ * Unless there is a must use ring 0,e.g. MC, connected.
+ */
+ skb_record_rx_queue(skb, skb_get_queue_mapping(skb));
+
+ dev_queue_xmit(skb);
+
+ return 0;
+}
+
+static netdev_tx_t parent_tx(struct sk_buff *skb, struct net_device *dev)
+{
+ struct parent *parent = netdev_priv(dev);
+ struct slave *slave;
+ struct ethhdr *ethh = (struct ethhdr *)(skb->data);
+ struct sk_buff *nskb;
+ int rc;
+ u16 vlan;
+ u8 mac_no_admin_bit[ETH_ALEN];
+
+ read_lock(&parent->lock);
+
+ if (unlikely(!IS_E_IPOIB_PROTO(ethh->h_proto))) {
+ ++parent->port_stats.tx_proto_errors;
+ goto drop;
+ }
+ /* assume: only orphan skb's. */
+ if (unlikely(skb_shared(skb))) {
+ ++parent->port_stats.tx_shared;
+ goto drop;
+ }
+
+ /* obtain VLAN information if present */
+ if (vlan_tx_tag_present(skb)) {
+ vlan = vlan_tx_tag_get(skb) & 0xfff;
+ ++parent->port_stats.tx_vlan;
+ } else {
+ vlan = VLAN_N_VID;
+ }
+
+ /* for live migration: mask the admin bit if exists. */
+ memcpy(mac_no_admin_bit, ethh->h_source, ETH_ALEN);
+ if (!memcmp(parent->dev->dev_addr + 1, ethh->h_source + 1, ETH_ALEN - 1))
+ mac_no_admin_bit[0] = mac_no_admin_bit[0] & 0xFD;
+
+ /* get slave, and queue packet */
+ slave = get_slave_by_mac_and_vlan(parent, mac_no_admin_bit, vlan);
+ if (unlikely(!slave)) {
+ pr_info("vif: %pM miss for parent: %s\n", ethh->h_source,
+ parent->ipoib_main_interface);
+ ++parent->port_stats.tx_vif_miss;
+ goto drop;
+ }
+
+ nskb = get_slave_skb(slave, skb);
+ if (unlikely(!nskb)) {
+ ++parent->port_stats.tx_skb_errors;
+ goto drop;
+ } else
+ skb = nskb;
+
+ /*
+ * VST mode: removes the vlan tag in the tx (will add it in the rx)
+ * the slave is from IPoIB and it is NETIF_F_VLAN_CHALLENGED,
+ * so must remove the vlan tag.
+ */
+ if (vlan != VLAN_N_VID)
+ skb->vlan_tci = 0;
+
+ rc = parent_dev_queue_xmit(parent, skb, slave->dev);
+ if (unlikely(rc)) {
+ pr_err("slave tx method failed %d\n", rc);
+ ++parent->port_stats.tx_slave_err;
+ dev_kfree_skb(skb);
+ }
+
+ goto out;
+
+drop:
+ ++parent->port_stats.tx_parent_dropped;
+ dev_kfree_skb(skb);
+
+out:
+ read_unlock(&parent->lock);
+ return NETDEV_TX_OK;
+}
+
+static int parent_open(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent->kill_timers = 0;
+ INIT_DELAYED_WORK(&parent->neigh_learn_work, neigh_learn_task);
+ INIT_DELAYED_WORK(&parent->emac_ip_work, emac_info_clean_task);
+ INIT_DELAYED_WORK(&parent->migrate_out_work, migrate_out_work_task);
+ return 0;
+}
+
+static int parent_close(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ write_lock_bh(&parent->lock);
+ parent->kill_timers = 1;
+ write_unlock_bh(&parent->lock);
+
+ cancel_delayed_work(&parent->neigh_learn_work);
+ cancel_delayed_work(&parent->emac_ip_work);
+ cancel_delayed_work(&parent->migrate_out_work);
+
+ return 0;
+}
+
+
+static void parent_deinit(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ list_del(&parent->parent_list);
+
+ parent_work_cancel_all(parent);
+}
+
+static void parent_uninit(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent_deinit(parent_dev);
+ parent_destroy_sysfs_entry(parent);
+
+ if (parent->wq)
+ destroy_workqueue(parent->wq);
+}
+
+static struct lock_class_key parent_netdev_xmit_lock_key;
+static struct lock_class_key parent_netdev_addr_lock_key;
+
+static void parent_set_lockdep_class_one(struct net_device *dev,
+ struct netdev_queue *txq,
+ void *_unused)
+{
+ lockdep_set_class(&txq->_xmit_lock,
+ &parent_netdev_xmit_lock_key);
+}
+
+static void parent_set_lockdep_class(struct net_device *dev)
+{
+ lockdep_set_class(&dev->addr_list_lock,
+ &parent_netdev_addr_lock_key);
+ netdev_for_each_tx_queue(dev, parent_set_lockdep_class_one, NULL);
+}
+
+static int parent_init(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent->wq = create_singlethread_workqueue(parent_dev->name);
+ if (!parent->wq)
+ return -ENOMEM;
+
+ parent_set_lockdep_class(parent_dev);
+
+ list_add_tail(&parent->parent_list, &parent_dev_list);
+
+ return 0;
+}
+
+static u16 parent_select_q(struct net_device *dev, struct sk_buff *skb)
+{
+ return skb_tx_hash(dev, skb);
+}
+
+static const struct net_device_ops parent_netdev_ops = {
+ .ndo_init = parent_init,
+ .ndo_uninit = parent_uninit,
+ .ndo_open = parent_open,
+ .ndo_stop = parent_close,
+ .ndo_start_xmit = parent_tx,
+ .ndo_select_queue = parent_select_q,
+ /* parnt mtu is min(slaves_mtus) */
+ .ndo_change_mtu = NULL,
+ /*
+ * initial mac address is randomized, can be changed
+ * thru this func later
+ */
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_get_stats = parent_get_stats,
+ .ndo_vlan_rx_add_vid = eth_ipoib_vlan_rx_add_vid,
+ .ndo_vlan_rx_kill_vid = eth_ipoib_vlan_rx_kill_vid,
+};
+
+static void parent_setup(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ /* initialize rwlocks */
+ rwlock_init(&parent->lock);
+
+ /* Initialize pointers */
+ parent->dev = parent_dev;
+ INIT_LIST_HEAD(&parent->vlan_list);
+ INIT_LIST_HEAD(&parent->neigh_add_list);
+ INIT_LIST_HEAD(&parent->slave_list);
+ INIT_LIST_HEAD(&parent->emac_ip_list);
+ /* Initialize the device entry points */
+ ether_setup(parent_dev);
+ /* parent_dev->hard_header_len is adjusted later */
+ parent_dev->netdev_ops = &parent_netdev_ops;
+ parent_set_ethtool_ops(parent_dev);
+
+ /* Initialize the device options */
+ parent_dev->tx_queue_len = 0;
+ /* mark the parent intf as pif (master of other vifs.) */
+ parent_dev->priv_flags |= IFF_EIPOIB_PIF;
+ parent_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
+
+ parent_dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
+ NETIF_F_RXCSUM | NETIF_F_GRO | NETIF_F_TSO;
+
+ parent_dev->features = parent_dev->hw_features;
+ parent_dev->vlan_features = parent_dev->hw_features;
+
+ parent_dev->features |= PARENT_VLAN_FEATURES;
+
+}
+
+/*
+ * Create a new parent based on the specified name and parent parameters.
+ * Caller must NOT hold rtnl_lock; we need to release it here before we
+ * set up our sysfs entries.
+ */
+static struct parent *parent_create(struct net_device *ibd)
+{
+ struct net_device *parent_dev;
+ u32 num_queues;
+ int rc;
+ union ib_gid gid;
+ struct parent *parent = NULL;
+ int i, j;
+
+ memcpy(&gid, ibd->dev_addr + 4, sizeof(union ib_gid));
+ num_queues = num_online_cpus();
+ num_queues = roundup_pow_of_two(num_queues);
+
+ parent_dev = alloc_netdev_mq(sizeof(struct parent), "",
+ parent_setup, num_queues);
+ if (!parent_dev) {
+ pr_err("%s failed to alloc netdev!\n", ibd->name);
+ rc = -ENOMEM;
+ goto out_rtnl;
+ }
+
+ rc = dev_alloc_name(parent_dev, "eth%d");
+ if (rc < 0)
+ goto out_netdev;
+
+ /* eIPoIB interface mac format. */
+ for (i = 0, j = 0; i < 8; i++) {
+ if ((PARENT_MAC_MASK >> i) & 0x1) {
+ if (j < 6) /* only 6 bytes eth address */
+ parent_dev->dev_addr[j] =
+ gid.raw[GUID_LEN + i];
+ j++;
+ }
+ }
+
+ /* assuming that the ibd->dev.parent was alreadey been set. */
+ SET_NETDEV_DEV(parent_dev, ibd->dev.parent);
+
+ rc = register_netdevice(parent_dev);
+ if (rc < 0)
+ goto out_parent;
+
+ dev_net_set(parent_dev, &init_net);
+
+ rc = parent_create_sysfs_entry(netdev_priv(parent_dev));
+ if (rc < 0)
+ goto out_unreg;
+
+ parent = netdev_priv(parent_dev);
+ memcpy(parent->gid.raw, gid.raw, GID_LEN);
+ strncpy(parent->ipoib_main_interface, ibd->name, IFNAMSIZ);
+ parent_dev->dev_id = ibd->dev_id;
+
+ return parent;
+
+out_unreg:
+ unregister_netdevice(parent_dev);
+out_parent:
+ parent_deinit(parent_dev);
+out_netdev:
+ free_netdev(parent_dev);
+out_rtnl:
+ return ERR_PTR(rc);
+}
+
+
+static void parent_free(struct parent *parent)
+{
+ struct net_device *parent_dev = parent->dev;
+
+ parent_work_cancel_all(parent);
+
+ parent_release_all(parent_dev);
+
+ unregister_netdevice(parent_dev);
+}
+
+static void parent_free_all(void)
+{
+ struct parent *parent, *nxt;
+
+ list_for_each_entry_safe(parent, nxt, &parent_dev_list, parent_list)
+ parent_free(parent);
+}
+
+/* netdev events handlers */
+static inline int is_ipoib_pif_intf(struct net_device *dev)
+{
+ if (ARPHRD_INFINIBAND == dev->type && dev->priv_flags & IFF_EIPOIB_PIF)
+ return 1;
+ return 0;
+}
+
+static int parent_event_changename(struct parent *parent)
+{
+ parent_destroy_sysfs_entry(parent);
+
+ parent_create_sysfs_entry(parent);
+
+ return NOTIFY_DONE;
+}
+
+static int parent_master_netdev_event(unsigned long event,
+ struct net_device *parent_dev)
+{
+ struct parent *event_parent = netdev_priv(parent_dev);
+
+ switch (event) {
+ case NETDEV_CHANGENAME:
+ pr_info("%s: got NETDEV_CHANGENAME event", parent_dev->name);
+ return parent_event_changename(event_parent);
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int parent_slave_netdev_event(unsigned long event,
+ struct net_device *slave_dev)
+{
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+
+ if (!parent_dev) {
+ pr_err("slave:%s has no parent.\n", slave_dev->name);
+ return NOTIFY_DONE;
+ }
+
+ switch (event) {
+ case NETDEV_UNREGISTER:
+ parent_release_slave(parent_dev, slave_dev);
+ break;
+ case NETDEV_CHANGE:
+ case NETDEV_UP:
+ case NETDEV_DOWN:
+ parent_set_carrier(parent);
+ break;
+ case NETDEV_CHANGEMTU:
+ parent_set_mtu(parent);
+ break;
+ case NETDEV_CHANGENAME:
+ break;
+ case NETDEV_FEAT_CHANGE:
+ parent_compute_features(parent);
+ break;
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int eipoib_netdev_event(struct notifier_block *this,
+ unsigned long event, void *ptr)
+{
+ struct net_device *event_dev = (struct net_device *)ptr;
+
+ if (dev_net(event_dev) != &init_net)
+ return NOTIFY_DONE;
+
+ if (is_parent(event_dev))
+ return parent_master_netdev_event(event, event_dev);
+
+ if (is_slave(event_dev))
+ return parent_slave_netdev_event(event, event_dev);
+ /*
+ * general network device triggers event, check if it is new
+ * ib interface that we want to enslave.
+ */
+ return eipoib_device_event(this, event, ptr);
+}
+
+static struct notifier_block parent_netdev_notifier = {
+ .notifier_call = eipoib_netdev_event,
+};
+
+static int eipoib_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = ptr;
+ struct parent *parent;
+
+ if (!is_ipoib_pif_intf(dev))
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case NETDEV_REGISTER:
+ parent = parent_create(dev);
+ if (IS_ERR(parent)) {
+ pr_warn("failed to create parent for %s\n",
+ dev->name);
+ break;
+ }
+ break;
+ case NETDEV_UNREGISTER:
+ parent = get_parent_by_pif_name(dev->name);
+ if (parent)
+ parent_free(parent);
+ break;
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int __init mod_init(void)
+{
+ int rc;
+
+ pr_info(DRV_NAME": %s", version);
+
+ rc = register_pernet_subsys(&eipoib_net_ops);
+ if (rc)
+ goto out;
+
+ rc = register_netdevice_notifier(&parent_netdev_notifier);
+ if (rc) {
+ pr_err("%s failed to register_netdevice_notifier, rc: 0x%x\n",
+ __func__, rc);
+ goto unreg_subsys;
+ }
+
+ goto out;
+
+unreg_subsys:
+ unregister_pernet_subsys(&eipoib_net_ops);
+out:
+ return rc;
+
+}
+
+static void __exit mod_exit(void)
+{
+ unregister_netdevice_notifier(&parent_netdev_notifier);
+
+ unregister_pernet_subsys(&eipoib_net_ops);
+
+ rtnl_lock();
+ parent_free_all();
+ rtnl_unlock();
+}
+
+module_init(mod_init);
+module_exit(mod_exit);
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION(DRV_DESCRIPTION ", v" DRV_VERSION);
+MODULE_AUTHOR("Ali Ayoub && Erez Shitrit");
--
1.7.1
^ permalink raw reply related
* [PATCH net-next 9/9] IB/ipoib: Add support for transmission of skbs w.o dst/neighbour
From: Or Gerlitz @ 2012-07-10 12:16 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1341922569-4118-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Guest IP packets sent by eIPoIB over an IPoIB VIF interface do not point
to dst or neighbour. This patch modifies IPoIB such that trasnmission
of such packets is possible. It does so by extending an already existing
path in the driver which was used so far only for unicast ARP probes.
This patch was made such that the series works as is over net-next, in
parallel to this driver a patch to modify IPoIB such that it doesn't
assume dst/neighbour on the skb was posted.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 1ccd42f..afe282c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -739,7 +739,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned long flags;
rcu_read_lock();
- if (likely(skb_dst(skb))) {
+ if (likely(skb_dst(skb)) && !(dev->priv_flags & IFF_EIPOIB_VIF)) {
n = dst_neigh_lookup_skb(skb_dst(skb), skb);
if (!n) {
++dev->stats.tx_dropped;
@@ -807,7 +807,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* unicast GID -- should be ARP or RARP reply */
if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
- (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
+ (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP) &&
+ !(dev->priv_flags & IFF_EIPOIB_VIF)) {
ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
skb_dst(skb) ? "neigh" : "dst",
be16_to_cpup((__be16 *) skb->data),
@@ -857,7 +858,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
* destination address into skb->cb so we can figure out where
* to send the packet later.
*/
- if (!skb_dst(skb)) {
+ if (!skb_dst(skb) || dev->priv_flags & IFF_EIPOIB_VIF) {
struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
}
--
1.7.1
^ permalink raw reply related
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: Merav Sicron @ 2012-07-10 12:17 UTC (permalink / raw)
To: David Miller; +Cc: netdev, eilong, dmitry
In-Reply-To: <20120709.141010.996787793429264956.davem@davemloft.net>
On Mon, 2012-07-09 at 14:10 -0700, David Miller wrote:
> From: "Merav Sicron" <meravs@broadcom.com>
> Date: Mon, 9 Jul 2012 13:00:55 +0300
>
> > - max_non_def_sbs = bnx2x_get_num_non_def_sbs(pdev);
> > + cnic_enabled = IS_ENABLED(CONFIG_CNIC) ? 1 : 0;
>
> This, as I said, it pointless.
>
> Every distribution is going to turn on this Kconfig option so guarding
> this at all using the Kconfig option is largely valueless.
>
There are still two advantages in disabling CNIC in bnx2x: Saving
resources (MSI-X vector and memory) as well as reducing some latency.
When the HW is configured to storage-offload (rather than NIC-only
mode) it does connection search over the PCI, which is additional
0.5usec - 2.5usec, depending on the system load. When CNIC is not
enabled, the HW is configured to eliminate the search.
While it is true that distributions enable the CNIC Kconfig option, some
users that care about resources and latency compile a kernel without it.
Can you please re-consider this patch?
Thanks,
Merav
^ permalink raw reply
* Re: getting warn once around skb_try_coalesce
From: Or Gerlitz @ 2012-07-10 12:19 UTC (permalink / raw)
To: Eric Dumazet
Cc: David Miller, netdev@vger.kernel.org, Shlomo Pongratz,
Erez Shitrit
In-Reply-To: <1341919328.3265.4871.camel@edumazet-glaptop>
On 7/10/2012 2:22 PM, Eric Dumazet wrote:
> And of course we also can fix the truesize bug. (Not sure it will fix
> the warning, but worth trying)
thanks, we will give that a try and let you know
^ permalink raw reply
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: David Miller @ 2012-07-10 12:21 UTC (permalink / raw)
To: meravs; +Cc: netdev, eilong, dmitry
In-Reply-To: <1341922620.27284.16.camel@lb-tlvb-meravs.il.broadcom.com>
From: "Merav Sicron" <meravs@broadcom.com>
Date: Tue, 10 Jul 2012 15:17:00 +0300
> There are still two advantages in disabling CNIC in bnx2x: Saving
> resources (MSI-X vector and memory) as well as reducing some latency.
But, nobody does this. No end user can do this easily, this
is therefore of zero value to him.
> While it is true that distributions enable the CNIC Kconfig option, some
> users that care about resources and latency compile a kernel without it.
This, therefore, results in a terrible user experience.
> Can you please re-consider this patch?
Absolutely not.
Make it really dynamic, and properly configurable at run time, so
people don't have to go through hoops to get the "advantages" you
speak so highly of.
^ permalink raw reply
* Re: [PATCH net-next 3/9] IB/ipoib: Add support for acting as VIF
From: Eric Dumazet @ 2012-07-10 12:26 UTC (permalink / raw)
To: Or Gerlitz; +Cc: davem, roland, netdev, ali, sean.hefty, Erez Shitrit
In-Reply-To: <1341922569-4118-4-git-send-email-ogerlitz@mellanox.com>
On Tue, 2012-07-10 at 15:16 +0300, Or Gerlitz wrote:
> From: Erez Shitrit <erezsh@mellanox.co.il>
>
> When IPoIB interface acts as a VIF for an eIPoIB interface, it uses
> the skb cb storage area on the RX flow, to place information which
> can be of use to the upper layer device.
>
> One such usage example, is when an eIPoIB inteface needs to generate
> a source mac for incoming Ethernet frames.
>
> The IPoIB code checks the VIF private flag on the RX path, and accoriding
> to the value of the flag prepares the skb CB data, etc.
>
...
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> index 5c1bc99..da28799 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> @@ -300,7 +300,13 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
> likely(wc->wc_flags & IB_WC_IP_CSUM_OK))
> skb->ip_summed = CHECKSUM_UNNECESSARY;
>
> - napi_gro_receive(&priv->napi, skb);
> + /* if handler is registered on top of ipoib, set skb oob data */
> + if (dev->priv_flags & IFF_EIPOIB_VIF) {
> + set_skb_oob_cb_data(skb, wc, &priv->napi);
> + /* the registered handler will take care of the skb */
> + netif_receive_skb(skb);
> + } else
> + napi_gro_receive(&priv->napi, skb);
skb->cb[] can be destroyed in netif_receive_skb() /
__netif_receive_skb()
#ifdef CONFIG_NET_CLS_ACT
skb = handle_ing(skb, &pt_prev, &ret, orig_dev);
...
#endif
^ permalink raw reply
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: Eilon Greenstein @ 2012-07-10 12:33 UTC (permalink / raw)
To: David Miller; +Cc: meravs, netdev, dmitry
In-Reply-To: <20120710.052149.792836375666491854.davem@davemloft.net>
On Tue, 2012-07-10 at 05:21 -0700, David Miller wrote:
> From: "Merav Sicron" <meravs@broadcom.com>
> Date: Tue, 10 Jul 2012 15:17:00 +0300
>
> > There are still two advantages in disabling CNIC in bnx2x: Saving
> > resources (MSI-X vector and memory) as well as reducing some latency.
>
> But, nobody does this. No end user can do this easily, this
> is therefore of zero value to him.
Most do not, but I'm aware of two customers that play with their own
kernel that do that - they can play with the driver and tweak it to
disable this mode manually, but that is similar to supporting something
outside the tree.
> > While it is true that distributions enable the CNIC Kconfig option, some
> > users that care about resources and latency compile a kernel without it.
>
> This, therefore, results in a terrible user experience.
We are using the Kconfig since it is meant for advanced users that
customize their kernel to their needs.
> > Can you please re-consider this patch?
>
> Absolutely not.
>
> Make it really dynamic, and properly configurable at run time, so
> people don't have to go through hoops to get the "advantages" you
> speak so highly of.
This is possible for the resources, but not for the latency - we cannot
change the HW mode once traffic started to run. Why is that so bad to
support Kconfig as a working mode like we did thus far? We are using it
specifically for users that wants to optimize the kernel, so Kconfig
does not sound that bad in that context.
^ permalink raw reply
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: David Miller @ 2012-07-10 12:37 UTC (permalink / raw)
To: eilong; +Cc: meravs, netdev, dmitry
In-Reply-To: <1341923634.27035.6.camel@lb-tlvb-eilong.il.broadcom.com>
From: "Eilon Greenstein" <eilong@broadcom.com>
Date: Tue, 10 Jul 2012 15:33:54 +0300
> On Tue, 2012-07-10 at 05:21 -0700, David Miller wrote:
>> Make it really dynamic, and properly configurable at run time, so
>> people don't have to go through hoops to get the "advantages" you
>> speak so highly of.
>
> This is possible for the resources, but not for the latency - we cannot
> change the HW mode once traffic started to run. Why is that so bad to
> support Kconfig as a working mode like we did thus far? We are using it
> specifically for users that wants to optimize the kernel, so Kconfig
> does not sound that bad in that context.
Sure you can find a way to make this work, you just really aren't
trying hard enough.
The current situation is a huge and gross hack. I'm not letting you
continue spreading this disease.
Implement this properly, I really mean it.
^ permalink raw reply
* Re: getting warn once around skb_try_coalesce
From: Shlomo Pongartz @ 2012-07-10 12:35 UTC (permalink / raw)
To: Eric Dumazet
Cc: Or Gerlitz, David Miller, netdev@vger.kernel.org, Erez Shitrit
In-Reply-To: <1341919328.3265.4871.camel@edumazet-glaptop>
On 7/10/2012 2:22 PM, Eric Dumazet wrote:
> On Tue, 2012-07-10 at 13:14 +0200, Eric Dumazet wrote:
>> On Tue, 2012-07-10 at 12:18 +0200, Eric Dumazet wrote:
>>> On Tue, 2012-07-10 at 12:54 +0300, Or Gerlitz wrote:
>>>> Hi Dave, Eric,
>>>>
>>>> Another trace that I see here with net-next is this one-time warning. I
>>>> get it always
>>>> on the passive side of TCP, something that seems related to GRO, it
>>>> happens only with
>>>> IPoIB, not with mlx4_en and igb (when igb get to work on net-next...)
>>>>
>>>> The latest commit in this area is bad43ca8325f493dcaa0896c2f036276af059c7e
>>>> "net: introduce skb_try_coalesce()" from Eric.
>>>>
>>>> Or.
>>>>
>>>> -----------[ cut here ]------------
>>>> WARNING: at net/core/skbuff.c:3413 skb_try_coalesce+0x1f8/0x31d()
>>> This warning catch skb truesize offenders, most probably its a driver
>>> issue.
>>>
>> By the way, this driver allocates not enough tailroom in skbs, so IP/TCP
>> stacks need to reallocate skb head to pull IP/TCP headers. Thats not
>> efficient.
>>
>> I suggest using following patch :
> And of course we also can fix the truesize bug.
> (Not sure it will fix the warning, but worth trying)
>
> Since this driver allocates a full page, it must use the PAGE_SIZE, not
> the used part in the fragment
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> index 5c1bc99..e611a924 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
> @@ -123,7 +123,7 @@ static void ipoib_ud_skb_put_frags(struct ipoib_dev_priv *priv,
>
> skb_frag_size_set(frag, size);
> skb->data_len += size;
> - skb->truesize += size;
> + skb->truesize += PAGE_SIZE;
> } else
> skb_put(skb, length);
>
> @@ -159,7 +159,7 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)
> u64 *mapping;
>
> if (ipoib_ud_need_sg(priv->max_ib_mtu))
> - buf_size = IPOIB_UD_HEAD_SIZE;
> + buf_size = IPOIB_UD_HEAD_SIZE + 128; /* reserve some tailroom for IP/TCP headers */
> else
> buf_size = IPOIB_UD_BUF_SIZE(priv->max_ib_mtu);
>
>
>
>
> .
>
Hi,
I've applied the patch and there are no more warnings. Thanks.
Can you please elaborate on this issue which was there from day one and
AFAIK never manifested itself.
Best regards,
S.P.
^ permalink raw reply
* Re: [PATCH 4 0/4] Add ability to set defaultless network device MAC addresses to deterministic computed locally administered values
From: Florian Fainelli @ 2012-07-10 12:37 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Andy Green, linux-omap, s-jan, arnd, patches, tony, netdev,
linux-kernel, rostedt
In-Reply-To: <20120705024259.26317.16000.stgit@build.warmcat.com>
Hi,
Le jeudi 05 juillet 2012 04:44:33, Andy Green a écrit :
> The following series adds some code to generate legal, locally administered
> MAC addresses from OMAP4 CPU Die ID fuse data, and then adds a helper at
> net/ethernet taking care of accepting device path / MAC mapping
> registrations and running a notifier to enforce the requested MAC when the
> matching network device turns up.
This looks like something you can solve by user-space entirely. Expose the
OMAP4 CPU Die ID using a sysfs attribute, and let user-space manage the MAC
address pool.
If you tell me you want to use this for nfsroot booting, what prevents you
from using an initramfs, assign a valid MAC to your interface and switch over
your nfsroot once the interface setup is done?
>
> On PandaBoard / ES, two devices have no board-level MAC either assigned by
> the manufacturer or stored on the board, the last patch in the series adds
> these device paths and gets them set when the network device is registered.
>
> Lastly for convenient testing, there's a little patch on
> omap2plus_defconfig that will get Ethernet and WLAN up on Pandaboard.
>
> The patches are against today's linux-omap.
>
> Thanks to Tony Lindgren and Arnd Bergmann for comments leading to the
> helper in net/ethernet.
>
> ---
>
> Andy Green (4):
> OMAP: add cpu id register to MAC address helper
> NET ethernet introduce mac_platform helper
> OMAP4 PANDA register ethernet and wlan for automatic mac allocation
> config test config extending omap2plus with wl12xx etc
>
>
> arch/arm/configs/omap2plus_defconfig | 35 +++----
> arch/arm/mach-omap2/Kconfig | 1
> arch/arm/mach-omap2/board-omap4panda.c | 30 ++++++
> arch/arm/mach-omap2/id.c | 39 ++++++++
> arch/arm/mach-omap2/include/mach/id.h | 1
> include/net/mac-platform.h | 39 ++++++++
> net/Kconfig | 5 +
> net/ethernet/Makefile | 3 +
> net/ethernet/mac-platform.c | 151
> ++++++++++++++++++++++++++++++++ 9 files changed, 282 insertions(+), 22
> deletions(-)
> create mode 100644 include/net/mac-platform.h
> create mode 100644 net/ethernet/mac-platform.c
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Florian
^ permalink raw reply
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: Eilon Greenstein @ 2012-07-10 12:41 UTC (permalink / raw)
To: David Miller; +Cc: meravs, netdev, dmitry
In-Reply-To: <20120710.053724.1002197670026212780.davem@davemloft.net>
On Tue, 2012-07-10 at 05:37 -0700, David Miller wrote:
> From: "Eilon Greenstein" <eilong@broadcom.com>
> Date: Tue, 10 Jul 2012 15:33:54 +0300
>
> > On Tue, 2012-07-10 at 05:21 -0700, David Miller wrote:
> >> Make it really dynamic, and properly configurable at run time, so
> >> people don't have to go through hoops to get the "advantages" you
> >> speak so highly of.
> >
> > This is possible for the resources, but not for the latency - we cannot
> > change the HW mode once traffic started to run. Why is that so bad to
> > support Kconfig as a working mode like we did thus far? We are using it
> > specifically for users that wants to optimize the kernel, so Kconfig
> > does not sound that bad in that context.
>
> Sure you can find a way to make this work, you just really aren't
> trying hard enough.
>
> The current situation is a huge and gross hack. I'm not letting you
> continue spreading this disease.
>
> Implement this properly, I really mean it.
>
OK. Since it blocks the ability to add SR-IOV support, is it acceptable
to submit it as constant enabled for PF and disabled for VF (SR-IOV)?
^ permalink raw reply
* Re: [PATCH 4 0/4] Add ability to set defaultless network device MAC addresses to deterministic computed locally administered values
From: "Andy Green (林安廸)" @ 2012-07-10 12:58 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-arm-kernel, linux-omap, s-jan, arnd, patches, tony, netdev,
linux-kernel, rostedt
In-Reply-To: <201207101437.54877.florian@openwrt.org>
On 10/07/12 20:37, the mail apparently from Florian Fainelli included:
Hi -
> Le jeudi 05 juillet 2012 04:44:33, Andy Green a écrit :
>> The following series adds some code to generate legal, locally administered
>> MAC addresses from OMAP4 CPU Die ID fuse data, and then adds a helper at
>> net/ethernet taking care of accepting device path / MAC mapping
>> registrations and running a notifier to enforce the requested MAC when the
>> matching network device turns up.
>
> This looks like something you can solve by user-space entirely. Expose the
That might seem so from a openwrt perspective, where you custom cook the
whole userland thing per-device, but it ain't so from a generic rootfs
perspective.
Why should Ubuntu, Fedora etc stink up their OSes with Panda-specific
workarounds? And Panda is not the only device with this issue.
-Andy
^ permalink raw reply
* Re: getting warn once around skb_try_coalesce
From: Eric Dumazet @ 2012-07-10 13:01 UTC (permalink / raw)
To: Shlomo Pongartz
Cc: Or Gerlitz, David Miller, netdev@vger.kernel.org, Erez Shitrit
In-Reply-To: <4FFC2191.1040001@mellanox.com>
On Tue, 2012-07-10 at 15:35 +0300, Shlomo Pongartz wrote:
> I've applied the patch and there are no more warnings. Thanks.
> Can you please elaborate on this issue which was there from day one and
> AFAIK never manifested itself.
two problems :
1) truesize underestimation
Well, I posted at least 50 patches related to various skb->truesize
mismatches in the past year.
skb->truesize is/should_be the true size of skb, that is the memory
allocated for sk_buff, skb->head and all fragments
Check commit e1ac50f64691de9a (bnx2x: fix skb truesize underestimation)
for a similar fix done on bnx2x
Its very important to do so to avoid OOM.
If you account few bytes per fragment but allocate PAGE_SIZE bytes, its
pretty easy to allocate far more memory than allowed by various
socket/tcp/udp/... limits, and exhaust kernel memory.
commit 924a4c7d2e962b (myri10ge: fix truesize underestimation)
commit 7b8b59617ead5acc (igbvf: fix truesize underestimation)
I probably missed your driver because it was not on drivers/net tree but
drivers/infiniband
2) Not enough tailroom
Invisible but performance suffers, because IP/TCP will need
to call pskb_may_pull() and the expensive __pskb_pull_tail().
So each incoming IP packet needs at least one pskb_expand_head().
I'll send an official patch, but I believe I should refine the tailroom
allocation like that :
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 5c1bc99..f10221f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -123,7 +123,7 @@ static void ipoib_ud_skb_put_frags(struct ipoib_dev_priv *priv,
skb_frag_size_set(frag, size);
skb->data_len += size;
- skb->truesize += size;
+ skb->truesize += PAGE_SIZE;
} else
skb_put(skb, length);
@@ -156,14 +156,18 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct sk_buff *skb;
int buf_size;
+ int tailroom;
u64 *mapping;
- if (ipoib_ud_need_sg(priv->max_ib_mtu))
+ if (ipoib_ud_need_sg(priv->max_ib_mtu)) {
buf_size = IPOIB_UD_HEAD_SIZE;
- else
+ tailroom = 128; /* reserve some tailroom for IP/TCP headers */
+ } else {
buf_size = IPOIB_UD_BUF_SIZE(priv->max_ib_mtu);
+ tailroom = 0;
+ }
- skb = dev_alloc_skb(buf_size + 4);
+ skb = dev_alloc_skb(buf_size + tailroom + 4);
if (unlikely(!skb))
return NULL;
^ permalink raw reply related
* Re: [GIT PULL net] IPVS
From: Pablo Neira Ayuso @ 2012-07-10 13:05 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hans Schillstrom, Jesper Dangaard Brouer
In-Reply-To: <20120710092002.GE12776@verge.net.au>
Hi Simon,
On Tue, Jul 10, 2012 at 06:20:03PM +0900, Simon Horman wrote:
> On Mon, Apr 30, 2012 at 11:27:22AM +0200, Pablo Neira Ayuso wrote:
> > On Fri, Apr 27, 2012 at 09:53:54AM +0900, Simon Horman wrote:
> > > Hi Pablo,
> > >
> > > please consider the following 5 changes for 3.4, they are all bug fixes.
> > > I would also like these changes considered for stable.
> >
> > Please, ping me again once these have hit Linus tree to ask for
> > -stable submission.
>
> Sorry for letting this slip through the cracks.
>
> Please consider the following commits which are in Linus's tree for stable.
> Or I can submit them directly if that is easier.
>
> There are 7 patches listed below. The first 5 were the patches in this
> pull request. The last two were patches in a git pull request
> a few days earlier.
That's fine, I can make it, but you have to include what stable
releases this will be applied, eg. patch 1 to releases 3.4 and 3.2.
I think -stable maintainers will ask for that.
> commit 8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0
> Author: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Date: Thu Apr 26 07:47:44 2012 +0200
>
> ipvs: kernel oops - do_ip_vs_get_ctl
>
> Change order of init so netns init is ready
> when register ioctl and netlink.
>
> Ver2
> Whitespace fixes and __init added.
>
> Reported-by: "Ryan O'Hara" <rohara@redhat.com>
> Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Acked-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> commit 582b8e3eadaec77788c1aa188081a8d5059c42a6
> Author: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Date: Thu Apr 26 09:45:35 2012 +0200
>
> ipvs: take care of return value from protocol init_netns
>
> ip_vs_create_timeout_table() can return NULL
> All functions protocol init_netns is affected of this patch.
>
> Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Acked-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> commit 4b984cd50bc1b6d492175cd77bfabb78e76ffa67
> Author: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Date: Thu Apr 26 09:45:34 2012 +0200
>
> ipvs: null check of net->ipvs in lblc(r) shedulers
>
> Avoid crash when registering shedulers after
> the IPVS core initialization for netns fails. Do this by
> checking for present core (net->ipvs).
>
> Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Acked-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> commit 39f618b4fd95ae243d940ec64c961009c74e3333
> Author: Julian Anastasov <ja@ssi.bg>
> Date: Wed Apr 25 00:29:58 2012 +0300
>
> ipvs: reset ipvs pointer in netns
>
> Make sure net->ipvs is reset on netns cleanup or failed
> initialization. It is needed for IPVS applications to know that
> IPVS core is not loaded in netns.
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> commit 8d08d71ce59438a6ef06be5db07966e0c144b74e
> Author: Julian Anastasov <ja@ssi.bg>
> Date: Wed Apr 25 00:29:59 2012 +0300
>
> ipvs: add check in ftp for initialized core
>
> Avoid crash when registering ip_vs_ftp after
> the IPVS core initialization for netns fails. Do this by
> checking for present core (net->ipvs).
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> commit 8f9b9a2fad47af27e14b037395e03cd8278d96d7
> Author: Julian Anastasov <ja@ssi.bg>
> Date: Fri Apr 13 18:08:43 2012 +0300
>
> ipvs: fix crash in ip_vs_control_net_cleanup on unload
>
> commit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39)
> ("Add __ip_vs_control_{init,cleanup}_sysctl()")
> introduced regression due to wrong __net_init for
> __ip_vs_control_cleanup_sysctl. This leads to crash when
> the ip_vs module is unloaded.
>
> Fix it by changing __net_init to __net_exit for
> the function that is already renamed to ip_vs_control_net_cleanup_sysctl.
>
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
>
> commit 7118c07a844d367560ee91adb2071bde2fabcdbf
> Author: Sasha Levin <levinsasha928@gmail.com>
> Date: Sat Apr 14 12:37:46 2012 -0400
>
> ipvs: Verify that IP_VS protocol has been registered
>
> The registration of a protocol might fail, there were no checks
> and all registrations were assumed to be correct. This lead to
> NULL ptr dereferences when apps tried registering.
>
> For example:
>
> [ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
> [ 1293.227038] IP: [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0
> [ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0
> [ 1293.227038] Oops: 0000 [#1] PREEMPT SMP
> [ 1293.227038] CPU 1
> [ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57
> [ 1293.227038] RIP: 0010:[<ffffffff822aacb0>] [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0
> [ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286
> [ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000
> [ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282
> [ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000
> [ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668
> [ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000
> [ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000
> [ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
> [ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0
> [ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> [ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> [ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000)
> [ 1293.227038] Stack:
> [ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580
> [ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b
> [ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580
> [ 1293.227038] Call Trace:
> [ 1293.227038] [<ffffffff822a716b>] ip_vs_app_inc_new+0xdb/0x180
> [ 1293.227038] [<ffffffff822a7258>] register_ip_vs_app_inc+0x48/0x70
> [ 1293.227038] [<ffffffff822b2fea>] __ip_vs_ftp_init+0xba/0x140
> [ 1293.227038] [<ffffffff821c9060>] ops_init+0x80/0x90
> [ 1293.227038] [<ffffffff821c90cb>] setup_net+0x5b/0xe0
> [ 1293.227038] [<ffffffff821c9416>] copy_net_ns+0x76/0x100
> [ 1293.227038] [<ffffffff810dc92b>] create_new_namespaces+0xfb/0x190
> [ 1293.227038] [<ffffffff810dca21>] unshare_nsproxy_namespaces+0x61/0x80
> [ 1293.227038] [<ffffffff810afd1f>] sys_unshare+0xff/0x290
> [ 1293.227038] [<ffffffff8187622e>] ? trace_hardirqs_on_thunk+0x3a/0x3f
> [ 1293.227038] [<ffffffff82665539>] system_call_fastpath+0x16/0x1b
> [ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 <66> 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d
> [ 1293.227038] RIP [<ffffffff822aacb0>] tcp_register_app+0x60/0xb0
> [ 1293.227038] RSP <ffff880038c1dd18>
> [ 1293.227038] CR2: 0000000000000018
> [ 1293.379284] ---[ end trace 364ab40c7011a009 ]---
> [ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt
>
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
> Acked-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
>
^ permalink raw reply
* Re: [net-next patch v2] bnx2x: Add run-time CNIC support
From: David Miller @ 2012-07-10 13:06 UTC (permalink / raw)
To: eilong; +Cc: meravs, netdev, dmitry
In-Reply-To: <1341924089.27035.7.camel@lb-tlvb-eilong.il.broadcom.com>
From: "Eilon Greenstein" <eilong@broadcom.com>
Date: Tue, 10 Jul 2012 15:41:29 +0300
> OK. Since it blocks the ability to add SR-IOV support, is it acceptable
> to submit it as constant enabled for PF and disabled for VF (SR-IOV)?
You're not describing to me why you guys are turning on features like
the CNIC mode before you necessarily have any users of that feature.
Why can't you turn CNIC off at the start, and if a CNIC user actually
arrives and is activated, reset the entire chip and put it into CNIC
mode?
And if CNIC being on is such a latency killer, why in the world
haven't you done things more reasonably like that from the very
beginning?
Why are you making it so that lower latency with your chips is only
available to a group of users who are effectively statistically
insignificant?
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox