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 E7A2EC05027 for ; Tue, 14 Mar 2023 17:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230373AbjCNRq3 (ORCPT ); Tue, 14 Mar 2023 13:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230350AbjCNRqZ (ORCPT ); Tue, 14 Mar 2023 13:46:25 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E488ACE2F for ; Tue, 14 Mar 2023 10:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678815976; x=1710351976; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Jv32DuHiKdVyamTKXcO/oJUMaAG3+3+JctJNWxvSMGE=; b=QnYlxIjeB8NrBQ0Ic9W0i7RBBpbAg5CGcLhYnw8yY4RWbf6UxTJzxiTH 5wlDy5VUtlFqvLYvfo5Dl8P+OajnZcqfrxl3zpxr3g1a1Ccbs0u6MOI5a 6kz7yKoLjJ5PGKXC9NFvz/LsNZ09j854gyIw9O5MQUD6mybx2s+vvQEYs 8AMMOPMcQ4sXQYzqarpQXruKsqTVrxZ6sS/3vIhVYdMPpMXT2isCH4N+t MT0xNHqLVDYVEflz1ahp7lKbl2ikuChh7mlH7wfzE4LD+V/X8iwI7le8O 2XMZLnoO2ODR84TBbh6CsyMCES3gxkl2hr+nqdcysidfS7xhq5VfBylml g==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="317148707" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="317148707" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 10:46:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="1008516919" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="1008516919" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by fmsmga005.fm.intel.com with ESMTP; 14 Mar 2023 10:46:05 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, netdev@vger.kernel.org Cc: Alexander Lobakin , anthony.l.nguyen@intel.com, Larysa Zaremba , Michal Kubiak , Rafal Romanowski Subject: [PATCH net 2/3] iavf: fix non-tunneled IPv6 UDP packet type and hashing Date: Tue, 14 Mar 2023 10:44:22 -0700 Message-Id: <20230314174423.1048526-3-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230314174423.1048526-1-anthony.l.nguyen@intel.com> References: <20230314174423.1048526-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Lobakin Currently, IAVF's decode_rx_desc_ptype() correctly reports payload type of L4 for IPv4 UDP packets and IPv{4,6} TCP, but only L3 for IPv6 UDP. Originally, i40e, ice and iavf were affected. Commit 73df8c9e3e3d ("i40e: Correct UDP packet header for non_tunnel-ipv6") fixed that in i40e, then commit 638a0c8c8861 ("ice: fix incorrect payload indicator on PTYPE") fixed that for ice. IPv6 UDP is L4 obviously. Fix it and make iavf report correct L4 hash type for such packets, so that the stack won't calculate it on CPU when needs it. Fixes: 206812b5fccb ("i40e/i40evf: i40e implementation for skb_set_hash") Reviewed-by: Larysa Zaremba Reviewed-by: Michal Kubiak Signed-off-by: Alexander Lobakin Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c index 16c490965b61..dd11dbbd5551 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c @@ -661,7 +661,7 @@ struct iavf_rx_ptype_decoded iavf_ptype_lookup[BIT(8)] = { /* Non Tunneled IPv6 */ IAVF_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3), IAVF_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3), - IAVF_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY3), + IAVF_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4), IAVF_PTT_UNUSED_ENTRY(91), IAVF_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4), IAVF_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4), -- 2.38.1