From nobody Fri Jun 20 13:52:19 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 4bNzS52fQWz5y3y8; 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 4bNzS42QG8z3XYY; Fri, 20 Jun 2025 13:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427540; 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=FNxGzyNLYr5FLecFGPQgOO3YohqsJh+kdjRl83gLP/o=; b=N0vldEI6bMdyeOlVtBOUkCq16b9FqPbRvl8mNHDtjTh/3G832JqQqktRyrH/ZQ20E+Vkgu HKTAdUYCPjpv9jIWykaJhlunvUrnHvI57rACl7326gI/kPbePUp7IZHJlhFfesdIV9BLTX WeV/e2DkLVl6HTXDvvMglZskJyB4PFjTTNXjiww52QBP2hFzx/JvfP7FofZuyAhTvOMzVL cZ693JTDmIUp7tYoZfqHyVqXcCXaLS1B+U1OjsAoS7M96p27MS8TiBqX7YkTGu0kNz/OU3 pP3h3Flqn5jNWY54fGGJ7fLnZ/HdiG+rMoqRTY9YwT/jMSty9KqyBDZd2w87wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750427540; 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=FNxGzyNLYr5FLecFGPQgOO3YohqsJh+kdjRl83gLP/o=; b=vw0rllOz9wfHCYSmlMAigICATkT/KI0smAp06qxpTvBfAGUgb9X+Dm5aa/y2mDF/Yjn09Y ISp/b2ENTV0VX4Hujx2SDv6mG02T/Rh+0ilfw46R6Ysett6XNpqgPwAMGIm+c0irTy3Adt E1M6cK34SFhbdbIgIxrOJBhhxT9nY1U8vv2TnNkLo4MNpaR73CWm+G9TeNt4pPHPDcI/iW H3MAq0nr5BhRsLFmCCBI9a63qCtoZThJcp0vE3jJ8zUP8lbm0GVWWNL+FUV2PwD1Pf7lP0 PU2JLeIiW6jLqAPO2ORGkgVsT83ZnTmOA0cTqbgaokj25qrX3QRuwfOdZd4XvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750427540; a=rsa-sha256; cv=none; b=k40N3gsGsC4eb6Bch2b/XU+Tt5L1yegwaTgJJ3RJHhlDzzI+Jc5vqsYuRpSkFpAeqin1bL 05dkFHNBQkn8TYFqy29xu7g9fZz+SzASPNvPUnJWddfMPWJlRnsjG10CJyuYY2Tm5brVPH Idt50x+kUgA+l0387KiWCmlqH6/S6dRI3Y457qRod+07deGije4z7JWhbG6iuVjK1H+4IT yhTiEsUV8CcnLQ0tMFKPyX820nMfWyvGNMpbjkBI6Q+C5egeNdi56ObUClPNSiIYBPf9cZ BpP0RZMkzm7tqS94CWH0WLOduaEPynhlxQFhZx4vH8N8XxRFY3a8+E8lqnobvA== 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 4bNzS40Kw5znNr; Fri, 20 Jun 2025 13:52:20 +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 55KDqJmI057948; Fri, 20 Jun 2025 13:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KDqJAv057945; Fri, 20 Jun 2025 13:52:19 GMT (envelope-from git) Date: Fri, 20 Jun 2025 13:52:19 GMT Message-Id: <202506201352.55KDqJAv057945@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: 18dac500d86f - stable/14 - e1000: Initialize helper variables 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: 18dac500d86f95c1a2399f2f3d94566e5a1e42c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=18dac500d86f95c1a2399f2f3d94566e5a1e42c4 commit 18dac500d86f95c1a2399f2f3d94566e5a1e42c4 Author: Mark Johnston AuthorDate: 2025-05-27 16:31:06 +0000 Commit: Mark Johnston CommitDate: 2025-06-20 12:46:09 +0000 e1000: Initialize helper variables in em_newitr() Due to races with the threaded transmit and receive paths, it's possible to have r/tx_bytes != 0 && r/tx_packets == 0, in which case the maximum byte count could be left uninitialized. Initialize them to zero to handle this case. PR: 286819 Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50416 (cherry picked from commit e0267657f3965a56d877075fe3d4d41b8afb2faf) --- sys/dev/e1000/if_em.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f49682285875..27500f936c25 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1671,6 +1671,7 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, goto em_set_next_itr; } + bytes = bytes_packets = 0; /* Get largest values from the associated tx and rx ring */ if (txr->tx_bytes && txr->tx_packets) { bytes = txr->tx_bytes;