From nobody Sat Nov 22 14:31:01 2025 X-Original-To: dev-commits-src-main@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 4dDDz96Mlwz6HDKR for ; Sat, 22 Nov 2025 14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz93Ngcz40sS for ; Sat, 22 Nov 2025 14: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=1763821861; 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=OvJVv7lby7zLwJZvdFxHQ/cgn9MAAOhEkj5mAri0caI=; b=ZY6i2QQrPEGBN6OryFZoL7aeQqnAPnTFKE5SE31K+EH2hWriANghnSYsyBbO0+jKekG3DI nBTRdqik93Rr8XPWQQLBYQuvjhTsToFGi7BFOuvo91wZxWT6O923rEXSf1OdjgzVxJFTff RuwQP+Xrf1ilGpsJSrSbMzepGzSVxy9n+VLwm2BXBo+E8C0oAv9b9n2TFf0j+kKRn+ypdb JUWaPpf1wIUUq5NDuVUWzhtRNOdcyYVMJOIxsGwVYdNg84pkxV7Yrgxv1N5FmlUvMIQLo/ y1HrkQAz0OSO7Q+TfJePyERKLvJGQZCn9hLbWhsVbfoGgBVSX+ZmPF+FEvM58w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821861; 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=OvJVv7lby7zLwJZvdFxHQ/cgn9MAAOhEkj5mAri0caI=; b=xz1m18p2HTafShoQyi4cukFpwo/QC3vYz6qvfnq7HzGsqvJV4z6xWXknrYdlGW/wfXen/H THFZ5sYOdf6pHUJnJWESNdh1E6Aqp6/g+EapWeLyex2MapuGi4FrRIEod7GVykpgDgVdrD tk7ROF3+G6bKkJKq+mXXoOVsKTURqf5uPyOKgFqcuM6pY092Z8fk7sqMT/f+UIKP0qwvaA cJMh+sEf2BrOODlko5p0ECqe5sNrItevQfFafB8p4B1PQFTRPtX6MEGJ6ZFEofxoIZ0xhW fptI58J6Xzn1ju8rNojPCxhD034tWhWoRSIDZ8N61WyIE/a4dKkBKcqpKvGkXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821861; a=rsa-sha256; cv=none; b=KwE+UZ34Nsa8TuQ3yiWaObPmwUvpRf88la9vcqkVllbBmXLILZj7piR+Ea4stp2eExIwtN lxznmIYkWv88Pc1X1a3xM/CKmUzu/PMheo7s9HUMf2q3V+pxy+uqBO5oZdsQeCtq5c1fXm ljwq5PTi3q6rC6fGJw8XktxXkqDfrHjsf8jjC0SbnY2J2CjDQYEG8+HWIvnSaiOs6Kr2Cp Sx3avIVhe2uBeicug6USttDq/vRgutCsAkGQsheGJo9EHBNRO2LDp9cVQwKq67tc4ekWRO 6+VoIPQRerKt5Sa/Pd/2Sz1LSP0TK5AaxuBbhpbEu0ZbKHgzS5SHjKd8HjDopg== 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 4dDDz92k3pz12Td for ; Sat, 22 Nov 2025 14:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f4c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 96cde0b9e606 - main - ena: use newly exposed RSS hash key API rather than ad-hoc hashing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96cde0b9e6068cd4c3aaebd86764b34afec1b624 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:01 +0000 Message-Id: <6921c925.2f4c0.30e400aa@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=96cde0b9e6068cd4c3aaebd86764b34afec1b624 commit 96cde0b9e6068cd4c3aaebd86764b34afec1b624 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +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 --- 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 ab082fa1810f..ec64ae9324bf 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 @@ -351,7 +349,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 @@ -362,7 +359,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 64dd41851fec..b7c5181397af 100644 --- a/sys/dev/ena/ena_rss.h +++ b/sys/dev/ena/ena_rss.h @@ -36,9 +36,7 @@ #include -#ifdef RSS #include -#endif #include "ena.h"