From nobody Sat Feb 7 08:14:01 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) (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 1BB0315B971; Tue, 27 Jan 2026 05:17:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769491050; cv=none; b=DDkMQP++TikaNK2LGRUWEQ0ME1z74o2OAwq2rHcKKXrO2nWTlOmRXsaxh8GH9jb+pHo482Vc+u8a8i1t1J/7M//GNM581GrRlr9WG/J05IjTVq9DZBjX/a7oQSkMqYUD4b7W+20KUkcbVZbZXpueOON6n12ZjG2OAs3yJCHE3Hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769491050; c=relaxed/simple; bh=sqqVroK96STTlZAd0E8KXlJlr9FSIaNQF38fuBZ7kOY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=u8cDSBpv4AaHkxW58zYGHbfU39WfjMgWcKPSdpQ0IbdpjXqpCTCIBAkWr0GyGvfAPR74yxLu+uzuFDp1wBiyzjTfP3gK239llQhN0wX67JB/UtLgVSFJmvQ65i/LN6vBIIdDbqN5YY7uo4BOc/ca/TtB6OLw+h2VbyUHWK3yFIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=guj7SmuJ; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="guj7SmuJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=OF J6kU8johQdJ6GCIUnOi8feLiMP8M0PJagg23RxtCc=; b=guj7SmuJneAHFvcY0U oD7v8EfSH4I867pyv7CyUBI8e21+uiroEB+y3iyv+aVCxT5whnt1WiYdF2tc/QFv UzoSmtOLFUYcnMvYCSY6zLM9hz4qoVjhnwb8cvdogZspXqoOibxuPcQVsoTjKsbO JTZRPsXlRT3Nv0c9WNrAiy61A= Received: from pek-lpg-core6.wrs.com (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wCHK7hVSnhpEwKcIg--.1986S2; Tue, 27 Jan 2026 13:17:10 +0800 (CST) From: Rahul Sharma To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Gavin Li , Jiri Pirko , Saeed Mahameed , Rahul Sharma Subject: [PATCH v6.1] Revert "net/mlx5: Block entering switchdev mode with ns inconsistency" Date: Tue, 27 Jan 2026 13:17:07 +0800 Message-Id: <20260127051707.2439076-1-black.hawk@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wCHK7hVSnhpEwKcIg--.1986S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJF15XF15GFy8KF1rCr1xKrg_yoW8tw4xpr W7KFyfAry8A3s0g3WUu34ru3sxWa1DJ34j9ryI93WrA3Wvyr1DtF1rtrWSvrW5Cr9rG34f tFyDCw1IvayUGFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zEb18JUUUUU= X-CM-SenderInfo: 5eoduy4okd4yi6rwjhhfrp/xtbC+RYguWl4SlZddwAA3R Content-Type: text/plain; charset="utf-8" From: Gavin Li [ Upstream commit 8deeefb24786ea7950b37bde4516b286c877db00 ] This reverts commit 662404b24a4c4d839839ed25e3097571f5938b9b. The revert is required due to the suspicion it is not good for anything and cause crash. Fixes: 662404b24a4c ("net/mlx5e: Block entering switchdev mode with ns inco= nsistency") Signed-off-by: Gavin Li Reviewed-by: Jiri Pirko Signed-off-by: Saeed Mahameed [ The context change is due to the commit e25373416678 ("net/mlx5e: Rewrite IPsec vs. TC block interface") in v6.6 which is irrelevant to the logic of this patch. ] Signed-off-by: Rahul Sharma --- .../mellanox/mlx5/core/eswitch_offloads.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/d= rivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 5237abbdcda1..f7f1eae998b5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -3493,18 +3493,6 @@ static int esw_inline_mode_to_devlink(u8 mlx5_mode, = u8 *mode) return 0; } =20 -static bool esw_offloads_devlink_ns_eq_netdev_ns(struct devlink *devlink) -{ - struct net *devl_net, *netdev_net; - struct mlx5_eswitch *esw; - - esw =3D mlx5_devlink_eswitch_get(devlink); - netdev_net =3D dev_net(esw->dev->mlx5e_res.uplink_netdev); - devl_net =3D devlink_net(devlink); - - return net_eq(devl_net, netdev_net); -} - int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, struct netlink_ext_ack *extack) { @@ -3519,13 +3507,6 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *de= vlink, u16 mode, if (esw_mode_from_devlink(mode, &mlx5_mode)) return -EINVAL; =20 - if (mode =3D=3D DEVLINK_ESWITCH_MODE_SWITCHDEV && - !esw_offloads_devlink_ns_eq_netdev_ns(devlink)) { - NL_SET_ERR_MSG_MOD(extack, - "Can't change E-Switch mode to switchdev when netdev net namespace = has diverged from the devlink's."); - return -EPERM; - } - mlx5_lag_disable_change(esw->dev); err =3D mlx5_esw_try_lock(esw); if (err < 0) { --=20 2.34.1