diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2024-11-08 15:46:56 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2024-11-08 15:46:56 +0000 |
| commit | bd57f7ca88040610529275504c1c178b8fd5c61e (patch) | |
| tree | 5a1ec6fe27e743624dc8a04d9d0721c5bbf793fb /sys | |
| parent | ca0a7d31c69d9514055fb190fa086b3a06f8ccfd (diff) | |
TCP send and receive space update are MP safe.
tcp_update_sndspace() and tcp_update_rcvspace() only read global
variables that do not change after initialization. Mark them as
such. Add braces around multi-line if blocks.
ok mvs@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 7704890afc0..d74abd3e03e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.231 2024/04/12 16:07:09 bluhm Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.232 2024/11/08 15:46:55 bluhm Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -102,15 +102,20 @@ #include <netinet6/in6_var.h> #endif +/* + * Locks used to protect global variables in this file: + * I immutable after creation + */ + #ifndef TCP_SENDSPACE #define TCP_SENDSPACE 1024*16 #endif -u_int tcp_sendspace = TCP_SENDSPACE; +u_int tcp_sendspace = TCP_SENDSPACE; /* [I] */ #ifndef TCP_RECVSPACE #define TCP_RECVSPACE 1024*16 #endif -u_int tcp_recvspace = TCP_RECVSPACE; -u_int tcp_autorcvbuf_inc = 16 * 1024; +u_int tcp_recvspace = TCP_RECVSPACE; /* [I] */ +u_int tcp_autorcvbuf_inc = 16 * 1024; /* [I] */ const struct pr_usrreqs tcp_usrreqs = { .pru_attach = tcp_attach, @@ -1516,13 +1521,14 @@ tcp_update_sndspace(struct tcpcb *tp) /* low on memory try to get rid of some */ if (tcp_sendspace < nmax) nmax = tcp_sendspace; - } else if (so->so_snd.sb_wat != tcp_sendspace) + } else if (so->so_snd.sb_wat != tcp_sendspace) { /* user requested buffer size, auto-scaling disabled */ nmax = so->so_snd.sb_wat; - else + } else { /* automatic buffer scaling */ nmax = MIN(sb_max, so->so_snd.sb_wat + tp->snd_max - tp->snd_una); + } /* a writable socket must be preserved because of poll(2) semantics */ if (sbspace(so, &so->so_snd) >= so->so_snd.sb_lowat) { @@ -1556,10 +1562,10 @@ tcp_update_rcvspace(struct tcpcb *tp) /* low on memory try to get rid of some */ if (tcp_recvspace < nmax) nmax = tcp_recvspace; - } else if (so->so_rcv.sb_wat != tcp_recvspace) + } else if (so->so_rcv.sb_wat != tcp_recvspace) { /* user requested buffer size, auto-scaling disabled */ nmax = so->so_rcv.sb_wat; - else { + } else { /* automatic buffer scaling */ if (tp->rfbuf_cnt > so->so_rcv.sb_hiwat / 8 * 7) nmax = MIN(sb_max, so->so_rcv.sb_hiwat + |