From nobody Thu Apr 2 22:50:55 2026 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 4fmxsW2jjKz6YwHH for ; Thu, 02 Apr 2026 22:50:55 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmxsW1SfWz46Jp for ; Thu, 02 Apr 2026 22:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775170255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJSCeYx7Nti8u+xM0xUgGA3IX+XGoE5SH8A/W4vC5Iw=; b=tHytEMsK4c3lcpI6+KWVXNH0a5gZcWK+teHJrNejTtVqhjYjlLhfFZaidhuTB6durkfxwW 0NpFpHLpjLERwZL/oaTzXE6v1Y5gKnmDLxX6gdl4ua3nvuF4cs0WychQxVsMBcPUM3Sly1 YNWq5i/GCjn2WZq7ocqEq1dc9LNxUfHwEygh3sC2449ajt56I02iD8Qy2gv3ALY0xXbyYG OnVLTIkoGIldWLU+d8gxclrQ3baJBNgxwnLSUWbOGL9TQXLifmx3w8ljsb9Pp28oJGZ9dl A+uj2tLd0EAF5CQQU/PcXi0hDZDL34VLTwNyRJKo/llNX2r/5kpXkZFv+Z42kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775170255; a=rsa-sha256; cv=none; b=SCr3naH7ZxZGKavFV+18JBoc+WZkzmav/kvNlakZ0MuB3aPdNkespgbchsiRsNgzhgStgn 9UlofIQMzc10FkkqIpYevXX1Po3pFYz3QkfCKnruzgjzEWYaVi+L/3ZbrQ4xKXosawPQ+n nFPq/Iv6IhbA2yPxqIxhhXRP49IaA9ET5Ge5jty8MbIFzk4NYstII7RSw5D+tpngWkvw+F TGQBXfJa/JQBlRGICIGuCz/mRZexB+CkaVuXqvRXChg1T2NolFLOgMZVlw/5E/F8GemgEc +BDXrVwct6INS3yDBaiimgvljyBaj7ub8wsLsOpg0zS/ZsWjZrtzlkF/FR+/WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775170255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJSCeYx7Nti8u+xM0xUgGA3IX+XGoE5SH8A/W4vC5Iw=; b=dDswpqjMimqcmyYi9FSttCE51mSEWjOXYoeKauc1r3crYCJeyQNQIf7EDMglWDwDbz9k42 SNZo8apgo4UVVbBGbXmdIbS9hvTgxyKF8BaJkd3tZeT17iPpaYFjClnBiGuWHOcdGZpV3/ Wgwr6q6XWLrq7hBALfDULo5HuLGEBkbM6TRJ4TawKR+xtwhoMukt7eXWLUzbPsRMXlxOqM Njnn2WjYunfIXgWaII8l7q8jbwkV9cZDz4aXD5EDpB/UUTaWGeiXiVAbLJxBC0B8xLYz9F hns7wJYhOjJ4ymWPurKEY5jtLtJC/mYt2JOXbUwuwz7Ygf8dojR2cDa4YgCisg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmxsW0xzKz66P for ; Thu, 02 Apr 2026 22:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 472ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 22:50:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Arthur Kiyanovski From: Arthur Kiyanovski Subject: git: f5370d118335 - stable/13 - ena: Verify that an ENA ring is in netmap only in native mode 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: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5370d118335defda098f0589ee96e84e3645174 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 22:50:55 +0000 Message-Id: <69cef2cf.472ee.534f3cfd@gitrepo.freebsd.org> The branch stable/13 has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=f5370d118335defda098f0589ee96e84e3645174 commit f5370d118335defda098f0589ee96e84e3645174 Author: Arthur Kiyanovski AuthorDate: 2026-02-14 01:34:50 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-04-02 22:50:05 +0000 ena: Verify that an ENA ring is in netmap only in native mode netmap operates in two modes: 1) Emulated - netmap handling is done by the network stack, the NIC driver operates transparently to netmap. 2) Native - netmap management is done by the NIC driver. When checking whether a specific ENA ring is running in netmap mode, only the following checks were done: 1. IFCAP_NETMAP - Check whether netmap capability is enabled on the device. 2. NKR_NETMAP_ON - Check whether netmap is actively using this ring. The above checks implied that the netmap mode is native and the ENA driver needs to handle the netmap logic. The code was missing an explicit check on whether native mode is actually on (NAF_NATIVE). This led to a case where though emulated mode was used and a netmap application was turned on, the ENA driver still managed netmap logic partially and caused missing buffers and lack of refill as part of the datapath. Note: Enabling netmap emulated mode is insufficient and there's a need to load a netmap program in order to trigger this use-case. Add an explicit check of whether NAF_NATIVE mode is set. The issue was reported in [1]. [1]: https://github.com/amzn/amzn-drivers/issues/361 Fixes: 358bcc4c6cde ("Add support for ENA NETMAP partial initialization") Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55697 Sponsored by: Amazon, Inc. (cherry picked from commit 97e84c587d6f86aa883720296449b380adcf6915) --- sys/dev/ena/ena_netmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index 41eb8abab39d..6a6ef67f9561 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -223,9 +223,11 @@ ena_ring_in_netmap(struct ena_adapter *adapter, int qid, enum txrx x) if (adapter->ifp->if_capenable & IFCAP_NETMAP) { na = NA(adapter->ifp); - kring = (x == NR_RX) ? na->rx_rings[qid] : na->tx_rings[qid]; - if (kring->nr_mode == NKR_NETMAP_ON) - return true; + if (na->na_flags & NAF_NATIVE) { + kring = (x == NR_RX) ? na->rx_rings[qid] : na->tx_rings[qid]; + if (kring->nr_mode == NKR_NETMAP_ON) + return true; + } } return false; }