From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 13/22] virtio_net: use virtqueue_add_sgs[] for command buffers.
Date: Tue, 19 Mar 2013 08:00:46 +0800 [thread overview]
Message-ID: <5147AAAE.7030309@cn.fujitsu.com> (raw)
In-Reply-To: <20130318111024.GA7595@redhat.com>
On 03/18/2013 07:10 PM, Michael S. Tsirkin wrote:
> On Mon, Mar 18, 2013 at 08:04:44PM +1030, Rusty Russell wrote:
>> It's a bit cleaner to hand multiple sgs, rather than one big one.
>>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>> ---
>> drivers/net/virtio_net.c | 50 +++++++++++++++++++++++-----------------------
>> 1 file changed, 25 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 57ac4b0..f19865a 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -39,7 +39,6 @@ module_param(gso, bool, 0444);
>> #define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)
>> #define GOOD_COPY_LEN 128
>>
>> -#define VIRTNET_SEND_COMMAND_SG_MAX 2
>> #define VIRTNET_DRIVER_VERSION "1.0.0"
>>
>> struct virtnet_stats {
>> @@ -767,32 +766,34 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
>> * never fail unless improperly formated.
>> */
>> static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
>> - struct scatterlist *data, int out, int in)
>> + struct scatterlist *out,
>> + struct scatterlist *in)
>> {
>> - struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
>> + struct scatterlist *sgs[4], hdr, stat;
>> struct virtio_net_ctrl_hdr ctrl;
>> virtio_net_ctrl_ack status = ~0;
>> - unsigned int tmp;
>> - int i;
>> + unsigned out_num = 0, in_num = 0, tmp;
>>
>> /* Caller should know better */
>> - BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ||
>> - (out + in > VIRTNET_SEND_COMMAND_SG_MAX));
>> -
>> - out++; /* Add header */
>> - in++; /* Add return status */
>> + BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ));
>>
>> ctrl.class = class;
>> ctrl.cmd = cmd;
>> + /* Add header */
>> + sg_init_one(&hdr, &ctrl, sizeof(ctrl));
>> + sgs[out_num++] = &hdr;
>>
>> - sg_init_table(sg, out + in);
>> + if (out)
>> + sgs[out_num++] = out;
>> + if (in)
>> + sgs[out_num + in_num++] = in;
>>
>> - sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
>> - for_each_sg(data, s, out + in - 2, i)
>> - sg_set_buf(&sg[i + 1], sg_virt(s), s->length);
>> - sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
>> + /* Add return status. */
>> + sg_init_one(&stat, &status, sizeof(status));
>> + sgs[out_num + in_num++] = &hdr;
>
> Should be &stat?
Good catch!!!
This is why I met the error message here:
[ 9.914123] net eth0: Failed to disable promisc mode.
[ 9.914958] net eth0: Failed to disable allmulti mode.
[ 9.915778] net eth0: Failed to set MAC fitler table.
[ 9.916564] net eth0: Failed to disable promisc mode.
[ 9.917322] net eth0: Failed to disable allmulti mode.
[ 9.918095] net eth0: Failed to set MAC fitler table.
[ 9.918876] net eth0: Failed to disable promisc mode.
[ 9.919636] net eth0: Failed to disable allmulti mode.
[ 9.920403] net eth0: Failed to set MAC fitler table.
[ 9.921183] net eth0: Failed to disable promisc mode.
[ 9.921921] net eth0: Failed to disable allmulti mode.
[ 9.922680] net eth0: Failed to set MAC fitler table.
[ 11.943884] net eth0: Failed to disable promisc mode.
[ 11.945460] net eth0: Failed to disable allmulti mode.
[ 11.946987] net eth0: Failed to set MAC fitler table.
network[503]: Bringing up interface eth0: [ OK ]
[ 12.242277] net eth0: Failed to disable promisc mode.
[ 12.243081] net eth0: Failed to disable allmulti mode.
[ 12.243824] net eth0: Failed to set MAC fitler table.
With &stat now, it has gone.
Tested-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Regards,
Wanlong Gao
>
> Also
> BUG_ON(out_num + in_num > ARRAY_SIZE(sgs))
> probably a good idea?
>
>>
>> - BUG_ON(virtqueue_add_buf(vi->cvq, sg, out, in, vi, GFP_ATOMIC) < 0);
>> + BUG_ON(virtqueue_add_sgs(vi->cvq, sgs, out_num, in_num, vi, GFP_ATOMIC)
>> + < 0);
>>
>> virtqueue_kick(vi->cvq);
>>
>> @@ -821,7 +822,7 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
>> sg_init_one(&sg, addr->sa_data, dev->addr_len);
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
>> VIRTIO_NET_CTRL_MAC_ADDR_SET,
>> - &sg, 1, 0)) {
>> + &sg, NULL)) {
>> dev_warn(&vdev->dev,
>> "Failed to set mac address by vq command.\n");
>> return -EINVAL;
>> @@ -889,8 +890,7 @@ static void virtnet_ack_link_announce(struct virtnet_info *vi)
>> {
>> rtnl_lock();
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_ANNOUNCE,
>> - VIRTIO_NET_CTRL_ANNOUNCE_ACK, NULL,
>> - 0, 0))
>> + VIRTIO_NET_CTRL_ANNOUNCE_ACK, NULL, NULL))
>> dev_warn(&vi->dev->dev, "Failed to ack link announce.\n");
>> rtnl_unlock();
>> }
>> @@ -908,7 +908,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
>> sg_init_one(&sg, &s, sizeof(s));
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MQ,
>> - VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &sg, 1, 0)){
>> + VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &sg, NULL)) {
>> dev_warn(&dev->dev, "Fail to set num of queue pairs to %d\n",
>> queue_pairs);
>> return -EINVAL;
>> @@ -955,7 +955,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
>> VIRTIO_NET_CTRL_RX_PROMISC,
>> - sg, 1, 0))
>> + sg, NULL))
>> dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
>> promisc ? "en" : "dis");
>>
>> @@ -963,7 +963,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
>> VIRTIO_NET_CTRL_RX_ALLMULTI,
>> - sg, 1, 0))
>> + sg, NULL))
>> dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",
>> allmulti ? "en" : "dis");
>>
>> @@ -1000,7 +1000,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
>> VIRTIO_NET_CTRL_MAC_TABLE_SET,
>> - sg, 2, 0))
>> + sg, NULL))
>> dev_warn(&dev->dev, "Failed to set MAC fitler table.\n");
>>
>> kfree(buf);
>> @@ -1014,7 +1014,7 @@ static int virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
>> sg_init_one(&sg, &vid, sizeof(vid));
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
>> - VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
>> + VIRTIO_NET_CTRL_VLAN_ADD, &sg, NULL))
>> dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid);
>> return 0;
>> }
>> @@ -1027,7 +1027,7 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
>> sg_init_one(&sg, &vid, sizeof(vid));
>>
>> if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
>> - VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
>> + VIRTIO_NET_CTRL_VLAN_DEL, &sg, NULL))
>> dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);
>> return 0;
>> }
>> --
>> 1.7.10.4
> _______________________________________________
> Virtualization mailing list
> Virtualization@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/virtualization
>
next prev parent reply other threads:[~2013-03-19 0:00 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 9:34 [PATCH 00/22] virtqueue_add_sgs, virtqueue_add_outbuf, virtqueue_add_inbuf Rusty Russell
2013-03-18 9:34 ` [PATCH 01/22] scatterlist: introduce sg_unmark_end Rusty Russell
2013-03-18 9:34 ` [PATCH 02/22] virtio_ring: virtqueue_add_sgs, to add multiple sgs Rusty Russell
2013-03-18 9:34 ` [PATCH 03/22] virtio_ring: don't count elements twice for add_buf path Rusty Russell
2013-03-18 9:34 ` [PATCH 04/22] virtio_ring: inline internal vring functions more aggressively Rusty Russell
2013-03-18 9:34 ` [PATCH 05/22] virtio_ring: virtqueue_add_outbuf / virtqueue_add_inbuf Rusty Russell
2013-03-18 9:34 ` [PATCH 06/22] tools/virtio: make vringh_test use inbuf/outbuf Rusty Russell
2013-03-18 9:34 ` [PATCH 07/22] virtio-blk: reorganize virtblk_add_req Rusty Russell
2013-03-18 9:34 ` [PATCH 08/22] virtio-blk: use virtqueue_add_sgs on bio path Rusty Russell
2013-03-18 9:34 ` [PATCH 09/22] virtio-blk: use virtqueue_add_sgs on req path Rusty Russell
2013-03-18 9:34 ` [PATCH 10/22] virtio_blk: remove nents member Rusty Russell
2013-03-18 9:34 ` [PATCH 11/22] virtio-scsi: use virtqueue_add_sgs for command buffers Rusty Russell
2013-03-19 6:51 ` Asias He
2013-03-19 9:48 ` [PATCH V2 " Wanlong Gao
2013-03-19 10:35 ` Paolo Bonzini
2013-03-20 0:35 ` Rusty Russell
2013-03-20 4:43 ` Asias He
2013-03-18 9:34 ` [PATCH 12/22] virtio_scsi: use virtqueue_add_inbuf() for virtscsi_kick_event Rusty Russell
2013-03-20 1:19 ` Asias He
2013-03-18 9:34 ` [PATCH 13/22] virtio_net: use virtqueue_add_sgs[] for command buffers Rusty Russell
2013-03-18 11:10 ` Michael S. Tsirkin
2013-03-18 23:47 ` Rusty Russell
2013-03-19 0:00 ` Wanlong Gao [this message]
2013-03-18 9:34 ` [PATCH 14/22] virtio_net: use simplified virtqueue accessors Rusty Russell
2013-03-20 1:20 ` Asias He
2013-03-18 9:34 ` [PATCH 15/22] virtio_rng: " Rusty Russell
2013-03-20 1:18 ` Asias He
2013-03-18 9:34 ` [PATCH 16/22] virtio_console: " Rusty Russell
2013-03-18 10:10 ` Amit Shah
2013-03-18 9:34 ` [PATCH 17/22] caif_virtio: " Rusty Russell
2013-03-18 9:34 ` [PATCH 18/22] virtio_rpmsg_bus: " Rusty Russell
2013-03-20 10:08 ` Ohad Ben-Cohen
2013-03-20 23:28 ` Rusty Russell
2013-03-18 9:34 ` [PATCH 19/22] virtio_balloon: " Rusty Russell
2013-03-18 9:34 ` [PATCH 20/22] 9p/trans_virtio.c: use virtio_add_sgs[] Rusty Russell
2013-03-20 4:53 ` Rusty Russell
2013-03-18 9:34 ` [PATCH 21/22] tools/virtio: remove virtqueue_add_buf() from tests Rusty Russell
2013-03-18 9:34 ` [PATCH 22/22] virtio: remove virtqueue_add_buf() Rusty Russell
2013-03-20 5:20 ` [PATCH 00/22] virtqueue_add_sgs, virtqueue_add_outbuf, virtqueue_add_inbuf Rusty Russell
2013-03-20 6:01 ` Asias He
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=5147AAAE.7030309@cn.fujitsu.com \
--to=gaowanlong@cn.fujitsu.com \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.