From patchwork Mon Jun 29 13:13:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kirjanov X-Patchwork-Id: 216893 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=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E6512C433DF for ; Mon, 29 Jun 2020 20:44:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4F1E20663 for ; Mon, 29 Jun 2020 20:44:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linux-powerpc-org.20150623.gappssmtp.com header.i=@linux-powerpc-org.20150623.gappssmtp.com header.b="fctEZfRk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731615AbgF2Uoa (ORCPT ); Mon, 29 Jun 2020 16:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731604AbgF2TOA (ORCPT ); Mon, 29 Jun 2020 15:14:00 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EC83C02A55B for ; Mon, 29 Jun 2020 06:13:56 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id 9so17963955ljv.5 for ; Mon, 29 Jun 2020 06:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-powerpc-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CCHg421KUhsy+nSn5wmRg7L3793Q0baKUacKDGsu3gU=; b=fctEZfRkcc1OVCKtSsfxjUB5UPqITfJ2aixSWWatkYlO7PTB8ag0Jdb9/Bsc+2P8bA 8ELtHRw7O+ijJkWB6KL7bGfJDzPNYDDIwaC5e0J5eRGo4ke0MbKN1XlovSpfmZQ5tPJf tDyPdQuKevZk02kegBrsdek4J23mLmC5jx9+ignQdxLfZBqswDA3+LHfYuCsL3W44Oib k2/iBXsgooT/INsw5EgXbEKdxdH1WVdDy/UhnUe0x+O5x4blaeKr+Wm8AMBigjS4Wvup fJp/iE+Z2qUyUcPhtQgLErtyog9Y3GaRfW1ZhaFCrdJd0p6WVW6Hh6/Qwh1ngIM8h7Ib IRqw== 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; bh=CCHg421KUhsy+nSn5wmRg7L3793Q0baKUacKDGsu3gU=; b=Up56X5iMOMAq6IyOutb+lvBvHv72as+6TdL1j4hPhmKRCNLEba8bH611Xq0rCqnUOr 3P89JeVoRNA8XzJv/AFsFJEGo3f+DLB6Cqpllr6aeIGMcknKPvMDiElWWdmYoaaht9Y0 DxTvpMtERv/0MI8s8jgPqXGeVVP2Fp/8oc0vURuh5ovnG6Qy6SObAgLHWkYOLJSScqOO LwVhQ7NmGsOCotpE3tYhVKOcnhIa9QLGus7RzrA5nJywS8kiDu5vkmfu2+xFmztym3bL qNW1jdnJDAKq78HTuqfFi2BNxxw2hGMvg4CcKc9PNhI3uzY0yXznsR9dcu20aX5nYWIw Fk6A== X-Gm-Message-State: AOAM532UXNgX4B6j+2kzuYQNUirhcFUry2yxVaZamgkxee9QFUBeZk2z JT1slq2pt6mCNDrsJpaZ1tzLFuDqi7GnLw== X-Google-Smtp-Source: ABdhPJyh6Lw4SQXnnbnwpxNgMt2T5awwRrB10JBqJYb08GQQl24ZkD4Vd7yNMlBSGCOMShqJS35tvg== X-Received: by 2002:a05:651c:106f:: with SMTP id y15mr8405335ljm.32.1593436434403; Mon, 29 Jun 2020 06:13:54 -0700 (PDT) Received: from centos7-pv-guest.localdomain ([5.35.13.201]) by smtp.gmail.com with ESMTPSA id 16sm647916ljw.127.2020.06.29.06.13.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2020 06:13:53 -0700 (PDT) From: Denis Kirjanov To: netdev@vger.kernel.org Cc: brouer@redhat.com, jgross@suse.com, wei.liu@kernel.org, paul@xen.org, ilias.apalodimas@linaro.org Subject: [PATCH net-next v14 1/3] xen: netif.h: add a new extra type for XDP Date: Mon, 29 Jun 2020 16:13:27 +0300 Message-Id: <1593436409-1101-2-git-send-email-kda@linux-powerpc.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593436409-1101-1-git-send-email-kda@linux-powerpc.org> References: <1593436409-1101-1-git-send-email-kda@linux-powerpc.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds a new extra type to be able to diffirentiate between RX responses on xen-netfront side with the adjusted offset required for XDP processing. The offset value from a guest is passed via xenstore. Signed-off-by: Denis Kirjanov --- include/xen/interface/io/netif.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/include/xen/interface/io/netif.h b/include/xen/interface/io/netif.h index 4f20dbc..2194322 100644 --- a/include/xen/interface/io/netif.h +++ b/include/xen/interface/io/netif.h @@ -161,6 +161,19 @@ */ /* + * "xdp-headroom" is used to request that extra space is added + * for XDP processing. The value is measured in bytes and passed by + * the frontend to be consistent between both ends. + * If the value is greater than zero that means that + * an RX response is going to be passed to an XDP program for processing. + * XEN_NETIF_MAX_XDP_HEADROOM defines the maximum headroom offset in bytes + * + * "feature-xdp-headroom" is set to "1" by the netback side like other features + * so a guest can check if an XDP program can be processed. + */ +#define XEN_NETIF_MAX_XDP_HEADROOM 0x7FFF + +/* * Control ring * ============ * @@ -846,7 +859,8 @@ struct xen_netif_tx_request { #define XEN_NETIF_EXTRA_TYPE_MCAST_ADD (2) /* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3) /* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_HASH (4) /* u.hash */ -#define XEN_NETIF_EXTRA_TYPE_MAX (5) +#define XEN_NETIF_EXTRA_TYPE_XDP (5) /* u.xdp */ +#define XEN_NETIF_EXTRA_TYPE_MAX (6) /* xen_netif_extra_info_t flags. */ #define _XEN_NETIF_EXTRA_FLAG_MORE (0) @@ -879,6 +893,10 @@ struct xen_netif_extra_info { uint8_t algorithm; uint8_t value[4]; } hash; + struct { + uint16_t headroom; + uint16_t pad[2]; + } xdp; uint16_t pad[3]; } u; }; From patchwork Mon Jun 29 13:13:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kirjanov X-Patchwork-Id: 216883 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=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, 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 2BCB1C433E0 for ; Mon, 29 Jun 2020 20:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09403206F1 for ; Mon, 29 Jun 2020 20:51:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linux-powerpc-org.20150623.gappssmtp.com header.i=@linux-powerpc-org.20150623.gappssmtp.com header.b="pMov5REF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731392AbgF2TN2 (ORCPT ); Mon, 29 Jun 2020 15:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730470AbgF2TNV (ORCPT ); Mon, 29 Jun 2020 15:13:21 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA5CAC02A55D for ; Mon, 29 Jun 2020 06:13:58 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id q7so4728318ljm.1 for ; Mon, 29 Jun 2020 06:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-powerpc-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TfCiQsj7eLAgJkgdqyNua9eNocqBjHIR4U55rpcBbMo=; b=pMov5REFrsQHKITMt04sAuX8FEVOZwePqo6yZc4K7DlywiyhX5hMAx6l/PMyRM/m9M m8TESSaCK+auCDjgb8b1ARRSIR3e4Jd+X4mjVjQB8Vg+A+Q0xO4h9fsf+KjH89If87rz FVb4EmaPRO1wgvUEPKST2pBGsFJsgNYXQY9uIMA0Bra3QEBLwvvUSKm/9o/y/DVW4JTD HsFITXxqHF0K3/V2Vvz3Or9rPrs/rZFOiLuaeJJvmnpU3LZ2VYqk9kvRhsn/+E+kY2wb V0I69/+Zjg6z+xJ34w6kBGrFXYgzofrXkT+zTw5kWL9qoa+fA51NIuW8+qXZ3IKIHhim D5yw== 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; bh=TfCiQsj7eLAgJkgdqyNua9eNocqBjHIR4U55rpcBbMo=; b=sJQGXSJP3LUom0SLldj70tRm1hC802uI1aneroH6KK4pnqhrGOp03AunUZdYTjU7Nc tAM++oqcCFNTt7c0/9eV8gp2vMJTdqMOmlQ+bYFA6hpvHcIfjchyfB/Esxls0gD0SToH N7WpC6GZvH3nMG5ns6QaIjFr5Yg/PVN+VDn25A5nOXkWxD7Ft1hT0gVey/RHZor7I6w9 wEQDbzy+mPbzA7RADGxKYAgEgHounhRj43P6DtkmFuFTC+9CZT5qqa0n9nrRY4HChpLa TCUpoJAOH6cIMs0RM/sxzre7SIsHrUYe4LZFJMY+hWGRkuU2b3QrJVpASR+vQ4HI04lq ZrAg== X-Gm-Message-State: AOAM530CEexnV86de2WuWkUnCNEU54BckdxSCYQbRB89pCPRmBnUp4jL lVx9OFuMpkxyyOye3TUq9nSzOvFOLerVWA== X-Google-Smtp-Source: ABdhPJxEfdVbcLf/eCNLVvub1+kLBHeQpG6IBw6jP7Ve3K1lsVlaFtCZHEXxN1T423Td/hXmamSIXg== X-Received: by 2002:a2e:9b8d:: with SMTP id z13mr7889980lji.463.1593436437092; Mon, 29 Jun 2020 06:13:57 -0700 (PDT) Received: from centos7-pv-guest.localdomain ([5.35.13.201]) by smtp.gmail.com with ESMTPSA id 16sm647916ljw.127.2020.06.29.06.13.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2020 06:13:56 -0700 (PDT) From: Denis Kirjanov To: netdev@vger.kernel.org Cc: brouer@redhat.com, jgross@suse.com, wei.liu@kernel.org, paul@xen.org, ilias.apalodimas@linaro.org Subject: [PATCH net-next v14 3/3] xen networking: add XDP offset adjustment to xen-netback Date: Mon, 29 Jun 2020 16:13:29 +0300 Message-Id: <1593436409-1101-4-git-send-email-kda@linux-powerpc.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593436409-1101-1-git-send-email-kda@linux-powerpc.org> References: <1593436409-1101-1-git-send-email-kda@linux-powerpc.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org the patch basically adds the offset adjustment and netfront state reading to make XDP work on netfront side. Reviewed-by: Paul Durrant Signed-off-by: Denis Kirjanov --- drivers/net/xen-netback/common.h | 4 ++++ drivers/net/xen-netback/interface.c | 2 ++ drivers/net/xen-netback/netback.c | 7 +++++++ drivers/net/xen-netback/rx.c | 15 ++++++++++++++- drivers/net/xen-netback/xenbus.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 05847eb..ae477f7 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -281,6 +281,9 @@ struct xenvif { u8 ipv6_csum:1; u8 multicast_control:1; + /* headroom requested by xen-netfront */ + u16 xdp_headroom; + /* Is this interface disabled? True when backend discovers * frontend is rogue. */ @@ -395,6 +398,7 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue) irqreturn_t xenvif_interrupt(int irq, void *dev_id); extern bool separate_tx_rx_irq; +extern bool provides_xdp_headroom; extern unsigned int rx_drain_timeout_msecs; extern unsigned int rx_stall_timeout_msecs; diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 0c8a02a..8af49728 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -483,6 +483,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, vif->queues = NULL; vif->num_queues = 0; + vif->xdp_headroom = 0; + spin_lock_init(&vif->lock); INIT_LIST_HEAD(&vif->fe_mcast_addr); diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 315dfc6..6dfca72 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -96,6 +96,13 @@ module_param_named(hash_cache_size, xenvif_hash_cache_size, uint, 0644); MODULE_PARM_DESC(hash_cache_size, "Number of flows in the hash cache"); +/* The module parameter tells that we have to put data + * for xen-netfront with the XDP_PACKET_HEADROOM offset + * needed for XDP processing + */ +bool provides_xdp_headroom = true; +module_param(provides_xdp_headroom, bool, 0644); + static void xenvif_idx_release(struct xenvif_queue *queue, u16 pending_idx, u8 status); diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c index ef58870..ac034f6 100644 --- a/drivers/net/xen-netback/rx.c +++ b/drivers/net/xen-netback/rx.c @@ -258,6 +258,19 @@ static void xenvif_rx_next_skb(struct xenvif_queue *queue, pkt->extra_count++; } + if (queue->vif->xdp_headroom) { + struct xen_netif_extra_info *extra; + + extra = &pkt->extras[XEN_NETIF_EXTRA_TYPE_XDP - 1]; + + memset(extra, 0, sizeof(struct xen_netif_extra_info)); + extra->u.xdp.headroom = queue->vif->xdp_headroom; + extra->type = XEN_NETIF_EXTRA_TYPE_XDP; + extra->flags = 0; + + pkt->extra_count++; + } + if (skb->sw_hash) { struct xen_netif_extra_info *extra; @@ -356,7 +369,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue, struct xen_netif_rx_request *req, struct xen_netif_rx_response *rsp) { - unsigned int offset = 0; + unsigned int offset = queue->vif->xdp_headroom; unsigned int flags; do { diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 286054b..7e62a6e 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -393,6 +393,24 @@ static void set_backend_state(struct backend_info *be, } } +static void read_xenbus_frontend_xdp(struct backend_info *be, + struct xenbus_device *dev) +{ + struct xenvif *vif = be->vif; + u16 headroom; + int err; + + err = xenbus_scanf(XBT_NIL, dev->otherend, + "xdp-headroom", "%hu", &headroom); + if (err != 1) { + vif->xdp_headroom = 0; + return; + } + if (headroom > XEN_NETIF_MAX_XDP_HEADROOM) + headroom = XEN_NETIF_MAX_XDP_HEADROOM; + vif->xdp_headroom = headroom; +} + /** * Callback received when the frontend's state changes. */ @@ -417,6 +435,11 @@ static void frontend_changed(struct xenbus_device *dev, set_backend_state(be, XenbusStateConnected); break; + case XenbusStateReconfiguring: + read_xenbus_frontend_xdp(be, dev); + xenbus_switch_state(dev, XenbusStateReconfigured); + break; + case XenbusStateClosing: set_backend_state(be, XenbusStateClosing); break; @@ -947,6 +970,8 @@ static int read_xenbus_vif_flags(struct backend_info *be) vif->ipv6_csum = !!xenbus_read_unsigned(dev->otherend, "feature-ipv6-csum-offload", 0); + read_xenbus_frontend_xdp(be, dev); + return 0; } @@ -1036,6 +1061,15 @@ static int netback_probe(struct xenbus_device *dev, goto abort_transaction; } + /* we can adjust a headroom for netfront XDP processing */ + err = xenbus_printf(xbt, dev->nodename, + "feature-xdp-headroom", "%d", + provides_xdp_headroom); + if (err) { + message = "writing feature-xdp-headroom"; + goto abort_transaction; + } + /* We don't support rx-flip path (except old guests who * don't grok this feature flag). */