From nobody Thu Jun 30 16:15:44 2022 X-Original-To: dev-commits-src-all@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 780848A425B; Thu, 30 Jun 2022 16:15:45 +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 4LYk2m5SYNz3Qlb; Thu, 30 Jun 2022 16:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605745; 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=j3AHOXtKxFRb4X/Yhn6aNOYgvL5TNlEv+BAC8/C6Szk=; b=sUzivKwGmsW/sf8TbgBWCMFMoxH/aKIW8uXLsxoz/tZrqbz5cJ4Hi4jMtx3OngaMkZ2uFn oA1PE/cZ0RSX18tSH4AffJ1p+rFWfpVcp9KdobHgmCOdAeMDiAqxhMUL3RwDtJbQpFc7Wc KDqnoZ/b93DvwvQX7A6ijNAW9DjtrYogez/QNa90575XpboFuUwstKxAJ+UumJNmudEJM/ iKDssjQ3X1Rsp11WEUaVDu9VwXMuq5c3Yd5157g5Cir6vyKe0GRF/d/a948igz3cabPfcO Kl3wGHXM8ozqcl2mq+NIHL82+m96VAp7Te5SKi+VbSfnLJFEfzEKJ1+F6YSi8g== 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 6D7A3182A; Thu, 30 Jun 2022 16:15:44 +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 25UGFiKh014997; Thu, 30 Jun 2022 16:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGFikj014996; Thu, 30 Jun 2022 16:15:44 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:15:44 GMT Message-Id: <202206301615.25UGFikj014996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: 79770fdad6c1 - main - ena: Fix invalid KASSERT test in netmap code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 79770fdad6c18d968cc122c4294820931cc542e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605745; 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=j3AHOXtKxFRb4X/Yhn6aNOYgvL5TNlEv+BAC8/C6Szk=; b=IeOG4OgNHFGuchZK0SQd4QrWfYvowoy7fif4tzO5fHS8XAvu8h75JSRtRvfK8ZMTwSiO1f vbvEJQAwmf8LkDx3EGNRr+f0vfsF9b+jHlbzqaE5pSl7QiVtroQna0AcLazlkbusD3YADX 2X0cxw8O7Z++OK/8FVHEI74hkIfhxH4u2tL0k6+/qgWhxIt49zIAGJHaa88EdCPn3HVGXW AFun8Tk/2Ux7vo+/0gtKiBCeVv3yMxzmgfxlpMtYEZbgi5QCZieAnzaIUB2nWVjowVTKdw JPLrzCiJLxon99qL5fGjl0kmGGXZhPyQT8QqQwyt36lHPTn6GEjHM53v418v4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656605745; a=rsa-sha256; cv=none; b=lua++AqYRGNhICE9m4SGksYXlsxUbZZAZV1yO4xA6gw1X+ZLA4YsFAD256xHIyUNaMX36u 31zN0qIRrXWX3G+nTZxmuZRaXOm1YWxE5zwuqEu+KR4IAw4jVlv3Vy+vf7AkeYO+Z0leE8 31KtLTkX8PjcprNNa5Ct7KipZRbePogFU+0G3bw7va+RcsKXoIRa0BF19OmaT03VqJ1Y6F kbGyeWzcKHRK39yijbnz6UrFFqPU3M/dmjYHaZgPWhzve7i/O0m1Fm+AhaEKd2C0ORc7rA v8bx2hcJSOJGfGdqM1KprEW9NUrEEqI8z0n666wiqRN67qlN5Y77a6d82vVhsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=79770fdad6c18d968cc122c4294820931cc542e0 commit 79770fdad6c18d968cc122c4294820931cc542e0 Author: Michal Krawczyk AuthorDate: 2022-06-10 09:18:13 +0000 Commit: Marcin Wojtas CommitDate: 2022-06-30 15:32:17 +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. --- 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 481a0ab3c2c2..e1244ffc8a44 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];