From nobody Thu Dec 18 07:33:52 2025 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 8590AC04E69 for ; Tue, 15 Aug 2023 19:16:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239962AbjHOTQg (ORCPT ); Tue, 15 Aug 2023 15:16:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239920AbjHOTPp (ORCPT ); Tue, 15 Aug 2023 15:15:45 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F108710E for ; Tue, 15 Aug 2023 12:15:43 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-31969580797so3053540f8f.3 for ; Tue, 15 Aug 2023 12:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1692126942; x=1692731742; 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=YUo7LjJkt/gLUmEsfc9WbDcPQ795ordeimMxgj8+/2g=; b=VGjFvMagcUYy9AEqiPKjV8lGxUaLayASGaNGQwSI4NHErE2SCoNh92jVxW+onMhFFQ X52PshJdA2TQY2vSmnkdCUH6CuwFKe4SktT7td1bmbbAH1lnS4dppp0Tpg98MepPzmeF szrC6cP9PTU7Fyq/WBOJudQxhiEgqv6Ak2uaSMdDiYdutq1w61J2Fv+GHk0okTK1S6ix B7ZZV0FWdqntMpQD4Vl3JRaCRUbeK/RiVfsbwPXb1aBHmVbSVQKZKgC6l0Q6JFfxy73Y icA7+UzlNqKlmk5+HbcPQMAoCZkY1Iesh/l59i2ceX5/f9J8YKV5p6Kyg6bPbKLZX5xj A2ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692126942; x=1692731742; 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=YUo7LjJkt/gLUmEsfc9WbDcPQ795ordeimMxgj8+/2g=; b=FcPyPaKvW5gTuzZ+4k8CRNu3GEOVCucjOuMqujHsVj3idZERh2whgrstyrlHoDd7CE qzadgKffSjgltUZFuqDoZVvjjCvYOF8BzCGOd9ZjTXq0OMspgIPpW8STFMpMPRDIJx3r zy1irkvSKDSHFGVdyDH2FllF/l522RzV2wyF9pfj7ZLwOLGQ12WjFNBKGoAHhCrRZgER XFJ934nAustODjekzDMDtByufxTjK2poNzCbw6HpNhNGBy5+IY1JUZ5n6Jwxomf2tPNa Im8jxtVrgJLF18eidC16KTHW7Me1WZqqoxpjjAZ2RtWMZ6+/vXlKFSOR/G7eftuw8QsD Wjzg== X-Gm-Message-State: AOJu0Yw9qE0IDeSflKfcVa3CObzuxeg0qd5kvbWmTX1OGHLPfDy6riTq wMR8aNQxzocFjBFDM60xlcazjw== X-Google-Smtp-Source: AGHT+IE68NpvgjIK0xkzouqUi25v+AvtuLrDYbvi9FVAQyX0K+UqUS48W2i4/AxRrWPOnfMXutPLxQ== X-Received: by 2002:a5d:538e:0:b0:314:2732:e81e with SMTP id d14-20020a5d538e000000b003142732e81emr9062594wrv.8.1692126942470; Tue, 15 Aug 2023 12:15:42 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003fbbe41fd78sm18779737wmc.10.2023.08.15.12.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 12:15:41 -0700 (PDT) From: Dmitry Safonov To: David Ahern , Eric Dumazet , Paolo Abeni , Jakub Kicinski , "David S. Miller" Cc: linux-kernel@vger.kernel.org, Dmitry Safonov , Andy Lutomirski , Ard Biesheuvel , Bob Gilligan , Dan Carpenter , David Laight , Dmitry Safonov <0x7f454c46@gmail.com>, Donald Cassidy , Eric Biggers , "Eric W. Biederman" , Francesco Ruggeri , "Gaillardetz, Dominik" , Herbert Xu , Hideaki YOSHIFUJI , Ivan Delalande , Leonard Crestez , "Nassiri, Mohammad" , Salam Noureddine , Simon Horman , "Tetreault, Francois" , netdev@vger.kernel.org Subject: [PATCH v10 net-next 22/23] net/tcp: Add TCP_AO_REPAIR Date: Tue, 15 Aug 2023 20:14:51 +0100 Message-ID: <20230815191455.1872316-23-dima@arista.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230815191455.1872316-1-dima@arista.com> References: <20230815191455.1872316-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add TCP_AO_REPAIR setsockopt(), getsockopt(). They let a user to repair TCP-AO ISNs/SNEs. Also let the user hack around when (tp->repair) is on and add ao_info on a socket in any supported state. As SNEs now can be read/written at any moment, use WRITE_ONCE()/READ_ONCE() to set/read them. Signed-off-by: Dmitry Safonov Acked-by: David Ahern --- include/net/tcp_ao.h | 14 +++++++ include/uapi/linux/tcp.h | 8 ++++ net/ipv4/tcp.c | 24 +++++++---- net/ipv4/tcp_ao.c | 90 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 125 insertions(+), 11 deletions(-) diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h index 7bffdc81e2a9..4336e295ac6f 100644 --- a/include/net/tcp_ao.h +++ b/include/net/tcp_ao.h @@ -197,6 +197,8 @@ void tcp_ao_time_wait(struct tcp_timewait_sock *tcptw, = struct tcp_sock *tp); bool tcp_ao_ignore_icmp(const struct sock *sk, int type, int code); int tcp_ao_get_mkts(struct sock *sk, sockptr_t optval, sockptr_t optlen); int tcp_ao_get_sock_info(struct sock *sk, sockptr_t optval, sockptr_t optl= en); +int tcp_ao_get_repair(struct sock *sk, sockptr_t optval, sockptr_t optlen); +int tcp_ao_set_repair(struct sock *sk, sockptr_t optval, unsigned int optl= en); enum skb_drop_reason tcp_inbound_ao_hash(struct sock *sk, const struct sk_buff *skb, unsigned short int family, const struct request_sock *req, int l3index, @@ -315,6 +317,18 @@ static inline int tcp_ao_get_sock_info(struct sock *sk= , sockptr_t optval, sockpt { return -ENOPROTOOPT; } + +static inline int tcp_ao_get_repair(struct sock *sk, + sockptr_t optval, sockptr_t optlen) +{ + return -ENOPROTOOPT; +} + +static inline int tcp_ao_set_repair(struct sock *sk, + sockptr_t optval, unsigned int optlen) +{ + return -ENOPROTOOPT; +} #endif =20 #if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO) diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 979ff960fddb..624198fa170d 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -133,6 +133,7 @@ enum { #define TCP_AO_DEL_KEY 39 /* Delete MKT */ #define TCP_AO_INFO 40 /* Set/list TCP-AO per-socket options */ #define TCP_AO_GET_KEYS 41 /* List MKT(s) */ +#define TCP_AO_REPAIR 42 /* Get/Set SNEs and ISNs */ =20 #define TCP_REPAIR_ON 1 #define TCP_REPAIR_OFF 0 @@ -445,6 +446,13 @@ struct tcp_ao_getsockopt { /* getsockopt(TCP_AO_GET_KE= YS) */ __u64 pkt_bad; /* out: segments that failed verification */ } __attribute__((aligned(8))); =20 +struct tcp_ao_repair { /* {s,g}etsockopt(TCP_AO_REPAIR) */ + __be32 snt_isn; + __be32 rcv_isn; + __u32 snd_sne; + __u32 rcv_sne; +} __attribute__((aligned(8))); + /* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */ =20 #define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 296e1985ee43..cdb48f21e782 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3598,20 +3598,28 @@ int do_tcp_setsockopt(struct sock *sk, int level, i= nt optname, __tcp_sock_set_quickack(sk, val); break; =20 + case TCP_AO_REPAIR: + err =3D tcp_ao_set_repair(sk, optval, optlen); + break; #ifdef CONFIG_TCP_AO case TCP_AO_ADD_KEY: case TCP_AO_DEL_KEY: case TCP_AO_INFO: { /* If this is the first TCP-AO setsockopt() on the socket, - * sk_state has to be LISTEN or CLOSE + * sk_state has to be LISTEN or CLOSE. Allow TCP_REPAIR + * in any state. */ - if (((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) || - rcu_dereference_protected(tcp_sk(sk)->ao_info, + if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) + goto ao_parse; + if (rcu_dereference_protected(tcp_sk(sk)->ao_info, lockdep_sock_is_held(sk))) - err =3D tp->af_specific->ao_parse(sk, optname, optval, - optlen); - else - err =3D -EISCONN; + goto ao_parse; + if (tp->repair) + goto ao_parse; + err =3D -EISCONN; + break; +ao_parse: + err =3D tp->af_specific->ao_parse(sk, optname, optval, optlen); break; } #endif @@ -4269,6 +4277,8 @@ int do_tcp_getsockopt(struct sock *sk, int level, return err; } #endif + case TCP_AO_REPAIR: + return tcp_ao_get_repair(sk, optval, optlen); case TCP_AO_GET_KEYS: case TCP_AO_INFO: { int err; diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index 65915313711c..2e9f6be90b5a 100644 --- a/net/ipv4/tcp_ao.c +++ b/net/ipv4/tcp_ao.c @@ -1440,6 +1440,16 @@ static struct tcp_ao_info *setsockopt_ao_info(struct= sock *sk) return ERR_PTR(-ESOCKTNOSUPPORT); } =20 +static struct tcp_ao_info *getsockopt_ao_info(struct sock *sk) +{ + if (sk_fullsock(sk)) + return rcu_dereference(tcp_sk(sk)->ao_info); + else if (sk->sk_state =3D=3D TCP_TIME_WAIT) + return rcu_dereference(tcp_twsk(sk)->ao_info); + + return ERR_PTR(-ESOCKTNOSUPPORT); +} + #define TCP_AO_KEYF_ALL (TCP_AO_KEYF_IFINDEX | TCP_AO_KEYF_EXCLUDE_OPT) #define TCP_AO_GET_KEYF_VALID (TCP_AO_KEYF_IFINDEX) =20 @@ -1621,11 +1631,13 @@ static int tcp_ao_add_cmd(struct sock *sk, unsigned= short int family, if (ret < 0) goto err_free_sock; =20 - /* Change this condition if we allow adding keys in states - * like close_wait, syn_sent or fin_wait... - */ - if (sk->sk_state =3D=3D TCP_ESTABLISHED) + if (!((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE))) { tcp_ao_cache_traffic_keys(sk, ao_info, key); + if (first) { + ao_info->current_key =3D key; + ao_info->rnext_key =3D key; + } + } =20 tcp_ao_link_mkt(ao_info, key); if (first) { @@ -1876,6 +1888,8 @@ static int tcp_ao_info_cmd(struct sock *sk, unsigned = short int family, if (IS_ERR(ao_info)) return PTR_ERR(ao_info); if (!ao_info) { + if (!((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE))) + return -EINVAL; ao_info =3D tcp_ao_alloc_info(GFP_KERNEL); if (!ao_info) return -ENOMEM; @@ -2258,3 +2272,71 @@ int tcp_ao_get_sock_info(struct sock *sk, sockptr_t = optval, sockptr_t optlen) return 0; } =20 +int tcp_ao_set_repair(struct sock *sk, sockptr_t optval, unsigned int optl= en) +{ + struct tcp_sock *tp =3D tcp_sk(sk); + struct tcp_ao_repair cmd; + struct tcp_ao_key *key; + struct tcp_ao_info *ao; + int err; + + if (optlen < sizeof(cmd)) + return -EINVAL; + + err =3D copy_struct_from_sockptr(&cmd, sizeof(cmd), optval, optlen); + if (err) + return err; + + if (!tp->repair) + return -EPERM; + + ao =3D setsockopt_ao_info(sk); + if (IS_ERR(ao)) + return PTR_ERR(ao); + if (!ao) + return -ENOENT; + + WRITE_ONCE(ao->lisn, cmd.snt_isn); + WRITE_ONCE(ao->risn, cmd.rcv_isn); + WRITE_ONCE(ao->snd_sne, cmd.snd_sne); + WRITE_ONCE(ao->rcv_sne, cmd.rcv_sne); + + hlist_for_each_entry_rcu(key, &ao->head, node) + tcp_ao_cache_traffic_keys(sk, ao, key); + + return 0; +} + +int tcp_ao_get_repair(struct sock *sk, sockptr_t optval, sockptr_t optlen) +{ + struct tcp_sock *tp =3D tcp_sk(sk); + struct tcp_ao_repair opt; + struct tcp_ao_info *ao; + int len; + + if (copy_from_sockptr(&len, optlen, sizeof(int))) + return -EFAULT; + + if (len <=3D 0) + return -EINVAL; + + if (!tp->repair) + return -EPERM; + + rcu_read_lock(); + ao =3D getsockopt_ao_info(sk); + if (IS_ERR_OR_NULL(ao)) { + rcu_read_unlock(); + return ao ? PTR_ERR(ao) : -ENOENT; + } + + opt.snt_isn =3D ao->lisn; + opt.rcv_isn =3D ao->risn; + opt.snd_sne =3D READ_ONCE(ao->snd_sne); + opt.rcv_sne =3D READ_ONCE(ao->rcv_sne); + rcu_read_unlock(); + + if (copy_to_sockptr(optval, &opt, min_t(int, len, sizeof(opt)))) + return -EFAULT; + return 0; +} --=20 2.41.0