Page MenuHomeFreeBSD
Files F156517614

D31377.id93098.diff
No OneTemporary
Actions

D31377.id93098.diff
View Options

diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h
--- a/sys/netinet/tcp_lro.h
+++ b/sys/netinet/tcp_lro.h
@@ -67,12 +67,14 @@
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 */
diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c
--- a/sys/netinet/tcp_lro.c
+++ b/sys/netinet/tcp_lro.c
@@ -394,6 +394,9 @@
po->data.vlan_id =
htons(m->m_pkthdr.ether_vtag) & htons(EVL_VLID_MASK);
}
+ /* Store decrypted flag, if any. */
+ if (__predict_false(m->m_pkthdr.csum_flags & CSUM_DECRYPTED))
+ po->data.lro_flags |= LRO_FLAG_DECRYPTED;
}
switch (po->data.lro_type) {
@@ -1583,7 +1586,7 @@
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;
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -658,7 +658,7 @@
#define CSUM_INNER_IP_TSO 0x00020000
#define CSUM_ENCAP_VXLAN 0x00040000 /* VXLAN outer encapsulation */
-#define CSUM_ENCAP_RSVD1 0x00080000
+#define CSUM_DECRYPTED 0x00080000 /* RX payload contains decrypted data */
/* Inbound checksum support where the checksum was verified by hardware. */
#define CSUM_INNER_L3_CALC 0x00100000
@@ -680,12 +680,12 @@
CSUM_INNER_IP6_TSO | CSUM_IP6_UDP | CSUM_IP6_TCP | CSUM_IP6_SCTP | \
CSUM_IP6_TSO | CSUM_IP6_ISCSI | CSUM_INNER_IP | CSUM_INNER_IP_UDP | \
CSUM_INNER_IP_TCP | CSUM_INNER_IP_TSO | CSUM_ENCAP_VXLAN | \
- CSUM_ENCAP_RSVD1 | CSUM_SND_TAG)
+ CSUM_SND_TAG)
#define CSUM_FLAGS_RX (CSUM_INNER_L3_CALC | CSUM_INNER_L3_VALID | \
CSUM_INNER_L4_CALC | CSUM_INNER_L4_VALID | CSUM_L3_CALC | CSUM_L3_VALID | \
CSUM_L4_CALC | CSUM_L4_VALID | CSUM_L5_CALC | CSUM_L5_VALID | \
- CSUM_COALESCED)
+ CSUM_COALESCED | CSUM_DECRYPTED)
/*
* CSUM flag description for use with printf(9) %b identifier.
@@ -696,7 +696,7 @@
"\11CSUM_INNER_IP6_TSO\12CSUM_IP6_UDP\13CSUM_IP6_TCP\14CSUM_IP6_SCTP" \
"\15CSUM_IP6_TSO\16CSUM_IP6_ISCSI\17CSUM_INNER_IP\20CSUM_INNER_IP_UDP" \
"\21CSUM_INNER_IP_TCP\22CSUM_INNER_IP_TSO\23CSUM_ENCAP_VXLAN" \
- "\24CSUM_ENCAP_RSVD1\25CSUM_INNER_L3_CALC\26CSUM_INNER_L3_VALID" \
+ "\24CSUM_DECRYPTED\25CSUM_INNER_L3_CALC\26CSUM_INNER_L3_VALID" \
"\27CSUM_INNER_L4_CALC\30CSUM_INNER_L4_VALID\31CSUM_L3_CALC" \
"\32CSUM_L3_VALID\33CSUM_L4_CALC\34CSUM_L4_VALID\35CSUM_L5_CALC" \
"\36CSUM_L5_VALID\37CSUM_COALESCED\40CSUM_SND_TAG"

File Metadata

Mime Type
text/plain
Expires
Fri, May 15, 8:31 AM (2 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33077922
Default Alt Text
D31377.id93098.diff (2 KB)

Event Timeline