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

Make TSO work with IPSEC compiled into the kernel.

Browse Source 
The lookup hurts a bit for connections but had been there anyway
if IPSEC was compiled in. So moving the lookup up a bit gives us
TSO support at not extra cost.

PR:		kern/115586
Tested by:	gallatin
Discussed with:	kmacy
MFC after:	2 months
This commit is contained in:
Bjoern A. Zeeb 2007-11-21 22:30:14 +00:00
parent c6fa9175a7
commit 9ad0173df1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/netinet/tcp_output.c
View File

@ -137,6 +137,9 @@ tcp_output(struct tcpcb *tp)
struct tcphdr *th;
u_char opt[TCP_MAXOLEN];
unsigned ipoptlen, optlen, hdrlen;
#ifdef IPSEC
unsigned ipsec_optlen = 0;
#endif
int idle, sendalot;
int sack_rxmit, sack_bytes_rxmt;
struct sackhole *p;
@ -456,13 +459,23 @@ after_sack_rexmit:
* removal of FIN (if not already catched here) are handled later after
* the exact length of the TCP options are known.
*/
#ifdef IPSEC
/*
* Pre-calculate here as we save another lookup into the darknesses
* of IPsec that way and can actually decide if TSO is ok.
*/
ipsec_optlen = ipsec_hdrsiz_tcp(tp);
#endif
if (len > tp->t_maxseg) {
if ((tp->t_flags & TF_TSO) && tcp_do_tso &&
((tp->t_flags & TF_SIGNATURE) == 0) &&
tp->rcv_numsacks == 0 && sack_rxmit == 0 &&
tp->t_inpcb->inp_options == NULL &&
tp->t_inpcb->in6p_options == NULL &&
tp->t_inpcb->inp_sp == NULL) {
tp->t_inpcb->in6p_options == NULL
#ifdef IPSEC
&& ipsec_optlen == 0
#endif
) {
tso = 1;
} else {
len = tp->t_maxseg;
@ -698,7 +711,7 @@ send:
else
ipoptlen = 0;
#ifdef IPSEC
ipoptlen += ipsec_hdrsiz_tcp(tp);
ipoptlen += ipsec_optlen;
#endif
/*