From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C6DC432C0 for ; Tue, 26 Nov 2019 10:09:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8192620895 for ; Tue, 26 Nov 2019 10:09:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fRo5+9ZK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727838AbfKZKJi (ORCPT ); Tue, 26 Nov 2019 05:09:38 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38312 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727841AbfKZKJh (ORCPT ); Tue, 26 Nov 2019 05:09:37 -0500 Received: by mail-pg1-f196.google.com with SMTP id t3so8308787pgl.5; Tue, 26 Nov 2019 02:09:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L8/5aZaE5i5lcakkRBtwP3FriVl4GQ+xN5YrOjIUlCM=; b=fRo5+9ZKWTD3s5uJLU9TNtKkQVCRPVzYcxVxl6Lb9D5Sflcesxx6GY10RfAqq10k3L 2dKkTp08HPOBLdXS0wZZPqLpVXU51DY9oXE2b9DC9UxnCDjdvcM1IukuHoVC1n4l7jyy ic145rX5r2EoWdTs4R+LaZL+vi+pwlT7G0BG07erZKekmBETQ63fioUFdc3gK1FBFBVl 0TnAFzy1s0cYyK+PPgWGbwH9g275XIrgsW06CMWNnSW9E8TnlJnbcCnYK2GVgBWiFkNI 7otab7zMtDrWC6ZLW4+mk7e6VL4XojLzPtRhSIbukm9LRqIKdMUAAATJq1dn7YseW9QI I8lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L8/5aZaE5i5lcakkRBtwP3FriVl4GQ+xN5YrOjIUlCM=; b=TxGFq6/WDGnC6xCBdSmMRw7BOrpqy8GGzYxkNLo7bBLibZXie5XruAd0aHhZ3q2ZnT Zk7lYlRV09gjUzusoqtk1MlsWHlvIIxTNugjaxNVscjhr4JANGK4Z+lYH7/94VHI/EVT QbvS87ExJcuz99FPIhuvMq46chLhaLVr2pEevRXjRcblQY5sV0NFiEN4GY5oHu8fRvNX EfvdJAF5SCsnas/FAWcpRNaP2C7QatL0O0P5pGbe9hoEmXuGw1+FVJKMRD9NCoUsz3LE uvgRP8hRskeq6s+duSHg0IX5yH85bmE6j0S1Gsp0FIZJuWoBDnpriD6dkIh9YLs0D7Vc XT/Q== X-Gm-Message-State: APjAAAWTenG4hAP250zK0h8MZbzMaFuni5X4gV4PzDDeaO8Bjtptzlqm kSiZs+opJcthdtc4ndxdq18= X-Google-Smtp-Source: APXvYqwM6Ee33ApLWb/jq6ETiPN5BAkCEQ3rIFbqFuJ25Hzp+y84mxjBl6KWK1nKTl45ek26gmxnEQ== X-Received: by 2002:aa7:90d0:: with SMTP id k16mr40811463pfk.131.1574762976474; Tue, 26 Nov 2019 02:09:36 -0800 (PST) Received: from localhost.localdomain ([222.151.198.97]) by smtp.gmail.com with ESMTPSA id s24sm11848485pfh.108.2019.11.26.02.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 02:09:35 -0800 (PST) From: Prashant Bhole To: "David S . Miller" , "Michael S . Tsirkin" Cc: Jason Wang , Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , netdev@vger.kernel.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, Prashant Bhole Subject: [RFC net-next 14/18] virtio_net: add XDP prog offload infrastructure Date: Tue, 26 Nov 2019 19:07:40 +0900 Message-Id: <20191126100744.5083-15-prashantbhole.linux@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> References: <20191126100744.5083-1-prashantbhole.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jason Wang 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 Co-developed-by: Prashant Bhole Signed-off-by: Prashant Bhole --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73491C432C0 for ; Tue, 26 Nov 2019 10:28:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DF1C2071E for ; Tue, 26 Nov 2019 10:28:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fRo5+9ZK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DF1C2071E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZY5T-0005uB-Vc for qemu-devel@archiver.kernel.org; Tue, 26 Nov 2019 05:28:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57434) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZXsI-0005f2-Vh for qemu-devel@nongnu.org; Tue, 26 Nov 2019 05:15:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZXmr-0003QA-CV for qemu-devel@nongnu.org; Tue, 26 Nov 2019 05:09:38 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:44699) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZXmr-0003Pe-6W for qemu-devel@nongnu.org; Tue, 26 Nov 2019 05:09:37 -0500 Received: by mail-pf1-x444.google.com with SMTP id d199so4299196pfd.11 for ; Tue, 26 Nov 2019 02:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L8/5aZaE5i5lcakkRBtwP3FriVl4GQ+xN5YrOjIUlCM=; b=fRo5+9ZKWTD3s5uJLU9TNtKkQVCRPVzYcxVxl6Lb9D5Sflcesxx6GY10RfAqq10k3L 2dKkTp08HPOBLdXS0wZZPqLpVXU51DY9oXE2b9DC9UxnCDjdvcM1IukuHoVC1n4l7jyy ic145rX5r2EoWdTs4R+LaZL+vi+pwlT7G0BG07erZKekmBETQ63fioUFdc3gK1FBFBVl 0TnAFzy1s0cYyK+PPgWGbwH9g275XIrgsW06CMWNnSW9E8TnlJnbcCnYK2GVgBWiFkNI 7otab7zMtDrWC6ZLW4+mk7e6VL4XojLzPtRhSIbukm9LRqIKdMUAAATJq1dn7YseW9QI I8lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L8/5aZaE5i5lcakkRBtwP3FriVl4GQ+xN5YrOjIUlCM=; b=Zxjq3l0WbmSNCbsQ6agcYnLgULQ926FzUl4t3D6ShFRUtVyU/+j2xShei2TYqahIL8 +bM/obc9QpSzPYBjai33AOz37Xdu+2bF0g2Xi0PcEY/hNWaGPCuJBtKC0mkxWwVdly9S qntGFQToGgbjnDsSlaA0JLeUJ905V7742iEL4cr1icKxZ+05bQ/hxbMV4vzhqJKbA4cN C8zHygmXUN5RzN379vhB2Zt4tSHFcfbpU25y+Qopgdc2CgGfLFwITiTiTCKxjPKx405b RwlnEDoVcDPLfq9xO9Iw6gkP5u3FVi5++mcgfrDD4GeZrMWd5G3yaGv9+Y6NGGThdX2S tP+w== X-Gm-Message-State: APjAAAU5QxmkuQzAD/F7Ict8oJUvLlG1sY8fcZygbTvlwbFXHe1YkIIS lucZ8kGHqwuEi2wjxlalmjZAWOyy X-Google-Smtp-Source: APXvYqwM6Ee33ApLWb/jq6ETiPN5BAkCEQ3rIFbqFuJ25Hzp+y84mxjBl6KWK1nKTl45ek26gmxnEQ== X-Received: by 2002:aa7:90d0:: with SMTP id k16mr40811463pfk.131.1574762976474; Tue, 26 Nov 2019 02:09:36 -0800 (PST) Received: from localhost.localdomain ([222.151.198.97]) by smtp.gmail.com with ESMTPSA id s24sm11848485pfh.108.2019.11.26.02.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 02:09:35 -0800 (PST) From: Prashant Bhole To: "David S . Miller" , "Michael S . Tsirkin" Subject: [RFC net-next 14/18] virtio_net: add XDP prog offload infrastructure Date: Tue, 26 Nov 2019 19:07:40 +0900 Message-Id: <20191126100744.5083-15-prashantbhole.linux@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191126100744.5083-1-prashantbhole.linux@gmail.com> References: <20191126100744.5083-1-prashantbhole.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Song Liu , Jakub Kicinski , Jesper Dangaard Brouer , Daniel Borkmann , netdev@vger.kernel.org, Jason Wang , John Fastabend , Alexei Starovoitov , qemu-devel@nongnu.org, Prashant Bhole , kvm@vger.kernel.org, Yonghong Song , Andrii Nakryiko , Martin KaFai Lau Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jason Wang 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 Co-developed-by: Prashant Bhole Signed-off-by: Prashant Bhole --- 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