From patchwork Mon Jun 26 15:08:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 13293037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87323EB64D7 for ; Mon, 26 Jun 2023 15:09:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbjFZPJS (ORCPT ); Mon, 26 Jun 2023 11:09:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjFZPJR (ORCPT ); Mon, 26 Jun 2023 11:09:17 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE59B10C1 for ; Mon, 26 Jun 2023 08:09:13 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-313e1c27476so1811744f8f.1 for ; Mon, 26 Jun 2023 08:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1687792152; x=1690384152; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=5ZOVpA71i/AmTOr0v+BW3r06CAsw8oH2AC2V9/+6+As=; b=GdsYVkur6vkSIf0v6Fb43unznX4XRRgVC0nO8m3/Wvzo43eywYYD8cZIE10xszPHYD qtL+X/ISsd3Nbz35oFyQxCqeKX8UiDW3l2JYhjuGxmEtE7QYDkJNOA5G52xZ6ovYdyxJ T4PNAA9bWvRyX1HUH+rYROW+GZ5SJ3ZaceXUxz4EcRCbNOq7/0HMoVIccaopzDgsS6ZT qUqFPFXp7cdwD/5KUM1U3Wa9d0hqaWF4EwNWUnTaPWFOOS3yW7eFl0to57i7wRWlpd0z gRu0/k26VreSnSLNRdz5smGVftdT87VaSVGsTU3loSxOK+rSn7V8oUbYSOcZKf3DH+aM bjoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687792152; x=1690384152; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5ZOVpA71i/AmTOr0v+BW3r06CAsw8oH2AC2V9/+6+As=; b=L4B+hp0P5nNZ6+JganaPPsVcZCnnp5AfNZ+AQqYllcrGuzD8wy8MW4xvrxYsjCQJa1 iYEvoCeNWSiD1KTEpq8CMOGXEH07fqRAjZrJfY7LoSbM+llAjjJvfDvs28DsB9ft5diG rRF8UgnsJ/n/YFbPKF06okouMKp4yIOk+masOGO28MWA6cdJBgQE3UiUrCvhNDNyRhFR uSGqt5HZ+kl22Z0Y9Ajjg95AOa94AXw8NcG+eFudpFWMhx9YYvJBoH5lZNXIwX9vLZoD rli6bapdYRFED4EitIRto5fzgBngAcr3TqkZZ1XwDOCfJNPYbnmdnJMtsZKfSK6JKeSz i6QQ== X-Gm-Message-State: AC+VfDyv71G3ONOH3MT30ld4KlQ/msl6t6S6XvUsLMZZiixEJ/Nt7N2S gOQRDF0gtCyIQsBs5rs8JEDgxA== X-Google-Smtp-Source: ACHHUZ7RHNZDCoPo174rAheI28qWcIkZjyKzfraeQtsbeiQnL7uXSNAtSOPnpXuirEpaYXMI0vMHeA== X-Received: by 2002:a5d:61c9:0:b0:313:f5ea:44f7 with SMTP id q9-20020a5d61c9000000b00313f5ea44f7mr1418213wrv.35.1687792152332; Mon, 26 Jun 2023 08:09:12 -0700 (PDT) Received: from [192.168.1.193] (f.c.7.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff::7cf]) by smtp.gmail.com with ESMTPSA id v1-20020adfe281000000b00311299df211sm7668710wri.77.2023.06.26.08.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 08:09:12 -0700 (PDT) From: Lorenz Bauer Subject: [PATCH bpf-next v3 0/7] Add SO_REUSEPORT support for TC bpf_sk_assign Date: Mon, 26 Jun 2023 16:08:57 +0100 Message-Id: <20230613-so-reuseport-v3-0-907b4cbb7b99@isovalent.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAAmqmWQC/22OwQ6CMBBEf4Xs2TXQKgRP/ofh0NZFmmjbdGuDI fy7hZMHj5M3kzcLMEVLDJdqgUjZsvWuBHmowEzKPQjtvWQQtZB120hkj5HeTMHHhNQLcxZt00k iKBOtmFBH5cy0jX67Gw6RRjvvthvoMKKjOcFQyGQ5+fjZb2Sx8//GLLBG3Zm2V/JUzPJq2Wf1J JeOxr9gWNf1C0IJORzVAAAA To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , David Ahern , Willem de Bruijn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Joe Stringer , Mykola Lysenko , Shuah Khan , Kuniyuki Iwashima Cc: Hemanth Malla , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Lorenz Bauer , Joe Stringer X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org We want to replace iptables TPROXY with a BPF program at TC ingress. To make this work in all cases we need to assign a SO_REUSEPORT socket to an skb, which is currently prohibited. This series adds support for such sockets to bpf_sk_assing. I did some refactoring to cut down on the amount of duplicate code. The key to this is to use INDIRECT_CALL in the reuseport helpers. To show that this approach is not just beneficial to TC sk_assign I removed duplicate code for bpf_sk_lookup as well. Changes from v1: - Correct commit abbrev length (Kuniyuki) - Reduce duplication (Kuniyuki) - Add checks on sk_state (Martin) - Split exporting inet[6]_lookup_reuseport into separate patch (Eric) Joint work with Daniel Borkmann. Signed-off-by: Lorenz Bauer --- Changes in v3: - Fix warning re udp_ehashfn and udp6_ehashfn (Simon) - Return higher scoring connected UDP reuseport sockets (Kuniyuki) - Fix ipv6 module builds - Link to v2: https://lore.kernel.org/r/20230613-so-reuseport-v2-0-b7c69a342613@isovalent.com --- Daniel Borkmann (1): selftests/bpf: Test that SO_REUSEPORT can be used with sk_assign helper Lorenz Bauer (6): udp: re-score reuseport groups when connected sockets are present net: export inet_lookup_reuseport and inet6_lookup_reuseport net: document inet[6]_lookup_reuseport sk_state requirements net: remove duplicate reuseport_lookup functions net: remove duplicate sk_lookup helpers bpf, net: Support SO_REUSEPORT sockets with bpf_sk_assign include/net/inet6_hashtables.h | 84 ++++++++- include/net/inet_hashtables.h | 77 +++++++- include/net/sock.h | 7 +- include/net/udp.h | 8 + include/uapi/linux/bpf.h | 3 - net/core/filter.c | 2 - net/ipv4/inet_hashtables.c | 70 +++++--- net/ipv4/udp.c | 88 ++++----- net/ipv6/inet6_hashtables.c | 73 +++++--- net/ipv6/udp.c | 98 ++++------ tools/include/uapi/linux/bpf.h | 3 - tools/testing/selftests/bpf/network_helpers.c | 3 + .../selftests/bpf/prog_tests/assign_reuse.c | 197 +++++++++++++++++++++ .../selftests/bpf/progs/test_assign_reuse.c | 142 +++++++++++++++ 14 files changed, 676 insertions(+), 179 deletions(-) --- base-commit: 970308a7b544fa1c7ee98a2721faba3765be8dd8 change-id: 20230613-so-reuseport-e92c526173ee Best regards,