From nobody Wed Nov 04 21:15:18 2026 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 4jKdWV3dLpz703X4 for ; Wed, 04 Nov 2026 21:15:18 +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 4jKdWV1ryTz4S8h for ; Wed, 04 Nov 2026 21:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793826918; 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=Y2U/FcTfDWiwnaNvzA0tpv6cDuMnNOFm+eoPTNnK0qQ=; b=CFSQdRAAwt4AYISTa+F4jk0cnqLzExQJpz0qvBMsTZv+IJNVs6cJw7FAvB3GKN4ZJMB6P3 1M6lvdl7yrRPP9LfhwMIFh+/p6s3q6FqmIWcCIeWeXYsnTtIsqlWiy4fEatv2zdQMXns7E kWZ16dw/3tyM8VfOeH3qx2kZ1mxoA9Oc4jsyR2oiOmT31+qKBevPfNh6jSCds5yfmEJHvp dyREh87l0BCbRM4OXBlHKoBrDS+PdztCJnm2RDombNypa5zMtTAxD6syruJNiPn/nWhz6t V2dQ1BI1B7LTOh6Pu5RFSd7t4uo0qRFdEWiXTWZnPn71JP9aHVAFSB8XJ7K71g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793826918; b=GzJXnD6gIYktsNNAmjS6dc1W0uBY5tca0zYTOUAb9uRX0qcReJEsnIjlUg3BpdpCSZPyX4 PoxnV00KZNcvP1pQzbmBFC/wsd0hi3AeC103m7Wr5Pd87xc9evPHeif5PRgNK/akGNLIBB 6OUuWAesO7oCfB4vU0o1/9MrH8X4314sLbLRFkUc+fApqyxSXkRJi6Inv37vXThmjIYoXC kzhh7KWz+4kaSorwpW7UcvheMgnYWdPdJdxs2nIcMvN6HcGCx7ncleoUq7eQAjRuNWCgQB oGFRB1Fjk4ITBQhk57fdb7RGTxSfl9sqHu56g1GVvGTcVvMRHik+PM3YnZCYqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793826918; 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=Y2U/FcTfDWiwnaNvzA0tpv6cDuMnNOFm+eoPTNnK0qQ=; b=gyP8I58/yl1bvPbf0CIk8Qv2z0mWMJnsxZqL/bbVseBl/ibflG23dYyyGZzeYUQ8XcPmWS 3+ZtNZrCFH9M2+36Bk2l2AcmR1pE0pFPYOTIA1zBo5XfPJMwPQmtWwZpKfSNbdZp655hWl Mq7SLRH7elqjW98lZrgHWKLL3mUaAjK5BAFZ1tnmmrzFa+rOUENucEPxCgjLWI6joLw2IG mwcVr5CNlsxcxCFxjYzdAr5yMuKVQChoPXy6CeLZpKxEZgLg87VM7q5u41aUFyzTohm9gN X1DonrayXRwVQTuiGS0GKn4CQb31j0P9UN88hVHwe5KM+YThk2CvNmdxTs4mkg== 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 4jKdWV1DGfzKHZ for ; Wed, 04 Nov 2026 21:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e975 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 21:15:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gilad Ben Yakov From: Arthur Kiyanovski Subject: git: dd9a612d0ac1 - stable/15 - ena: Reinit RSS table on device restore when queue count shrinks List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dd9a612d0ac1f384f4e30fec9cc39b0c5a7a2d2a Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 21:15:18 +0000 Message-Id: <6aeba066.1e975.3b387cda@gitrepo.freebsd.org> The branch stable/15 has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=dd9a612d0ac1f384f4e30fec9cc39b0c5a7a2d2a commit dd9a612d0ac1f384f4e30fec9cc39b0c5a7a2d2a Author: Gilad Ben Yakov AuthorDate: 2026-05-05 10:02:13 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-11-04 20:52:57 +0000 ena: Reinit RSS table on device restore when queue count shrinks When ena_restore_device() is called after a reset, pci_alloc_msix() may return fewer MSI-X vectors than requested, causing num_io_queues to shrink. When this happens, the RSS indirection table retains entries referencing queues that no longer exist, routing packets to non-existent queues and causing connectivity loss. Extract ena_set_io_queue_count() to pair the queue count update with ena_com_rss_destroy(), ensuring the RSS table is always invalidated when the queue count changes. Use it from both ena_update_io_rings() and ena_restore_device(). Reviewed by: cperciva Fixes: e2735b095b7e ("Fix assumptions about number of IO queues in the ENA") MFC after: 3 days Sponsored by: Amazon, Inc. (cherry picked from commit 2d4d2ed3fef6acda9269f545f6703d6f32f2f0b7) --- sys/dev/ena/ena.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 412a9d95e3be..c417e9cf7efc 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -1299,13 +1299,18 @@ ena_update_queue_size(struct ena_adapter *adapter, uint32_t new_tx_size, } static void -ena_update_io_rings(struct ena_adapter *adapter, uint32_t num) +ena_set_io_queue_count(struct ena_adapter *adapter, uint32_t num) { - ena_free_all_io_rings_resources(adapter); + adapter->num_io_queues = num; /* Force indirection table to be reinitialized */ ena_com_rss_destroy(adapter->ena_dev); +} - adapter->num_io_queues = num; +static void +ena_update_io_rings(struct ena_adapter *adapter, uint32_t num) +{ + ena_free_all_io_rings_resources(adapter); + ena_set_io_queue_count(adapter, num); ena_init_io_rings(adapter); } @@ -3680,7 +3685,8 @@ ena_restore_device(struct ena_adapter *adapter) * are available. */ if ((adapter->msix_vecs - ENA_ADMIN_MSIX_VEC) < adapter->num_io_queues) - adapter->num_io_queues = adapter->msix_vecs - ENA_ADMIN_MSIX_VEC; + ena_set_io_queue_count(adapter, + adapter->msix_vecs - ENA_ADMIN_MSIX_VEC); /* Re-initialize rings basic information */ ena_init_io_rings(adapter);