Sorry for previous tree breakage.
The reworked diff for `so_snd' SS_CANTSENDMORE state bit. As proposed by
deraadt@, SS_CANTSENDMORE definition left as is, but used with newly
introduced socket's buffer state `sb_state'. `sb_state' ored with
original `so_state' when socket's data exported to the userland, so the
ABI left as it was.
The `so_rcv' related SS_CANTRCVMORE and SS_RCVATMARK bits left to the
following diff.
Index: sys/kern/kern_sysctl.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.408
diff -u -p -r1.408 kern_sysctl.c
--- sys/kern/kern_sysctl.c 7 Nov 2022 14:25:44 -0000 1.408
+++ sys/kern/kern_sysctl.c 17 Dec 2022 16:43:17 -0000
@@ -1184,7 +1184,7 @@ fill_file(struct kinfo_file *kf, struct
}
kf->so_type = so->so_type;
- kf->so_state = so->so_state;
+ kf->so_state = so->so_state | so->so_snd.sb_state;
if (show_pointers)
kf->so_pcb = PTRTOINT64(so->so_pcb);
else
Index: sys/kern/sys_socket.c
===================================================================
RCS file: /cvs/src/sys/kern/sys_socket.c,v
retrieving revision 1.58
diff -u -p -r1.58 sys_socket.c
--- sys/kern/sys_socket.c 12 Dec 2022 08:30:22 -0000 1.58
+++ sys/kern/sys_socket.c 17 Dec 2022 16:43:17 -0000
@@ -151,7 +151,7 @@ soo_stat(struct file *fp, struct stat *u
solock(so);
if ((so->so_state & SS_CANTRCVMORE) == 0 || so->so_rcv.sb_cc != 0)
ub->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
- if ((so->so_state & SS_CANTSENDMORE) == 0)
+ if ((so->so_snd.sb_state & SS_CANTSENDMORE) == 0)
ub->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
ub->st_uid = so->so_euid;
ub->st_gid = so->so_egid;
Index: sys/kern/uipc_socket.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_socket.c,v
retrieving revision 1.293
diff -u -p -r1.293 uipc_socket.c
--- sys/kern/uipc_socket.c 12 Dec 2022 08:30:22 -0000 1.293
+++ sys/kern/uipc_socket.c 17 Dec 2022 16:43:17 -0000
@@ -580,7 +580,7 @@ restart:
goto out;
so->so_state |= SS_ISSENDING;
do {
- if (so->so_state & SS_CANTSENDMORE)
+ if (so->so_snd.sb_state & SS_CANTSENDMORE)
snderr(EPIPE);
if (so->so_error) {
error = so->so_error;
@@ -1465,7 +1465,7 @@ somove(struct socket *so, int wait)
error = so->so_error;
goto release;
}
- if (sosp->so_state & SS_CANTSENDMORE) {
+ if (sosp->so_snd.sb_state & SS_CANTSENDMORE) {
error = EPIPE;
goto release;
}
@@ -1659,7 +1659,8 @@ somove(struct socket *so, int wait)
if (o) {
error = pru_send(sosp, m, NULL, NULL);
if (error) {
- if (sosp->so_state & SS_CANTSENDMORE)
+ if (sosp->so_snd.sb_state &
+ SS_CANTSENDMORE)
error = EPIPE;
m_freem(o);
goto release;
@@ -1676,7 +1677,7 @@ somove(struct socket *so, int wait)
*mtod(o, caddr_t) = *mtod(m, caddr_t);
error = pru_sendoob(sosp, o, NULL, NULL);
if (error) {
- if (sosp->so_state & SS_CANTSENDMORE)
+ if (sosp->so_snd.sb_state & SS_CANTSENDMORE)
error = EPIPE;
m_freem(m);
goto release;
@@ -1697,7 +1698,7 @@ somove(struct socket *so, int wait)
sosp->so_state &= ~SS_ISSENDING;
error = pru_send(sosp, m, NULL, NULL);
if (error) {
- if (sosp->so_state & SS_CANTSENDMORE)
+ if (sosp->so_snd.sb_state & SS_CANTSENDMORE)
error = EPIPE;
goto release;
}
@@ -1714,7 +1715,8 @@ somove(struct socket *so, int wait)
if (error)
so->so_error = error;
if (((so->so_state & SS_CANTRCVMORE) && so->so_rcv.sb_cc == 0) ||
- (sosp->so_state & SS_CANTSENDMORE) || maxreached || error) {
+ (sosp->so_snd.sb_state & SS_CANTSENDMORE) ||
+ maxreached || error) {
sounsplice(so, sosp, 0);
return (0);
}
@@ -1839,7 +1841,7 @@ sosetopt(struct socket *so, int level, i
switch (optname) {
case SO_SNDBUF:
- if (so->so_state & SS_CANTSENDMORE)
+ if (so->so_snd.sb_state & SS_CANTSENDMORE)
return (EINVAL);
if (sbcheckreserve(cnt, so->so_snd.sb_wat) ||
sbreserve(so, &so->so_snd, cnt))
@@ -2185,7 +2187,7 @@ filt_sowrite(struct knote *kn, long hint
soassertlocked(so);
kn->kn_data = sbspace(so, &so->so_snd);
- if (so->so_state & SS_CANTSENDMORE) {
+ if (so->so_snd.sb_state & SS_CANTSENDMORE) {
kn->kn_flags |= EV_EOF;
if (kn->kn_flags & __EV_POLL) {
if (so->so_state & SS_ISDISCONNECTED)
Index: sys/kern/uipc_socket2.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_socket2.c,v
retrieving revision 1.131
diff -u -p -r1.131 uipc_socket2.c
--- sys/kern/uipc_socket2.c 12 Dec 2022 08:30:22 -0000 1.131
+++ sys/kern/uipc_socket2.c 17 Dec 2022 16:43:17 -0000
@@ -142,7 +142,8 @@ soisdisconnecting(struct socket *so)
{
soassertlocked(so);
so->so_state &= ~SS_ISCONNECTING;
- so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
+ so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE);
+ so->so_snd.sb_state |= SS_CANTSENDMORE;
wakeup(&so->so_timeo);
sowwakeup(so);
sorwakeup(so);
@@ -153,7 +154,8 @@ soisdisconnected(struct socket *so)
{
soassertlocked(so);
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
- so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED);
+ so->so_state |= (SS_CANTRCVMORE|SS_ISDISCONNECTED);
+ so->so_snd.sb_state |= SS_CANTSENDMORE;
wakeup(&so->so_timeo);
sowwakeup(so);
sorwakeup(so);
@@ -334,7 +336,7 @@ void
socantsendmore(struct socket *so)
{
soassertlocked(so);
- so->so_state |= SS_CANTSENDMORE;
+ so->so_snd.sb_state |= SS_CANTSENDMORE;
sowwakeup(so);
}
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.197
diff -u -p -r1.197 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c 12 Dec 2022 08:30:22 -0000 1.197
+++ sys/kern/uipc_usrreq.c 17 Dec 2022 16:43:17 -0000
@@ -509,7 +509,7 @@ uipc_send(struct socket *so, struct mbuf
goto out;
}
- if (so->so_state & SS_CANTSENDMORE) {
+ if (so->so_snd.sb_state & SS_CANTSENDMORE) {
error = EPIPE;
goto dispose;
}
Index: sys/miscfs/fifofs/fifo_vnops.c
===================================================================
RCS file: /cvs/src/sys/miscfs/fifofs/fifo_vnops.c,v
retrieving revision 1.98
diff -u -p -r1.98 fifo_vnops.c
--- sys/miscfs/fifofs/fifo_vnops.c 12 Dec 2022 08:30:22 -0000 1.98
+++ sys/miscfs/fifofs/fifo_vnops.c 17 Dec 2022 16:43:17 -0000
@@ -174,7 +174,7 @@ fifo_open(void *v)
}
fip->fi_readers = fip->fi_writers = 0;
solock(wso);
- wso->so_state |= SS_CANTSENDMORE;
+ wso->so_snd.sb_state |= SS_CANTSENDMORE;
wso->so_snd.sb_lowat = PIPE_BUF;
sounlock(wso);
} else {
@@ -185,7 +185,7 @@ fifo_open(void *v)
fip->fi_readers++;
if (fip->fi_readers == 1) {
solock(wso);
- wso->so_state &= ~SS_CANTSENDMORE;
+ wso->so_snd.sb_state &= ~SS_CANTSENDMORE;
sounlock(wso);
if (fip->fi_writers > 0)
wakeup(&fip->fi_writers);
@@ -559,7 +559,7 @@ filt_fifowrite(struct knote *kn, long hi
soassertlocked(so);
kn->kn_data = sbspace(so, &so->so_snd);
- if (so->so_state & SS_CANTSENDMORE) {
+ if (so->so_snd.sb_state & SS_CANTSENDMORE) {
kn->kn_flags |= EV_EOF;
rv = 1;
} else {
Index: sys/netinet/tcp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.214
diff -u -p -r1.214 tcp_usrreq.c
--- sys/netinet/tcp_usrreq.c 12 Dec 2022 08:30:22 -0000 1.214
+++ sys/netinet/tcp_usrreq.c 17 Dec 2022 16:43:17 -0000
@@ -773,7 +773,7 @@ tcp_shutdown(struct socket *so)
ostate = tp->t_state;
}
- if (so->so_state & SS_CANTSENDMORE)
+ if (so->so_snd.sb_state & SS_CANTSENDMORE)
goto out;
socantsendmore(so);
Index: sys/sys/socketvar.h
===================================================================
RCS file: /cvs/src/sys/sys/socketvar.h,v
retrieving revision 1.114
diff -u -p -r1.114 socketvar.h
--- sys/sys/socketvar.h 12 Dec 2022 08:30:22 -0000 1.114
+++ sys/sys/socketvar.h 17 Dec 2022 16:43:17 -0000
@@ -121,6 +121,7 @@ struct socket {
short sb_flags; /* flags, see below */
/* End area that is zeroed on flush. */
#define sb_endzero sb_flags
+ short sb_state; /* socket state on sockbuf */
uint64_t sb_timeo_nsecs;/* timeout for read/write */
struct selinfo sb_sel; /* process selecting read/write */
} so_rcv, so_snd;
@@ -237,7 +238,7 @@ sowriteable(struct socket *so)
return ((sbspace(so, &so->so_snd) >= so->so_snd.sb_lowat &&
((so->so_state & SS_ISCONNECTED) ||
(so->so_proto->pr_flags & PR_CONNREQUIRED)==0)) ||
- (so->so_state & SS_CANTSENDMORE) || so->so_error);
+ (so->so_snd.sb_state & SS_CANTSENDMORE) || so->so_error);
}
/* adjust counters in sb reflecting allocation of m */
