leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: add sock_enable_timestamps

Browse Source 
Add a helper to directly enable timestamps instead of setting the
SO_TIMESTAMP* sockopts from kernel space and going through a fake
uaccess.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-28 07:12:14 +02:00 committed by David S. Miller
parent 7594888c78
commit 783da70e83
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/sock.h
View File

@ -2689,6 +2689,7 @@ static inline bool sk_dev_equal_l3scope(struct sock *sk, int dif)
void sock_def_readable(struct sock *sk); void sock_def_readable(struct sock *sk);
int sock_bindtoindex(struct sock *sk, int ifindex); int sock_bindtoindex(struct sock *sk, int ifindex);
void sock_enable_timestamps(struct sock *sk);
void sock_no_linger(struct sock *sk); void sock_no_linger(struct sock *sk);
void sock_set_priority(struct sock *sk, u32 priority); void sock_set_priority(struct sock *sk, u32 priority);
void sock_set_reuseaddr(struct sock *sk); void sock_set_reuseaddr(struct sock *sk);

53
net/core/sock.c
View File

@ -757,6 +757,28 @@ void sock_set_sndtimeo(struct sock *sk, s64 secs)
} }
EXPORT_SYMBOL(sock_set_sndtimeo); EXPORT_SYMBOL(sock_set_sndtimeo);
static void __sock_set_timestamps(struct sock *sk, bool val, bool new, bool ns)
{
if (val) {
sock_valbool_flag(sk, SOCK_TSTAMP_NEW, new);
sock_valbool_flag(sk, SOCK_RCVTSTAMPNS, ns);
sock_set_flag(sk, SOCK_RCVTSTAMP);
sock_enable_timestamp(sk, SOCK_TIMESTAMP);
} else {
sock_reset_flag(sk, SOCK_RCVTSTAMP);
sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
sock_reset_flag(sk, SOCK_TSTAMP_NEW);
}
}
void sock_enable_timestamps(struct sock *sk)
{
lock_sock(sk);
__sock_set_timestamps(sk, true, false, true);
release_sock(sk);
}
EXPORT_SYMBOL(sock_enable_timestamps);
/* /*
* This is meant for all protocols to use and covers goings on * This is meant for all protocols to use and covers goings on
* at the socket level. Everything here is generic. * at the socket level. Everything here is generic.
@ -948,28 +970,17 @@ set_rcvbuf:
break; break;
case SO_TIMESTAMP_OLD: case SO_TIMESTAMP_OLD:
case SO_TIMESTAMP_NEW: __sock_set_timestamps(sk, valbool, false, false);
case SO_TIMESTAMPNS_OLD: break;
case SO_TIMESTAMPNS_NEW: case SO_TIMESTAMP_NEW:
if (valbool) { __sock_set_timestamps(sk, valbool, true, false);
if (optname == SO_TIMESTAMP_NEW || optname == SO_TIMESTAMPNS_NEW) break;
sock_set_flag(sk, SOCK_TSTAMP_NEW); case SO_TIMESTAMPNS_OLD:
else __sock_set_timestamps(sk, valbool, false, true);
sock_reset_flag(sk, SOCK_TSTAMP_NEW); break;
case SO_TIMESTAMPNS_NEW:
if (optname == SO_TIMESTAMP_OLD || optname == SO_TIMESTAMP_NEW) __sock_set_timestamps(sk, valbool, true, true);
sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
else
sock_set_flag(sk, SOCK_RCVTSTAMPNS);
sock_set_flag(sk, SOCK_RCVTSTAMP);
sock_enable_timestamp(sk, SOCK_TIMESTAMP);
} else {
sock_reset_flag(sk, SOCK_RCVTSTAMP);
sock_reset_flag(sk, SOCK_RCVTSTAMPNS);
sock_reset_flag(sk, SOCK_TSTAMP_NEW);
}
break; break;
case SO_TIMESTAMPING_NEW: case SO_TIMESTAMPING_NEW:
sock_set_flag(sk, SOCK_TSTAMP_NEW); sock_set_flag(sk, SOCK_TSTAMP_NEW);
/* fall through */ /* fall through */

8
net/rxrpc/local_object.c
View File

@ -189,13 +189,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
} }
/* We want receive timestamps. */ /* We want receive timestamps. */
opt = 1; sock_enable_timestamps(local->socket->sk);
ret = kernel_setsockopt(local->socket, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
(char *)&opt, sizeof(opt));
if (ret < 0) {
_debug("setsockopt failed");
goto error;
}
break; break;
default: default: