From nobody Wed May 28 15:42:32 2025 X-Original-To: dev-commits-src-main@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 4b6tzs3QVBz5wtxL; Wed, 28 May 2025 15:42:33 +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 4b6tzs0F2kz4LKt; Wed, 28 May 2025 15:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446953; 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=7gkf+us+kXXnys0VL+Xr02u/jviYQ/KtdjNzmwoBOQg=; b=k3xpBTAsuyRWKT83S/ubGjnbWJAx1UJQNPpBKilA0VZaaChbzkvGJF6d4shrrX/krB2w/V CIptXFiDunCuAwqy3HbsomAv8+C3Xhbt0xTlXvhx8xWjCC6si/g6g8/BSxg7jiTx44Gv79 Amo0qWflJr0+qcrOkhBE4dd360TSAJTsvPF6cMi8v55mvTOsaKIbgyW3d1tDtc0b8/qHvZ C7gIKB2OrxVWg8n14XKYfVf1gUNSd/kj3VG4F7YtXNntNzmOiSnvuAyzla8LV2jxa9IzaT 47/vF/sYl8QrZvHXb6s0eOZvLkzFGs226nCt7QS2tHfClCoYjKErCXGqSEeeRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446953; a=rsa-sha256; cv=none; b=WpMzBaUyZ4nv++vvyjbvyhT6apY2v3HlpTtm+wvAWvJK0IXXTugYkmi692DLL2Jd+BET5G ExVEuwjcUEOLPbbolYWus1y9goA5sovyr0EoF9tSGVqUCXWAPUCJ3BYOYcgmngwLsogBm4 aisqwROnRIez1aQcOBXMtKqJC0pzvmGj12M6vVmx+ODqE0Nsq8hHgU5+deNCvi0n8rzaiA UvMrbd0p68x3LJiF/sBz8SdkSNCBdXIDG2wMlJ/Bhz/Fcx1PGB7Cd4Mtr0wE3ovnln7vqx Y36klDd0hBfk5LDdTp0/KsW6IM/0bH1tmdst38waWGgJlMVH/k/1XJqCrTOeSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446953; 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=7gkf+us+kXXnys0VL+Xr02u/jviYQ/KtdjNzmwoBOQg=; b=lpkmnod+DTvNsLqy0vIlk/tNpwQSKt76tiw8T2/6ZNRf2ZfqOxp3GVA2vvJ9WbGw+qTxmL or8yBr7l0L5qlwBkPiReILj82qX656P0cDgvPSjwxH9P+QQit+S9eqlP3gFPjSqX27HNWi 95xlgHbtLr9oSBS6DaIw9NPu5YtWcPaS93OLG4N8Pzc4C/gyct6SfAilxpK5aQ0jcBE3fa 5KdR4pcKhau95PI06SAUZ1cWmYH9Ueh6qVgNpVGm23ytz7egKZBFmBisV8TGgpalUSCHJO yV1dGiTJoCA9eJ2jYViB3UmrE6g/0sQSS5jBeAXbKKkz5DtzglFYpzujYlZOIQ== 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 4b6tzr6vLxzkl4; Wed, 28 May 2025 15:42:32 +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 54SFgWAt060399; Wed, 28 May 2025 15:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgWwr060396; Wed, 28 May 2025 15:42:32 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:32 GMT Message-Id: <202505281542.54SFgWwr060396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ef062029ceff - main - igc: Fix some issues in igc_neweitr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ef062029ceffacb6bde3a5639a2bd8c4d59ca1df Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef062029ceffacb6bde3a5639a2bd8c4d59ca1df commit ef062029ceffacb6bde3a5639a2bd8c4d59ca1df Author: Mark Johnston AuthorDate: 2025-05-28 13:31:44 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +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 --- 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;