From patchwork Sat Feb 4 13:35:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 52780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1359898wrn; Sat, 4 Feb 2023 05:57:05 -0800 (PST) X-Google-Smtp-Source: AK7set/KRIl3vXIgEKmeziRooU5TbCEaSBsFBW5yQuytJOoxTAtF3QZ9a8S1WUhYCS4DYQV9NcZ8 X-Received: by 2002:a17:907:9d08:b0:870:58ae:842e with SMTP id kt8-20020a1709079d0800b0087058ae842emr16016297ejc.24.1675519025010; Sat, 04 Feb 2023 05:57:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675519024; cv=none; d=google.com; s=arc-20160816; b=Ou2+WI5RsZZ8fu25hmfdh4ThMwZDFtX8Z6bX1t0n6KngSxG3vREWWs7spfuB2Ibona neF94VQQC1lUPDUmGNUHfD7FQcp5FJmH9w7gI6gg/mNaKzzi8CE9PZMYh1+Ij+tZBK16 w2qM3hXKval+223OFat5szovbr+6ytWcG5zwau3WKWZNuHZOtGodw0RQHU9LkLZdgBr0 vsJmjGmiI+1p+oYvXIR2BgtXNH0G8LJnlxzMhh3DKAB824s8c4WzEpiZisnKMjL3w7Wf 0n5dzZoDTU/n+A3vi0Q0UDOA+4GdCprbJE/I/pVYSMC0LD9JEdRsyUNGCSS9XY2VG/Eb LnOg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lV+jIwfpIfjlKMz7MBn8qE6oOOJOfnotd/kmF+jUhhM=; b=As6D9wUxbUG7VeKZ27jmlFCAZ+qoxn4ZasnQ1J7gnleyxLwPCVRmJhIPuNlFvh21er hQlEUKjd0yNFEVGSxpvgMo9C+YCScrPbWFhfkXWjp11UwvlPEaIeyy6VDyr3/nIWyi82 +xLVZeX1T3aiNx7MR/NlBYvWvHLU3b0adO49G6j0CBzH0EPosXfSMiYzPa4PDgr/RG2p Xvl7qYjGjWS+UvfXVcT+V1ujyrUDjH83YbYKaABxeUGT174X7qRnPhAOnIidysWd6jZ9 03i3XNx5UqxG3MWS8XfOW9YiHy+d+AwCOjE+twgkO+YeyIB/oVHSEvr/LP+9Eke1Rxq2 TpJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YMsRv2Wz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gh16-20020a1709073c1000b00886de65e971si6040961ejc.698.2023.02.04.05.56.41; Sat, 04 Feb 2023 05:57:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YMsRv2Wz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233798AbjBDNhG (ORCPT + 99 others); Sat, 4 Feb 2023 08:37:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233805AbjBDNgv (ORCPT ); Sat, 4 Feb 2023 08:36:51 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A99DE07C; Sat, 4 Feb 2023 05:36:45 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id m2so7898624plg.4; Sat, 04 Feb 2023 05:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lV+jIwfpIfjlKMz7MBn8qE6oOOJOfnotd/kmF+jUhhM=; b=YMsRv2WzJABVcHWfB8CthUOP1a1+ON3dEke2uXaOnLUc5PxwEBjlYxxUOhUbMBv4/w MoIXr4LmyB0eW0YOrUDdpTz3uJIkcHcZCC33DA2Uc4y7YA4oGcJANHOjWGUi2x5y4LCf Qpdpgr0j1rufoSGJKF95bdhpEZA4Zc1GyZ+34QVVXG1uMllzmZiPmrBF449GeBU02JqY 1KsSq0OCVS+T0Cjhe/gVfgq2rKNYjbqk7uZDQJE4r9fqvsuPuO12NB945wFoNomj5gq3 9/056OPoMhJXdty2jtW0CEJeRPqBIzln/7Xejjk7Cm8zr2Pi1TURmlYe7/Sg+xwUEVpn 64Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lV+jIwfpIfjlKMz7MBn8qE6oOOJOfnotd/kmF+jUhhM=; b=tSxn2o1DJ1f8IKnfinNLCS0T5yAJExLjvkF5CPDJ0mowDo4BD9gb5u9CTx5IU49WHU Df5uG9TwN7uQImYJg+OI0q+dilOV+z+QYKP/AJCATigZQIs8XADVEYN3MjX9wXKVUmuo dUurt4c5gnzBPbN2RN6lCaOVbnG3DA4secQGxh09hwOFygjrn1VgHXI0+Gm8DV2r4iOG nxR2LYIjmh448R0OKIzII9zJM6d4HILAyKn0MqTZSUiEhBTk2/Grs1mjhiN8XzNPt91G BH+aC7PVCQfoVZleAOpQRINZgYVlBwxhRtV3Nt+KGCC8jTOV7+xVCVUOtAAzw7gSXil3 2aaA== X-Gm-Message-State: AO0yUKXTu62Zb0rktEPE+Giq1lqpY1cAOfRDwcxFlCxBAGwegrBQ9Bw0 8JNZlOtVeAqySL58Su3frgIiAIYIa6KyNZwi X-Received: by 2002:a17:902:f243:b0:198:eaac:464a with SMTP id j3-20020a170902f24300b00198eaac464amr2858741plc.42.1675517804585; Sat, 04 Feb 2023 05:36:44 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([114.253.32.172]) by smtp.gmail.com with ESMTPSA id 21-20020a170902c25500b0019605a51d50sm3463575plg.61.2023.02.04.05.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 05:36:44 -0800 (PST) From: Jason Xing To: jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, alexandr.lobakin@intel.com, maciej.fijalkowski@intel.com Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 2/3] i40e: add double of VLAN header when computing the max MTU Date: Sat, 4 Feb 2023 21:35:34 +0800 Message-Id: <20230204133535.99921-3-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230204133535.99921-1-kerneljasonxing@gmail.com> References: <20230204133535.99921-1-kerneljasonxing@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756909036818675503?= X-GMAIL-MSGID: =?utf-8?q?1756909036818675503?= From: Jason Xing Include the second VLAN HLEN into account when computing the maximum MTU size as other drivers do. Fixes: 0c8493d90b6b ("i40e: add XDP support for pass and drop actions") Signed-off-by: Jason Xing --- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 60e351665c70..e03853d3c706 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -107,6 +107,8 @@ #define I40E_BW_MBPS_DIVISOR 125000 /* rate / (1000000 / 8) Mbps */ #define I40E_MAX_BW_INACTIVE_ACCUM 4 /* accumulate 4 credits max */ +#define I40E_PACKET_HDR_PAD (ETH_HLEN + ETH_FCS_LEN + (VLAN_HLEN * 2)) + /* driver state flags */ enum i40e_state_t { __I40E_TESTING, diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 53d0083e35da..d039928f3646 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -2921,7 +2921,7 @@ static int i40e_change_mtu(struct net_device *netdev, int new_mtu) struct i40e_pf *pf = vsi->back; if (i40e_enabled_xdp_vsi(vsi)) { - int frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; + int frame_size = new_mtu + I40E_PACKET_HDR_PAD; if (frame_size > i40e_max_xdp_frame_size(vsi)) return -EINVAL;