From: xiaohui.xin@intel.com
To: netdev@vger.kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, mst@redhat.com, mingo@elte.hu,
davem@davemloft.net, herbert@gondor.hengli.com.au,
jdike@linux.intel.com
Cc: Xin Xiaohui <xiaohui.xin@intel.com>
Subject: [PATCH v16 10/17] If device is in zero-copy mode first, bonding will fail.
Date: Wed, 1 Dec 2010 16:08:21 +0800 [thread overview]
Message-ID: <8975fe27df1b0bc2da53c579a05648507153fd85.1291187695.git.xiaohui.xin@intel.com> (raw)
In-Reply-To: <fc6e95d63a2c62aaf77f8ded22fc43ccefcdbbff.1291187695.git.xiaohui.xin@intel.com>
In-Reply-To: <fc6e95d63a2c62aaf77f8ded22fc43ccefcdbbff.1291187695.git.xiaohui.xin@intel.com>
From: Xin Xiaohui <xiaohui.xin@intel.com>
If device is in this zero-copy mode first, we cannot handle this,
so fail it. This patch is for this.
If bonding is created first, and one of the device will be in zero-copy
mode, this will be handled by mp device. It will first check if all the
slaves have the zero-copy capability. If no, fail too. Otherwise make
all the slaves in zero-copy mode.
Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com>
---
drivers/net/bonding/bond_main.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3b16f62..dfb6a2c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1428,6 +1428,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
bond_dev->name);
}
+ /* if the device is in zero-copy mode before bonding, fail it. */
+ if (dev_is_mpassthru(slave_dev))
+ return -EBUSY;
+
/* already enslaved */
if (slave_dev->flags & IFF_SLAVE) {
pr_debug("Error, Device was already enslaved\n");
--
1.7.3
next prev parent reply other threads:[~2010-12-01 7:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 8:08 [PATCH v16 01/17] Add a new structure for skb buffer from external xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 02/17]Add a new struct for device to manipulate external buffer xiaohui.xin
2010-12-10 20:36 ` David Miller
2010-12-01 8:08 ` [PATCH v16 03/17] Add a ndo_mp_port_prep pointer to net_device_ops xiaohui.xin
2010-12-10 20:36 ` David Miller
2010-12-01 8:08 ` [PATCH v16 04/17]Add a function make external buffer owner to query capability xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 05/17] Add a function to indicate if device use external buffer xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 06/17]move member destructor_arg before member dataref xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 07/17]Modify netdev_alloc_page() to get external buffer xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 08/17]Modify netdev_free_page() to release " xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 09/17] Don't do skb recycle, if device use " xiaohui.xin
2010-12-01 8:08 ` xiaohui.xin [this message]
2010-12-01 8:08 ` [PATCH v16 11/17]Add a hook to intercept external buffers from NIC driver xiaohui.xin
2010-12-01 9:38 ` Changli Gao
2010-12-01 8:08 ` [PATCH v16 12/17] Add header file for mp device xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 13/17] Add mp(mediate passthru) device xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 14/17]Add a kconfig entry and make entry for mp device xiaohui.xin
2010-12-01 17:53 ` Randy Dunlap
2010-12-02 1:32 ` Xin, Xiaohui
2010-12-01 8:08 ` [PATCH v16 15/17]Provides multiple submits and asynchronous notifications xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 16/17]An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 17/17]An example how to alloc user buffer based on " xiaohui.xin
2010-12-01 8:08 ` [PATCH v16 00/17] Provide a zero-copy method on KVM virtio-net xiaohui.xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8975fe27df1b0bc2da53c579a05648507153fd85.1291187695.git.xiaohui.xin@intel.com \
--to=xiaohui.xin@intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.au \
--cc=jdike@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®