From nobody Fri Jun 20 13:52:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bNzSD2Tjjz5y4LY; Fri, 20 Jun 2025 13:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNzSB5l6lz3Xdv; Fri, 20 Jun 2025 13:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmFrz382F5b3c6lQPRTMzj0CGGvcYWytd//8YgDyjU8=; b=ZBxHuxkbzY2OXP85Kg8iO8/AGglI8j2IZOHL1BKFqjx/gIUslrX2rb3+sSLihNFUR6vn9Q kFaB8LhD6QttOw5IAwW96prOEByNKIr3hH4IJY0JZta90/1A6jJI5ae/t/AV1gooAyeb5F 7BAaETI0TfzjGDJ8LlAJNElzogD/LVEYrEo+TzHvLeJw7Te9S/hQxCfLU1egXjvpHVPO6G 7uv3jwhThUZy3e1b/e5GfD+L2vseZVv1HsqSOzVBNzTw8bbdcu6auzgBnVA5NxvaokbkZB c8y+SD2l8B0ZKaNdaj6h4N4lKj/hl20O5aTHC4QvCcmySpwUxG4HWWKYs4sxDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmFrz382F5b3c6lQPRTMzj0CGGvcYWytd//8YgDyjU8=; b=M54mTlOGbAcA9Mrp1PrCmZ1uVwcEi8S8k3mmG7ZU466DqLJ4zRTqLQdMMAi/5EvqAJcjCu BBHtTGGdZkhUQUF8oBdM4wphS190ygZoqVZ7/kI4CVuDd4Oi/4qdARjCXdLOCvw8ezBf5V uSBHDPuwr5np4LV22IhksEqckhe9nHNeugyDAqg+m9SZhzPCZBNQd32g63u1sRwU3nbQ5o pRn6UIo2wwl56xcr/x3VN9SKCYqqb/JHvUj9H+l4GisATiM7BPQ1l+z1w6ISUjaYWHikwZ sKkC/sTJBn7lgZ7qstRsQ/AUecEW3UhZVi0I9aSwAbVLLLG/rrIR1K5utYgAlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750427546; a=rsa-sha256; cv=none; b=YaIuXceZQb+SNheu5GWCI5bMgHVSrmoOgJer/v6yjiVyVfc/MKetRk9bqHjo7Ejzm9gVgW Mw7kw2P17Y4eFRKhOooZ2BwQ6HOS2KHi1UydpOnQVjFB5g7Zrvvj71h4lGjL+zoRsxeL+w xrXQzCS+/Hon+T9NKLGLwbc15pqOVpU7LsZJOMdsgZSsD3/J/4LEKCa9NCovSVqO/k3anA e4H9UYtjLsNavj8pVPM2BrvdjUJThllKKT0J3ekEXqBOFMg+lp95EWrLn37i5UcMOuBmgz sGQrd18VvWJwACxGcMi9+hosGhxzP3wPraaq/yI+NeCF9PAmGdyft7Uq8NUNEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bNzSB5Hh0znCv; Fri, 20 Jun 2025 13:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55KDqQsT058158; Fri, 20 Jun 2025 13:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KDqQMk058154; Fri, 20 Jun 2025 13:52:26 GMT (envelope-from git) Date: Fri, 20 Jun 2025 13:52:26 GMT Message-Id: <202506201352.55KDqQMk058154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 021eb07a8b28 - stable/14 - igc: Fix some issues in igc_neweitr() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 021eb07a8b2806f875aed20de4320cd2d2a90ab7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=021eb07a8b2806f875aed20de4320cd2d2a90ab7 commit 021eb07a8b2806f875aed20de4320cd2d2a90ab7 Author: Mark Johnston AuthorDate: 2025-05-28 13:31:44 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 12:46:10 +0000 igc: Fix some issues in igc_neweitr() The justification is the same as in commit fb876eef219e ("e1000: Fix some issues in em_newitr()"). Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50548 (cherry picked from commit ef062029ceffacb6bde3a5639a2bd8c4d59ca1df) --- sys/dev/igc/if_igc.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index f34b0507c1ea..a1ae35c7aa43 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -909,14 +909,16 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct igc_hw *hw = &sc->hw; + unsigned long bytes, bytes_per_packet, packets; + unsigned long rxbytes, rxpackets, txbytes, txpackets; u32 neweitr; - u32 bytes; - u32 bytes_packets; - u32 packets; u8 nextlatency; + rxbytes = atomic_load_long(&rxr->rx_bytes); + txbytes = atomic_load_long(&txr->tx_bytes); + /* Idle, do nothing */ - if ((txr->tx_bytes == 0) && (rxr->rx_bytes == 0)) + if (txbytes == 0 && rxbytes == 0) return; neweitr = 0; @@ -936,18 +938,20 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, goto igc_set_next_eitr; } - bytes = bytes_packets = 0; + bytes = bytes_per_packet = 0; /* Get largest values from the associated tx and rx ring */ - if (txr->tx_bytes && txr->tx_packets) { - bytes = txr->tx_bytes; - bytes_packets = txr->tx_bytes/txr->tx_packets; - packets = txr->tx_packets; + txpackets = atomic_load_long(&txr->tx_packets); + if (txpackets != 0) { + bytes = txbytes; + bytes_per_packet = txbytes / txpackets; + packets = txpackets; } - if (rxr->rx_bytes && rxr->rx_packets) { - bytes = max(bytes, rxr->rx_bytes); - bytes_packets = max(bytes_packets, - rxr->rx_bytes/rxr->rx_packets); - packets = max(packets, rxr->rx_packets); + rxpackets = atomic_load_long(&rxr->rx_packets); + if (rxpackets != 0) { + bytes = lmax(bytes, rxbytes); + bytes_per_packet = + lmax(bytes_per_packet, rxbytes / rxpackets); + packets = lmax(packets, rxpackets); } /* Latency state machine */ @@ -957,7 +961,7 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, break; case eitr_latency_lowest: /* 70k ints/s */ /* TSO and jumbo frames */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = eitr_latency_bulk; else if ((packets < 5) && (bytes > 512)) nextlatency = eitr_latency_low; @@ -965,14 +969,14 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, case eitr_latency_low: /* 20k ints/s */ if (bytes > 10000) { /* Handle TSO */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = eitr_latency_bulk; else if ((packets < 10) || - (bytes_packets > 1200)) + (bytes_per_packet > 1200)) nextlatency = eitr_latency_bulk; else if (packets > 35) nextlatency = eitr_latency_lowest; - } else if (bytes_packets > 2000) { + } else if (bytes_per_packet > 2000) { nextlatency = eitr_latency_bulk; } else if (packets < 3 && bytes < 512) { nextlatency = eitr_latency_lowest;