On Sun, Aug 28, 2022 at 10:42:11PM +0200, Alexander Bluhm wrote:
> On Sun, Aug 28, 2022 at 10:51:31PM +0300, Vitaliy Makkoveev wrote:
> > Another candidate for future refactoring. Except the tcp(4) and unix(4)
> > cases we do nothing with passed `ub', but in all cases we return no
> > error.
>
> Instead of adding all these return(0) functions, we should return(0)
> in pru_sense() if .pru_sense == NULL.
>
No problem. Updated diff.
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.177
diff -u -p -r1.177 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c 28 Aug 2022 18:44:16 -0000 1.177
+++ sys/kern/uipc_usrreq.c 28 Aug 2022 21:16:13 -0000
@@ -139,6 +139,7 @@ const struct pr_usrreqs uipc_usrreqs = {
.pru_rcvd = uipc_rcvd,
.pru_send = uipc_send,
.pru_abort = uipc_abort,
+ .pru_sense = uipc_sense,
};
void
@@ -246,25 +247,6 @@ uipc_usrreq(struct socket *so, int req,
}
break;
- case PRU_SENSE: {
- struct stat *sb = (struct stat *)m;
-
- sb->st_blksize = so->so_snd.sb_hiwat;
- sb->st_dev = NODEV;
- mtx_enter(&unp_ino_mtx);
- if (unp->unp_ino == 0)
- unp->unp_ino = unp_ino++;
- mtx_leave(&unp_ino_mtx);
- sb->st_atim.tv_sec =
- sb->st_mtim.tv_sec =
- sb->st_ctim.tv_sec = unp->unp_ctime.tv_sec;
- sb->st_atim.tv_nsec =
- sb->st_mtim.tv_nsec =
- sb->st_ctim.tv_nsec = unp->unp_ctime.tv_nsec;
- sb->st_ino = unp->unp_ino;
- break;
- }
-
case PRU_RCVOOB:
case PRU_SENDOOB:
error = EOPNOTSUPP;
@@ -593,6 +575,28 @@ uipc_abort(struct socket *so)
unp_detach(unp);
sofree(so, 0);
+
+ return (0);
+}
+
+int
+uipc_sense(struct socket *so, struct stat *sb)
+{
+ struct unpcb *unp = sotounpcb(so);
+
+ sb->st_blksize = so->so_snd.sb_hiwat;
+ sb->st_dev = NODEV;
+ mtx_enter(&unp_ino_mtx);
+ if (unp->unp_ino == 0)
+ unp->unp_ino = unp_ino++;
+ mtx_leave(&unp_ino_mtx);
+ sb->st_atim.tv_sec =
+ sb->st_mtim.tv_sec =
+ sb->st_ctim.tv_sec = unp->unp_ctime.tv_sec;
+ sb->st_atim.tv_nsec =
+ sb->st_mtim.tv_nsec =
+ sb->st_ctim.tv_nsec = unp->unp_ctime.tv_nsec;
+ sb->st_ino = unp->unp_ino;
return (0);
}
Index: sys/net/pfkeyv2.c
===================================================================
RCS file: /cvs/src/sys/net/pfkeyv2.c,v
retrieving revision 1.244
diff -u -p -r1.244 pfkeyv2.c
--- sys/net/pfkeyv2.c 28 Aug 2022 18:44:16 -0000 1.244
+++ sys/net/pfkeyv2.c 28 Aug 2022 21:16:14 -0000
@@ -419,10 +419,6 @@ pfkeyv2_usrreq(struct socket *so, int re
error = EOPNOTSUPP;
break;
- case PRU_SENSE:
- /* stat: don't bother with a blocksize. */
- break;
-
/* minimal support, just implement a fake peer address */
case PRU_SOCKADDR:
error = EINVAL;
Index: sys/net/rtsock.c
===================================================================
RCS file: /cvs/src/sys/net/rtsock.c,v
retrieving revision 1.344
diff -u -p -r1.344 rtsock.c
--- sys/net/rtsock.c 28 Aug 2022 18:44:16 -0000 1.344
+++ sys/net/rtsock.c 28 Aug 2022 21:16:14 -0000
@@ -243,10 +243,6 @@ route_usrreq(struct socket *so, int req,
error = EOPNOTSUPP;
break;
- case PRU_SENSE:
- /* stat: don't bother with a blocksize. */
- break;
-
/* minimal support, just implement a fake peer address */
case PRU_SOCKADDR:
error = EINVAL;
Index: sys/netinet/ip_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_divert.c,v
retrieving revision 1.79
diff -u -p -r1.79 ip_divert.c
--- sys/netinet/ip_divert.c 28 Aug 2022 18:44:16 -0000 1.79
+++ sys/netinet/ip_divert.c 28 Aug 2022 21:16:14 -0000
@@ -279,9 +279,6 @@ divert_usrreq(struct socket *so, int req
in_setpeeraddr(inp, addr);
break;
- case PRU_SENSE:
- break;
-
case PRU_CONNECT2:
case PRU_SENDOOB:
case PRU_FASTTIMO:
Index: sys/netinet/raw_ip.c
===================================================================
RCS file: /cvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.140
diff -u -p -r1.140 raw_ip.c
--- sys/netinet/raw_ip.c 28 Aug 2022 18:44:16 -0000 1.140
+++ sys/netinet/raw_ip.c 28 Aug 2022 21:16:14 -0000
@@ -482,12 +482,6 @@ rip_usrreq(struct socket *so, int req, s
error = EOPNOTSUPP;
break;
- case PRU_SENSE:
- /*
- * stat: don't bother with a blocksize.
- */
- break;
-
/*
* Not supported.
*/
Index: sys/netinet/tcp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.197
diff -u -p -r1.197 tcp_usrreq.c
--- sys/netinet/tcp_usrreq.c 28 Aug 2022 18:44:16 -0000 1.197
+++ sys/netinet/tcp_usrreq.c 28 Aug 2022 21:16:14 -0000
@@ -124,6 +124,7 @@ const struct pr_usrreqs tcp_usrreqs = {
.pru_rcvd = tcp_rcvd,
.pru_send = tcp_send,
.pru_abort = tcp_abort,
+ .pru_sense = tcp_sense,
};
static int pr_slowhz = PR_SLOWHZ;
@@ -227,10 +228,6 @@ tcp_usrreq(struct socket *so, int req, s
error = EOPNOTSUPP;
break;
- case PRU_SENSE:
- ((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat;
- break;
-
case PRU_RCVOOB:
if ((so->so_oobmark == 0 &&
(so->so_state & SS_RCVATMARK) == 0) ||
@@ -981,6 +978,25 @@ tcp_abort(struct socket *so)
if (otp)
tcp_trace(TA_USER, ostate, tp, otp, NULL, PRU_ABORT, 0);
+ return (0);
+}
+
+int
+tcp_sense(struct socket *so, struct stat *ub)
+{
+ struct inpcb *inp;
+ struct tcpcb *tp;
+ int error;
+
+ soassertlocked(so);
+
+ if ((error = tcp_sogetpcb(so, &inp, &tp)))
+ return (error);
+
+ ub->st_blksize = so->so_snd.sb_hiwat;
+
+ if (so->so_options & SO_DEBUG)
+ tcp_trace(TA_USER, tp->t_state, tp, tp, NULL, PRU_SENSE, 0);
return (0);
}
Index: sys/netinet/tcp_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_var.h,v
retrieving revision 1.150
diff -u -p -r1.150 tcp_var.h
--- sys/netinet/tcp_var.h 28 Aug 2022 18:44:16 -0000 1.150
+++ sys/netinet/tcp_var.h 28 Aug 2022 21:16:14 -0000
@@ -513,6 +513,7 @@ struct tcp_ident_mapping {
#ifdef _KERNEL
#include <sys/percpu.h>
+#include <sys/stat.h>
enum tcpstat_counters {
tcps_connattempt,
@@ -724,6 +725,7 @@ int tcp_rcvd(struct socket *);
int tcp_send(struct socket *, struct mbuf *, struct mbuf *,
struct mbuf *);
int tcp_abort(struct socket *);
+int tcp_sense(struct socket *, struct stat *);
void tcp_xmit_timer(struct tcpcb *, int);
void tcpdropoldhalfopen(struct tcpcb *, u_int16_t);
void tcp_sack_option(struct tcpcb *,struct tcphdr *,u_char *,int);
Index: sys/netinet/udp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.292
diff -u -p -r1.292 udp_usrreq.c
--- sys/netinet/udp_usrreq.c 28 Aug 2022 18:44:16 -0000 1.292
+++ sys/netinet/udp_usrreq.c 28 Aug 2022 21:16:14 -0000
@@ -1106,16 +1106,6 @@ udp_usrreq(struct socket *so, int req, s
in_setpeeraddr(inp, addr);
break;
- case PRU_SENSE:
- /*
- * stat: don't bother with a blocksize.
- */
- /*
- * Perhaps Path MTU might be returned for a connected
- * UDP socket in this case.
- */
- break;
-
case PRU_SENDOOB:
case PRU_FASTTIMO:
case PRU_SLOWTIMO:
Index: sys/netinet6/ip6_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.78
diff -u -p -r1.78 ip6_divert.c
--- sys/netinet6/ip6_divert.c 28 Aug 2022 18:44:17 -0000 1.78
+++ sys/netinet6/ip6_divert.c 28 Aug 2022 21:16:14 -0000
@@ -285,9 +285,6 @@ divert6_usrreq(struct socket *so, int re
in6_setpeeraddr(inp, addr);
break;
- case PRU_SENSE:
- break;
-
case PRU_CONNECT2:
case PRU_SENDOOB:
case PRU_FASTTIMO:
Index: sys/netinet6/raw_ip6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.160
diff -u -p -r1.160 raw_ip6.c
--- sys/netinet6/raw_ip6.c 28 Aug 2022 18:44:17 -0000 1.160
+++ sys/netinet6/raw_ip6.c 28 Aug 2022 21:16:14 -0000
@@ -597,11 +597,6 @@ rip6_usrreq(struct socket *so, int req,
error = EOPNOTSUPP;
break;
- case PRU_SENSE:
- /*
- * stat: don't bother with a blocksize
- */
- break;
/*
* Not supported.
*/
Index: sys/sys/protosw.h
===================================================================
RCS file: /cvs/src/sys/sys/protosw.h,v
retrieving revision 1.46
diff -u -p -r1.46 protosw.h
--- sys/sys/protosw.h 28 Aug 2022 18:44:17 -0000 1.46
+++ sys/sys/protosw.h 28 Aug 2022 21:16:14 -0000
@@ -58,6 +58,7 @@ struct sockaddr;
struct socket;
struct domain;
struct proc;
+struct stat;
struct pr_usrreqs {
/* user request: see list below */
@@ -76,6 +77,7 @@ struct pr_usrreqs {
int (*pru_send)(struct socket *, struct mbuf *, struct mbuf *,
struct mbuf *);
int (*pru_abort)(struct socket *);
+ int (*pru_sense)(struct socket *, struct stat *);
};
struct protosw {
@@ -350,8 +352,9 @@ pru_control(struct socket *so, u_long cm
static inline int
pru_sense(struct socket *so, struct stat *ub)
{
- return (*so->so_proto->pr_usrreqs->pru_usrreq)(so,
- PRU_SENSE, (struct mbuf *)ub, NULL, NULL, curproc);
+ if (so->so_proto->pr_usrreqs->pru_sense)
+ return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub);
+ return (0);
}
static inline int
Index: sys/sys/unpcb.h
===================================================================
RCS file: /cvs/src/sys/sys/unpcb.h,v
retrieving revision 1.36
diff -u -p -r1.36 unpcb.h
--- sys/sys/unpcb.h 28 Aug 2022 18:44:17 -0000 1.36
+++ sys/sys/unpcb.h 28 Aug 2022 21:16:14 -0000
@@ -102,6 +102,9 @@ struct unpcb {
#define sotounpcb(so) ((struct unpcb *)((so)->so_pcb))
#ifdef _KERNEL
+
+struct stat;
+
struct fdpass {
struct file *fp;
int flags;
@@ -123,6 +126,7 @@ int uipc_rcvd(struct socket *);
int uipc_send(struct socket *, struct mbuf *, struct mbuf *,
struct mbuf *);
int uipc_abort(struct socket *);
+int uipc_sense(struct socket *, struct stat *u);
void unp_init(void);
int unp_bind(struct unpcb *, struct mbuf *, struct proc *);
