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.
> 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 19:46:18 -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 19:46:20 -0000
> @@ -176,6 +176,7 @@ int pfkeyv2_shutdown(struct socket *);
> int pfkeyv2_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int pfkeyv2_abort(struct socket *);
> +int pfkeyv2_sense(struct socket *, struct stat *);
> int pfkeyv2_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
> struct mbuf *, struct proc *);
> int pfkeyv2_output(struct mbuf *, struct socket *, struct sockaddr *,
> @@ -212,6 +213,7 @@ const struct pr_usrreqs pfkeyv2_usrreqs
> .pru_shutdown = pfkeyv2_shutdown,
> .pru_send = pfkeyv2_send,
> .pru_abort = pfkeyv2_abort,
> + .pru_sense = pfkeyv2_sense,
> };
>
> const struct protosw pfkeysw[] = {
> @@ -391,6 +393,13 @@ pfkeyv2_abort(struct socket *so)
> }
>
> int
> +pfkeyv2_sense(struct socket *so, struct stat *ub)
> +{
> + /* stat: don't bother with a blocksize. */
> + return (0);
> +}
> +
> +int
> pfkeyv2_usrreq(struct socket *so, int req, struct mbuf *m,
> struct mbuf *nam, struct mbuf *control, struct proc *p)
> {
> @@ -417,10 +426,6 @@ pfkeyv2_usrreq(struct socket *so, int re
> /* no connect, bind, accept. Socket is connected from the start */
> case PRU_CONNECT2:
> error = EOPNOTSUPP;
> - break;
> -
> - case PRU_SENSE:
> - /* stat: don't bother with a blocksize. */
> break;
>
> /* minimal support, just implement a fake peer address */
> 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 19:46:21 -0000
> @@ -120,6 +120,7 @@ int route_rcvd(struct socket *);
> int route_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int route_abort(struct socket *);
> +int route_sense(struct socket *, struct stat *);
> void route_input(struct mbuf *m0, struct socket *, sa_family_t);
> int route_arp_conflict(struct rtentry *, struct rt_addrinfo *);
> int route_cleargateway(struct rtentry *, void *, unsigned int);
> @@ -243,10 +244,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;
> @@ -411,6 +408,13 @@ route_abort(struct socket *so)
> }
>
> int
> +route_sense(struct socket *so, struct stat *ub)
> +{
> + /* stat: don't bother with a blocksize. */
> + return (0);
> +}
> +
> +int
> route_ctloutput(int op, struct socket *so, int level, int optname,
> struct mbuf *m)
> {
> @@ -2454,6 +2458,7 @@ const struct pr_usrreqs route_usrreqs =
> .pru_rcvd = route_rcvd,
> .pru_send = route_send,
> .pru_abort = route_abort,
> + .pru_sense = route_sense,
> };
>
> const struct protosw routesw[] = {
> 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 19:46:21 -0000
> @@ -70,6 +70,7 @@ const struct pr_usrreqs divert_usrreqs =
> .pru_shutdown = divert_shutdown,
> .pru_send = divert_send,
> .pru_abort = divert_abort,
> + .pru_sense = divert_sense,
> };
>
> int divbhashsize = DIVERTHASHSIZE;
> @@ -279,9 +280,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:
> @@ -377,6 +375,12 @@ divert_abort(struct socket *so)
> soisdisconnected(so);
> in_pcbdetach(inp);
>
> + return (0);
> +}
> +
> +int
> +divert_sense(struct socket *so, struct stat *ub)
> +{
> return (0);
> }
>
> Index: sys/netinet/ip_divert.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_divert.h,v
> retrieving revision 1.20
> diff -u -p -r1.20 ip_divert.h
> --- sys/netinet/ip_divert.h 28 Aug 2022 18:44:16 -0000 1.20
> +++ sys/netinet/ip_divert.h 28 Aug 2022 19:46:21 -0000
> @@ -79,5 +79,6 @@ int divert_shutdown(struct socket *);
> int divert_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int divert_abort(struct socket *);
> +int divert_sense(struct socket *, struct stat *);
> #endif /* _KERNEL */
> #endif /* _IP_DIVERT_H_ */
> Index: sys/netinet/ip_gre.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_gre.c,v
> retrieving revision 1.81
> diff -u -p -r1.81 ip_gre.c
> --- sys/netinet/ip_gre.c 28 Aug 2022 18:44:16 -0000 1.81
> +++ sys/netinet/ip_gre.c 28 Aug 2022 19:46:21 -0000
> @@ -71,6 +71,7 @@ const struct pr_usrreqs gre_usrreqs = {
> .pru_shutdown = rip_shutdown,
> .pru_send = gre_send,
> .pru_abort = rip_abort,
> + .pru_sense = rip_sense,
> };
>
> int
> Index: sys/netinet/ip_var.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_var.h,v
> retrieving revision 1.103
> diff -u -p -r1.103 ip_var.h
> --- sys/netinet/ip_var.h 28 Aug 2022 18:44:16 -0000 1.103
> +++ sys/netinet/ip_var.h 28 Aug 2022 19:46:21 -0000
> @@ -225,6 +225,7 @@ extern struct rttimer_queue ip_mtudisc_t
> extern struct pool ipqent_pool;
> struct route;
> struct inpcb;
> +struct stat;
>
> int ip_ctloutput(int, struct socket *, int, int, struct mbuf *);
> int ip_fragment(struct mbuf *, struct mbuf_list *, struct ifnet *, u_long);
> @@ -267,6 +268,7 @@ int rip_shutdown(struct socket *);
> int rip_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int rip_abort(struct socket *);
> +int rip_sense(struct socket *, struct stat *);
> #ifdef MROUTING
> extern struct socket *ip_mrouter[]; /* multicast routing daemon */
> #endif
> 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 19:46:21 -0000
> @@ -113,6 +113,7 @@ const struct pr_usrreqs rip_usrreqs = {
> .pru_shutdown = rip_shutdown,
> .pru_send = rip_send,
> .pru_abort = rip_abort,
> + .pru_sense = rip_sense,
> };
>
> /*
> @@ -482,12 +483,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.
> */
> @@ -690,4 +685,13 @@ rip_abort(struct socket *so)
> in_pcbdetach(inp);
>
> return (0);
> +}
> +
> +int
> +rip_sense(struct socket *so, struct stat *ub)
> +{
> + /*
> + * stat: don't bother with a blocksize.
> + */
> + return 0;
> }
> 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 19:46:21 -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 19:46:21 -0000
> @@ -724,6 +724,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 19:46:22 -0000
> @@ -132,6 +132,7 @@ const struct pr_usrreqs udp_usrreqs = {
> .pru_shutdown = udp_shutdown,
> .pru_send = udp_send,
> .pru_abort = udp_abort,
> + .pru_sense = udp_sense,
> };
>
> const struct sysctl_bounded_args udpctl_vars[] = {
> @@ -1106,16 +1107,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:
> @@ -1311,6 +1302,19 @@ udp_abort(struct socket *so)
> in_pcbdetach(inp);
>
> return (0);
> +}
> +
> +int
> +udp_sense(struct socket *so, struct stat *ub)
> +{
> + /*
> + * stat: don't bother with a blocksize.
> + */
> + /*
> + * Perhaps Path MTU might be returned for a connected
> + * UDP socket in this case.
> + */
> + return (0);
> }
>
> /*
> Index: sys/netinet/udp_var.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet/udp_var.h,v
> retrieving revision 1.44
> diff -u -p -r1.44 udp_var.h
> --- sys/netinet/udp_var.h 28 Aug 2022 18:44:16 -0000 1.44
> +++ sys/netinet/udp_var.h 28 Aug 2022 19:46:22 -0000
> @@ -150,5 +150,6 @@ int udp_shutdown(struct socket *);
> int udp_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int udp_abort(struct socket *);
> +int udp_sense(struct socket *, struct stat *);
> #endif /* _KERNEL */
> #endif /* _NETINET_UDP_VAR_H_ */
> 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 19:46:22 -0000
> @@ -71,6 +71,7 @@ const struct pr_usrreqs divert6_usrreqs
> .pru_shutdown = divert6_shutdown,
> .pru_send = divert6_send,
> .pru_abort = divert6_abort,
> + .pru_sense = divert6_sense,
> };
>
> int divb6hashsize = DIVERTHASHSIZE;
> @@ -285,9 +286,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:
> @@ -384,6 +382,12 @@ divert6_abort(struct socket *so)
> soisdisconnected(so);
> in_pcbdetach(inp);
>
> + return (0);
> +}
> +
> +int
> +divert6_sense(struct socket *so, struct stat *ub)
> +{
> return (0);
> }
>
> Index: sys/netinet6/ip6_divert.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/ip6_divert.h,v
> retrieving revision 1.18
> diff -u -p -r1.18 ip6_divert.h
> --- sys/netinet6/ip6_divert.h 28 Aug 2022 18:44:17 -0000 1.18
> +++ sys/netinet6/ip6_divert.h 28 Aug 2022 19:46:22 -0000
> @@ -79,6 +79,7 @@ int divert6_shutdown(struct socket *);
> int divert6_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int divert6_abort(struct socket *);
> +int divert6_sense(struct socket *, struct stat *);
> #endif /* _KERNEL */
>
> #endif /* _IP6_DIVERT_H_ */
> Index: sys/netinet6/ip6_var.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/ip6_var.h,v
> retrieving revision 1.101
> diff -u -p -r1.101 ip6_var.h
> --- sys/netinet6/ip6_var.h 28 Aug 2022 18:44:17 -0000 1.101
> +++ sys/netinet6/ip6_var.h 28 Aug 2022 19:46:22 -0000
> @@ -304,6 +304,7 @@ extern const struct pr_usrreqs rip6_usrr
>
> struct in6pcb;
> struct inpcb;
> +struct stat;
>
> int icmp6_ctloutput(int, struct socket *, int, int, struct mbuf *);
>
> @@ -362,6 +363,7 @@ int rip6_shutdown(struct socket *);
> int rip6_send(struct socket *, struct mbuf *, struct mbuf *,
> struct mbuf *);
> int rip6_abort(struct socket *);
> +int rip6_sense(struct socket *, struct stat *ub);
> int rip6_sysctl(int *, u_int, void *, size_t *, void *, size_t);
>
> int dest6_input(struct mbuf **, int *, int, int);
> 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 19:46:22 -0000
> @@ -115,6 +115,7 @@ const struct pr_usrreqs rip6_usrreqs = {
> .pru_shutdown = rip6_shutdown,
> .pru_send = rip6_send,
> .pru_abort = rip6_abort,
> + .pru_sense = rip6_sense,
> };
>
> /*
> @@ -597,11 +598,6 @@ rip6_usrreq(struct socket *so, int req,
> error = EOPNOTSUPP;
> break;
>
> - case PRU_SENSE:
> - /*
> - * stat: don't bother with a blocksize
> - */
> - break;
> /*
> * Not supported.
> */
> @@ -823,6 +819,15 @@ rip6_abort(struct socket *so)
>
> in_pcbdetach(in6p);
>
> + return (0);
> +}
> +
> +int
> +rip6_sense(struct socket *so, struct stat *ub)
> +{
> + /*
> + * stat: don't bother with a blocksize
> + */
> return (0);
> }
>
> 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 19:46:22 -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,7 @@ 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);
> + return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub);
> }
>
> 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 19:46:23 -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 *);
