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 8D548C7618A for ; Wed, 15 Mar 2023 12:42:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233030AbjCOMm4 (ORCPT ); Wed, 15 Mar 2023 08:42:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233045AbjCOMmf (ORCPT ); Wed, 15 Mar 2023 08:42:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B44E82BEF3 for ; Wed, 15 Mar 2023 05:41:20 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 2D91361D69 for ; Wed, 15 Mar 2023 12:41:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43022C433EF; Wed, 15 Mar 2023 12:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678884078; bh=feaYzCQmnolwAAkCECIkZtYjMX1x4GiBId7TUk3zZN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tj2is6Ocsy6N6Rh43BsFBfPixJCfmkvyNn7pdVtw0Mc8RmBZfRRNIjpmUdUNtmMbm /+ijtwVul0rBIuwIseVcneMktIeM8Med0NxWvAPj7gvVCLB83xwujzOESBPaf+0/J1 ZmmqNMM1Qh9Z/t61O4b42nUXhtmzLwm8uZi5TJyQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Huanhuan Wang , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 6.2 069/141] nfp: fix esp-tx-csum-offload doesnt take effect Date: Wed, 15 Mar 2023 13:12:52 +0100 Message-Id: <20230315115742.060828108@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230315115739.932786806@linuxfoundation.org> References: <20230315115739.932786806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Huanhuan Wang [ Upstream commit 1cf78d4c4144ffdbc2c9d505db482cb204bb480b ] When esp-tx-csum-offload is set to on, the protocol stack shouldn't calculate the IPsec offload packet's csum, but it does. Because the callback `.ndo_features_check` incorrectly masked NETIF_F_CSUM_MASK bit. Fixes: 57f273adbcd4 ("nfp: add framework to support ipsec offloading") Signed-off-by: Huanhuan Wang Signed-off-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 70d7484c82af4..1182fa48a3b54 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "nfpcore/nfp_dev.h" #include "nfpcore/nfp_nsp.h" @@ -1897,6 +1898,9 @@ nfp_net_features_check(struct sk_buff *skb, struct net_device *dev, features &= ~NETIF_F_GSO_MASK; } + if (xfrm_offload(skb)) + return features; + /* VXLAN/GRE check */ switch (vlan_get_protocol(skb)) { case htons(ETH_P_IP): -- 2.39.2