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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64C7FC433F5 for ; Tue, 18 Jan 2022 02:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344358AbiARCoY (ORCPT ); Mon, 17 Jan 2022 21:44:24 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:48790 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346766AbiARCjx (ORCPT ); Mon, 17 Jan 2022 21:39:53 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BC6D6B81243; Tue, 18 Jan 2022 02:39:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CB3AC36AE3; Tue, 18 Jan 2022 02:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473589; bh=Py0Utb8K/TKDOXRe9hLUxo0KxcgvtJEQobvTI9y/7YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ti2jo+omzDNzRBCnSR2srz9zmjLce1COAPEhwq7p+WSJ5NRBpzAbf5jXsTS9pHdFd eCT+Urfp3J92PJkVwsWAO7J3CTPMX5gi4fFJl23EJ6gQxAlhe1jwXTGmqygvlprak/ ArCPhfdVoB7fLtFwg7jCK6aznh0ZyIwE45NfjWYdtSlzxVBXi02YOsyYTOUG1ciOeN 8EDtX/XYOJ6SbDEkyfrjLEl7eE+BKpNjVCxl0eXn/J9Hm6Oq1ow0kT+TioAW4ZGWZb loNucTkySGJyKkvTFz/Y8AcfuZIKTPAXZX0Bsiqpj3L9Exwde/lxhUAixC5TZzVhn9 ERR/WiGLbYUEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maor Dickman , Roi Dayan , Saeed Mahameed , Sasha Levin , davem@davemloft.net, kuba@kernel.org, parav@nvidia.com, dlinkin@nvidia.com, mbloch@nvidia.com, huyn@nvidia.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 181/188] net/mlx5e: Unblock setting vid 0 for VF in case PF isn't eswitch manager Date: Mon, 17 Jan 2022 21:31:45 -0500 Message-Id: <20220118023152.1948105-181-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maor Dickman [ Upstream commit 7846665d3504812acaebf920d1141851379a7f37 ] When using libvirt to passthrough VF to VM it will always set the VF vlan to 0 even if user didn’t request it, this will cause libvirt to fail to boot in case the PF isn't eswitch owner. Example of such case is the DPU host PF which isn't eswitch manager, so any attempt to passthrough VF of it using libvirt will fail. Fix it by not returning error in case set VF vlan is called with vid 0. Signed-off-by: Maor Dickman Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c index df277a6cddc0b..0c4c743ca31e1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c @@ -431,7 +431,7 @@ int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw, int err = 0; if (!mlx5_esw_allowed(esw)) - return -EPERM; + return vlan ? -EPERM : 0; if (vlan || qos) set_flags = SET_VLAN_STRIP | SET_VLAN_INSERT; -- 2.34.1