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

Update the TCP LRO code to handle both encrypted and un-encrypted traffic.

Browse Source 
Encrypted and un-encrypted traffic needs to be coalesced separately.
Split the 16-bit lro_type field in the address information into two
8-bit fields, and then use the last 8-bit field for flags, which among
other indicate if the received mbuf is encrypted or un-encrypted.

Differential Revision:	https://reviews.freebsd.org/D31377
Reviewed by:	gallatin
MFC after:	1 week
Sponsored by:	NVIDIA Networking
This commit is contained in:
Hans Petter Selasky 2021-08-02 11:53:12 +02:00
parent ed2196e5df
commit bb5cd80e8b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netinet/tcp_lro.c
View File

@ -394,6 +394,9 @@ tcp_lro_parser(struct mbuf *m, struct lro_parser *po, struct lro_parser *pi, boo
po->data.vlan_id =
htons(m->m_pkthdr.ether_vtag) & htons(EVL_VLID_MASK);
}
/* Store decrypted flag, if any. */
if (__predict_false(m->m_flags & M_DECRYPTED))
po->data.lro_flags |= LRO_FLAG_DECRYPTED;
}
switch (po->data.lro_type) {
@ -1583,7 +1586,7 @@ do_bpf_strip_and_compress(struct inpcb *inp, struct lro_ctrl *lc,
uint32_t *ts_ptr;
int32_t n_mbuf;
bool other_opts, can_compress;
uint16_t lro_type;
uint8_t lro_type;
uint16_t iptos;
int tcp_hdr_offset;
int idx;

4
sys/netinet/tcp_lro.h
View File

@ -67,12 +67,14 @@ struct inpcb;
union lro_address {
u_long raw[1];
struct {
uint16_t lro_type; /* internal */
uint8_t lro_type; /* internal */
#define LRO_TYPE_NONE 0
#define LRO_TYPE_IPV4_TCP 1
#define LRO_TYPE_IPV6_TCP 2
#define LRO_TYPE_IPV4_UDP 3
#define LRO_TYPE_IPV6_UDP 4
uint8_t lro_flags;
#define LRO_FLAG_DECRYPTED 1
uint16_t vlan_id; /* VLAN identifier */
uint16_t s_port; /* source TCP/UDP port */
uint16_t d_port; /* destination TCP/UDP port */