ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

tcp: Remove CMSG magic numbers for tcp_recvmsg().

Browse Source 
At present, tcp_recvmsg() uses flags to track if any CMSGs are pending
and what those CMSGs are. These flags are currently magic numbers,
used only within tcp_recvmsg().

To prepare for receive timestamp support in tcp receive zerocopy,
gently refactor these magic numbers into enums.

Signed-off-by: Arjun Roy <arjunroy@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Arjun Roy
2021-01-20 16:41:47 -08:00
committed by Jakub Kicinski
parent 5225d5f57b
commit 925bba24e6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/tcp.c
View File

@@ -280,6 +280,12 @@
#include <asm/ioctls.h> #include <asm/ioctls.h>
#include <net/busy_poll.h> #include <net/busy_poll.h>
/* Track pending CMSGs. */
enum {
TCP_CMSG_INQ = 1,
TCP_CMSG_TS = 2
};
struct percpu_counter tcp_orphan_count; struct percpu_counter tcp_orphan_count;
EXPORT_SYMBOL_GPL(tcp_orphan_count); EXPORT_SYMBOL_GPL(tcp_orphan_count);
@@ -2272,7 +2278,7 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,
goto out; goto out;
if (tp->recvmsg_inq) if (tp->recvmsg_inq)
*cmsg_flags = 1; *cmsg_flags = TCP_CMSG_INQ;
timeo = sock_rcvtimeo(sk, nonblock); timeo = sock_rcvtimeo(sk, nonblock);
/* Urgent data needs to be handled specially. */ /* Urgent data needs to be handled specially. */
@@ -2453,7 +2459,7 @@ skip_copy:
if (TCP_SKB_CB(skb)->has_rxtstamp) { if (TCP_SKB_CB(skb)->has_rxtstamp) {
tcp_update_recv_tstamps(skb, tss); tcp_update_recv_tstamps(skb, tss);
*cmsg_flags |= 2; *cmsg_flags |= TCP_CMSG_TS;
} }
if (used + offset < skb->len) if (used + offset < skb->len)
@@ -2513,9 +2519,9 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
release_sock(sk); release_sock(sk);
if (cmsg_flags && ret >= 0) { if (cmsg_flags && ret >= 0) {
if (cmsg_flags & 2) if (cmsg_flags & TCP_CMSG_TS)
tcp_recv_timestamp(msg, sk, &tss); tcp_recv_timestamp(msg, sk, &tss);
if (cmsg_flags & 1) { if (cmsg_flags & TCP_CMSG_INQ) {
inq = tcp_inq_hint(sk); inq = tcp_inq_hint(sk);
put_cmsg(msg, SOL_TCP, TCP_CM_INQ, sizeof(inq), &inq); put_cmsg(msg, SOL_TCP, TCP_CM_INQ, sizeof(inq), &inq);
} }