From nobody Tue Jul 26 19:31:00 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 4Lsn855j6jz4WwGG; Tue, 26 Jul 2022 19:31:01 +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 4Lsn851PJ0z439J; Tue, 26 Jul 2022 19:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863861; 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=KPdzjyACaHG801tQqzay1UJeHBkGM40nOHLf6HchvRQ=; b=IwQCzALfC/gGfIzcDPgGMMaXFKkynmFLtf5KIFCJSod6XlSBy9cfgcUrEUQhWkz2nqHC5k y9UCrs7kMBOvFvaApMy8VPMaazLI5MGSPwtAbX0L4prq16J2wd2g1yoxHgeGqKL0uqsqEb uJ2rv6VO2qk3spPA4NdoR/7wq340FTjN4ZkVWpE83RrlKtFlAOFL+RrXSY2CS5gR6b3P0E icH0abLxTm8z/ZTcJ2MJaFU1ydgpSVL5NUEryRb0MUXBp8uJwRF0QUKZmMW0mLIPCQh4zz TYtVnkB7Z7Mr/Sopw6EemO/1SFogz08thmb3b0izUPwVjTLmdEhlNQ2Lso9Oiw== 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 4Lsn850W9NzpK2; Tue, 26 Jul 2022 19:31:01 +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 26QJV0nP029814; Tue, 26 Jul 2022 19:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJV0vn029813; Tue, 26 Jul 2022 19:31:00 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:31:00 GMT Message-Id: <202207261931.26QJV0vn029813@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: 3d5fed51ed46 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3d5fed51ed46fc718b32b48de8e98dd507c2b637 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863861; 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=KPdzjyACaHG801tQqzay1UJeHBkGM40nOHLf6HchvRQ=; b=SKJqu5w2SsIHvnmxN/GyHgM8BJHbsUxzUQZmTfuDEb4GF+p2D6lRpRe/nGiYl1PfJxtaTQ J5XknOkZl38JLlwIpPtXlpp9h1yOB8TkY7883c2BPbX2g/8XtpG7zAC6JBaKHxmTEuG86+ kvqjAigaRlxh8jVJgkBn8v6tdnwk8yEAc972OVTXh/knVOvFsZ9Nv6q8vXN7S8iX8Y9EYM 41S5hJLdX/Xf6CDqtc02N17DVfrcWcJDTikScgsyENWQnOK+/2HOdTIWyDyaCPYaEaN1cR odBHzi2SxwQ7l+aZSnkGHGEYDbj8CZkjdt2/lf5mGApbhk7n1KhJw4tiNqFnfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863861; a=rsa-sha256; cv=none; b=MAjZrviZuK+kMSOzETB0R/VZMslxqS6tC07LxgvvGgS6zZhltVHRG+K2RdDQuieu7z3q/u pgMilP7FrVZyf/XcFf2EUZvPUo/Avc/3KEAOrLl9K2lRpmNha5yfi86B5cO1ZIrmlA7aH3 3H811fjOMlc2ev1pgknBX6peqjuw+ZF8VoIFSpoJ9Rs5QV8q4NATKaUUGWjeq/XVqItBnx r5oNDeIoQR+kuU32qi16e1Po8fMy16mg6ddcJ9kB8wixIcI+7k62arRKqFX1+X9bNcdt0X DqK3EA90R0vU+pFNg4IfThla8u1bjHb4chOhP9tRCYS/6ca15MNjpOD9aPppJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=3d5fed51ed46fc718b32b48de8e98dd507c2b637 commit 3d5fed51ed46fc718b32b48de8e98dd507c2b637 Author: Michal Krawczyk AuthorDate: 2022-06-10 09:18:13 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:30:16 +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];