From: John Fastabend <john.fastabend@gmail.com>
To: jasowang@redhat.com, mst@redhat.com
Cc: john.r.fastabend@intel.com, netdev@vger.kernel.org,
john.fastabend@gmail.com, alexei.starovoitov@gmail.com,
daniel@iogearbox.net
Subject: [net PATCH] net: virtio: cap mtu when XDP programs are running
Date: Mon, 02 Jan 2017 14:30:31 -0800 [thread overview]
Message-ID: <20170102223031.11541.28717.stgit@john-Precision-Tower-5810> (raw)
XDP programs can not consume multiple pages so we cap the MTU to
avoid this case. Virtio-net however only checks the MTU at XDP
program load and does not block MTU changes after the program
has loaded.
This patch sets/clears the max_mtu value at XDP load/unload time.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
drivers/net/virtio_net.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5deeda6..783e842 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1699,6 +1699,9 @@ static void virtnet_init_settings(struct net_device *dev)
.set_settings = virtnet_set_settings,
};
+#define MIN_MTU ETH_MIN_MTU
+#define MAX_MTU ETH_MAX_MTU
+
static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog)
{
unsigned long int max_sz = PAGE_SIZE - sizeof(struct padded_vnet_hdr);
@@ -1748,6 +1751,9 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog)
virtnet_set_queues(vi, curr_qp);
return PTR_ERR(prog);
}
+ dev->max_mtu = max_sz;
+ } else {
+ dev->max_mtu = ETH_MAX_MTU;
}
vi->xdp_queue_pairs = xdp_qp;
@@ -2133,9 +2139,6 @@ static bool virtnet_validate_features(struct virtio_device *vdev)
return true;
}
-#define MIN_MTU ETH_MIN_MTU
-#define MAX_MTU ETH_MAX_MTU
-
static int virtnet_probe(struct virtio_device *vdev)
{
int i, err;
next reply other threads:[~2017-01-02 22:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 22:30 John Fastabend [this message]
2017-01-03 6:14 ` [net PATCH] net: virtio: cap mtu when XDP programs are running Jason Wang
2017-01-03 16:48 ` John Fastabend
2017-01-04 3:16 ` Jason Wang
2017-01-04 18:57 ` John Fastabend
2017-01-05 3:09 ` Jason Wang
2017-01-09 23:05 ` Michael S. Tsirkin
2017-01-09 23:13 ` John Fastabend
2017-01-09 23:24 ` Michael S. Tsirkin
2017-01-09 23:49 ` John Fastabend
2017-01-09 23:58 ` Michael S. Tsirkin
2017-01-10 2:29 ` Jason Wang
2017-01-10 2:51 ` Michael S. Tsirkin
2017-01-10 3:30 ` John Fastabend
2017-01-10 3:55 ` Michael S. Tsirkin
2017-01-10 4:25 ` John Fastabend
2017-01-10 5:00 ` Michael S. Tsirkin
2017-01-11 3:37 ` Jason Wang
2017-01-10 3:34 ` Jason Wang
2017-01-10 14:51 ` Michael S. Tsirkin
2017-01-03 16:48 ` John Fastabend
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=20170102223031.11541.28717.stgit@john-Precision-Tower-5810 \
--to=john.fastabend@gmail.com \
--cc=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=jasowang@redhat.com \
--cc=john.r.fastabend@intel.com \
--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