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 14/18] virtio_net: add XDP prog offload infrastructure Date: Tue, 26 Nov 2019 19:07:40 +0900 [thread overview] Message-ID: <20191126100744.5083-15-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> From: Jason Wang <jasowang@redhat.com> This patch prepares virtio_net of XDP offloading. It adds data structures, blank callback implementations for bpf_prog_offload_ops. It also implements ndo_init, ndo_uninit operations for setting up offload related data structures. Signed-off-by: Jason Wang <jasowang@redhat.com> Co-developed-by: Prashant Bhole <prashantbhole.linux@gmail.com> Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/virtio_net.c | 103 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index cee5c2b15c62..a1088d0114f2 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -229,8 +229,14 @@ struct virtnet_info { struct failover *failover; struct bpf_prog __rcu *xdp_prog; + struct bpf_prog __rcu *offload_xdp_prog; struct xdp_attachment_info xdp; + struct xdp_attachment_info xdp_hw; + + struct bpf_offload_dev *bpf_dev; + + struct list_head bpf_bound_progs; }; struct padded_vnet_hdr { @@ -258,6 +264,14 @@ static struct xdp_frame *ptr_to_xdp(void *ptr) return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG); } +struct virtnet_bpf_bound_prog { + struct virtnet_info *vi; + struct bpf_prog *prog; + struct list_head list; + u32 len; + struct bpf_insn insnsi[0]; +}; + /* Converting between virtqueue no. and kernel tx/rx queue no. * 0:rx0 1:tx0 2:rx1 3:tx1 ... 2N:rxN 2N+1:txN 2N+2:cvq */ @@ -2506,13 +2520,63 @@ static int virtnet_xdp_set(struct net_device *dev, struct netdev_bpf *bpf) return err; } +static int virtnet_bpf_verify_insn(struct bpf_verifier_env *env, int insn_idx, + int prev_insn) +{ + return 0; +} + +static void virtnet_bpf_destroy_prog(struct bpf_prog *prog) +{ +} + +static int virtnet_xdp_set_offload(struct virtnet_info *vi, + struct netdev_bpf *bpf) +{ + return -EBUSY; +} + +static int virtnet_bpf_verifier_setup(struct bpf_prog *prog) +{ + return -ENOMEM; +} + +static int virtnet_bpf_verifier_prep(struct bpf_prog *prog) +{ + return 0; +} + +static int virtnet_bpf_translate(struct bpf_prog *prog) +{ + return 0; +} + +static int virtnet_bpf_finalize(struct bpf_verifier_env *env) +{ + return 0; +} + +static const struct bpf_prog_offload_ops virtnet_bpf_dev_ops = { + .setup = virtnet_bpf_verifier_setup, + .prepare = virtnet_bpf_verifier_prep, + .insn_hook = virtnet_bpf_verify_insn, + .finalize = virtnet_bpf_finalize, + .translate = virtnet_bpf_translate, + .destroy = virtnet_bpf_destroy_prog, +}; + static int virtnet_xdp(struct net_device *dev, struct netdev_bpf *xdp) { + struct virtnet_info *vi = netdev_priv(dev); switch (xdp->command) { case XDP_SETUP_PROG: return virtnet_xdp_set(dev, xdp); case XDP_QUERY_PROG: return xdp_attachment_query(&vi->xdp, xdp); + case XDP_SETUP_PROG_HW: + return virtnet_xdp_set_offload(vi, xdp); + case XDP_QUERY_PROG_HW: + return xdp_attachment_query(&vi->xdp_hw, xdp); default: return -EINVAL; } @@ -2559,7 +2623,46 @@ static int virtnet_set_features(struct net_device *dev, return 0; } +static int virtnet_bpf_init(struct virtnet_info *vi) +{ + int err; + + vi->bpf_dev = bpf_offload_dev_create(&virtnet_bpf_dev_ops, NULL); + err = PTR_ERR_OR_ZERO(vi->bpf_dev); + if (err) + return err; + + err = bpf_offload_dev_netdev_register(vi->bpf_dev, vi->dev); + if (err) + goto err_netdev_register; + + INIT_LIST_HEAD(&vi->bpf_bound_progs); + + return 0; + +err_netdev_register: + bpf_offload_dev_destroy(vi->bpf_dev); + return err; +} + +static int virtnet_init(struct net_device *dev) +{ + struct virtnet_info *vi = netdev_priv(dev); + + return virtnet_bpf_init(vi); +} + +static void virtnet_uninit(struct net_device *dev) +{ + struct virtnet_info *vi = netdev_priv(dev); + + bpf_offload_dev_netdev_unregister(vi->bpf_dev, vi->dev); + bpf_offload_dev_destroy(vi->bpf_dev); +} + static const struct net_device_ops virtnet_netdev = { + .ndo_init = virtnet_init, + .ndo_uninit = virtnet_uninit, .ndo_open = virtnet_open, .ndo_stop = virtnet_close, .ndo_start_xmit = start_xmit, -- 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 14/18] virtio_net: add XDP prog offload infrastructure Date: Tue, 26 Nov 2019 19:07:40 +0900 [thread overview] Message-ID: <20191126100744.5083-15-prashantbhole.linux@gmail.com> (raw) In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> From: Jason Wang <jasowang@redhat.com> This patch prepares virtio_net of XDP offloading. It adds data structures, blank callback implementations for bpf_prog_offload_ops. It also implements ndo_init, ndo_uninit operations for setting up offload related data structures. Signed-off-by: Jason Wang <jasowang@redhat.com> Co-developed-by: Prashant Bhole <prashantbhole.linux@gmail.com> Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com> --- drivers/net/virtio_net.c | 103 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index cee5c2b15c62..a1088d0114f2 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -229,8 +229,14 @@ struct virtnet_info { struct failover *failover; struct bpf_prog __rcu *xdp_prog; + struct bpf_prog __rcu *offload_xdp_prog; struct xdp_attachment_info xdp; + struct xdp_attachment_info xdp_hw; + + struct bpf_offload_dev *bpf_dev; + + struct list_head bpf_bound_progs; }; struct padded_vnet_hdr { @@ -258,6 +264,14 @@ static struct xdp_frame *ptr_to_xdp(void *ptr) return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG); } +struct virtnet_bpf_bound_prog { + struct virtnet_info *vi; + struct bpf_prog *prog; + struct list_head list; + u32 len; + struct bpf_insn insnsi[0]; +}; + /* Converting between virtqueue no. and kernel tx/rx queue no. * 0:rx0 1:tx0 2:rx1 3:tx1 ... 2N:rxN 2N+1:txN 2N+2:cvq */ @@ -2506,13 +2520,63 @@ static int virtnet_xdp_set(struct net_device *dev, struct netdev_bpf *bpf) return err; } +static int virtnet_bpf_verify_insn(struct bpf_verifier_env *env, int insn_idx, + int prev_insn) +{ + return 0; +} + +static void virtnet_bpf_destroy_prog(struct bpf_prog *prog) +{ +} + +static int virtnet_xdp_set_offload(struct virtnet_info *vi, + struct netdev_bpf *bpf) +{ + return -EBUSY; +} + +static int virtnet_bpf_verifier_setup(struct bpf_prog *prog) +{ + return -ENOMEM; +} + +static int virtnet_bpf_verifier_prep(struct bpf_prog *prog) +{ + return 0; +} + +static int virtnet_bpf_translate(struct bpf_prog *prog) +{ + return 0; +} + +static int virtnet_bpf_finalize(struct bpf_verifier_env *env) +{ + return 0; +} + +static const struct bpf_prog_offload_ops virtnet_bpf_dev_ops = { + .setup = virtnet_bpf_verifier_setup, + .prepare = virtnet_bpf_verifier_prep, + .insn_hook = virtnet_bpf_verify_insn, + .finalize = virtnet_bpf_finalize, + .translate = virtnet_bpf_translate, + .destroy = virtnet_bpf_destroy_prog, +}; + static int virtnet_xdp(struct net_device *dev, struct netdev_bpf *xdp) { + struct virtnet_info *vi = netdev_priv(dev); switch (xdp->command) { case XDP_SETUP_PROG: return virtnet_xdp_set(dev, xdp); case XDP_QUERY_PROG: return xdp_attachment_query(&vi->xdp, xdp); + case XDP_SETUP_PROG_HW: + return virtnet_xdp_set_offload(vi, xdp); + case XDP_QUERY_PROG_HW: + return xdp_attachment_query(&vi->xdp_hw, xdp); default: return -EINVAL; } @@ -2559,7 +2623,46 @@ static int virtnet_set_features(struct net_device *dev, return 0; } +static int virtnet_bpf_init(struct virtnet_info *vi) +{ + int err; + + vi->bpf_dev = bpf_offload_dev_create(&virtnet_bpf_dev_ops, NULL); + err = PTR_ERR_OR_ZERO(vi->bpf_dev); + if (err) + return err; + + err = bpf_offload_dev_netdev_register(vi->bpf_dev, vi->dev); + if (err) + goto err_netdev_register; + + INIT_LIST_HEAD(&vi->bpf_bound_progs); + + return 0; + +err_netdev_register: + bpf_offload_dev_destroy(vi->bpf_dev); + return err; +} + +static int virtnet_init(struct net_device *dev) +{ + struct virtnet_info *vi = netdev_priv(dev); + + return virtnet_bpf_init(vi); +} + +static void virtnet_uninit(struct net_device *dev) +{ + struct virtnet_info *vi = netdev_priv(dev); + + bpf_offload_dev_netdev_unregister(vi->bpf_dev, vi->dev); + bpf_offload_dev_destroy(vi->bpf_dev); +} + static const struct net_device_ops virtnet_netdev = { + .ndo_init = virtnet_init, + .ndo_uninit = virtnet_uninit, .ndo_open = virtnet_open, .ndo_stop = virtnet_close, .ndo_start_xmit = start_xmit, -- 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 ` [RFC net-next 07/18] tun: set offloaded xdp program Prashant Bhole 2019-11-26 10:07 ` 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 ` Prashant Bhole [this message] 2019-11-26 10:07 ` [RFC net-next 14/18] virtio_net: add XDP prog offload infrastructure 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-15-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.