From: Jason Wang <jasowang@redhat.com>
To: davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, mst@redhat.com
Cc: Jason Wang <jasowang@redhat.com>
Subject: [net-next rfc V2 5/8] macvtap: eliminate linear search
Date: Fri, 31 May 2013 17:53:22 +0800 [thread overview]
Message-ID: <1369994005-5943-6-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1369994005-5943-1-git-send-email-jasowang@redhat.com>
Linear search were used in both get_slot() and macvtap_get_queue(), this is
because:
- macvtap didn't reshuffle the array of taps when create or destroy a queue, so
when adding a new queue, macvtap must do linear search to find a location for
the new queue. This will also complicate the TUNSETQUEUE implementation for
multiqueue API.
- the queue itself didn't track the queue index, so the we must do a linear
search in the array to find the location of a existed queue.
The solution is straightforward: reshuffle the array and introduce a queue_index
to macvtap_queue.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 63 +++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 43 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 56b38e9..e76484c 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -44,6 +44,7 @@ struct macvtap_queue {
struct macvlan_dev __rcu *vlan;
struct file *file;
unsigned int flags;
+ u16 queue_index;
};
static struct proto macvtap_proto = {
@@ -84,30 +85,10 @@ static const struct proto_ops macvtap_socket_ops;
*/
static DEFINE_SPINLOCK(macvtap_lock);
-/*
- * get_slot: return a [unused/occupied] slot in vlan->taps[]:
- * - if 'q' is NULL, return the first empty slot;
- * - otherwise, return the slot this pointer occupies.
- */
-static int get_slot(struct macvlan_dev *vlan, struct macvtap_queue *q)
-{
- int i;
-
- for (i = 0; i < MAX_MACVTAP_QUEUES; i++) {
- if (rcu_dereference_protected(vlan->taps[i],
- lockdep_is_held(&macvtap_lock)) == q)
- return i;
- }
-
- /* Should never happen */
- BUG_ON(1);
-}
-
static int macvtap_set_queue(struct net_device *dev, struct file *file,
struct macvtap_queue *q)
{
struct macvlan_dev *vlan = netdev_priv(dev);
- int index;
int err = -EBUSY;
spin_lock(&macvtap_lock);
@@ -115,12 +96,12 @@ static int macvtap_set_queue(struct net_device *dev, struct file *file,
goto out;
err = 0;
- index = get_slot(vlan, NULL);
rcu_assign_pointer(q->vlan, vlan);
- rcu_assign_pointer(vlan->taps[index], q);
+ rcu_assign_pointer(vlan->taps[vlan->numvtaps], q);
sock_hold(&q->sk);
q->file = file;
+ q->queue_index = vlan->numvtaps;
file->private_data = q;
vlan->numvtaps++;
@@ -140,16 +121,23 @@ out:
*/
static void macvtap_put_queue(struct macvtap_queue *q)
{
+ struct macvtap_queue *nq;
struct macvlan_dev *vlan;
spin_lock(&macvtap_lock);
vlan = rcu_dereference_protected(q->vlan,
lockdep_is_held(&macvtap_lock));
if (vlan) {
- int index = get_slot(vlan, q);
+ int index = q->queue_index;
+ BUG_ON(index >= vlan->numvtaps);
+
+ nq = rcu_dereference_protected(vlan->taps[vlan->numvtaps - 1],
+ lockdep_is_held(&macvtap_lock));
+ rcu_assign_pointer(vlan->taps[index], nq);
+ nq->queue_index = index;
- RCU_INIT_POINTER(vlan->taps[index], NULL);
RCU_INIT_POINTER(q->vlan, NULL);
+
sock_put(&q->sk);
--vlan->numvtaps;
}
@@ -182,8 +170,7 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev,
rxq = skb_get_rxhash(skb);
if (rxq) {
tap = rcu_dereference(vlan->taps[rxq % numvtaps]);
- if (tap)
- goto out;
+ goto out;
}
if (likely(skb_rx_queue_recorded(skb))) {
@@ -193,17 +180,10 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev,
rxq -= numvtaps;
tap = rcu_dereference(vlan->taps[rxq]);
- if (tap)
- goto out;
- }
-
- /* Everything failed - find first available queue */
- for (rxq = 0; rxq < MAX_MACVTAP_QUEUES; rxq++) {
- tap = rcu_dereference(vlan->taps[rxq]);
- if (tap)
- break;
+ goto out;
}
+ tap = rcu_dereference(vlan->taps[0]);
out:
return tap;
}
@@ -221,17 +201,14 @@ static void macvtap_del_queues(struct net_device *dev)
/* macvtap_put_queue can free some slots, so go through all slots */
spin_lock(&macvtap_lock);
- for (i = 0; i < MAX_MACVTAP_QUEUES && vlan->numvtaps; i++) {
+ for (i = 0; i < vlan->numvtaps; i++) {
q = rcu_dereference_protected(vlan->taps[i],
lockdep_is_held(&macvtap_lock));
- if (q) {
- qlist[j++] = q;
- RCU_INIT_POINTER(vlan->taps[i], NULL);
- RCU_INIT_POINTER(q->vlan, NULL);
- vlan->numvtaps--;
- }
+ BUG_ON(q == NULL);
+ qlist[j++] = q;
+ RCU_INIT_POINTER(vlan->taps[i], NULL);
+ RCU_INIT_POINTER(q->vlan, NULL);
}
- BUG_ON(vlan->numvtaps != 0);
/* guarantee that any future macvtap_set_queue will fail */
vlan->numvtaps = MAX_MACVTAP_QUEUES;
spin_unlock(&macvtap_lock);
--
1.7.1
next prev parent reply other threads:[~2013-05-31 10:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 9:53 [net-next rfc V2 0/8] Multiqueue API for macvtap Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 1/8] macvtap: do not add self to waitqueue if doing a nonblock read Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 2/8] macvlan: switch to use IS_ENABLED() Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 3/8] macvtap: introduce macvtap_get_vlan() Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 4/8] macvlan: change the max number of queues to 16 Jason Wang
2013-05-31 9:53 ` Jason Wang [this message]
2013-05-31 9:53 ` [net-next rfc V2 6/8] macvtap: allow TUNSETIFF to create multiqueue device Jason Wang
2013-05-31 14:48 ` Sergei Shtylyov
2013-06-03 3:05 ` Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 7/8] macvtap: add TUNSETQUEUE ioctl Jason Wang
2013-06-02 11:22 ` Michael S. Tsirkin
2013-06-03 5:20 ` Jason Wang
2013-06-03 11:09 ` Michael S. Tsirkin
2013-06-04 5:54 ` Jason Wang
2013-06-04 7:05 ` Michael S. Tsirkin
2013-06-05 3:01 ` Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 8/8] macvtap: enable multiqueue flag Jason Wang
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=1369994005-5943-6-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).