From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: <willemdebruijn.kernel@gmail.com>
Cc: <brauner@kernel.org>, <davem@davemloft.net>,
<edumazet@google.com>, <horms@kernel.org>, <kuba@kernel.org>,
<kuni1840@gmail.com>, <kuniyu@amazon.com>,
<netdev@vger.kernel.org>, <pabeni@redhat.com>,
<willemb@google.com>
Subject: Re: [PATCH v2 net-next 4/9] tcp: Restrict SO_TXREHASH to TCP socket.
Date: Mon, 12 May 2025 15:14:01 -0700 [thread overview]
Message-ID: <20250512221414.56633-1-kuniyu@amazon.com> (raw)
In-Reply-To: <68224974de7ed_e985e294b5@willemb.c.googlers.com.notmuch>
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Date: Mon, 12 May 2025 15:18:12 -0400
> Kuniyuki Iwashima wrote:
> > sk->sk_txrehash is only used for TCP.
> >
> > Let's restrict SO_TXREHASH to TCP to reflect this.
> >
> > Later, we will make sk_txrehash a part of the union for other
> > protocol families, so we set 0 explicitly in getsockopt().
> >
> > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> > ---
> > net/core/sock.c | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/core/sock.c b/net/core/sock.c
> > index b64df2463300..5c84a608ddd7 100644
> > --- a/net/core/sock.c
> > +++ b/net/core/sock.c
> > @@ -1276,6 +1276,8 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
> > return 0;
> > }
> > case SO_TXREHASH:
> > + if (!sk_is_tcp(sk))
> > + return -EOPNOTSUPP;
> > if (val < -1 || val > 1)
> > return -EINVAL;
> > if ((u8)val == SOCK_TXREHASH_DEFAULT)
> > @@ -2102,8 +2104,11 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
> > break;
> >
> > case SO_TXREHASH:
> > - /* Paired with WRITE_ONCE() in sk_setsockopt() */
> > - v.val = READ_ONCE(sk->sk_txrehash);
> > + if (sk_is_tcp(sk))
> > + /* Paired with WRITE_ONCE() in sk_setsockopt() */
> > + v.val = READ_ONCE(sk->sk_txrehash);
> > + else
> > + v.val = 0;
>
> Here and in the following getsockopt calls: should the call fail with
> EOPNOTSUPP rather than return a value that is legal where the option
> is supported (in TCP).
I was wondering which is better but didn't have preference, so will
return -EOPNOTSUPP in v3.
Thanks!
next prev parent reply other threads:[~2025-05-12 22:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-10 1:56 [PATCH v2 net-next 0/9] af_unix: Introduce SO_PASSRIGHTS Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 1/9] af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 2/9] af_unix: Don't pass struct socket to maybe_add_creds() Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 3/9] scm: Move scm_recv() from scm.h to scm.c Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 4/9] tcp: Restrict SO_TXREHASH to TCP socket Kuniyuki Iwashima
2025-05-12 19:18 ` Willem de Bruijn
2025-05-12 22:14 ` Kuniyuki Iwashima [this message]
2025-05-13 2:42 ` Willem de Bruijn
2025-05-13 3:11 ` Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 5/9] net: Restrict SO_PASS{CRED,PIDFD,SEC} to AF_{UNIX,NETLINK,BLUETOOTH} Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 6/9] af_unix: Move SOCK_PASS{CRED,PIDFD,SEC} to struct sock Kuniyuki Iwashima
2025-05-12 19:20 ` Willem de Bruijn
2025-05-12 22:20 ` Kuniyuki Iwashima
2025-05-13 2:44 ` Willem de Bruijn
2025-05-13 3:18 ` Kuniyuki Iwashima
2025-05-13 2:03 ` kernel test robot
2025-05-10 1:56 ` [PATCH v2 net-next 7/9] af_unix: Inherit sk_flags at connect() Kuniyuki Iwashima
2025-05-12 19:38 ` Willem de Bruijn
2025-05-12 22:34 ` Kuniyuki Iwashima
2025-05-13 2:48 ` Willem de Bruijn
2025-05-13 3:20 ` Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 8/9] af_unix: Introduce SO_PASSRIGHTS Kuniyuki Iwashima
2025-05-10 1:56 ` [PATCH v2 net-next 9/9] selftest: af_unix: Test SO_PASSRIGHTS Kuniyuki Iwashima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250512221414.56633-1-kuniyu@amazon.com \
--to=kuniyu@amazon.com \
--cc=brauner@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).