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=-7.1 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 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 DC7C9C433E1 for ; Fri, 26 Jun 2020 11:29:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADB4720724 for ; Fri, 26 Jun 2020 11:29:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZO+b3ODy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728575AbgFZL3L (ORCPT ); Fri, 26 Jun 2020 07:29:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbgFZL3K (ORCPT ); Fri, 26 Jun 2020 07:29:10 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 201F1C08C5C1 for ; Fri, 26 Jun 2020 04:29:10 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id o2so9053329wmh.2 for ; Fri, 26 Jun 2020 04:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:reply-to:to:cc:references:in-reply-to:subject:date:message-id :mime-version:content-transfer-encoding:content-language :thread-index; bh=Sh1TY5f7VkdHb/epA0QmHxZ9o+LQOqnnqVolI3HlCb4=; b=ZO+b3ODyCsQ4uBMCjYFaaSB87NYZwV9/C2GCD9Ybg20RMszy570DcTeoylSjl3M+PK /VuWyqimj9gen0X+JCQgTFlYQ84PIssiv2c/OYisxfm544d3U2FpPSrpUUymRLFADKEg dmcC+rU6QfpDBIdJEkK67Qz7w9M8YDb6RQ04kuhB0g74B5ueyyRfAT8Q9LPHIkQZuuYO zxXznmejV/GL3hkGTwSh03Oz0W3VwTSgCR+9EJIbYq164JwnFmFTj6qP3C8lmZn6WGdL 5uccpD7uYtIF4x4HHlkBXNBbVNq6P+egMsBgMMexoEebZHR11NchwNbK7sRkSdArcCKz ypmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:reply-to:to:cc:references:in-reply-to :subject:date:message-id:mime-version:content-transfer-encoding :content-language:thread-index; bh=Sh1TY5f7VkdHb/epA0QmHxZ9o+LQOqnnqVolI3HlCb4=; b=ORpJgoI9Hf3astLhsTY9k91nq1pujQ0C63Hly9B2rb/AVueZrKih3r6fklelbBJ7LA bN/VzQVxqRthjlLwSFRowT4+bs9s0//Q8HIzeQR+cppd0Fcs0WtzBuvvsx8emIvfMgww Kxh4/5eVj6IaefuWiBWAO4MZNDyTD9EI8stAOYPAIqqd9CRefgqy7Bw2AX7VoRgsBL8J DycJ/Ldxv2eDmlghT2f0RhtulVFaPwDDyJrq3zDxZQMCnFuprN+kgUXpuM/tZp1s7Ptx TvsKuQuKFbvFoSVea21nxDodCQlLXhiahCpiFwITHVA4JRj7zibW1qJkxa6WivNMEQkY TDRw== X-Gm-Message-State: AOAM531sIbL1RCWfcruvCweRGuh2Zg63vPXnWJu2E4FPuBK6wTO4sRw0 y7QBWSnZOfifOU7+BPM39WU= X-Google-Smtp-Source: ABdhPJzKneOZIQsbZ22G0vDlMqyaZkKLUwC0Sx3jDkuiDXV99CKVyKQDOZ9iZAqHmeoqZJXCa++RqQ== X-Received: by 2002:a1c:9cd0:: with SMTP id f199mr2847028wme.94.1593170948868; Fri, 26 Jun 2020 04:29:08 -0700 (PDT) Received: from CBGR90WXYV0 (54-240-197-236.amazon.com. [54.240.197.236]) by smtp.gmail.com with ESMTPSA id r10sm19362708wrm.17.2020.06.26.04.29.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2020 04:29:08 -0700 (PDT) From: Paul Durrant X-Google-Original-From: "Paul Durrant" Reply-To: To: "'Denis Kirjanov'" , Cc: , , , References: <1593170826-1600-1-git-send-email-kda@linux-powerpc.org> <1593170826-1600-4-git-send-email-kda@linux-powerpc.org> In-Reply-To: <1593170826-1600-4-git-send-email-kda@linux-powerpc.org> Subject: RE: [PATCH net-next v12 3/3] xen networking: add XDP offset adjustment to xen-netback Date: Fri, 26 Jun 2020 12:29:07 +0100 Message-ID: <000801d64bad$01b45830$051d0890$@xen.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Content-Language: en-gb Thread-Index: AQFtBvJntFcnGl4dTnLrH7EiRU2MRwG66dCAqa90sdA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org > -----Original Message----- > From: Denis Kirjanov > Sent: 26 June 2020 12:27 > 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 v12 3/3] xen networking: add XDP offset adjustment to xen-netback > > 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 | 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..fc16edd 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->netfront_xdp_headroom = 0; > + Erm... surely this won't compile now? Paul > 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..c5e9e14 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->netfront_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->netfront_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->netfront_xdp_headroom; > unsigned int flags; > > do { > diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c > index 286054b..f321068 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->netfront_xdp_headroom = 0; > + return; > + } > + if (headroom > XEN_NETIF_MAX_XDP_HEADROOM) > + headroom = XEN_NETIF_MAX_XDP_HEADROOM; > + vif->netfront_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). > */ > -- > 1.8.3.1