From nobody Thu Oct 29 03:29:37 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 4jFV8d4CZFz6xfw3 for ; Thu, 29 Oct 2026 03:29:37 +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 4jFV8d0rXQz4RNX for ; Thu, 29 Oct 2026 03:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793244577; 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=NrILbO/h0pxHnOTPpPDllFD9trH3+PY0vX2IdWNqfB4=; b=VPuwW328ZFitH5+PfbTdPhPX+ITyoroFW7fjsxDGvjJ2k0GUF58+sN1kRrMqxZshNfpw+w suNEA7bJyn74VHz7ylSRIimCJPXau4asbL7JEbJdK1eO/gkINTEY8bdBbX4bjAh6u5ptxg 9EBVEDqP77WW1Cb+VevPS2uVJLWadh+eMTTWzJylRcsSrF1uAhANzaQ2EIDNcBXaGys1NQ ghc+47f3O4dFTlQ9+fHjhHmJTfcvUe9Lp7Q4PrGi2vEsOsxca+WZxX8NsYZTjq1RqgijBr Nj8ApjKwMpvRnk0navVgqLOzPEQBgm2eUBhanTTsHQj/ccBqUlGBY8CmXIvNDg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793244577; b=hMSMR89oo+/7EJF0aVPOx9HI1Tw5C5iTCagKyIMsymlAMOBo+Ga44HFX9lvfEwuAooKfLz vI0M4nbZlt1qtKZQ/e93eLAYUCJicuJukSSQbzcJRw3SmV7Ai3hQPE2xvOiIp4HoCHGanM hAA13qYa9i+pRvqd3IOS9sMyxBdVz3cwRjXF65XD7g7WU3bbKg6yICtbGB0or+J7Uofsh3 /jQ07MfjrPSeV7mhzHn5ceNAbrDOuxgvdI9aoZ8lpjkh1zqLhtDd3PDlT3mxfKHW+IoPg1 CBTqqx5AWDwOshy0ia4ungdXdYKC11+EED9rXYWI5KF1O87+Gg6JuXEgfC76zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793244577; 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=NrILbO/h0pxHnOTPpPDllFD9trH3+PY0vX2IdWNqfB4=; b=RrC9Ta3GT3lAYSBTnpJdkP4v942/7JNIfoatUgphxplCnbwijoOClTEtXxbySRJcZMnSLV jC/kNjdmC8g4ybQptcjNn4Qh4M7PNjuvCU6xtqMmQ25sWxPW1OGP9+qVTexxOQEQcgfqFR aTvWsUGVcK3p16/Pc/ZJ6HuP5IKrgtuElgkNCTf5Dm5NWp83GN3DDx8psb3Xg9AmJENA2i tvbQzaRcR7tqIXzsMSSs9qnV5Wnx4otQrHLUtLQJ46Srw/ChO9rnc7Z0I3MgyXtR8fKUtZ UkQyeZWGJg0h98WRrS2agZY+S1UzVLTqBfVJdFWHgH+b6LgxFUNM5lCziHN82A== 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 4jFV8d0BR5zLKB for ; Thu, 29 Oct 2026 03:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 202d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 03:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Gilad Ben Yakov From: Arthur Kiyanovski Subject: git: 2d4d2ed3fef6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2d4d2ed3fef6acda9269f545f6703d6f32f2f0b7 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 03:29:37 +0000 Message-Id: <6ae2bda1.202d5.53955464@gitrepo.freebsd.org> The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=2d4d2ed3fef6acda9269f545f6703d6f32f2f0b7 commit 2d4d2ed3fef6acda9269f545f6703d6f32f2f0b7 Author: Gilad Ben Yakov AuthorDate: 2026-05-05 10:02:13 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-10-29 03:25:50 +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. --- 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 211e33b8a4ce..b16e8ff324be 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);