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 DB07D26869D; Tue, 8 Apr 2025 12:03:08 +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=1744113789; cv=none; b=nfIcdOMNMo09ECoywxsTv1BKWEX0BlD/N9bdSOL88puPZjIUFfKXa8JRfcg84M0hpozvUsN/uzZwg325WRbfRME+A3YTdKtR2WLI9/QDu6Bd5FJMzwEMR4RvMoSbzb+csIAmWvbTjFvLQlI/3pZ6Eg9V/HFPe4JnTiTzVU+voyE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113789; c=relaxed/simple; bh=osjh9dP5KOwweiy4LbM0uqsDQ2BUwHCk9RD8oD6toVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qmd3ByM7Pf4zkbfzzfLPAlqaTtmIBGvBFhtDlY7TsoqBhhwsLb3CVERT5QeZzYmWtbofASmBKNDuqVyJp4E5goU9Lw3vGM/pdfVlHNUwhk99zpPFvayBNLpTEb292WNHkSMMF4oWH8yX7ihGaDZ95+6dCsib+rNE76CCmDydhOo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w4z5k9Ym; 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="w4z5k9Ym" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAF55C4CEE5; Tue, 8 Apr 2025 12:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113788; bh=osjh9dP5KOwweiy4LbM0uqsDQ2BUwHCk9RD8oD6toVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4z5k9YmdpKSBMJjhNufI/cTe/RTPlAByty4gXmz1f0qO581IYtShsogax5LCMPQU jEfTwnz4E14nkoHBnoiG+FzY2nyypYAr7l1k0MXHdbV7fSK+2TcQLp47KvFi8e/K9G uDb0K7Psq5pMcI2afb8h54kIn5WnipaUxEfIg7jo= 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.4 020/154] net/mlx5e: Prevent bridge link show failure for non-eswitch-allowed devices Date: Tue, 8 Apr 2025 12:49:21 +0200 Message-ID: <20250408104815.927878850@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104815.295196624@linuxfoundation.org> References: <20250408104815.295196624@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-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 363c4ab059909..b3ba996004f1d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4684,11 +4684,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