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 D627C26561C; Tue, 8 Apr 2025 10:54:58 +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=1744109698; cv=none; b=pnOe+wjIpSCgb0kHV8HN76LmKJ21itFtnUpD6Vazw4BSjjA//oAj8nWE5wpY7PFPU+/STvy8BEwP2AZDp4rk1syIe0hwKTA7fqV+WQoMLdzB6YCeJHkv8/UdO8xRScObVPrBlcO77RQ0w0uM6qgS565cm2qWTCba6h+TIY43EYc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109698; c=relaxed/simple; bh=jfG9iJpYrnL2mCay7EucmL04etQ5PqjD3ctdpEsTzC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ElpDQTyNtckowNxNuXilEzleBxEhp6ltah6dgrahFiQJ41eNvW7DI55eZZzLoS7kNLP4rrbLtzBqGeSP02OS4hdo1LXAhJPpqsjKQDeOm9tar9yoZjzKB2UC8XJZg6+bFTFKx2o0sOHHod9oa+1aVURXlXH7+PSLN6Ik2txP5wo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B0zlK8x3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="B0zlK8x3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 658DEC4CEE5; Tue, 8 Apr 2025 10:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744109698; bh=jfG9iJpYrnL2mCay7EucmL04etQ5PqjD3ctdpEsTzC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0zlK8x3cubOwtzKtjcDyxcbNMpDJoPd7x3uqAr9ZI0M7JelRxwzmsNTWT+VZz/uL gHZayvYR6TCGFIDojKPgHqr/AcR7CNcd1WIIHB+uMOeL0Era+KE8qdilhfkmnZfRl9 cITHd9uRAWt3KmCMB7d2Tln/ir+LvIz4zP//YDLk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Carolina Jubran , Jianbo Liu , Tariq Toukan , Michal Swiatkowski , Paolo Abeni , Sasha Levin Subject: [PATCH 5.10 020/227] net/mlx5e: Prevent bridge link show failure for non-eswitch-allowed devices Date: Tue, 8 Apr 2025 12:46:38 +0200 Message-ID: <20250408104821.003786519@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Carolina Jubran [ Upstream commit e92df790d07a8eea873efcb84776e7b71f81c7d5 ] mlx5_eswitch_get_vepa returns -EPERM if the device lacks eswitch_manager capability, blocking mlx5e_bridge_getlink from retrieving VEPA mode. Since mlx5e_bridge_getlink implements ndo_bridge_getlink, returning -EPERM causes bridge link show to fail instead of skipping devices without this capability. To avoid this, return -EOPNOTSUPP from mlx5e_bridge_getlink when mlx5_eswitch_get_vepa fails, ensuring the command continues processing other devices while ignoring those without the necessary capability. Fixes: 4b89251de024 ("net/mlx5: Support ndo bridge_setlink and getlink") Signed-off-by: Carolina Jubran Reviewed-by: Jianbo Liu Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski Link: https://patch.msgid.link/1741644104-97767-7-git-send-email-tariqt@nvidia.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index aeb8bb3c549a1..c3ff1fc577a7c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4604,11 +4604,9 @@ static int mlx5e_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5_core_dev *mdev = priv->mdev; u8 mode, setting; - int err; - err = mlx5_eswitch_get_vepa(mdev->priv.eswitch, &setting); - if (err) - return err; + if (mlx5_eswitch_get_vepa(mdev->priv.eswitch, &setting)) + return -EOPNOTSUPP; mode = setting ? BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB; return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, -- 2.39.5