From patchwork Tue Jul 4 13:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 13301276 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 0A72FEB64D9 for ; Tue, 4 Jul 2023 13:46:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231319AbjGDNqr (ORCPT ); Tue, 4 Jul 2023 09:46:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231162AbjGDNqq (ORCPT ); Tue, 4 Jul 2023 09:46:46 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AA41EE for ; Tue, 4 Jul 2023 06:46:44 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fba8e2aa52so67768965e9.1 for ; Tue, 04 Jul 2023 06:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1688478402; x=1691070402; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=O3ZEHKXTVG/Gb9fOd1FQSYBQN3ni6h9P0p7yh5ic6CY=; b=ESheU9hFBk0h6N2kS+nTQir6IROjqSLFNKvaku+9x/BZQfYeMpNwijF2twERuTtmDM fgRkYoWq36XNW0YmbegWWzmrjG3Ktgyq/6lEyzeN+qgUt/6qjjr3LZQD7fBk95cPN+Ra 6DGS6AHyLLSR5esqoXXK6DB6mpuDOQFsTyQONNJbZHAnBduijy71ljU/fO4QbkLPAfSw Z2R9mmxZOjVPFQOaENy8NSBthTTiypoWAxhjr67rJbcPRvVftLMWC1CaYbz/58yv1yyv YzcUFTy3fLdpd4RieBkCfhtrsMfXU8sSkEC3HU0YlWIz/vG7t7FFnuOFfCT8J34NQWYV w8bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688478402; x=1691070402; 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=O3ZEHKXTVG/Gb9fOd1FQSYBQN3ni6h9P0p7yh5ic6CY=; b=RDUQ646IfmyFKkofLyI2HH404y5cd/PwZqFUWJIcxe5V14XYfGOanwQr7TZirLuDCN kjWoCyniY4SgNNxggjeINv9fcYVI3rpaKPksyFmBltMoNLZNfKvH7hW7vAcaYxxsiH1F fnrQmYTl6fY38eJ4GfcDYJiM3LndlhRCGSSQ0jhSccsfeORRcsxVA29/qUGuyWtCp/7s CDRsHDfT0TX1fj6XsLoG7WPKfnkwVK99Px7qeRnNGx3/MnJylpXcC2jPIUyycuwHXdzY i81Jkr4HaPI0KplumQjNNC+O8FO+OzUaBR2nwarjHSt0+cOay4qhQK5U6PxjaUk9QeqZ DUgw== X-Gm-Message-State: AC+VfDyM2BDW+1WnzqLdp+M3K8oOB5JcbKPPvJkPsH6MAQN3OacA17ng syR6DTpn9PCFaqFvbsDQbgkP5e8JPXrc6qdFUgQarA== X-Google-Smtp-Source: ACHHUZ6KIjf5+rG3djA315MFSZFS8jV5nrHiYXmanlyO83a6ak9oOnYyWW9Eqtc+I8kqI0UWLB4fKA== X-Received: by 2002:a7b:cb8a:0:b0:3fa:97b3:7ce0 with SMTP id m10-20020a7bcb8a000000b003fa97b37ce0mr11388577wmi.26.1688478402274; Tue, 04 Jul 2023 06:46:42 -0700 (PDT) Received: from [192.168.133.175] ([5.148.46.226]) by smtp.gmail.com with ESMTPSA id x8-20020a5d60c8000000b003142b0d98b4sm9274680wrt.37.2023.07.04.06.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 06:46:42 -0700 (PDT) From: Lorenz Bauer Subject: [PATCH bpf-next v5 0/7] Add SO_REUSEPORT support for TC bpf_sk_assign Date: Tue, 04 Jul 2023 14:46:22 +0100 Message-Id: <20230613-so-reuseport-v5-0-f6686a0dbce0@isovalent.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAK4ipGQC/32OQQ7CIBBFr2JYi6FAi7jyHsYFg6MlUWigkpqmd 5d2ZUzT5c+b//6MJGF0mMhpN5KI2SUXfAn1fkdsa/wDqbuVTDjjgjWVoCnQiO+EXYg9Rc1tzZt KCURSKmASUojG23Yu/d7OuIt4d8OydiHQ3anHoSfXQlqX+hA/yxuZL3x9MXPKKCjbaCNkWRZnl 0I2T/T9wYbXIstiSyCKQDMF0gIo0HpNILcEsggkWlSNYkcA8y+YpukLGbAabVcBAAA= 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. Joint work with Daniel Borkmann. Signed-off-by: Lorenz Bauer --- Changes in v5: - Drop reuse_sk == sk check in inet[6]_steal_stock (Kuniyuki) - Link to v4: https://lore.kernel.org/r/20230613-so-reuseport-v4-0-4ece76708bba@isovalent.com Changes in v4: - WARN_ON_ONCE if reuseport socket is refcounted (Kuniyuki) - Use inet[6]_ehashfn_t to shorten function declarations (Kuniyuki) - Shuffle documentation patch around (Kuniyuki) - Update commit message to explain why IPv6 needs EXPORT_SYMBOL - Link to v3: https://lore.kernel.org/r/20230613-so-reuseport-v3-0-907b4cbb7b99@isovalent.com 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 Changes in v2: - Correct commit abbrev length (Kuniyuki) - Reduce duplication (Kuniyuki) - Add checks on sk_state (Martin) - Split exporting inet[6]_lookup_reuseport into separate patch (Eric) --- 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: remove duplicate reuseport_lookup functions net: document inet[6]_lookup_reuseport sk_state requirements net: remove duplicate sk_lookup helpers bpf, net: Support SO_REUSEPORT sockets with bpf_sk_assign include/net/inet6_hashtables.h | 81 ++++++++- include/net/inet_hashtables.h | 74 +++++++- include/net/sock.h | 7 +- include/uapi/linux/bpf.h | 3 - net/core/filter.c | 2 - net/ipv4/inet_hashtables.c | 68 ++++--- net/ipv4/udp.c | 88 ++++----- net/ipv6/inet6_hashtables.c | 71 +++++--- 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 +++++++++++++++ 13 files changed, 658 insertions(+), 179 deletions(-) --- base-commit: c20f9cef725bc6b19efe372696e8000fb5af0d46 change-id: 20230613-so-reuseport-e92c526173ee Best regards,