Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp852427yba; Wed, 24 Apr 2019 10:38:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyn0ZYj+ec8JJC7Pfd2nGLwXHnkB1aZbGCMlk1oryf6K5t7HE3s8Rl/GbTML4F5+aHQmQY3 X-Received: by 2002:a63:8c7:: with SMTP id 190mr25469543pgi.447.1556127492254; Wed, 24 Apr 2019 10:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556127492; cv=none; d=google.com; s=arc-20160816; b=PsaloJ/MBOmzPjHajf0SJ0eil0WXlSVHKU8xESnT3PIcSVmSMrHpvcMtnuaotDS3/V 4nKGB3uska1W0RNwEMVjlzIASNXNgiJeJ7BVPhVHpGkNyxHrT99SO5c0uFalCbXuNXn+ zcGXCvHszcO3+F+2pvRAs4ZPVvelF62bEfdLpa2jTgxgfcTJHi9k+nqP8xtq3Jgjqqy0 qIycQYTMgvZROo07xhT/vxEAZuT/pa+nTSVWleTHr8eUsmuumMNh70B089d6vb4IE+zy KCSS73bhCLhLE+ISfXvY87ytJtzCSnw0ExSg7od0H/WdZOiQKu41gvDc71cN92iqvwRm LQxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zWeBLEIpDog3EEgsI7tIZMzhhS3qJnq+/w+g/EDgaKM=; b=p/1foM/WNfN/GOqgNarIcUPshX3dSfjmRKsoaZAwvHSAif2nwHdnAn7EIwqWgamIMA wJk4yEikx5DI7Y4nBsWSDiQ+FRCSfRgrlwfH/3R4a8t1CoavnlDMiJ11LKOGyNdk3NiA CXhK15ylSviU8d/LEujyBzZoPOVLiyR8Bsf+VKiVM67RIAvhR7Tb+tv2IRPV7xJAr5dw NKfcaPxrKK5y+EK/ItkVNw8qn6h8Y+c4kvWYKNAy4owlg2m2trFBdoIgQsZcjv3w7ZmO MrMVjsNQhJXvzlEDlfayMy3ACWDHi/53v6B3sl2J0e+848D2ahqGLQdmqMXoPTm5Sz0V Xqbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bCuaL3Wt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o12si19550755plk.310.2019.04.24.10.37.56; Wed, 24 Apr 2019 10:38:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bCuaL3Wt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390861AbfDXRg3 (ORCPT + 99 others); Wed, 24 Apr 2019 13:36:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403873AbfDXRg1 (ORCPT ); Wed, 24 Apr 2019 13:36:27 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65354218B0; Wed, 24 Apr 2019 17:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127386; bh=RAsi0xcUbYMzYVmmXaYs+1U34RsRM6sFAVk1c2qMrl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bCuaL3WteYRVcg+0UOXnue4j5sG/v8nAH5xrV3X0sCplsI+uqfrwAnjgLUxPMgLUw YhhfGDlWw2QzdJDyVADDo1D03rYOM8/UkPa8mEC60eEkU9FRepXSiXPMRZvv+GuMUk nFKxWon6AX/30kqA2boEHDFCYqXgWHwkGFIiEH1A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmytro Linkin , Eli Britstein , Vlad Buslov , Roi Dayan , Saeed Mahameed Subject: [PATCH 5.0 028/115] net/mlx5e: Protect against non-uplink representor for encap Date: Wed, 24 Apr 2019 19:09:24 +0200 Message-Id: <20190424170926.685771205@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170924.797924502@linuxfoundation.org> References: <20190424170924.797924502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmytro Linkin [ Upstream commit 5e0060b1491b299b1706414e61ede0b02265680e ] TC encap offload is supported only for the physical uplink representor. Fail for non uplink representor. Fixes: 3e621b19b0bb ("net/mlx5e: Support TC encapsulation offloads with upper devices") Signed-off-by: Dmytro Linkin Reviewed-by: Eli Britstein Reviewed-by: Vlad Buslov Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -39,6 +39,10 @@ static int get_route_and_out_devs(struct return -EOPNOTSUPP; } + if (!(mlx5e_eswitch_rep(*out_dev) && + mlx5e_is_uplink_rep(netdev_priv(*out_dev)))) + return -EOPNOTSUPP; + return 0; }