git: 52f45d8acee9 - main - net: iflib: let the drivers use isc_capenable

The branch main has been updated by vmaffione:

URL: https://cgit.FreeBSD.org/src/commit/?id=52f45d8acee95199159b65a33c94142492c38e41

commit 52f45d8acee95199159b65a33c94142492c38e41
Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-12-28 11:00:32 +0000
Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2021-12-28 11:03:52 +0000

    net: iflib: let the drivers use isc_capenable
    
    Since isc_capenable (private copy of ifp->if_capenable) is
    now synchronized to if_capenable, use it in the drivers
    when checking the IFCAP_* bits.
    This results in better cache usage and avoids indirection
    through the ifp pointer.
    
    PR:             260068
    Reviewed by:    kbowling, gallatin
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D33156
---
 sys/dev/e1000/em_txrx.c        | 2 +-
 sys/dev/iavf/iavf_txrx_iflib.c | 3 ++-
 sys/dev/ice/ice_iflib_txrx.c   | 3 ++-
 sys/dev/ixgbe/ix_txrx.c        | 6 +++---
 sys/dev/ixl/ixl_txrx.c         | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c
index 1f1c13c9a099..58f9345ea19d 100644
--- a/sys/dev/e1000/em_txrx.c
+++ b/sys/dev/e1000/em_txrx.c
@@ -706,7 +706,7 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 		i++;
 	} while (!eop);
 
-	if (if_getcapenable(ri->iri_ifp) & IFCAP_RXCSUM)
+	if (scctx->isc_capenable & IFCAP_RXCSUM)
 		em_receive_checksum(staterr, staterr >> 24, ri);
 
 	if (staterr & E1000_RXD_STAT_VP) {
diff --git a/sys/dev/iavf/iavf_txrx_iflib.c b/sys/dev/iavf/iavf_txrx_iflib.c
index 29507360c251..f536f7f23ff5 100644
--- a/sys/dev/iavf/iavf_txrx_iflib.c
+++ b/sys/dev/iavf/iavf_txrx_iflib.c
@@ -665,6 +665,7 @@ static int
 iavf_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 {
 	struct iavf_vsi		*vsi = arg;
+	if_softc_ctx_t		scctx = vsi->shared;
 	struct iavf_rx_queue	*que = &vsi->rx_queues[ri->iri_qsidx];
 	struct rx_ring		*rxr = &que->rxr;
 	union iavf_rx_desc	*cur;
@@ -726,7 +727,7 @@ iavf_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	rxr->packets++;
 	rxr->rx_packets++;
 
-	if ((if_getcapenable(vsi->ifp) & IFCAP_RXCSUM) != 0)
+	if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0)
 		iavf_rx_checksum(ri, status, error, ptype);
 	ri->iri_flowid = le32toh(cur->wb.qword0.hi_dword.rss);
 	ri->iri_rsstype = iavf_ptype_to_hash(ptype);
diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c
index b370c68f4f3a..7d89c51ddec0 100644
--- a/sys/dev/ice/ice_iflib_txrx.c
+++ b/sys/dev/ice/ice_iflib_txrx.c
@@ -282,6 +282,7 @@ static int
 ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 {
 	struct ice_softc *sc = (struct ice_softc *)arg;
+	if_softc_ctx_t scctx = sc->scctx;
 	struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[ri->iri_qsidx];
 	union ice_32b_rx_flex_desc *cur;
 	u16 status0, plen, vtag, ptype;
@@ -334,7 +335,7 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	rxq->stats.rx_packets++;
 	rxq->stats.rx_bytes += ri->iri_len;
 
-	if ((iflib_get_ifp(sc->ctx)->if_capenable & IFCAP_RXCSUM) != 0)
+	if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0)
 		ice_rx_checksum(rxq, &ri->iri_csum_flags,
 				&ri->iri_csum_data, status0, ptype);
 	ri->iri_flowid = le32toh(RX_FLEX_NIC(&cur->wb, rss_hash));
diff --git a/sys/dev/ixgbe/ix_txrx.c b/sys/dev/ixgbe/ix_txrx.c
index 14e0fce11970..7c87b0ec10fc 100644
--- a/sys/dev/ixgbe/ix_txrx.c
+++ b/sys/dev/ixgbe/ix_txrx.c
@@ -393,9 +393,9 @@ static int
 ixgbe_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 {
 	struct ixgbe_softc       *sc = arg;
+	if_softc_ctx_t		 scctx = sc->shared;
 	struct ix_rx_queue       *que = &sc->rx_queues[ri->iri_qsidx];
 	struct rx_ring           *rxr = &que->rxr;
-	struct ifnet             *ifp = iflib_get_ifp(sc->ctx);
 	union ixgbe_adv_rx_desc  *rxd;
 
 	uint16_t                  pkt_info, len, cidx, i;
@@ -433,7 +433,7 @@ ixgbe_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 		/* Make sure bad packets are discarded */
 		if (eop && (staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) {
 			if (sc->feat_en & IXGBE_FEATURE_VF)
-				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+				if_inc_counter(ri->iri_ifp, IFCOUNTER_IERRORS, 1);
 
 			rxr->rx_discarded++;
 			return (EBADMSG);
@@ -452,7 +452,7 @@ ixgbe_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	rxr->packets++;
 	rxr->rx_bytes += ri->iri_len;
 
-	if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
+	if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0)
 		ixgbe_rx_checksum(staterr, ri,  ptype);
 
 	ri->iri_flowid = le32toh(rxd->wb.lower.hi_dword.rss);
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index bdd3cb8725f8..58ae751e5e10 100644
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -658,6 +658,7 @@ static int
 ixl_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 {
 	struct ixl_vsi		*vsi = arg;
+	if_softc_ctx_t		scctx = vsi->shared;
 	struct ixl_rx_queue	*que = &vsi->rx_queues[ri->iri_qsidx];
 	struct rx_ring		*rxr = &que->rxr;
 	union i40e_rx_desc	*cur;
@@ -719,7 +720,7 @@ ixl_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	rxr->packets++;
 	rxr->rx_packets++;
 
-	if ((if_getcapenable(vsi->ifp) & IFCAP_RXCSUM) != 0)
+	if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0)
 		rxr->csum_errs += ixl_rx_checksum(ri, status, error, ptype);
 	ri->iri_flowid = le32toh(cur->wb.qword0.hi_dword.rss);
 	ri->iri_rsstype = ixl_ptype_to_hash(ptype);