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=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=no 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 00D21C433E1 for ; Wed, 15 Jul 2020 13:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C712020657 for ; Wed, 15 Jul 2020 13:08:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Czy863+R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731432AbgGONIo (ORCPT ); Wed, 15 Jul 2020 09:08:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729900AbgGONIn (ORCPT ); Wed, 15 Jul 2020 09:08:43 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72929C061755; Wed, 15 Jul 2020 06:08:43 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id x72so2079187pfc.6; Wed, 15 Jul 2020 06:08:43 -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 :mime-version:content-transfer-encoding; bh=MKjXROH6iJTft1dbpqTVLsrZ4esRtauVC9aRyqt5rhE=; b=Czy863+RJELcnLyT9VdPPKmjJvwLvPICV8xnZtvas+Jau5w8LGjOpJZVfupBdeHHLR 8MFmzCz3AmTSnYLg503Bj0+SA9ol1CtW39+wziPf9P1ApKnwHFkch5FVUy1xe1bIKaY9 wlPjbUCeueB9SICdgRXRjyxUxBQX4sv3AMJFBv1JlpY/WPvk6/h6ZZAG44QSMOG5IBae 0hRcvkFJH98DE2TBmH2o6qgWi5ABSO42K/ZBjgf/2BKItHuXxnrv2Mw5ByZq7KWhTZwK w+8XEZa4ORdMTinzaty80jas523yDX8UWqEOYOOhFqyW30MZfAjRus49innvxuUmeCdn RgOg== 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:mime-version:content-transfer-encoding; bh=MKjXROH6iJTft1dbpqTVLsrZ4esRtauVC9aRyqt5rhE=; b=UdC0s0TgsXBZdxbJamDpB9s1QJIrsWymypxov+FeomZmWrlrJQusYgzm3rHlgvU4BJ rIgQsk7CwyN1HhSLUpbyNGDgd+74egzWky5jPv6bMRL/6td39RGoigUxVkeC1mRV+cBD Cqo12WZNCVkP2ulzJa+t0OoUkOFMWLx0gol8gNGQuMnpMTRJsU4uC2BzAj7rF7Ex43dj zi8bgHJvjSpG+/bY6VFsrVsqLNi7zwknxPxS7VSiepnndagZeYOUqwSx70o5A0+W80nx IbNT75DOv+2egK+4uU/pPQ05jFmNT1WNshYd5igPhHl+6J9Wu+2fsLVxkw7Evthy0xLL MV5w== X-Gm-Message-State: AOAM530QA8gmc46FpDyb21EUqfO5B/C0C4yL/6u4kCCrL/FI4rDGSy+q mgbQPYz6mhZYBV77/2ysQstpBntupA6UDA== X-Google-Smtp-Source: ABdhPJz3EtMEq4Y9DtXZltDVJ5dicRbXyuBpNCe6NMEljg7Sk8s6LKrkNrLj9Q2P4Y/YVylcBxDBEA== X-Received: by 2002:a63:8f18:: with SMTP id n24mr7762272pgd.432.1594818522530; Wed, 15 Jul 2020 06:08:42 -0700 (PDT) Received: from dhcp-12-153.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id t126sm2167700pfd.214.2020.07.15.06.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 06:08:41 -0700 (PDT) From: Hangbin Liu To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Jiri Benc , Jesper Dangaard Brouer , Eelco Chaudron , ast@kernel.org, Daniel Borkmann , Lorenzo Bianconi , Hangbin Liu Subject: [PATCHv8 bpf-next 0/3] xdp: add a new helper for dev map multicast support Date: Wed, 15 Jul 2020 21:08:13 +0800 Message-Id: <20200715130816.2124232-1-liuhangbin@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200714063257.1694964-1-liuhangbin@gmail.com> References: <20200714063257.1694964-1-liuhangbin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is for xdp multicast support. which has been discussed before[0], The goal is to be able to implement an OVS-like data plane in XDP, i.e., a software switch that can forward XDP frames to multiple ports. To achieve this, an application needs to specify a group of interfaces to forward a packet to. It is also common to want to exclude one or more physical interfaces from the forwarding operation - e.g., to forward a packet to all interfaces in the multicast group except the interface it arrived on. While this could be done simply by adding more groups, this quickly leads to a combinatorial explosion in the number of groups an application has to maintain. To avoid the combinatorial explosion, we propose to include the ability to specify an "exclude group" as part of the forwarding operation. This needs to be a group (instead of just a single port index), because there may have multi interfaces you want to exclude. Thus, the logical forwarding operation becomes a "set difference" operation, i.e. "forward to all ports in group A that are not also in group B". This series implements such an operation using device maps to represent the groups. This means that the XDP program specifies two device maps, one containing the list of netdevs to redirect to, and the other containing the exclude list. To achieve this, I re-implement a new helper bpf_redirect_map_multi() to accept two maps, the forwarding map and exclude map. If user don't want to use exclude map and just want simply stop redirecting back to ingress device, they can use flag BPF_F_EXCLUDE_INGRESS. The 2nd and 3rd patches are for usage sample and testing purpose, so there is no effort has been made on performance optimisation. I did same tests with pktgen(pkt size 64) to compire with xdp_redirect_map(). Here is the test result(the veth peer has a dummy xdp program with XDP_DROP directly): Version | Test | Native | Generic 5.8 rc1 | xdp_redirect_map i40e->i40e | 10.0M | 1.9M 5.8 rc1 | xdp_redirect_map i40e->veth | 12.7M | 1.6M 5.8 rc1 + patch | xdp_redirect_map i40e->i40e | 10.0M | 1.9M 5.8 rc1 + patch | xdp_redirect_map i40e->veth | 12.3M | 1.6M 5.8 rc1 + patch | xdp_redirect_map_multi i40e->i40e | 7.2M | 1.5M 5.8 rc1 + patch | xdp_redirect_map_multi i40e->veth | 8.5M | 1.3M 5.8 rc1 + patch | xdp_redirect_map_multi i40e->i40e+veth | 3.0M | 0.98M The bpf_redirect_map_multi() is slower than bpf_redirect_map() as we loop the arrays and do clone skb/xdpf. The native path is slower than generic path as we send skbs by pktgen. So the result looks reasonable. Last but not least, thanks a lot to Jiri, Eelco, Toke and Jesper for suggestions and help on implementation. [0] https://xdp-project.net/#Handling-multicast v8: a) Update function dev_in_exclude_map(): - remove duplicate ex_map map_type check in - lookup the element in dev map by obj dev index directly instead of looping all the map v7: a) Fix helper flag check b) Limit the *ex_map* to use DEVMAP_HASH only and update function dev_in_exclude_map() to get better performance. v6: converted helper return types from int to long v5: a) Check devmap_get_next_key() return value. b) Pass through flags to __bpf_tx_xdp_map() instead of bool value. c) In function dev_map_enqueue_multi(), consume xdpf for the last obj instead of the first on. d) Update helper description and code comments to explain that we use NULL target value to distinguish multicast and unicast forwarding. e) Update memory model, memory id and frame_sz in xdpf_clone(). f) Split the tests from sample and add a bpf kernel selftest patch. v4: Fix bpf_xdp_redirect_map_multi_proto arg2_type typo v3: Based on Toke's suggestion, do the following update a) Update bpf_redirect_map_multi() description in bpf.h. b) Fix exclude_ifindex checking order in dev_in_exclude_map(). c) Fix one more xdpf clone in dev_map_enqueue_multi(). d) Go find next one in dev_map_enqueue_multi() if the interface is not able to forward instead of abort the whole loop. e) Remove READ_ONCE/WRITE_ONCE for ex_map. v2: Add new syscall bpf_xdp_redirect_map_multi() which could accept include/exclude maps directly. Hangbin Liu (3): xdp: add a new helper for dev map multicast support sample/bpf: add xdp_redirect_map_multicast test selftests/bpf: add xdp_redirect_multi test include/linux/bpf.h | 20 ++ include/linux/filter.h | 1 + include/net/xdp.h | 1 + include/uapi/linux/bpf.h | 26 +++ kernel/bpf/devmap.c | 124 +++++++++++++ kernel/bpf/verifier.c | 6 + net/core/filter.c | 111 ++++++++++- net/core/xdp.c | 29 +++ samples/bpf/Makefile | 3 + samples/bpf/xdp_redirect_map_multi_kern.c | 57 ++++++ samples/bpf/xdp_redirect_map_multi_user.c | 166 +++++++++++++++++ tools/include/uapi/linux/bpf.h | 26 +++ tools/testing/selftests/bpf/Makefile | 4 +- .../bpf/progs/xdp_redirect_multi_kern.c | 90 +++++++++ .../selftests/bpf/test_xdp_redirect_multi.sh | 164 +++++++++++++++++ .../selftests/bpf/xdp_redirect_multi.c | 173 ++++++++++++++++++ 16 files changed, 995 insertions(+), 6 deletions(-) create mode 100644 samples/bpf/xdp_redirect_map_multi_kern.c create mode 100644 samples/bpf/xdp_redirect_map_multi_user.c create mode 100644 tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c create mode 100755 tools/testing/selftests/bpf/test_xdp_redirect_multi.sh create mode 100644 tools/testing/selftests/bpf/xdp_redirect_multi.c -- 2.25.4