Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 412BA63AB for ; Sat, 12 Aug 2023 09:33:54 +0000 (UTC) Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9533C213B for ; Sat, 12 Aug 2023 02:33:52 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d1c693a29a0so3081736276.1 for ; Sat, 12 Aug 2023 02:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691832832; x=1692437632; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Y1APcOMErd5MRc/B/1D1SNQrUjR+ZxTLE3V0ZbbhyUk=; b=IAulfqABGmFBCF/hZdpTRwd0jQL68mWkJvLVInaWKFJuDOA33mxDVAyCd9y1uSbUZq HEXuL/HuNKu9RPokcbqAujSDmTniwq1KsF2ikIvrhPGb4AjZvUBGG6qRH26LlbHQUX67 Jn9eQgd7PiHzMAZTceb0DD107BA79C3C4qHyhhvnTCda5wzJVxWtGLpSuMm6o1ZIP99d WruomMAyfxSBoho0XHGWSfFmZn/UiEP0pBgkz7kVGmbjSDBhrLByF1Tgt7Q34U4mUXod WyiAmDenBTz8W2bPGxY6YeOPYY/aK5DWW/MLuPzbUrPZaHXaDzZWtlJNhsmWXRtD8RAC lgwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691832832; x=1692437632; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y1APcOMErd5MRc/B/1D1SNQrUjR+ZxTLE3V0ZbbhyUk=; b=djqThzpvrftmLEfxMpNPWmjTlVo/FzM2DZquhxTxK7YwIePrLyqPq0X3nA0FVAJ8oR yBfrb2LgrNopyR+h15TAkgigSUbJ8EmUfLtoprrO5V3wl2hJu3ML199HLAwMcQEF7eBu hJc4sl8CfPqSK+ZCfFBVGbVkXPf/jplfOwXEiq/Zs73NaRAWap81MdA97f6XzE+nLgcM 6QaDZNdHgiil/h5k4uwpemRtCkHJqAa1HdjO/L30efPx/QWI1W3v3xjjFbfpkXqNLbSg GYaDVD+4CleFiKgl5fzVOES0Wzn+xGbIxSk2dY9nA77feRtCA/RA5zSOWqUwNrK7UWop HCqg== X-Gm-Message-State: AOJu0YyPbWJt+KtKXtip470XOB7niKWDjzT7z8m3r5ZexBcNT+MqtuSw TdIyjgQmAz4DdKpXLEYFMOaATpJtrhvmHw== X-Google-Smtp-Source: AGHT+IGBZYOOPEuPthmbM/IXT2c97ZCs7Jt/HBzaVFHY2HcC+Y6b7HFmuOBZbl7ZgoseKz8FPkjKaObnqZWRGg== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a25:db05:0:b0:d49:e117:3a17 with SMTP id g5-20020a25db05000000b00d49e1173a17mr71975ybf.4.1691832831903; Sat, 12 Aug 2023 02:33:51 -0700 (PDT) Date: Sat, 12 Aug 2023 09:33:33 +0000 In-Reply-To: <20230812093344.3561556-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230812093344.3561556-1-edumazet@google.com> X-Mailer: git-send-email 2.41.0.640.ga95def55d0-goog Message-ID: <20230812093344.3561556-5-edumazet@google.com> Subject: [PATCH v3 net-next 04/15] inet: move inet->recverr_rfc4884 to inet->inet_flags From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Soheil Hassas Yeganeh , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net IP_RECVERR_RFC4884 socket option can now be set/read without locking the socket. Signed-off-by: Eric Dumazet Acked-by: Soheil Hassas Yeganeh --- include/net/inet_sock.h | 2 +- net/ipv4/inet_diag.c | 2 +- net/ipv4/ip_sockglue.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 552188aa5a2d2f968b1d95e963d48a063ec4fd59..c01f1f64a8617582c68079048f74e0db606e1834 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -238,7 +238,6 @@ struct inet_sock { mc_all:1, nodefrag:1; __u8 bind_address_no_port:1, - recverr_rfc4884:1, defer_connect:1; /* Indicates that fastopen_connect is set * and cookie exists so we defer connect * until first data frame is written @@ -271,6 +270,7 @@ enum { INET_FLAGS_RECVFRAGSIZE = 8, INET_FLAGS_RECVERR = 9, + INET_FLAGS_RECVERR_RFC4884 = 10, }; /* cmsg flags for inet */ diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 25d5f76b66bd82be2c2abc6bd5206ec54f736be6..6255d6fdbc80d82904583a8fc6c439a25e875a0b 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -191,7 +191,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, inet_sockopt.mc_all = inet->mc_all; inet_sockopt.nodefrag = inet->nodefrag; inet_sockopt.bind_address_no_port = inet->bind_address_no_port; - inet_sockopt.recverr_rfc4884 = inet->recverr_rfc4884; + inet_sockopt.recverr_rfc4884 = inet_test_bit(RECVERR_RFC4884, sk); inet_sockopt.defer_connect = inet->defer_connect; if (nla_put(skb, INET_DIAG_SOCKOPT, sizeof(inet_sockopt), &inet_sockopt)) diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 8283d862a9dbb5040db4e419e9dff31bbd3cff81..f75f44ad7b11ac169b343b3c26d744cdc81d747c 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -433,7 +433,7 @@ void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, serr->port = port; if (skb_pull(skb, payload - skb->data)) { - if (inet_sk(sk)->recverr_rfc4884) + if (inet_test_bit(RECVERR_RFC4884, sk)) ipv4_icmp_error_rfc4884(skb, &serr->ee.ee_rfc4884); skb_reset_transport_header(skb); @@ -980,6 +980,11 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, if (!val) skb_queue_purge(&sk->sk_error_queue); return 0; + case IP_RECVERR_RFC4884: + if (val < 0 || val > 1) + return -EINVAL; + inet_assign_bit(RECVERR_RFC4884, sk, val); + return 0; } err = 0; @@ -1066,11 +1071,6 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, goto e_inval; inet->pmtudisc = val; break; - case IP_RECVERR_RFC4884: - if (val < 0 || val > 1) - goto e_inval; - inet->recverr_rfc4884 = !!val; - break; case IP_MULTICAST_TTL: if (sk->sk_type == SOCK_STREAM) goto e_inval; @@ -1575,6 +1575,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, case IP_RECVERR: val = inet_test_bit(RECVERR, sk); goto copyval; + case IP_RECVERR_RFC4884: + val = inet_test_bit(RECVERR_RFC4884, sk); + goto copyval; } if (needs_rtnl) @@ -1649,9 +1652,6 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, } break; } - case IP_RECVERR_RFC4884: - val = inet->recverr_rfc4884; - break; case IP_MULTICAST_TTL: val = inet->mc_ttl; break; -- 2.41.0.640.ga95def55d0-goog