From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) (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 0410B403EBA for ; Wed, 3 Jun 2026 07:28:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780471733; cv=none; b=j+K+5PiOEwHpDu1KGwxek7ctkGwgzSFVS8YMsSdZ56xm6AV+p9QwOemoc8gb76nEE9dRPcNx2JBUNYCJ8zAoNYpknAZr3qEtzwLPCRP3NPpK1rgwKvbbdv6g2EHLbEiXjTwFN7JDa6vNjQ48cOM2vm01MeaJWUROOfCGyKxWpco= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780471733; c=relaxed/simple; bh=u6F/2C+fvBzquIXPlmU/3j5rjS4sBgawX1rb11MeljM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hEW2PvoR5Dco50twN5k2UmqjDYdOjrnTLqNt36Zv0QiPZ5sa7he5kWtQHggxFFnvkz30O37NPE6m0pcuRhQrSJ8Ib37y/j189m3UNSSKiuvwxJOWy420x0LUeBUe9ud91dI15GyK9X1mXyS14GiDW4SvFRW5f6lYsk01zEIMiA4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=OeNMOhBG; arc=none smtp.client-ip=95.215.58.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="OeNMOhBG" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1780471729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TbOdb5ayEdhtH6yD3DNTe0xKjBwdKK62mPaH1TFHgak=; b=OeNMOhBGJqIjbiZIKthmLgw+5Il6LKUo0dcmPR1dzBbD8H+Js2nFq3Ay1dDPfbpf9til3s tUnLRquTGzzLGphpHl8IzZlcuVPPCm6Gz9QJYauVovHPLRPdsbZ+neQD3wHgkzgroL5Cfe iK0+sPgC+3g24EjqfI/auwnChrp1bJg= From: Fushuai Wang To: saeedm@nvidia.com, leon@kernel.org, tariqt@nvidia.com, mbloch@nvidia.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, shayd@nvidia.com, parav@nvidia.com, moshe@nvidia.com Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, wangfushuai@baidu.com Subject: [PATCH 2/2] net/mlx5: Only consider online CPUs in affinity subset check Date: Wed, 3 Jun 2026 15:26:57 +0800 Message-Id: <20260603072657.10868-3-fushuai.wang@linux.dev> In-Reply-To: <20260603072657.10868-1-fushuai.wang@linux.dev> References: <20260603072657.10868-1-fushuai.wang@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Fushuai Wang When an SF is created after a CPU has been taken offline, the IRQ pool may contain IRQs with affinity masks that include the offline CPU. Since only online CPUs should be considered for IRQ placement, cpumask_subset() check would fail because the iter_mask contains offline CPUs that are not present in req_mask, causing SF creation to fail. Filter the affinity mask to only include online CPUs before checking if it's a subset of the requested mask, ensuring SF creation succeeds in this scenario. Fixes: 061f5b23588a ("net/mlx5: SF, Use all available cpu for setting cpu affinity") Signed-off-by: Fushuai Wang --- .../net/ethernet/mellanox/mlx5/core/irq_affinity.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c index 994fe83da4be..8c0df240b888 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c @@ -102,18 +102,26 @@ irq_pool_find_least_loaded(struct mlx5_irq_pool *pool, const struct cpumask *req struct mlx5_irq *iter; int irq_refcount = 0; unsigned long index; + cpumask_var_t tmp; lockdep_assert_held(&pool->lock); + + if (!alloc_cpumask_var(&tmp, GFP_ATOMIC)) + return NULL; + xa_for_each_range(&pool->irqs, index, iter, start, end) { struct cpumask *iter_mask = mlx5_irq_get_affinity_mask(iter); int iter_refcount = mlx5_irq_read_locked(iter); - if (!cpumask_subset(iter_mask, req_mask)) + cpumask_and(tmp, iter_mask, cpu_online_mask); + if (!cpumask_subset(tmp, req_mask)) /* skip IRQs with a mask which is not subset of req_mask */ continue; - if (iter_refcount < pool->min_threshold) + if (iter_refcount < pool->min_threshold) { /* If we found an IRQ with less than min_thres, return it */ + free_cpumask_var(tmp); return iter; + } if (!irq || iter_refcount < irq_refcount) { /* In case we won't find an IRQ with less than min_thres, * keep a pointer to the least used IRQ @@ -122,6 +130,8 @@ irq_pool_find_least_loaded(struct mlx5_irq_pool *pool, const struct cpumask *req irq = iter; } } + + free_cpumask_var(tmp); return irq; } -- 2.36.1