From nobody Tue Jul 26 19:33:31 2022 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 4LsnC01FW6z4WxCj; Tue, 26 Jul 2022 19:33:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LsnC00YmDz47tx; Tue, 26 Jul 2022 19:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658864012; 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=6NMQPc0MfeGHFSqrJJWG/YQ8eqd/bhvxPwNRlriFPjo=; b=Q9+gVRA4EhCW313YRA14Ouxu9we43V5BsPQO854sAySPGrdVIRXMfJgwIS59PtRns7rFrJ mgnnBnXk3zNd+nQ+7adeZoDvq7OStPZT+cqf5u+2AS1ofiEPfyTWwv0T2oNM2STHK8EEIH 3fJhwjjBKHty+8mBvQdsfBLU6T90vJADm2ReaBOJY2ox/ZuS7BaakMkdfYR/QMM/ah0sVX DyW5a1nhF/4/VI7oFxNr3epsphS/x35HEF/LpoZbdC4RhJUmLc2aoJhYeTR9HGa9XJ52uK smzk6vx0MMfu/x39z2fVE9lY7oUVjDgRnVdOz2qDdM3hY4EyCsimKaOiAkGchA== 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 4LsnBz6lmNzpHL; Tue, 26 Jul 2022 19:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QJXVPO033980; Tue, 26 Jul 2022 19:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJXVFg033979; Tue, 26 Jul 2022 19:33:31 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:33:31 GMT Message-Id: <202207261933.26QJXVFg033979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: b672b9ef77d7 - stable/12 - ena: Fix invalid KASSERT test in netmap code 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b672b9ef77d7e2a1f711ef16af3cf3d0b6f9ad26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658864012; 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=6NMQPc0MfeGHFSqrJJWG/YQ8eqd/bhvxPwNRlriFPjo=; b=TlTpWaWz8fjqSYJSZH7qlnc4Nh9WfD8/4mEWYnXTWj7q9DxPo4XEE6sfgVDTVR89ejxCFr 5jN0gaIe7g8RDYESJ1HM86eP6Lydpfx/hYvmRTURl/Rj+rFBcVlucRZc6XQ/vsphSA0YOR RFAgfkCk9oR1XjBhUfH4XqtmYXj6hN7kkpW5rA1pd1jned7yIGqC20vlhnpzX9Y64uBtsz kuCPs3qbT68akSz/RiLLQDS1Ck7HSYtFaMeTqsUuNPs4sDnsAr1A8AzdaGY6IO5ln4jWed 7YwUmS1kaMfG3m7qOXMURCHjBw4LCuXSluac24zy2ZfLrJ/laDKZ5x9TGHQaMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658864012; a=rsa-sha256; cv=none; b=bQ20FjdIASV2GrtoCBFfUkusJ59JhdnaAQNjCupXmMXoCyJ1QZ7sCNg84J5G2+zEwf1k/d hscFP6lhtR5+YF/3w2ibt5HVgFsO1ZJJ/URjc64smj+D0bjmF6Lgupt/gk7fjhh8MAIfYz 9aFT3XIUO7NhE8Pub4Zap7/KXastRCq4QNl/b/q2lqhold2matn5y5HD2Be5xOEbSeqcIY kTMWl+wR7lJ1ARX9NLR3q1MBovG6fMD6Yhn26ALZXsN4Fv956Wv1uYHsYqRu3QVOKLVo0d HEVQK6urc/4vwGOOuCjRPw236AnaOea34XNf1GCLCp6Ml68DPnPb7Zp0ddI7EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=b672b9ef77d7e2a1f711ef16af3cf3d0b6f9ad26 commit b672b9ef77d7e2a1f711ef16af3cf3d0b6f9ad26 Author: Michal Krawczyk AuthorDate: 2022-06-10 09:18:13 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:33:04 +0000 ena: Fix invalid KASSERT test in netmap code The KASSERT was originally added to ensure that the netmap Rx ring is not NULL, however, it was checking for the opposite. Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit 79770fdad6c18d968cc122c4294820931cc542e0) --- sys/dev/ena/ena_netmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index 6a780440efc9..228db0cb31ab 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -206,7 +206,7 @@ ena_netmap_free_rx_slot(struct ena_adapter *adapter, struct ena_ring *rx_ring, BUS_DMASYNC_POSTREAD); netmap_unload_map(na, adapter->rx_buf_tag, rx_info->map); - KASSERT(kring->ring == NULL, ("Netmap Rx ring is NULL\n")); + KASSERT(kring->ring != NULL, ("Netmap Rx ring is NULL\n")); slot = &kring->ring->slot[nm_i];