d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust the fb to have a way to ask the underlying stack

Browse Source 
if it can support the PRUS option (OOB). And then have
the new function call that to validate and give the
correct error response if needed to the user (rack
and bbr do not support obsoleted OOB data).

Sponsoered by: Netflix Inc.
Differential Revision:	 https://reviews.freebsd.org/D24574
This commit is contained in:
Randall Stewart 2020-05-04 20:19:57 +00:00
parent ea69bf7f5d
commit d3b6c96b7d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=360638
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/netinet/tcp_usrreq.c
View File

@ -133,6 +133,8 @@ static void tcp_disconnect(struct tcpcb *);
static void tcp_usrclosed(struct tcpcb *);
static void tcp_fill_info(struct tcpcb *, struct tcp_info *);
static int tcp_pru_options_support(struct tcpcb *tp, int flags);
#ifdef TCPDEBUG
#define TCPDEBUG0 int ostate = 0
#define TCPDEBUG1() ostate = tp ? tp->t_state : 0
@ -979,6 +981,15 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m,
goto out;
}
tp = intotcpcb(inp);
if (flags & PRUS_OOB) {
if ((error = tcp_pru_options_support(tp, PRUS_OOB)) != 0) {
if (control)
m_freem(control);
if (m && (flags & PRUS_NOTREADY) == 0)
m_freem(m);
goto out;
}
}
TCPDEBUG1();
if (nam != NULL && tp->t_state < TCPS_SYN_SENT) {
switch (nam->sa_family) {
@ -1362,6 +1373,24 @@ tcp_usr_close(struct socket *so)
NET_EPOCH_EXIT(et);
}
static int
tcp_pru_options_support(struct tcpcb *tp, int flags)
{
/*
* If the specific TCP stack has a pru_options
* specified then it does not always support
* all the PRU_XX options and we must ask it.
* If the function is not specified then all
* of the PRU_XX options are supported.
*/
int ret = 0;
if (tp->t_fb->tfb_pru_options) {
ret = (*tp->t_fb->tfb_pru_options)(tp, flags);
}
return (ret);
}
/*
* Receive out-of-band data.
*/
@ -1381,6 +1410,10 @@ tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags)
goto out;
}
tp = intotcpcb(inp);
error = tcp_pru_options_support(tp, PRUS_OOB);
if (error) {
goto out;
}
TCPDEBUG1();
if ((so->so_oobmark == 0 &&
(so->so_rcv.sb_state & SBS_RCVATMARK) == 0) ||

1
sys/netinet/tcp_var.h
View File

@ -345,6 +345,7 @@ struct tcp_function_block {
void (*tfb_tcp_rexmit_tmr)(struct tcpcb *);
int (*tfb_tcp_handoff_ok)(struct tcpcb *);
void (*tfb_tcp_mtu_chg)(struct tcpcb *);
int (*tfb_pru_options)(struct tcpcb *, int);
volatile uint32_t tfb_refcnt;
uint32_t tfb_flags;
uint8_t tfb_id;