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.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 A2518C3F2D2 for ; Mon, 2 Mar 2020 14:21:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A878214DB for ; Mon, 2 Mar 2020 14:21:37 +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="GrcUcmth" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727152AbgCBOVg (ORCPT ); Mon, 2 Mar 2020 09:21:36 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35380 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbgCBOVg (ORCPT ); Mon, 2 Mar 2020 09:21:36 -0500 Received: by mail-lj1-f193.google.com with SMTP id a12so10878186ljj.2 for ; Mon, 02 Mar 2020 06:21:33 -0800 (PST) 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; bh=5jbWwlWPaK42zFF47NPdS6Z88EVzT+1obepYAaQMSzM=; b=GrcUcmthiUvMtDkC3I78nFSHPXCqr0xbx/Q+KYEvk90wp0CIkCpRdaWBdQ0mqG4bLk zyATgS9XnIglrGHw18h6q8I6oFuJ4g5UEa4/i5tzTKtL1h/m07APDbavHV0us5wiKbmw fzb8U3MdkV1a5QBJB9QSKVeay3xhg7uKQbZyeNkiLQyz/ki/9oYRMrCbOmf2cYlHmNtl oorel/a7UZsCQftQRvS+yDyuZ2WCM/LX8jxlq09FrEA4AjBqBgYfoBg7OU2u74ZhyyoP sgHOy6RJhSTcQoDY0emnir3bvJTHBEsbnmBonQxtcz0ad8Rqlg6vkU0/+3SB7PHLGt0/ XlKg== 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; bh=5jbWwlWPaK42zFF47NPdS6Z88EVzT+1obepYAaQMSzM=; b=mNhU9w4JxiFZHlT/eEOR1Tz2Fi2LReYi0hjua6G4jpJffg1DOw5GDhphpYZaiP3+15 1WkNAyk+GerhPLlC1kmrJGFcJq8ooD489DMnn/Q+KvUGtHjSN61Ux+NiQUje9TS+y69g lQay9ZBXtbQwwd/z3IRtfLlvdpoeOP2TF8zShcg1SUHPxpNnC/s05wK8z7qwQSxiMENM yw/bQjmrQ2UpG+qI2KcNJlYavgR9lu1L7S8c58vvaDjtsNdiD4p+n4hLqp6gHPjY4e6g rB6qN/qExsJvMWn9H0aXZIBllrccDc2I3WfRuuq37Ke2MbA3gabi9oE1LegNwr24TwOy vNUQ== X-Gm-Message-State: ANhLgQ3UPZpZmntWD+y3UveyytKkcSGJU8vbCbdx1bjl1yLtIALRtkEN rz4kOD9m6Fo+vjfwPreNClC0hAypq7jzrA== X-Google-Smtp-Source: ADFU+vsDeFgOxCYNi26x10Nwa2js/MEmf5WsX7ehLKqW/3rID7GIXEqliM76zYmnvkdMyV6CMpraOA== X-Received: by 2002:a2e:554:: with SMTP id 81mr6390538ljf.92.1583158892081; Mon, 02 Mar 2020 06:21:32 -0800 (PST) Received: from centos7-pv-guest.localdomain ([5.35.35.59]) by smtp.gmail.com with ESMTPSA id n5sm5352672ljg.88.2020.03.02.06.21.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2020 06:21:31 -0800 (PST) From: Denis Kirjanov To: netdev@vger.kernel.org Cc: jgross@suse.com, ilias.apalodimas@linaro.org, Denis Kirjanov Subject: [PATCH net-next v2] xen-netfront: add basic XDP support Date: Mon, 2 Mar 2020 17:21:14 +0300 Message-Id: <1583158874-2751-1-git-send-email-kda@linux-powerpc.org> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org the patch adds a basic xdo logic to the netfront driver XDP redirect is not supported yet v2: - avoid data copying while passing to XDP - tell xen-natback that we need the headroom space Signed-off-by: Denis Kirjanov --- drivers/net/xen-netback/common.h | 1 + drivers/net/xen-netback/rx.c | 9 ++- drivers/net/xen-netback/xenbus.c | 21 ++++++ drivers/net/xen-netfront.c | 157 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 2 deletions(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 05847eb..0750c6f 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. diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c index ef58870..a110a59 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 { @@ -389,7 +394,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue, flags |= XEN_NETRXF_extra_info; } - rsp->offset = 0; + rsp->offset = xenvif_rx_xdp_offset(queue->vif); rsp->flags = flags; rsp->id = req->id; rsp->status = (s16)offset; diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 286054b..81a6023 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_fronetend_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_fronetend_xdp(be, dev); + xenbus_switch_state(dev, XenbusStateReconfigured); + break; + case XenbusStateClosing: set_backend_state(be, XenbusStateClosing); break; @@ -935,6 +954,8 @@ static int read_xenbus_vif_flags(struct backend_info *be) vif->gso_mask = 0; + vif->xdp_enabled = 0; + if (xenbus_read_unsigned(dev->otherend, "feature-gso-tcpv4", 0)) vif->gso_mask |= GSO_BIT(TCPV4); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 482c6c8..db8a280 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include #include @@ -102,6 +104,8 @@ struct netfront_queue { char name[QUEUE_NAME_SIZE]; /* DEVNAME-qN */ struct netfront_info *info; + struct bpf_prog __rcu *xdp_prog; + struct napi_struct napi; /* Split event channels support, tx_* == rx_* when using @@ -778,6 +782,40 @@ static int xennet_get_extras(struct netfront_queue *queue, return err; } +u32 xennet_run_xdp(struct netfront_queue *queue, struct page *pdata, + struct xen_netif_rx_response *rx, struct bpf_prog *prog, + struct xdp_buff *xdp) +{ + u32 len = rx->status; + u32 act = XDP_PASS; + + xdp->data_hard_start = page_address(pdata); + xdp->data = xdp->data_hard_start + XDP_PACKET_HEADROOM; + xdp_set_data_meta_invalid(xdp); + xdp->data_end = xdp->data + len; + xdp->handle = 0; + + act = bpf_prog_run_xdp(prog, xdp); + switch (act) { + case XDP_PASS: + case XDP_TX: + case XDP_DROP: + break; + + case XDP_ABORTED: + trace_xdp_exception(queue->info->netdev, prog, act); + break; + + default: + bpf_warn_invalid_xdp_action(act); + } + + if (act != XDP_PASS && act != XDP_TX) + xdp->data_hard_start = NULL; + + return act; +} + static int xennet_get_responses(struct netfront_queue *queue, struct netfront_rx_info *rinfo, RING_IDX rp, struct sk_buff_head *list) @@ -792,6 +830,9 @@ static int xennet_get_responses(struct netfront_queue *queue, int slots = 1; int err = 0; unsigned long ret; + struct bpf_prog *xdp_prog; + struct xdp_buff xdp; + u32 verdict; if (rx->flags & XEN_NETRXF_extra_info) { err = xennet_get_extras(queue, extras, rp); @@ -827,6 +868,22 @@ static int xennet_get_responses(struct netfront_queue *queue, gnttab_release_grant_reference(&queue->gref_rx_head, ref); + rcu_read_lock(); + xdp_prog = rcu_dereference(queue->xdp_prog); + if (xdp_prog) { + /* currently only a single page contains data */ + WARN_ON_ONCE(skb_shinfo(skb)->nr_frags != 1); + verdict = xennet_run_xdp(queue, + skb_frag_page(&skb_shinfo(skb)->frags[0]), + rx, xdp_prog, &xdp); + + if (verdict != XDP_PASS && verdict != XDP_TX) { + err = -EINVAL; + goto next; + } + + } + rcu_read_unlock(); __skb_queue_tail(list, skb); next: @@ -1261,6 +1318,105 @@ static void xennet_poll_controller(struct net_device *dev) } #endif +#define NETBACK_XDP_HEADROOM_DISABLE 0 +#define NETBACK_XDP_HEADROOM_ENABLE 1 + +static int talk_to_netback_xdp(struct netfront_info *np, int xdp) +{ + struct xenbus_transaction xbt; + const char *message; + int err; + +again: + err = xenbus_transaction_start(&xbt); + if (err) { + xenbus_dev_fatal(np->xbdev, err, "starting transaction"); + goto out; + } + + err = xenbus_printf(xbt, np->xbdev->nodename, "feature-xdp", "%d", xdp); + if (err) { + message = "writing feature-xdp"; + goto abort_transaction; + } + + err = xenbus_transaction_end(xbt, 0); + if (err) { + if (err == -EAGAIN) + goto again; + } + + return 0; + +abort_transaction: + xenbus_dev_fatal(np->xbdev, err, "%s", message); + xenbus_transaction_end(xbt, 1); +out: + return err; +} + +static int xennet_xdp_set(struct net_device *dev, struct bpf_prog *prog, + struct netlink_ext_ack *extack) +{ + struct netfront_info *np = netdev_priv(dev); + struct bpf_prog *old_prog; + unsigned int i, err; + + old_prog = rtnl_dereference(np->queues[0].xdp_prog); + if (!old_prog && !prog) + return 0; + + if (prog) + bpf_prog_add(prog, dev->real_num_tx_queues); + + for (i = 0; i < dev->real_num_tx_queues; ++i) + rcu_assign_pointer(np->queues[i].xdp_prog, prog); + + if (old_prog) + for (i = 0; i < dev->real_num_tx_queues; ++i) + bpf_prog_put(old_prog); + + err = talk_to_netback_xdp(np, old_prog ? NETBACK_XDP_HEADROOM_DISABLE: + NETBACK_XDP_HEADROOM_ENABLE); + if (err) + return err; + + xenbus_switch_state(np->xbdev, XenbusStateReconfiguring); + + return 0; +} + +static u32 xennet_xdp_query(struct net_device *dev) +{ + struct netfront_info *np = netdev_priv(dev); + unsigned int num_queues = dev->real_num_tx_queues; + unsigned int i; + struct netfront_queue *queue; + const struct bpf_prog *xdp_prog; + + for (i = 0; i < num_queues; ++i) { + queue = &np->queues[i]; + xdp_prog = rtnl_dereference(queue->xdp_prog); + if (xdp_prog) + return xdp_prog->aux->id; + } + + return 0; +} + +static int xennet_xdp(struct net_device *dev, struct netdev_bpf *xdp) +{ + switch (xdp->command) { + case XDP_SETUP_PROG: + return xennet_xdp_set(dev, xdp->prog, xdp->extack); + case XDP_QUERY_PROG: + xdp->prog_id = xennet_xdp_query(dev); + return 0; + default: + return -EINVAL; + } +} + static const struct net_device_ops xennet_netdev_ops = { .ndo_open = xennet_open, .ndo_stop = xennet_close, @@ -1272,6 +1428,7 @@ static void xennet_poll_controller(struct net_device *dev) .ndo_fix_features = xennet_fix_features, .ndo_set_features = xennet_set_features, .ndo_select_queue = xennet_select_queue, + .ndo_bpf = xennet_xdp, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = xennet_poll_controller, #endif -- 1.8.3.1