From patchwork Thu Oct 27 20:43:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 11981 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp450249wru; Thu, 27 Oct 2022 13:53:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7DNC1qxn2dP3NHzkwR+ULa9WvsV99dZduiuEZctFnoXE0mL/coKLMZ68PdKDnHBF4+pSCN X-Received: by 2002:a05:6402:51c6:b0:462:6545:5d88 with SMTP id r6-20020a05640251c600b0046265455d88mr9361154edd.304.1666903984313; Thu, 27 Oct 2022 13:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666903984; cv=none; d=google.com; s=arc-20160816; b=tKzgqj+91RknuMwZ5XucqpvmEDzrHz7LHjlkvwPLhOByoUmkR+ZzVV14U9je/WoSlC KKy1FoRgAsNorGpBFUgMU3tC5kjgZXgcWlmD8p7ks+JrxacfauVVklqwIQ5ydysM+fK1 hAmzO/Aic+aQD+wEteu0cF4DyIe50ia+IHXQpH96o0gX2nPqb6+2oLY1Ux3jQr5XaGWh S6l4bLasu3M9Xql3suYPdkl6jd+v+AQ3cHoBsasAx03F40vaC6HAE1Fx1wXtRqiEO43u 2ZJObBt2PQoOB/Iw2LD/+VStsURoDxwEpvGQvY4rafFC3kffkIG3Ogp5CZ+xhRy+Wg/S kn0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BO0mm+QEf5Np62JXxlh17iSFdxt4l5JfCFy1h9DfxFc=; b=r49oT5a2vqvFXPE0D/FrNR24th+nlDMAXIqvqm6Qr0IPhyQynBYPwg6ph4e5Atqj98 15zRxOBSYRjspeoBCKFG+m2lZ5j9FDoNo1+utBLlwDO1J7YstUEL3KOtP6tEyFNm7z/A 0ovi5zp5f19pIEbdOZ4MhBLQrTaUpzTStdfFvxLFBkoGbIrolN/EXEer6t1VF0K7EwbG XLaTec1xa1WZDl2PlBpkAAwnkOcQnr9niKvkF0UwRJXlVTzIEuWorO9LzxQOPbSClS0R eIqXIau7VrYsfSuCNNTzoQAFH/MCyNVVs4QZGZKfm3cNasS/HcaybEXv2gaqcXlKlzkR j06w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=bZ51BqO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a50eb4a000000b00460f0ff4906si2301618edp.130.2022.10.27.13.52.39; Thu, 27 Oct 2022 13:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=bZ51BqO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236365AbiJ0UwA (ORCPT + 99 others); Thu, 27 Oct 2022 16:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237219AbiJ0Uvh (ORCPT ); Thu, 27 Oct 2022 16:51:37 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0377A543D9 for ; Thu, 27 Oct 2022 13:45:13 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so2102574wmq.4 for ; Thu, 27 Oct 2022 13:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BO0mm+QEf5Np62JXxlh17iSFdxt4l5JfCFy1h9DfxFc=; b=bZ51BqO1op2Q3t8/SRCIkOpd+PNFcHn5mgtntOQdkUDwjAB0msiKkN7hquaoJxMIwV G32tPbu0ooycFl1It+qSg2dq/iXmlcZ+PSZdF1KQE5/1ax+zAV2LArjka0h0A+rlN9J+ JpbS+X3doweyYS4edNiE7hDAhe1H1lleuUYvVYrKI1Nf/wAt/xZXIGcYRmiMijvs82VP VrV2b2NZbUjMuiDSa5Vl87PWduM86RTN/h645x8ItldiZSoo8VFPykijL3DznD2QasK5 OEV580zOZRGh1U7eWQ9D+pIVmPYt7yL6IwFK05wOYq/1rY36NxgboaJGoSpb7GMyfHBx SnfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BO0mm+QEf5Np62JXxlh17iSFdxt4l5JfCFy1h9DfxFc=; b=NWjeA2ha+DYIKG7U0ItLfBwXBMFIvhTbZ74LORwPTpUW4IS3ddDEMseRhIXfvbzOLh RkhwXgiex/G4p2jgSFJUEpxgJd3OoQqcq2nN4MaIe0xJTACAoUyHfOvSjKIAha9VyZun Mak3v3H9KFfDkL8ymcH+a0x15uBD16Qn1hLKI7QVIwZWjbH6EsjXtdt1aw5g1wR9VHDI fg78eqsHnT+MVelXY+jKsdu/uKpJLRCSwWTQlrTiZ02sO46i7sz5K7dpLYQFxDKf86ZU Opg72riLOegaHryee76VKopfXqwsvZz3Cg93t2bV3HEUpvb4iXh2SFOYLdeqC5Q1GWy5 Ycgw== X-Gm-Message-State: ACrzQf3+p6/d/05WufrO1yu0nm3FK+hBZDUH1IPWec5wZ50BFa7GMiq7 lyXZyMBGSYH2Xu4pLahEfBSK86GoAWm8XFnd X-Received: by 2002:a05:600c:4f93:b0:3cc:9bc5:c454 with SMTP id n19-20020a05600c4f9300b003cc9bc5c454mr7249457wmq.84.1666903473022; Thu, 27 Oct 2022 13:44:33 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id n3-20020a5d6b83000000b00236644228besm1968739wrx.40.2022.10.27.13.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 13:44:32 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org, David Ahern , Eric Dumazet Cc: Dmitry Safonov , Andy Lutomirski , Ard Biesheuvel , Bob Gilligan , Dan Carpenter , "David S. Miller" , Dmitry Safonov <0x7f454c46@gmail.com>, Eric Biggers , "Eric W. Biederman" , Francesco Ruggeri , Herbert Xu , Hideaki YOSHIFUJI , Ivan Delalande , Jakub Kicinski , Leonard Crestez , Paolo Abeni , Salam Noureddine , Shuah Khan , netdev@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH v3 25/36] net/tcp-ao: Add static_key for TCP-AO Date: Thu, 27 Oct 2022 21:43:36 +0100 Message-Id: <20221027204347.529913-26-dima@arista.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221027204347.529913-1-dima@arista.com> References: <20221027204347.529913-1-dima@arista.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747875512212219262?= X-GMAIL-MSGID: =?utf-8?q?1747875512212219262?= Similarly to TCP-MD5, add a static key to TCP-AO that is patched out when there are no keys on a machine and dynamically enabled with the first setsockopt(TCP_AO) adds a key on any socket. The static key is as well dynamically disabled later when the socket is destructed. The lifetime of enabled static key here is the same as ao_info: it is enabled on allocation, passed over from full socket to twsk and destructed when ao_info is scheduled for destruction. Signed-off-by: Dmitry Safonov --- include/net/tcp_ao.h | 2 ++ net/ipv4/tcp_ao.c | 15 +++++++++++++++ net/ipv4/tcp_input.c | 42 ++++++++++++++++++++++++++++-------------- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h index 67f5273396ec..0923cd3b6b45 100644 --- a/include/net/tcp_ao.h +++ b/include/net/tcp_ao.h @@ -131,6 +131,8 @@ do { \ #ifdef CONFIG_TCP_AO /* TCP-AO structures and functions */ +#include +extern struct static_key_false_deferred tcp_ao_needed; struct tcp4_ao_context { __be32 saddr; diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index 46df1d455889..494fa5e1428c 100644 --- a/net/ipv4/tcp_ao.c +++ b/net/ipv4/tcp_ao.c @@ -17,6 +17,9 @@ #include #include +DEFINE_STATIC_KEY_DEFERRED_FALSE(tcp_ao_needed, HZ); +EXPORT_SYMBOL(tcp_ao_needed); + int tcp_ao_calc_traffic_key(struct tcp_ao_key *mkt, u8 *key, void *ctx, unsigned int len) { @@ -58,6 +61,9 @@ bool tcp_ao_ignore_icmp(struct sock *sk, int type, int code) struct tcp_ao_info *ao; bool ignore_icmp = false; + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return false; + /* RFC5925, 7.8: * >> A TCP-AO implementation MUST default to ignore incoming ICMPv4 * messages of Type 3 (destination unreachable), Codes 2-4 (protocol @@ -148,6 +154,9 @@ struct tcp_ao_key *tcp_ao_do_lookup_sndid(const struct sock *sk, u8 keyid) struct tcp_ao_key *key; struct tcp_ao_info *ao; + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return NULL; + if (sk->sk_state == TCP_TIME_WAIT) ao = rcu_dereference_check(tcp_twsk(sk)->ao_info, lockdep_sock_is_held(sk)); @@ -232,6 +241,9 @@ struct tcp_ao_key *tcp_ao_do_lookup(const struct sock *sk, struct tcp_ao_key *key; struct tcp_ao_info *ao; + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return NULL; + ao = rcu_dereference_check(tcp_sk(sk)->ao_info, lockdep_sock_is_held(sk)); if (!ao) @@ -319,6 +331,7 @@ void tcp_ao_destroy_sock(struct sock *sk, bool twsk) } kfree_rcu(ao, rcu); + static_branch_slow_dec_deferred(&tcp_ao_needed); } void tcp_ao_time_wait(struct tcp_timewait_sock *tcptw, struct tcp_sock *tp) @@ -1078,6 +1091,7 @@ int tcp_ao_copy_all_matching(const struct sock *sk, struct sock *newsk, sk_gso_disable(newsk); rcu_assign_pointer(tcp_sk(newsk)->ao_info, new_ao); + atomic_inc(&tcp_ao_needed.key.key.enabled); } return 0; @@ -1605,6 +1619,7 @@ static int tcp_ao_add_cmd(struct sock *sk, unsigned short int family, if (first) { sk_gso_disable(sk); rcu_assign_pointer(tcp_sk(sk)->ao_info, ao_info); + static_branch_inc(&tcp_ao_needed.key); } /* Can't fail: the key with sndid/rcvid was just added */ diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 2ba46d5db421..3f1f5c0e78ae 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3524,17 +3524,14 @@ static inline bool tcp_may_update_window(const struct tcp_sock *tp, (ack_seq == tp->snd_wl1 && nwin > tp->snd_wnd); } -/* If we update tp->snd_una, also update tp->bytes_acked */ -static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack) +static void tcp_snd_sne_update(struct tcp_sock *tp, u32 ack) { - u32 delta = ack - tp->snd_una; #ifdef CONFIG_TCP_AO struct tcp_ao_info *ao; -#endif - sock_owned_by_me((struct sock *)tp); - tp->bytes_acked += delta; -#ifdef CONFIG_TCP_AO + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return; + ao = rcu_dereference_protected(tp->ao_info, lockdep_sock_is_held((struct sock *)tp)); if (ao) { @@ -3543,20 +3540,27 @@ static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack) ao->snd_sne_seq = ack; } #endif +} + +/* If we update tp->snd_una, also update tp->bytes_acked */ +static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack) +{ + u32 delta = ack - tp->snd_una; + + sock_owned_by_me((struct sock *)tp); + tp->bytes_acked += delta; + tcp_snd_sne_update(tp, ack); tp->snd_una = ack; } -/* If we update tp->rcv_nxt, also update tp->bytes_received */ -static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq) +static void tcp_rcv_sne_update(struct tcp_sock *tp, u32 seq) { - u32 delta = seq - tp->rcv_nxt; #ifdef CONFIG_TCP_AO struct tcp_ao_info *ao; -#endif - sock_owned_by_me((struct sock *)tp); - tp->bytes_received += delta; -#ifdef CONFIG_TCP_AO + if (!static_branch_unlikely(&tcp_ao_needed.key)) + return; + ao = rcu_dereference_protected(tp->ao_info, lockdep_sock_is_held((struct sock *)tp)); if (ao) { @@ -3565,6 +3569,16 @@ static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq) ao->rcv_sne_seq = seq; } #endif +} + +/* If we update tp->rcv_nxt, also update tp->bytes_received */ +static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq) +{ + u32 delta = seq - tp->rcv_nxt; + + sock_owned_by_me((struct sock *)tp); + tp->bytes_received += delta; + tcp_rcv_sne_update(tp, seq); WRITE_ONCE(tp->rcv_nxt, seq); }