From: Prashant Bhole <prashantbhole.linux@gmail.com> To: "David S . Miller" <davem@davemloft.net>, "Michael S . Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Jakub Kicinski <jakub.kicinski@netronome.com>, Jesper Dangaard Brouer <hawk@kernel.org>, John Fastabend <john.fastabend@gmail.com>, Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>, netdev@vger.kernel.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, Prashant Bhole <prashantbhole.linux@gmail.com> Subject: [RFC net-next 07/18] tun: set offloaded xdp program Date: Tue, 26 Nov 2019 19:07:33 +0900 [thread overview] Message-ID: <20191126100744.5083-8-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> From: Jason Wang <jasowang@redhat.com> This patch introduces an ioctl way to set an offloaded XDP program to tun driver. This ioctl will be used by qemu to offload XDP program from virtio_net in the guest. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/tun.c | 19 ++++++++++++++----- include/uapi/linux/if_tun.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d078b4659897..ecb49101b0b5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -241,6 +241,7 @@ struct tun_struct { struct bpf_prog __rcu *xdp_prog; struct tun_prog __rcu *steering_prog; struct tun_prog __rcu *filter_prog; + struct tun_prog __rcu *offloaded_xdp_prog; struct ethtool_link_ksettings link_ksettings; }; @@ -2256,7 +2257,7 @@ static void tun_prog_free(struct rcu_head *rcu) { struct tun_prog *prog = container_of(rcu, struct tun_prog, rcu); - bpf_prog_destroy(prog->prog); + bpf_prog_put(prog->prog); kfree(prog); } @@ -2301,6 +2302,7 @@ static void tun_free_netdev(struct net_device *dev) security_tun_dev_free_security(tun->security); __tun_set_ebpf(tun, &tun->steering_prog, NULL); __tun_set_ebpf(tun, &tun->filter_prog, NULL); + __tun_set_ebpf(tun, &tun->offloaded_xdp_prog, NULL); } static void tun_setup(struct net_device *dev) @@ -3036,7 +3038,7 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) } static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p, - void __user *data) + void __user *data, int type) { struct bpf_prog *prog; int fd; @@ -3047,7 +3049,7 @@ static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p, if (fd == -1) { prog = NULL; } else { - prog = bpf_prog_get_type(fd, BPF_PROG_TYPE_SOCKET_FILTER); + prog = bpf_prog_get_type(fd, type); if (IS_ERR(prog)) return PTR_ERR(prog); } @@ -3345,11 +3347,18 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, break; case TUNSETSTEERINGEBPF: - ret = tun_set_ebpf(tun, &tun->steering_prog, argp); + ret = tun_set_ebpf(tun, &tun->steering_prog, argp, + BPF_PROG_TYPE_SOCKET_FILTER); break; case TUNSETFILTEREBPF: - ret = tun_set_ebpf(tun, &tun->filter_prog, argp); + ret = tun_set_ebpf(tun, &tun->filter_prog, argp, + BPF_PROG_TYPE_SOCKET_FILTER); + break; + + case TUNSETOFFLOADEDXDP: + ret = tun_set_ebpf(tun, &tun->offloaded_xdp_prog, argp, + BPF_PROG_TYPE_XDP); break; case TUNSETCARRIER: diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h index 454ae31b93c7..21dbd8db2401 100644 --- a/include/uapi/linux/if_tun.h +++ b/include/uapi/linux/if_tun.h @@ -61,6 +61,7 @@ #define TUNSETFILTEREBPF _IOR('T', 225, int) #define TUNSETCARRIER _IOW('T', 226, int) #define TUNGETDEVNETNS _IO('T', 227) +#define TUNSETOFFLOADEDXDP _IOW('T', 228, int) /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Prashant Bhole <prashantbhole.linux@gmail.com> To: "David S . Miller" <davem@davemloft.net>, "Michael S . Tsirkin" <mst@redhat.com> Cc: Song Liu <songliubraving@fb.com>, Jakub Kicinski <jakub.kicinski@netronome.com>, Jesper Dangaard Brouer <hawk@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, netdev@vger.kernel.org, Jason Wang <jasowang@redhat.com>, John Fastabend <john.fastabend@gmail.com>, Alexei Starovoitov <ast@kernel.org>, qemu-devel@nongnu.org, Prashant Bhole <prashantbhole.linux@gmail.com>, kvm@vger.kernel.org, Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>, Martin KaFai Lau <kafai@fb.com> Subject: [RFC net-next 07/18] tun: set offloaded xdp program Date: Tue, 26 Nov 2019 19:07:33 +0900 [thread overview] Message-ID: <20191126100744.5083-8-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> From: Jason Wang <jasowang@redhat.com> This patch introduces an ioctl way to set an offloaded XDP program to tun driver. This ioctl will be used by qemu to offload XDP program from virtio_net in the guest. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/tun.c | 19 ++++++++++++++----- include/uapi/linux/if_tun.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d078b4659897..ecb49101b0b5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -241,6 +241,7 @@ struct tun_struct { struct bpf_prog __rcu *xdp_prog; struct tun_prog __rcu *steering_prog; struct tun_prog __rcu *filter_prog; + struct tun_prog __rcu *offloaded_xdp_prog; struct ethtool_link_ksettings link_ksettings; }; @@ -2256,7 +2257,7 @@ static void tun_prog_free(struct rcu_head *rcu) { struct tun_prog *prog = container_of(rcu, struct tun_prog, rcu); - bpf_prog_destroy(prog->prog); + bpf_prog_put(prog->prog); kfree(prog); } @@ -2301,6 +2302,7 @@ static void tun_free_netdev(struct net_device *dev) security_tun_dev_free_security(tun->security); __tun_set_ebpf(tun, &tun->steering_prog, NULL); __tun_set_ebpf(tun, &tun->filter_prog, NULL); + __tun_set_ebpf(tun, &tun->offloaded_xdp_prog, NULL); } static void tun_setup(struct net_device *dev) @@ -3036,7 +3038,7 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) } static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p, - void __user *data) + void __user *data, int type) { struct bpf_prog *prog; int fd; @@ -3047,7 +3049,7 @@ static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p, if (fd == -1) { prog = NULL; } else { - prog = bpf_prog_get_type(fd, BPF_PROG_TYPE_SOCKET_FILTER); + prog = bpf_prog_get_type(fd, type); if (IS_ERR(prog)) return PTR_ERR(prog); } @@ -3345,11 +3347,18 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, break; case TUNSETSTEERINGEBPF: - ret = tun_set_ebpf(tun, &tun->steering_prog, argp); + ret = tun_set_ebpf(tun, &tun->steering_prog, argp, + BPF_PROG_TYPE_SOCKET_FILTER); break; case TUNSETFILTEREBPF: - ret = tun_set_ebpf(tun, &tun->filter_prog, argp); + ret = tun_set_ebpf(tun, &tun->filter_prog, argp, + BPF_PROG_TYPE_SOCKET_FILTER); + break; + + case TUNSETOFFLOADEDXDP: + ret = tun_set_ebpf(tun, &tun->offloaded_xdp_prog, argp, + BPF_PROG_TYPE_XDP); break; case TUNSETCARRIER: diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h index 454ae31b93c7..21dbd8db2401 100644 --- a/include/uapi/linux/if_tun.h +++ b/include/uapi/linux/if_tun.h @@ -61,6 +61,7 @@ #define TUNSETFILTEREBPF _IOR('T', 225, int) #define TUNSETCARRIER _IOW('T', 226, int) #define TUNGETDEVNETNS _IO('T', 227) +#define TUNSETOFFLOADEDXDP _IOW('T', 228, int) /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -- 2.20.1
next prev parent reply other threads:[~2019-11-26 10:09 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-26 10:07 [RFC net-next 00/18] virtio_net XDP offload Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 01/18] bpf: introduce bpf_prog_offload_verifier_setup() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 02/18] net: core: rename netif_receive_generic_xdp() to do_generic_xdp_core() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 03/18] net: core: export do_xdp_generic_core() Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 04/18] tuntap: check tun_msg_ctl type at necessary places Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 05/18] vhost_net: user tap recvmsg api to access ptr ring Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 06/18] tuntap: remove usage of ptr ring in vhost_net Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole [this message] 2019-11-26 10:07 ` [RFC net-next 07/18] tun: set offloaded xdp program Prashant Bhole 2019-12-01 16:35 ` David Ahern 2019-12-01 16:35 ` David Ahern 2019-12-02 2:44 ` Jason Wang 2019-12-02 2:44 ` Jason Wang 2019-12-01 16:45 ` David Ahern 2019-12-01 16:45 ` David Ahern 2019-12-02 2:47 ` Jason Wang 2019-12-02 2:47 ` Jason Wang 2019-12-09 0:24 ` Prashant Bhole 2019-12-09 0:24 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 08/18] tun: run offloaded XDP program in Tx path Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-12-01 16:39 ` David Ahern 2019-12-01 16:39 ` David Ahern 2019-12-01 20:56 ` David Miller 2019-12-01 20:56 ` David Miller 2019-12-01 21:40 ` Michael S. Tsirkin 2019-12-01 21:40 ` Michael S. Tsirkin 2019-12-01 21:54 ` David Miller 2019-12-01 21:54 ` David Miller 2019-12-02 2:56 ` Jason Wang 2019-12-02 2:56 ` Jason Wang 2019-12-02 2:45 ` Jason Wang 2019-12-02 2:45 ` Jason Wang 2019-11-26 10:07 ` [RFC net-next 09/18] tun: add a way to inject Tx path packet into Rx path Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 10/18] tun: handle XDP_TX action of offloaded program Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 11/18] tun: run xdp prog when tun is read from file interface Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 12/18] virtio-net: store xdp_prog in device Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 13/18] virtio_net: use XDP attachment helpers Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 14/18] virtio_net: add XDP prog offload infrastructure Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 15/18] virtio_net: implement XDP prog offload functionality Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-27 20:42 ` Michael S. Tsirkin 2019-11-27 20:42 ` Michael S. Tsirkin 2019-11-28 2:53 ` Prashant Bhole 2019-11-28 2:53 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 16/18] bpf: export function __bpf_map_get Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 10:07 ` [RFC net-next 17/18] virtio_net: implment XDP map offload functionality Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 20:19 ` kbuild test robot 2019-11-26 10:07 ` [RFC net-next 18/18] virtio_net: restrict bpf helper calls from offloaded program Prashant Bhole 2019-11-26 10:07 ` Prashant Bhole 2019-11-26 20:35 ` [RFC net-next 00/18] virtio_net XDP offload Jakub Kicinski 2019-11-26 20:35 ` Jakub Kicinski 2019-11-27 2:59 ` Jason Wang 2019-11-27 2:59 ` Jason Wang 2019-11-27 19:49 ` Jakub Kicinski 2019-11-27 19:49 ` Jakub Kicinski 2019-11-28 3:41 ` Jason Wang 2019-11-28 3:41 ` Jason Wang 2019-11-27 20:32 ` Michael S. Tsirkin 2019-11-27 20:32 ` Michael S. Tsirkin 2019-11-27 23:40 ` Jakub Kicinski 2019-11-27 23:40 ` Jakub Kicinski 2019-12-02 15:29 ` Michael S. Tsirkin 2019-12-02 15:29 ` Michael S. Tsirkin 2019-11-28 3:32 ` Alexei Starovoitov 2019-11-28 3:32 ` Alexei Starovoitov 2019-11-28 4:18 ` Jason Wang 2019-11-28 4:18 ` Jason Wang 2019-12-01 16:54 ` David Ahern 2019-12-01 16:54 ` David Ahern 2019-12-02 2:48 ` Jason Wang 2019-12-02 2:48 ` Jason Wang
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=20191126100744.5083-8-prashantbhole.linux@gmail.com \ --to=prashantbhole.linux@gmail.com \ --cc=andriin@fb.com \ --cc=ast@kernel.org \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=hawk@kernel.org \ --cc=jakub.kicinski@netronome.com \ --cc=jasowang@redhat.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ --cc=songliubraving@fb.com \ --cc=yhs@fb.com \ /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: linkBe 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.