From: John Fastabend <john.fastabend@gmail.com>
To: tgraf@suug.ch, shm@cumulusnetworks.com,
alexei.starovoitov@gmail.com, daniel@iogearbox.net,
davem@davemloft.net
Cc: john.r.fastabend@intel.com, netdev@vger.kernel.org,
bblanco@plumgrid.com, john.fastabend@gmail.com,
brouer@redhat.com
Subject: [PATCH 1/5] net: virtio dynamically disable/enable LRO
Date: Fri, 18 Nov 2016 10:59:31 -0800 [thread overview]
Message-ID: <20161118185931.16137.90840.stgit@john-Precision-Tower-5810> (raw)
In-Reply-To: <20161118185517.16137.92123.stgit@john-Precision-Tower-5810>
This adds support for dynamically setting the LRO feature flag. The
message to control guest features in the backend uses the
CTRL_GUEST_OFFLOADS msg type.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
drivers/net/virtio_net.c | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 2cafd12..0758cae 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1419,6 +1419,41 @@ static void virtnet_init_settings(struct net_device *dev)
.set_settings = virtnet_set_settings,
};
+static int virtnet_set_features(struct net_device *netdev,
+ netdev_features_t features)
+{
+ struct virtnet_info *vi = netdev_priv(netdev);
+ struct virtio_device *vdev = vi->vdev;
+ struct scatterlist sg;
+ u64 offloads = 0;
+
+ if (features & NETIF_F_LRO)
+ offloads |= (1 << VIRTIO_NET_F_GUEST_TSO4) |
+ (1 << VIRTIO_NET_F_GUEST_TSO6);
+
+ if (features & NETIF_F_RXCSUM)
+ offloads |= (1 << VIRTIO_NET_F_GUEST_CSUM);
+
+ if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)) {
+ sg_init_one(&sg, &offloads, sizeof(uint64_t));
+ if (!virtnet_send_command(vi,
+ VIRTIO_NET_CTRL_GUEST_OFFLOADS,
+ VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET,
+ &sg)) {
+ dev_warn(&netdev->dev,
+ "Failed to set guest offloads by virtnet command.\n");
+ return -EINVAL;
+ }
+ } else if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) &&
+ !virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) {
+ dev_warn(&netdev->dev,
+ "No support for setting offloads pre version_1.\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static const struct net_device_ops virtnet_netdev = {
.ndo_open = virtnet_open,
.ndo_stop = virtnet_close,
@@ -1435,6 +1470,7 @@ static void virtnet_init_settings(struct net_device *dev)
#ifdef CONFIG_NET_RX_BUSY_POLL
.ndo_busy_poll = virtnet_busy_poll,
#endif
+ .ndo_set_features = virtnet_set_features,
};
static void virtnet_config_changed_work(struct work_struct *work)
@@ -1810,6 +1846,12 @@ static int virtnet_probe(struct virtio_device *vdev)
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))
dev->features |= NETIF_F_RXCSUM;
+ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) &&
+ virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6)) {
+ dev->features |= NETIF_F_LRO;
+ dev->hw_features |= NETIF_F_LRO;
+ }
+
dev->vlan_features = dev->features;
/* MTU range: 68 - 65535 */
@@ -2049,6 +2091,7 @@ static int virtnet_restore(struct virtio_device *vdev)
VIRTIO_NET_F_CTRL_MAC_ADDR,
VIRTIO_F_ANY_LAYOUT,
VIRTIO_NET_F_MTU,
+ VIRTIO_NET_F_CTRL_GUEST_OFFLOADS,
};
static struct virtio_driver virtio_net_driver = {
next prev parent reply other threads:[~2016-11-18 18:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-18 18:59 [PATCH 0/5] XDP for virtio_net John Fastabend
2016-11-18 18:59 ` John Fastabend [this message]
2016-11-18 18:59 ` [PATCH 2/5] net: xdp: add invalid buffer warning John Fastabend
2016-11-18 19:00 ` [PATCH 3/5] virtio_net: Add XDP support John Fastabend
2016-11-18 23:21 ` Eric Dumazet
2016-11-19 2:16 ` John Fastabend
2016-11-18 23:23 ` Eric Dumazet
2016-11-19 1:02 ` John Fastabend
2016-11-18 19:00 ` [PATCH 4/5] virtio_net: add dedicated XDP transmit queues John Fastabend
2016-11-18 21:09 ` Jakub Kicinski
2016-11-19 2:10 ` Jakub Kicinski
2016-11-19 2:43 ` John Fastabend
2016-11-19 2:57 ` Jakub Kicinski
2016-11-19 3:20 ` Eric Dumazet
2016-11-19 3:23 ` Jakub Kicinski
2016-11-19 21:33 ` John Fastabend
2016-11-18 19:01 ` [PATCH 5/5] virtio_net: add XDP_TX support John Fastabend
2016-11-18 19:06 ` [PATCH 0/5] XDP for virtio_net John Fastabend
-- strict thread matches above, loose matches on Subject: below --
2017-10-19 2:18 [PATCH 1/5] net: virtio dynamically disable/enable LRO Caleb Raitto
2017-10-19 2:47 ` Michael S. Tsirkin
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=20161118185931.16137.90840.stgit@john-Precision-Tower-5810 \
--to=john.fastabend@gmail.com \
--cc=alexei.starovoitov@gmail.com \
--cc=bblanco@plumgrid.com \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.r.fastabend@intel.com \
--cc=netdev@vger.kernel.org \
--cc=shm@cumulusnetworks.com \
--cc=tgraf@suug.ch \
/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).