iflib: initialize LRO unconditionally
Changes to the LRO code have exposed a bug in iflib where devices which are not capable of doing LRO are still calling tcp_lro_flush_all(), even when they have not initialized the LRO context. This used to be mostly harmless, but the LRO code now sets the VNET based on the ifp in the lro context and will try to access it through a NULL ifp resulting in a panic at boot. To fix this, we unconditionally initializes LRO so that we have a valid LRO context when calling tcp_lro_flush_all(). One alternative is to check the device capabilities before calling tcp_lro_flush_all() or adding a new state flag in the ctx. However, it seems unwise to add an extra, mostly useless test for higher performance devices when we can just initialize LRO for all devices. Reviewed by: erj, hselasky, markj, olivier Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D29928
This commit is contained in:
parent
5f00292fe3
commit
3183d0b680
@ -5891,7 +5891,6 @@ iflib_rx_structures_setup(if_ctx_t ctx)
|
||||
|
||||
for (q = 0; q < ctx->ifc_softc_ctx.isc_nrxqsets; q++, rxq++) {
|
||||
#if defined(INET6) || defined(INET)
|
||||
if (if_getcapabilities(ctx->ifc_ifp) & IFCAP_LRO) {
|
||||
err = tcp_lro_init_args(&rxq->ifr_lc, ctx->ifc_ifp,
|
||||
TCP_LRO_ENTRIES, min(1024,
|
||||
ctx->ifc_softc_ctx.isc_nrxd[rxq->ifr_fl_offset]));
|
||||
@ -5900,7 +5899,6 @@ iflib_rx_structures_setup(if_ctx_t ctx)
|
||||
"LRO Initialization failed!\n");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
IFDI_RXQ_SETUP(ctx, rxq->ifr_id);
|
||||
}
|
||||
@ -5914,7 +5912,6 @@ iflib_rx_structures_setup(if_ctx_t ctx)
|
||||
*/
|
||||
rxq = ctx->ifc_rxqs;
|
||||
for (i = 0; i < q; ++i, rxq++) {
|
||||
if (if_getcapabilities(ctx->ifc_ifp) & IFCAP_LRO)
|
||||
tcp_lro_free(&rxq->ifr_lc);
|
||||
}
|
||||
return (err);
|
||||
@ -5938,7 +5935,6 @@ iflib_rx_structures_free(if_ctx_t ctx)
|
||||
iflib_dma_free(&rxq->ifr_ifdi[j]);
|
||||
iflib_rx_sds_free(rxq);
|
||||
#if defined(INET6) || defined(INET)
|
||||
if (if_getcapabilities(ctx->ifc_ifp) & IFCAP_LRO)
|
||||
tcp_lro_free(&rxq->ifr_lc);
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user