From nobody Thu Oct 29 06:35:13 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 4jFZGp0ccyz6xtK4 for ; Thu, 29 Oct 2026 06:35:14 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZGn57mgz57ZQ for ; Thu, 29 Oct 2026 06:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255713; 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=I/KNhE+dqsYKX/A78ZavM6o1yacJvxCOMUhoQmwro24=; b=HMyuINKKLy6baPQbuo7SblIJAZW/vZXvqf5dz1JaHdiyqJv9rK1Crd59qiTE8o+McWaLj8 z5Exr5NiEZeJ0Odj/ueDbbjSrkdRhE0FkQSAkA8K21wFlzYPQ6dsTnI0fB8wluQNKSvg9u b/hbZbp53i95i7l43gd8248672bwHf8YDT8PCWvQb7TMJxRpztGg+f3G0FH4wjPTDTsxDx AdiYq24q+ktHD8qUw9QbqhSp81MmvL5jlnXmIqfmmUFJ8xLNX4cmc1cwAIZ70Qmt3n8Uzj lz8bL93doApk7+lh1+6z34fdW0qSsZL1TZDIiqpGCUZNgJIrF8uw6bxLDcckJQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255713; b=QKTFQietpl6I1ufnCklg5eTgfS4XJv+g+LYoYmTtTE5hYB25W2AzVklLE3flXaDNLaUWPZ 88u9v6+dCmxR3AKPP6XsmrMRWDTfM6MH67cUXt03vogmKbOcbZ/Los6LjDHgdBvE80HEV5 iLU375u1nBuOXNTYoVtStlsgAi6ujKSdD1DGeKsKvNOa4n1/BOOMS05uox3HPX7FAvoJMi sHY2Z/Lvl19vtdHk2R94h/3XRtmSH3SLwrPXL3XK+PJ0BlkJtnnjgdzBZZ0TzFzJmX8iFp OerBNxWnxcRxtSlxMAx3uKSNwh/YfJdoLVNdtKldagnTZ4l4ryndQesGkiPJ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255713; 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=I/KNhE+dqsYKX/A78ZavM6o1yacJvxCOMUhoQmwro24=; b=XIr61lEQ/gK+BgLasmhWaaalBGBVxGvFvPchWPudkO554wd9OIvCmW50K8R1fhgQ+8RPTR vuOsq1zVtPcKKVWH/FblaMHCaTrOiQVcbckI+yPfoPebmnxFG75APEZa8t7gMK+luva3N7 ELrJgZCsI6YD5Ud7x9RDOnReu7i8/F7MzkpGPSO6AQdZZcWTBpX4/B1gYuasCxBSmFvYV1 PfQQamFN3/80FvIFB+WGAf66sexJIc4J4bcbwOJFyhi3A80LTY1+eN8FwdMBqgxfGLS5C0 XhUsn7BYt3F6YVcnXuTp6rdRGi7qfpKAgJ0NLlLjkazKi8yPpN7jAl8iKWgJMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFZGn4mmKzRR9 for ; Thu, 29 Oct 2026 06:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cbfd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: a571b56421b1 - stable/15 - ena: use newly exposed RSS hash key API rather than ad-hoc hashing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a571b56421b1f212a62d1a8b023e6f0cab150ef2 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:13 +0000 Message-Id: <6ae2e921.3cbfd.290dbde@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a571b56421b1f212a62d1a8b023e6f0cab150ef2 commit a571b56421b1f212a62d1a8b023e6f0cab150ef2 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:26:40 +0000 ena: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53100 Reviewed by: akiyano_amazon.com (cherry picked from commit 96cde0b9e6068cd4c3aaebd86764b34afec1b624) --- sys/dev/ena/ena_datapath.c | 4 ---- sys/dev/ena/ena_rss.c | 2 -- sys/dev/ena/ena_rss.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 1fe1209a77d4..b58779e51fc3 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -34,9 +34,7 @@ #ifdef DEV_NETMAP #include "ena_netmap.h" #endif /* DEV_NETMAP */ -#ifdef RSS #include -#endif /* RSS */ #include @@ -349,7 +347,6 @@ ena_rx_hash_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx, if (likely(ENA_FLAG_ISSET(ENA_FLAG_RSS_ACTIVE, adapter))) { mbuf->m_pkthdr.flowid = ena_rx_ctx->hash; -#ifdef RSS /* * Hardware and software RSS are in agreement only when both are * configured to Toeplitz algorithm. This driver configures @@ -360,7 +357,6 @@ ena_rx_hash_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx, M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH); return; } -#endif if (ena_rx_ctx->frag && (ena_rx_ctx->l3_proto != ENA_ETH_IO_L3_PROTO_UNKNOWN)) { diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c index b7706e33065d..88fb3c902f5d 100644 --- a/sys/dev/ena/ena_rss.c +++ b/sys/dev/ena/ena_rss.c @@ -125,7 +125,6 @@ ena_rss_init_default(struct ena_adapter *adapter) } -#ifdef RSS uint8_t rss_algo = rss_gethashalgo(); if (rss_algo == RSS_HASH_TOEPLITZ) { uint8_t hash_key[RSS_KEYSIZE]; @@ -133,7 +132,6 @@ ena_rss_init_default(struct ena_adapter *adapter) rss_getkey(hash_key); rc = ena_rss_set_hash(ena_dev, hash_key); } else -#endif rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ, NULL, ENA_HASH_KEY_SIZE, 0x0); if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) { diff --git a/sys/dev/ena/ena_rss.h b/sys/dev/ena/ena_rss.h index d2706deef8ca..d1236ef26c33 100644 --- a/sys/dev/ena/ena_rss.h +++ b/sys/dev/ena/ena_rss.h @@ -37,9 +37,7 @@ #include #include "ena.h" -#ifdef RSS #include -#endif #define ENA_RX_RSS_MSG_RECORD_SZ 8