From patchwork Sun Jul 22 15:13:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Toshiaki Makita X-Patchwork-Id: 947478 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AhELqD6y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41YSnB5YZrz9s3N for ; Mon, 23 Jul 2018 01:13:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729850AbeGVQKb (ORCPT ); Sun, 22 Jul 2018 12:10:31 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:33255 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728394AbeGVQKb (ORCPT ); Sun, 22 Jul 2018 12:10:31 -0400 Received: by mail-pl0-f65.google.com with SMTP id 6-v6so7160717plb.0 for ; Sun, 22 Jul 2018 08:13:31 -0700 (PDT) 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; bh=Fej+FK2Ec5SX1ZXBPw3rC9Kf3wDYZpa1YiWyhnveH7k=; b=AhELqD6yUT88AlFXl5j0FqBuQEvCnXDt3d6ek2phq/6DtOPGp1YCsr91CggS1wMnqG vsyk25S4J+FEJpGQjyj0sDq0ivynQoo6Mp+Y65KvKtmqhMQE6s8dcDe1LC0SR1oedfHv 9baate6LN4YLt2a5G0/GFzidDTsqqd7GZqpaQ3ciaGeZl8dRdmhOCqxXuLIy/Ubi0McI 3iN+yppPek6KT21ZA0vnB5Pmem7ZoTV9iLwbvVbaXDfG3QHkXLO3/jAahQqkqQLTv7+Z 0xh3XpuKZHFZOC3aHmTd65cqthHQaJ0QHVxCWv0HPzLvFej8gpAlXMLBKf3ddoM/pD/a hANw== 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=Fej+FK2Ec5SX1ZXBPw3rC9Kf3wDYZpa1YiWyhnveH7k=; b=HpdMU9bozsCUlDjrMbCe0SZMTHliN3yG72JP2NXqpaqo9Ehs0q5fVss4NXfDvb2eNs p/gEJCubsm7s3eDMz4/wGvI6P0CsjE6FB0K8Jo3tqee7x1Tn/g0a/fc/mSHe22dwb0dC njh6P30Y2HiUYKYEr0Bly6NuaoF3gRJjqbRCC3APU9WAPD6oxmvQBet/1dlLgyQNpDqp Qru8CUEkIz3MqPn4hX2fQRLNCSWvD6G3PIlatyjHP/jxafPzZq4uKBbceiPrFddunlR2 /kCQ0UjM0f5b94CI5F31BpT08/3HWDSDggrlM1o+TG/2ThODtKh3P4pNIxQM+ivzglnL lvWA== X-Gm-Message-State: AOUpUlFePXefnwQYjLZwP2k3M2mYnufdAbZvb8GVqf1vZJrSwdzCb1YM xu+q1Yzxdl3TGcYZgEa6xuuHZYsh X-Google-Smtp-Source: AAOMgpeFQBQ2Wh/cTrS7AfaanIJG7SRWuDKOvwv+61g5Rqa38778d48zMEDcCjceBzc2m3eSD3dwvA== X-Received: by 2002:a17:902:8a87:: with SMTP id p7-v6mr9319172plo.281.1532272410848; Sun, 22 Jul 2018 08:13:30 -0700 (PDT) Received: from localhost.localdomain (i153-145-22-9.s42.a013.ap.plala.or.jp. [153.145.22.9]) by smtp.gmail.com with ESMTPSA id v6-v6sm12092940pfa.28.2018.07.22.08.13.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Jul 2018 08:13:30 -0700 (PDT) From: Toshiaki Makita To: netdev@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann Cc: Toshiaki Makita , Jesper Dangaard Brouer Subject: [PATCH v3 bpf-next 5/8] veth: Add ndo_xdp_xmit Date: Mon, 23 Jul 2018 00:13:05 +0900 Message-Id: <20180722151308.5480-6-toshiaki.makita1@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180722151308.5480-1-toshiaki.makita1@gmail.com> References: <20180722151308.5480-1-toshiaki.makita1@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Toshiaki Makita This allows NIC's XDP to redirect packets to veth. The destination veth device enqueues redirected packets to the napi ring of its peer, then they are processed by XDP on its peer veth device. This can be thought as calling another XDP program by XDP program using REDIRECT, when the peer enables driver XDP. Note that when the peer veth device does not set driver xdp, redirected packets will be dropped because the peer is not ready for NAPI. v2: - Drop the part converting xdp_frame into skb when XDP is not enabled. - Implement bulk interface of ndo_xdp_xmit. - Implement XDP_XMIT_FLUSH bit and drop ndo_xdp_flush. Signed-off-by: Toshiaki Makita --- drivers/net/veth.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 4be75c58bc6a..57187e955fea 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -125,6 +126,11 @@ static void *veth_ptr_to_xdp(void *ptr) return (void *)((unsigned long)ptr & ~VETH_XDP_FLAG); } +static void *veth_xdp_to_ptr(void *ptr) +{ + return (void *)((unsigned long)ptr | VETH_XDP_FLAG); +} + static void veth_ptr_free(void *ptr) { if (veth_is_xdp_frame(ptr)) @@ -267,6 +273,44 @@ static struct sk_buff *veth_build_skb(void *head, int headroom, int len, return skb; } +static int veth_xdp_xmit(struct net_device *dev, int n, + struct xdp_frame **frames, u32 flags) +{ + struct veth_priv *rcv_priv, *priv = netdev_priv(dev); + struct net_device *rcv; + int i, drops = 0; + + if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) + return -EINVAL; + + rcv = rcu_dereference(priv->peer); + if (unlikely(!rcv)) + return -ENXIO; + + rcv_priv = netdev_priv(rcv); + /* xdp_ring is initialized on receive side? */ + if (!rcu_access_pointer(rcv_priv->xdp_prog)) + return -ENXIO; + + spin_lock(&rcv_priv->xdp_ring.producer_lock); + for (i = 0; i < n; i++) { + struct xdp_frame *frame = frames[i]; + void *ptr = veth_xdp_to_ptr(frame); + + if (unlikely(xdp_ok_fwd_dev(rcv, frame->len) || + __ptr_ring_produce(&rcv_priv->xdp_ring, ptr))) { + xdp_return_frame_rx_napi(frame); + drops++; + } + } + spin_unlock(&rcv_priv->xdp_ring.producer_lock); + + if (flags & XDP_XMIT_FLUSH) + __veth_xdp_flush(rcv_priv); + + return n - drops; +} + static struct sk_buff *veth_xdp_rcv_one(struct veth_priv *priv, struct xdp_frame *frame) { @@ -760,6 +804,7 @@ static const struct net_device_ops veth_netdev_ops = { .ndo_features_check = passthru_features_check, .ndo_set_rx_headroom = veth_set_rx_headroom, .ndo_bpf = veth_xdp, + .ndo_xdp_xmit = veth_xdp_xmit, }; #define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HW_CSUM | \