From nobody Fri Jun 20 13:52:21 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 4bNzS55188z602tY; Fri, 20 Jun 2025 13:52:21 +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 4bNzS51fhYz3Xh3; Fri, 20 Jun 2025 13:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427541; 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=m2998HNchk5Qqfy5TYBZEF8ApfCl0d7Dek2KyRUCnAI=; b=LYDohjMfhCZ4mZzIWjQfOFs6rS7FRzq1eyamPOB+KunkAefZRHnC8o8XDwV6VXpDDKVEQj kQzKKkcHXeAgKU70xQH82ZhYJiQ1zZoYh9P40LYYudspLDLBFDiIu/f+t2yI3xnc1lxH5u quc4DJKq1P3diywsiB0K6lvqFh9Uli/dWj0ishqmBCsvkTTbFs7SJzbRQ57dkry5pORLRV JkpW2+mRQiW9WjxCKfw+86cC51TvWbHImPu/bIW88Q8++VpFhswNM2YTv1UdqbxiCVc92n gmYAJue8fRhsp+IRBbeS6QvYqpjDdcoD/fiBKEceQXX8df4UaFWHTkxNafYVjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427541; 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=m2998HNchk5Qqfy5TYBZEF8ApfCl0d7Dek2KyRUCnAI=; b=mOSZoUiY9FoUtqalKETZszypORsZHRMDeBRU1YVwnqlScXGhkZun4el5hGOk72mdtmiBUT OHI2uRGbj6B1IeyujOMjE8AeW91pbaLoFs//w2i3M73QaMZpZKKcQwDWP5l6Z9PVuclh24 qlx05F+TRIaU/7ZwSczkOxakA5hunDxAxBl3yB8u/bgXoS1pwg0/0JigfSIs9C/DSMTaFT atxmVtYNdxsLNId2C7DbMhwVpDQNRWdAk9F6+N3WQAIW2AutldYdPRDzaIp5GDME7oeia9 jzhz91y8wtvrDLdY57NZiji9M6R1nfn4J0aGlMFoAIqFP8ubHxz1veWqqytPRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750427541; a=rsa-sha256; cv=none; b=Kure6d4YsobAxU7iADvupIu14d/8OTLd9wI0zdH4fex1ONKf9SGZDyL/IVT/C4x8HDYrMX AMmY8Vob+eu+EfRgybqZvFqdIBGGz0A4nJJ91VRAAyNqhmSVsVTOkGo9Bsr8DS8pZqdiTd opgu213qb45EAs1dkCOEm3YuvtusYcqlERMIA2SmEwJBt73wnxY8yTmI1NkwJWsdJMa/zw +a5srIjTZu9jNm26lpULb+n8tj+8FIGiJ79pRPvdYsaW4Pum7VsYQv+Y9LXEcq8N0jmHPO bb0BZF+U+h4SwR8Q40tOTPF9Ct0fykWuBY/XfOHHRo2zav7ryrwVCpOGjWgUCQ== 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 4bNzS51DrTznt1; Fri, 20 Jun 2025 13:52:21 +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 55KDqL2l057982; Fri, 20 Jun 2025 13:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KDqLnT057979; Fri, 20 Jun 2025 13:52:21 GMT (envelope-from git) Date: Fri, 20 Jun 2025 13:52:21 GMT Message-Id: <202506201352.55KDqLnT057979@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: 35e91b0447f1 - stable/14 - e1000: Fix some issues in em_newitr() 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: 35e91b0447f185085624ee9c5e529f35bf556184 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35e91b0447f185085624ee9c5e529f35bf556184 commit 35e91b0447f185085624ee9c5e529f35bf556184 Author: Mark Johnston AuthorDate: 2025-05-27 17:08:07 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 12:46:09 +0000 e1000: Fix some issues in em_newitr() - Load packet and byte counters exactly once, as they can be concurrently mutated. - Rename bytes_packets to bytes_per_packet, which seems clearer. - Use local variables that have the same types as the counter values, rather than truncating unsigned long to u32. Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50416 (cherry picked from commit 731c145612dd6ffe457a562959a5c027acf13334) --- sys/dev/e1000/if_em.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 27500f936c25..f0ef6051fab1 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1644,14 +1644,16 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct e1000_hw *hw = &sc->hw; + unsigned long bytes, bytes_per_packet, packets; + unsigned long rxbytes, rxpackets, txbytes, txpackets; u32 newitr; - 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; newitr = 0; @@ -1671,18 +1673,20 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, goto em_set_next_itr; } - 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 */ @@ -1692,7 +1696,7 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, break; case itr_latency_lowest: /* 70k ints/s */ /* TSO and jumbo frames */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = itr_latency_bulk; else if ((packets < 5) && (bytes > 512)) nextlatency = itr_latency_low; @@ -1700,14 +1704,14 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, case itr_latency_low: /* 20k ints/s */ if (bytes > 10000) { /* Handle TSO */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = itr_latency_bulk; else if ((packets < 10) || - (bytes_packets > 1200)) + (bytes_per_packet > 1200)) nextlatency = itr_latency_bulk; else if (packets > 35) nextlatency = itr_latency_lowest; - } else if (bytes_packets > 2000) { + } else if (bytes_per_packet > 2000) { nextlatency = itr_latency_bulk; } else if (packets < 3 && bytes < 512) { nextlatency = itr_latency_lowest;