From patchwork Mon May 4 08:37:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kirjanov X-Patchwork-Id: 219986 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.8 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 62B94C3A5A9 for ; Mon, 4 May 2020 08:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41579206B9 for ; Mon, 4 May 2020 08:38:54 +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="rcX6vOyX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728266AbgEDIix (ORCPT ); Mon, 4 May 2020 04:38:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726445AbgEDIix (ORCPT ); Mon, 4 May 2020 04:38:53 -0400 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9959C061A0E for ; Mon, 4 May 2020 01:38:52 -0700 (PDT) Received: by mail-lf1-x142.google.com with SMTP id b24so8996866lfp.7 for ; Mon, 04 May 2020 01:38:52 -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=1fLEeRYwXk/nJQcyhL7B6f4RUZcEb5sdvnoC5EF2alc=; b=rcX6vOyXUeKbuF5+vsdhyhjf8N7fnj+Dk4TIcDLg2fPcV2YCroHwOdseyyevWJzqoi FAEuEq8/HMrLXWCCiqAhzIaPB5arGIP2Fa0YRXKK5n2aIYl4q0K39FbnrZVGsyUgFKzo /n7a7BFToQDmDhUg0VxbgBvehfaIvDs3JIpx5RPwkSnnOzG6rnnns3DJppQsVVHj5six Xn39s6vnGBIuHffYFbRKhXcquJHSj+Ve+V8QNZp3r7+YF1xR5Y7l3QdN3D4wO2BsFgcy WzuEu+b4G9wvdcy2QVHk8XMVXiP4/K6nA9S8kevcshr5rS4MAw99Q5MSj3wDMfUeesS4 Cg9g== 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=1fLEeRYwXk/nJQcyhL7B6f4RUZcEb5sdvnoC5EF2alc=; b=oonA6/t7duAi+/iUE/3jTeYZiNiGx2HxyqxAFWPy2VyjbLZQvR2BjwRJXZx6d5Ud8+ tABgfMpQVJruuylPoLP41H3Z7oJdL4wMwOIt0sE6hoMWCymk4b2wdBGaT9mh4oTi9DOB SQEJnQfsfnPy/PZpdY/Wa7m5XwgWB9bwtKLrFKDsX2JZs3XR2ioThYsx9YYuF6Z7ugMa bzKTdZJPj9BgNYlXQ5tfS61uYrZWxrCUhgsCxXn3HHtgp9WpvPTlW2Gn8xtlb6V1lriI zx4nyheMatPuXTnbJkEBIMU7kJ86ZlvI2etohyHQo7TyNw5AEUCoEgLaWX6zbmrIcsrZ Tk5w== X-Gm-Message-State: AGi0Pubi5M9kpznEqErTn3Ie3eSJ2fB9NnrMj13oQpUiAIg1B7y4tO5L KMq4mbMd3Z0gZ3ih/0Y4/QjylltAuHKyJg== X-Google-Smtp-Source: APiQypK6qyx67AvA/ZmUvuchYzFuTQ8nSCXkDHh/Ln13UAOHveCQ+tRa+DucOjarXB4rW/PTOltN1Q== X-Received: by 2002:a05:6512:44d:: with SMTP id y13mr10599020lfk.118.1588581530898; Mon, 04 May 2020 01:38:50 -0700 (PDT) Received: from centos7-pv-guest.localdomain ([5.35.46.227]) by smtp.gmail.com with ESMTPSA id z16sm10122418lfq.18.2020.05.04.01.38.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 May 2020 01:38:50 -0700 (PDT) From: Denis Kirjanov To: netdev@vger.kernel.org Cc: jgross@suse.com, wei.liu@kernel.org, paul@xen.org, ilias.apalodimas@linaro.org Subject: [PATCH net-next v7 2/2] xen networking: add XDP offset adjustment to xen-netback Date: Mon, 4 May 2020 11:37:54 +0300 Message-Id: <1588581474-18345-2-git-send-email-kda@linux-powerpc.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588581474-18345-1-git-send-email-kda@linux-powerpc.org> References: <1588581474-18345-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. Signed-off-by: Denis Kirjanov --- drivers/net/xen-netback/common.h | 2 ++ drivers/net/xen-netback/netback.c | 7 +++++++ drivers/net/xen-netback/rx.c | 7 ++++++- drivers/net/xen-netback/xenbus.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 05847eb..4a148d6 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -280,6 +280,7 @@ struct xenvif { u8 ip_csum:1; u8 ipv6_csum:1; u8 multicast_control:1; + u8 xdp_enabled:1; /* Is this interface disabled? True when backend discovers * frontend is rogue. @@ -395,6 +396,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/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..1c0cf8a 100644 --- a/drivers/net/xen-netback/rx.c +++ b/drivers/net/xen-netback/rx.c @@ -33,6 +33,11 @@ #include #include +static inline int xenvif_rx_xdp_offset(struct xenvif *vif) +{ + return vif->xdp_enabled ? XDP_PACKET_HEADROOM : 0; +} + static bool xenvif_rx_ring_slots_available(struct xenvif_queue *queue) { RING_IDX prod, cons; @@ -356,7 +361,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 = xenvif_rx_xdp_offset(queue->vif); unsigned int flags; do { diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 286054b..7c0450e 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -393,6 +393,20 @@ 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; + unsigned int val; + int err; + + err = xenbus_scanf(XBT_NIL, dev->otherend, + "feature-xdp", "%u", &val); + if (err < 0) + return; + vif->xdp_enabled = val; +} + /** * Callback received when the frontend's state changes. */ @@ -417,6 +431,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; @@ -1036,6 +1055,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). */