From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9CA5C3ABB9 for ; Mon, 5 May 2025 22:55:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7EB6260B88; Mon, 5 May 2025 22:55:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8b8tLWSrKTze; Mon, 5 May 2025 22:55:07 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F1EDD60B92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1746485707; bh=OJ+iY2X3mB8wAL+OiuTolRbExwIkxFjfxTRovpLJVtE=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fENLWLhJbQt3szsHbvQmK88YCMszXIXj26EStzOOpeNfzWVgCICZboK1KcoqX1+AK n/gjY4JDGD49jeaS/+siIpEL+DLJjevrnmLiIIpP3e78uiDu64d/Kqv7OHiFTyHK1F O5z8dD5+99FH7WyDqy8F5VrWEfcp43XJ7aqwxtIqSQ1TPar1C35+cUpnCGiu2FIGP7 jD0yoGB+yow5lhhzvpwJFT6CLTS10f4j0EhhodlOJqWMSsxM21ZRQTR26KN8oLo7RE Hj2eMF2Vp8ikRfCFQburMFNdJxm9NeTjQW01rVekGQKPwY4UCbSKTYUka8dcyq6w9m wy/ai8X4t5iTQ== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id F1EDD60B92; Mon, 5 May 2025 22:55:06 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id C77E620F9 for ; Mon, 5 May 2025 22:55:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A9220400AB for ; Mon, 5 May 2025 22:55:04 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 2KM1l6SU3sNz for ; Mon, 5 May 2025 22:55:03 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=sashal@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 82A3C400CC DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 82A3C400CC Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by smtp2.osuosl.org (Postfix) with ESMTPS id 82A3C400CC for ; Mon, 5 May 2025 22:55:03 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id EFCA3629CB; Mon, 5 May 2025 22:54:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 009B6C4CEED; Mon, 5 May 2025 22:54:59 +0000 (UTC) From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Swiatkowski , Jacob Keller , Pucha Himasekhar Reddy , Tony Nguyen , Sasha Levin , przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Date: Mon, 5 May 2025 18:38:28 -0400 Message-Id: <20250505223922.2682012-432-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485701; bh=r4fgLAAVznNRNX+Ukr/B1QOru5Iw0iU6f8ToF0OtkFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=An6mkgLOpfOXnvmTSu6c058drQew3R7QVXZ9mBTuqmg/20vHz4R55mN5X6vnuQshd WLDUZG2N7Pd0IAUgksHroYOPrVgSfLy9wM9p+ppUAUlFJwmTSAR4jaHApIyKGWXJgX cGOoglwEc3lrKyXFLxq84fK7aA+SzIt6t2zWT1xxscN4RIPgjf6EAe+gmWbrdLGKwP zhZs9GZpHbNc3tjuWDyGp3wc5R049Dyhrvx0u39og2lqlgmMNrjTp9GGHczdBrmrKe BW3/qLbwgZJeu6KLieQkDdFTR1OMC8mbVz0HwOp5QBFnE1qb7KOIrLiIqHY0NWUqnq cIxVWJMQ+R/yQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=An6mkgLO Subject: [Intel-wired-lan] [PATCH AUTOSEL 6.12 432/486] ice: init flow director before RDMA X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Michal Swiatkowski [ Upstream commit d67627e7b53203ca150e54723abbed81a0716286 ] Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it. Reviewed-by: Jacob Keller Tested-by: Pucha Himasekhar Reddy Signed-off-by: Michal Swiatkowski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index ca707dfcb286e..63d2105fce933 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5175,11 +5175,12 @@ int ice_load(struct ice_pf *pf) ice_napi_add(vsi); + ice_init_features(pf); + err = ice_init_rdma(pf); if (err) goto err_init_rdma; - ice_init_features(pf); ice_service_task_restart(pf); clear_bit(ICE_DOWN, pf->state); @@ -5187,6 +5188,7 @@ int ice_load(struct ice_pf *pf) return 0; err_init_rdma: + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); err_tc_indir_block_register: ice_unregister_netdev(vsi); @@ -5210,8 +5212,8 @@ void ice_unload(struct ice_pf *pf) devl_assert_locked(priv_to_devlink(pf)); - ice_deinit_features(pf); ice_deinit_rdma(pf); + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); ice_unregister_netdev(vsi); ice_devlink_destroy_pf_port(pf); -- 2.39.5 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B5792D6449; Mon, 5 May 2025 22:55:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485702; cv=none; b=muQSXI79m5ZOm5EkVMZOzXmfSYd+DVILZomT4OczBow693/LECuTwyjfGx5ZIfvmWFNUarcrJEVoifQBxMCY408upmIGZ2TEwcMZIimu/V8YMgwCgMOmsIew24sf/6dmZdtGkMP9Jbuj0HLoDY5980jeO7MJOpqHlS0nFLc5cmU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485702; c=relaxed/simple; bh=r4fgLAAVznNRNX+Ukr/B1QOru5Iw0iU6f8ToF0OtkFg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cETjKa1P6rqcFK7p09OyTt4b+JNafwbXXmwBumQjIFqMzg4dl9oNqM35voh2/1gI48PTiOx/1aMVbLP15KFfCiHU543pDtq5Xi6j1dgY/WSDqFsXKE2ZCI+WxOu13FbavdEVMpYXVUVGq7D93LylN89QtOoOJNy4dSAl2cuti+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=An6mkgLO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="An6mkgLO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 009B6C4CEED; Mon, 5 May 2025 22:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485701; bh=r4fgLAAVznNRNX+Ukr/B1QOru5Iw0iU6f8ToF0OtkFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=An6mkgLOpfOXnvmTSu6c058drQew3R7QVXZ9mBTuqmg/20vHz4R55mN5X6vnuQshd WLDUZG2N7Pd0IAUgksHroYOPrVgSfLy9wM9p+ppUAUlFJwmTSAR4jaHApIyKGWXJgX cGOoglwEc3lrKyXFLxq84fK7aA+SzIt6t2zWT1xxscN4RIPgjf6EAe+gmWbrdLGKwP zhZs9GZpHbNc3tjuWDyGp3wc5R049Dyhrvx0u39og2lqlgmMNrjTp9GGHczdBrmrKe BW3/qLbwgZJeu6KLieQkDdFTR1OMC8mbVz0HwOp5QBFnE1qb7KOIrLiIqHY0NWUqnq cIxVWJMQ+R/yQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Swiatkowski , Jacob Keller , Pucha Himasekhar Reddy , Tony Nguyen , Sasha Levin , przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 432/486] ice: init flow director before RDMA Date: Mon, 5 May 2025 18:38:28 -0400 Message-Id: <20250505223922.2682012-432-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit From: Michal Swiatkowski [ Upstream commit d67627e7b53203ca150e54723abbed81a0716286 ] Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it. Reviewed-by: Jacob Keller Tested-by: Pucha Himasekhar Reddy Signed-off-by: Michal Swiatkowski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index ca707dfcb286e..63d2105fce933 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5175,11 +5175,12 @@ int ice_load(struct ice_pf *pf) ice_napi_add(vsi); + ice_init_features(pf); + err = ice_init_rdma(pf); if (err) goto err_init_rdma; - ice_init_features(pf); ice_service_task_restart(pf); clear_bit(ICE_DOWN, pf->state); @@ -5187,6 +5188,7 @@ int ice_load(struct ice_pf *pf) return 0; err_init_rdma: + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); err_tc_indir_block_register: ice_unregister_netdev(vsi); @@ -5210,8 +5212,8 @@ void ice_unload(struct ice_pf *pf) devl_assert_locked(priv_to_devlink(pf)); - ice_deinit_features(pf); ice_deinit_rdma(pf); + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); ice_unregister_netdev(vsi); ice_devlink_destroy_pf_port(pf); -- 2.39.5