Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3933958pxj; Mon, 21 Jun 2021 09:41:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMbyukWoqByzVVfroWfe1twaXyxV64KPS5winsVHdNMeGzm4lrH+HmeWQlZBeY1QGuMzVl X-Received: by 2002:aa7:cf03:: with SMTP id a3mr13893417edy.27.1624293667023; Mon, 21 Jun 2021 09:41:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293667; cv=none; d=google.com; s=arc-20160816; b=gChhV+pkH8oNVs3hbETgp75F1127EqGbCedxIZfLVUX6ujJToVQLMRHa7SRQx2gekW 7xbaqVKr2eoDBZB4IrAkjEF06VdXgpAVZt1zODxnTMYEyIodaeFSreKKFD/1KjLZYbl0 z0Z8gFSHOgiYudjpkSL7V3XvS9Rz8WdqwCUOmDv7AIKBzE1SW4efXs0KMEUZH3Is752h H8ZqqzR7oZMhnjoDO2Dl1M6A8swhuZnFItDKZ5dWDj0m7zYS1rAuVWZNjhZSupjtZeBs aP7ffhDG4KwDvFbqcPKebOu3yjNbzSGd9vAplpWigXi6JW2XSKHJ9zJBiOMUpndWnVzk RRpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0WFEGBmDLlJBmAZyZfTY3JcEBKoWNhmSrAya3haogmU=; b=SbV9jX2YI1ArgRwY0PfYVeWTLc9DnibAlFcv1WfzO9cH9NSk7eiDszUAvHn0OIl+RC 8by4QcDTmh/H23/rHy4hK78Et+DHkicMrru1VNIdyCsMWbCvAeNx+CJXvYjS6VU+xwyY UOe8qnbqx47fYMLGY9uj2xaHud++9q9su6TQVel2bPRNzbTuEddmEzHpH/P2Wb3/UjJF fIYuxcIDC0OKeylo5CThqQ7s6G9USiZtCkMCIOf6A7eUTyyIRH7W/xHdR+4ZkEr9qI18 KbF+7thn5PJmWnnWW7rEpGz3pSgayoCkDRiTgAQP9DXEJ7RsSaPeyEdorNR58glapfTW kQHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="pJTN4Yi/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h9si4785874ejl.536.2021.06.21.09.40.30; Mon, 21 Jun 2021 09:41:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="pJTN4Yi/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232760AbhFUQlV (ORCPT + 99 others); Mon, 21 Jun 2021 12:41:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:60770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232762AbhFUQhZ (ORCPT ); Mon, 21 Jun 2021 12:37:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85D666100A; Mon, 21 Jun 2021 16:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624292934; bh=L1d6I5VKLiIbY9lV5ChXDEgSH6YenZtYxZcqv9O/R0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pJTN4Yi/djM/RoG1G2YtwFS5vThlhnagc2/Ll8pyRpFBps6VBxtRuBWoz6afc0LGE Gej4my+P87hP+SOBI+Cy0J64QsaIK7beZJC50migfVSX7vOdsT4OX7qRuft2da77gT 2UTmxCnLMT8uCY1dTGoXcwFZBgEZQ44ICnjHvJRc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aya Levin , Tariq Toukan , Saeed Mahameed , Sasha Levin Subject: [PATCH 5.12 039/178] net/mlx5e: Block offload of outer header csum for GRE tunnel Date: Mon, 21 Jun 2021 18:14:13 +0200 Message-Id: <20210621154923.436504321@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210621154921.212599475@linuxfoundation.org> References: <20210621154921.212599475@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aya Levin [ Upstream commit 54e1217b90486c94b26f24dcee1ee5ef5372f832 ] The device is able to offload either the outer header csum or inner header csum. The driver utilizes the inner csum offload. So, prohibit setting of tx-gre-csum-segmentation and let it be: off[fixed]. Fixes: 2729984149e6 ("net/mlx5e: Support TSO and TX checksum offloads for GRE tunnels") Signed-off-by: Aya Levin Reviewed-by: Tariq Toukan Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 2a3da167f248..16b8f5245032 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -5174,12 +5174,9 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) } if (mlx5e_tunnel_proto_supported_tx(mdev, IPPROTO_GRE)) { - netdev->hw_features |= NETIF_F_GSO_GRE | - NETIF_F_GSO_GRE_CSUM; - netdev->hw_enc_features |= NETIF_F_GSO_GRE | - NETIF_F_GSO_GRE_CSUM; - netdev->gso_partial_features |= NETIF_F_GSO_GRE | - NETIF_F_GSO_GRE_CSUM; + netdev->hw_features |= NETIF_F_GSO_GRE; + netdev->hw_enc_features |= NETIF_F_GSO_GRE; + netdev->gso_partial_features |= NETIF_F_GSO_GRE; } if (mlx5e_tunnel_proto_supported_tx(mdev, IPPROTO_IPIP)) { -- 2.30.2