UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

macvtap: Increase limit of macvtap queues 

Macvtap should be compatible with tuntap for
maximum number of queues.

commit 'baf71c5c1f80d82e92924050a60b5baaf97e3094 (tuntap:
Increase the number of queues in tun.)' removes
the limitations and increases number of queues in tuntap.
Now, Its safe to increase number of queues in Macvtap as well.

This patch also modifies 'macvtap_del_queues' function
to avoid extra memory allocation in stack.

Changes from v1->v2 :
Michael S. Tsirkin, Jason Wang  :
                  Better way to use linked list to
avoid use of extra memory in stack.
Sergei Shtylyov : Specify dependent commit's summary.

Signed-off-by: Pankaj Gupta <pagupta@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pankaj Gupta 2015-06-19 19:47:53 +05:30 committed by David S. Miller
parent 0fb1170ee6
commit dfe816c5e3
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/macvtap.c
View File

@ -263,27 +263,21 @@ out:
static void macvtap_del_queues(struct net_device *dev) static void macvtap_del_queues(struct net_device *dev)
{ {
struct macvlan_dev *vlan = netdev_priv(dev); struct macvlan_dev *vlan = netdev_priv(dev);
struct macvtap_queue *q, *tmp, *qlist[MAX_MACVTAP_QUEUES]; struct macvtap_queue *q, *tmp;
int i, j = 0;
ASSERT_RTNL(); ASSERT_RTNL();
list_for_each_entry_safe(q, tmp, &vlan->queue_list, next) { list_for_each_entry_safe(q, tmp, &vlan->queue_list, next) {
list_del_init(&q->next); list_del_init(&q->next);
qlist[j++] = q;
RCU_INIT_POINTER(q->vlan, NULL); RCU_INIT_POINTER(q->vlan, NULL);
if (q->enabled) if (q->enabled)
vlan->numvtaps--; vlan->numvtaps--;
vlan->numqueues--; vlan->numqueues--;
sock_put(&q->sk);
} }
for (i = 0; i < vlan->numvtaps; i++)
RCU_INIT_POINTER(vlan->taps[i], NULL);
BUG_ON(vlan->numvtaps); BUG_ON(vlan->numvtaps);
BUG_ON(vlan->numqueues); BUG_ON(vlan->numqueues);
/* guarantee that any future macvtap_set_queue will fail */ /* guarantee that any future macvtap_set_queue will fail */
vlan->numvtaps = MAX_MACVTAP_QUEUES; vlan->numvtaps = MAX_MACVTAP_QUEUES;
for (--j; j >= 0; j--)
sock_put(&qlist[j]->sk);
} }
static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb) static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb)

2
include/linux/if_macvlan.h
View File

@ -29,7 +29,7 @@ struct macvtap_queue;
* Maximum times a macvtap device can be opened. This can be used to * Maximum times a macvtap device can be opened. This can be used to
* configure the number of receive queue, e.g. for multiqueue virtio. * configure the number of receive queue, e.g. for multiqueue virtio.
*/ */
#define MAX_MACVTAP_QUEUES 16 #define MAX_MACVTAP_QUEUES 256
#define MACVLAN_MC_FILTER_BITS 8 #define MACVLAN_MC_FILTER_BITS 8
#define MACVLAN_MC_FILTER_SZ (1 << MACVLAN_MC_FILTER_BITS) #define MACVLAN_MC_FILTER_SZ (1 << MACVLAN_MC_FILTER_BITS)