openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xen-netfront: always set num queues if possible 

If netfront connects with two (or more) queues and then reconnects with
only one queue it fails to delete or rewrite the multi-queue-num-queues
key and netback will try to use the wrong number of queues.

Always write the num-queues field if the backend has multi-queue support.

Signed-off-by: Chas Williams <3chas3@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
chas williams 2015-09-16 16:28:25 -04:00 committed by David S. Miller
parent 47bbbb30b4
commit 812494d9a0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/xen-netfront.c
View File

@ -1819,19 +1819,22 @@ static int talk_to_netback(struct xenbus_device *dev,
goto destroy_ring; goto destroy_ring;
} }
if (xenbus_exists(XBT_NIL,
info->xbdev->otherend, "multi-queue-max-queues")) {
/* Write the number of queues */
err = xenbus_printf(xbt, dev->nodename,
"multi-queue-num-queues", "%u", num_queues);
if (err) {
message = "writing multi-queue-num-queues";
goto abort_transaction_no_dev_fatal;
}
}
if (num_queues == 1) { if (num_queues == 1) {
err = write_queue_xenstore_keys(&info->queues[0], &xbt, 0); /* flat */ err = write_queue_xenstore_keys(&info->queues[0], &xbt, 0); /* flat */
if (err) if (err)
goto abort_transaction_no_dev_fatal; goto abort_transaction_no_dev_fatal;
} else { } else {
/* Write the number of queues */
err = xenbus_printf(xbt, dev->nodename, "multi-queue-num-queues",
"%u", num_queues);
if (err) {
message = "writing multi-queue-num-queues";
goto abort_transaction_no_dev_fatal;
}
/* Write the keys for each queue */ /* Write the keys for each queue */
for (i = 0; i < num_queues; ++i) { for (i = 0; i < num_queues; ++i) {
queue = &info->queues[i]; queue = &info->queues[i];