From: "Arnd Bergmann" <arnd@arndb.de>
To: "Willem de Bruijn" <willemdebruijn.kernel@gmail.com>,
"Thomas Lange" <thomas@corelatus.se>,
Netdev <netdev@vger.kernel.org>,
"Deepa Dinamani" <deepa.kernel@gmail.com>
Cc: "Jörn-Thorben Hinz" <jthinz@mailbox.tu-berlin.de>
Subject: Re: net/core/sock.c lacks some SO_TIMESTAMPING_NEW support
Date: Wed, 20 Dec 2023 09:43:45 +0000 [thread overview]
Message-ID: <0d7cddc9-03fa-43db-a579-14f3e822615b@app.fastmail.com> (raw)
In-Reply-To: <658266e18643_19028729436@willemb.c.googlers.com.notmuch>
On Wed, Dec 20, 2023, at 04:00, Willem de Bruijn wrote:
> Thomas Lange wrote:
>> diff --git a/net/core/sock.c b/net/core/sock.c
>> index 16584e2dd648..a56ec1d492c9 100644
>> --- a/net/core/sock.c
>> +++ b/net/core/sock.c
>> @@ -2821,6 +2821,7 @@ int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
>> sockc->mark = *(u32 *)CMSG_DATA(cmsg);
>> break;
>> case SO_TIMESTAMPING_OLD:
>> + case SO_TIMESTAMPING_NEW:
>> if (cmsg->cmsg_len != CMSG_LEN(sizeof(u32)))
>> return -EINVAL;
>>
>> However, looking through the module, it seems that sk_getsockopt() has no
>> support for SO_TIMESTAMPING_NEW either, but sk_setsockopt() has.
>
> Good point. Adding the author to see if this was a simple oversight or
> there was a rationale at the time for leaving it out.
I'm fairly sure this was just a mistake on our side. For the cmsg case,
I think we just missed it because there is no corresponding SO_TIMESTAMP{,NS}
version of this, so it fell through the cracks.
In the patch above, I'm not entirely sure about what needs to happen
with the old/new format, i.e. the
sock_valbool_flag(sk, SOCK_TSTAMP_NEW, optname == SO_TIMESTAMPING_NEW)
from setsockopt(). Is __sock_cmsg_send() allowed to turn on timestamping
without it being first enabled using setsockopt()? If so, I think
we need to set the flag here the same way that setsockopt does. If
not, then I think we instead should check that the old/new format
in the option sent via cmsg is the same that was set earlier with
setsockopt.
For the missing getsockopt, there was even a patch earlier this year
by Jörn-Thorben Hinz [1], but I failed to realize that we need patch
1/2 from his series regardless of patch 2/2.
Arnd
[1] https://lore.kernel.org/lkml/20230703175048.151683-2-jthinz@mailbox.tu-berlin.de/
next prev parent reply other threads:[~2023-12-20 9:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-18 21:28 net/core/sock.c lacks some SO_TIMESTAMPING_NEW support Thomas Lange
2023-12-20 4:00 ` Willem de Bruijn
2023-12-20 9:43 ` Arnd Bergmann [this message]
2023-12-20 11:13 ` Jörn-Thorben Hinz
2023-12-20 14:53 ` Willem de Bruijn
2023-12-20 15:06 ` Willem de Bruijn
2023-12-20 15:59 ` Arnd Bergmann
2023-12-21 15:49 ` Jörn-Thorben Hinz
2023-12-21 17:07 ` Willem de Bruijn
2023-12-21 23:32 ` Jörn-Thorben Hinz
2024-01-02 15:26 ` Willem de Bruijn
2024-01-02 19:06 ` Thomas Lange
2024-01-02 19:44 ` Willem de Bruijn
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=0d7cddc9-03fa-43db-a579-14f3e822615b@app.fastmail.com \
--to=arnd@arndb.de \
--cc=deepa.kernel@gmail.com \
--cc=jthinz@mailbox.tu-berlin.de \
--cc=netdev@vger.kernel.org \
--cc=thomas@corelatus.se \
--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).