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

sfxge: LRO may be done only if checksums are OK

Browse Source 
Also it is cheaper to check Rx descriptor flags than TCP protocol in IP
header.

Reviewed by:    gnn
Sponsored by:   Solarflare Communications, Inc.
MFC after:      2 days
Differential Revision: https://reviews.freebsd.org/D2542
This commit is contained in:
Andrew Rybchenko 2015-05-15 06:48:36 +00:00
parent 3d6b500ff9
commit 3b3390c115
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/sfxge/sfxge_rx.c
View File

@ -688,15 +688,18 @@ sfxge_lro(struct sfxge_rxq *rxq, struct sfxge_rx_sw_desc *rx_buf)
*/
if (l3_proto == htons(ETHERTYPE_IP)) {
struct ip *iph = nh;
if ((iph->ip_p - IPPROTO_TCP) |
(iph->ip_hl - (sizeof(*iph) >> 2u)) |
KASSERT(iph->ip_p == IPPROTO_TCP,
("IPv4 protocol is not TCP, but packet marker is set"));
if ((iph->ip_hl - (sizeof(*iph) >> 2u)) |
(iph->ip_off & htons(IP_MF | IP_OFFMASK)))
goto deliver_now;
th = (struct tcphdr *)(iph + 1);
} else if (l3_proto == htons(ETHERTYPE_IPV6)) {
struct ip6_hdr *iph = nh;
if (iph->ip6_nxt != IPPROTO_TCP)
goto deliver_now;
KASSERT(iph->ip6_nxt == IPPROTO_TCP,
("IPv6 next header is not TCP, but packet marker is set"));
l2_id |= SFXGE_LRO_L2_ID_IPV6;
th = (struct tcphdr *)(iph + 1);
} else {
@ -841,7 +844,9 @@ sfxge_rx_qcomplete(struct sfxge_rxq *rxq, boolean_t eop)
/* Pass packet up the stack or into LRO (pipelined) */
if (prev != NULL) {
if (lro_enabled)
if (lro_enabled &&
((prev->flags & (EFX_PKT_TCP | EFX_CKSUM_TCPUDP)) ==
(EFX_PKT_TCP | EFX_CKSUM_TCPUDP)))
sfxge_lro(rxq, prev);
else
sfxge_rx_deliver(sc, prev);
@ -860,7 +865,9 @@ discard:
/* Pass last packet up the stack or into LRO */
if (prev != NULL) {
if (lro_enabled)
if (lro_enabled &&
((prev->flags & (EFX_PKT_TCP | EFX_CKSUM_TCPUDP)) ==
(EFX_PKT_TCP | EFX_CKSUM_TCPUDP)))
sfxge_lro(rxq, prev);
else
sfxge_rx_deliver(sc, prev);