From patchwork Sat Feb 4 13:35:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 52782 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1360294wrn; Sat, 4 Feb 2023 05:58:30 -0800 (PST) X-Google-Smtp-Source: AK7set/fbPwWjSpQJZgZ5IFlpWZWYNSgSD+3nuXtnthJrgDcKQljFOMQCz4BMTotx3Niny3sf/e8 X-Received: by 2002:a17:906:3f92:b0:88f:7d3b:b90 with SMTP id b18-20020a1709063f9200b0088f7d3b0b90mr8354483ejj.42.1675519110676; Sat, 04 Feb 2023 05:58:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675519110; cv=none; d=google.com; s=arc-20160816; b=l93g3hoqECT0zXK63uSifF01d+EOo4YSUxIURjh2RzQgg0ZE8BUveQSJiITkrOj+S3 lVOo8S8TnMO5CxeV0PG13LdJe9vRS1YCOUZ81I4/VXuY9TPQB8eiv1c0VOhMC6fSitwm Rt82HpaMRBAW4ROaFIm8QAELuzQkoEPWlY6Bv56IPaX+BuvVPWCqy0DHCd+Jvv9DNI2E 9n5ZbDmH2Hw2o3jANEsZkDIbGk1MMBSxf9HazfJ2pRH8WnpXiVUarxEnYFvLA/ALTv/s bvpIJJCZ8ifoXZ1q9ooWK3vUCQCA99D5qppizfMnd2cNWmxRVKhV7oJc6DlBOLjANjOG +5EQ== 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=I7aOuN0Z7cOy5dqAaUiuywFRmsjtA1MOUQCg+0SjNXU=; b=u5RXUoeXt5f8LcZcZt/aJUpej/JWr/HFuVcZ5C/Ko5xGLIipJiY9S6YPtpFzTBMrYe PR/bShQ0U8RzIeNgI2F1tHCGV44GeknNuWVlfag0ZzIpdGO7VXXnaeSHWQaAbNCBrSrt 7recwVTsKGub/2cSwu4ec0veNT7qpcJsoZnHltiPSL7akXuNUK9HtwY2tTmVy8lbYOKp wyvjnkKAzFE1cBrxbUA+sucldEu/NR5KbehJgRj1aFnAWYai7jrMb8dKqKf04PPt7aPD nsCduruJVUyhSSi1sB2ZA/SCwe/gN7L7s6ZMb20fP8fFZdMx2ENYK+zzSiP+g2sR9IFn 97pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hQQzKyaW; 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 fd19-20020a1709072a1300b0087bd78cd19csi5543469ejc.10.2023.02.04.05.58.07; Sat, 04 Feb 2023 05:58:30 -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=hQQzKyaW; 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 S233098AbjBDNgx (ORCPT + 99 others); Sat, 4 Feb 2023 08:36:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233751AbjBDNgi (ORCPT ); Sat, 4 Feb 2023 08:36:38 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC18619F1E; Sat, 4 Feb 2023 05:36:35 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id nm12-20020a17090b19cc00b0022c2155cc0bso7356217pjb.4; Sat, 04 Feb 2023 05:36:35 -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=I7aOuN0Z7cOy5dqAaUiuywFRmsjtA1MOUQCg+0SjNXU=; b=hQQzKyaWdvmDukB36qd0U5WCkp30kIycSrZRPaiYB6pruSWlSVqjbWe4IfTgeuB0yR utHtWsyC5FHYj7jhdKBwoJt7BJcbWiTGic0/xWP98GLBGRBUmJrzQzo/KYU9ov/g9x7z SLTd07Li+6rqmJAx/49QJH7roZibn/7/Wt+ZfNuTPScFP9Rv1IilK/PIPG030I+Uj/xt ZuOYv6p2oYQbemS0aDa1ua+ujhyIoUgMXaRhkM2aqtctNEEX87Su3XdzhhV/plrSKja+ k2QuO1K1OJfY+Rmy2lYd2MmOK9UB0vJ4LItB1FW0VW+t32TlgiRp63x4ucZQplmHA/Er eXIw== 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=I7aOuN0Z7cOy5dqAaUiuywFRmsjtA1MOUQCg+0SjNXU=; b=vwrzF7GdOdBFJJRrDFamJW77FAf4XpyKjfdMusdMcdsLNwbisjCTnZS14uyCC+LUr9 /gY+H+SijioAk1Fv71SpVHfNky/vFkB62JGAFT0sUNyoIdbm5sdo2I20LShn+QwgsbdR XquHGFmULtoxYq+y45lNHET8VrZbIzWUUDVHyMUJqYCI9no0jHnZ003K7GX5dEQFovK1 4wTI0B6A9LNYVn9esoAzYQgp4cXMQH0UjaUex5Yfk2y3J6M4KZl8hWu9mGsCNKvDFr5t NJ5fKDPUW5jO4t1DCARnJ9phjXk3/3BRv35saog348xHyZmkmYvwZBE5P71ceYp+LtcV KEKw== X-Gm-Message-State: AO0yUKWZP7hWqkuy1z4ZBRteNPSOpe19BLKba8Yz6lV7au8Lm4tnXYJa acNx1STOL1Jb3DfKg6H6qQE= X-Received: by 2002:a17:902:c792:b0:198:f13d:14d4 with SMTP id w18-20020a170902c79200b00198f13d14d4mr2096692pla.55.1675517795162; Sat, 04 Feb 2023 05:36:35 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 05:36:34 -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 v3 1/3] ixgbe: allow to increase MTU to 3K with XDP enabled Date: Sat, 4 Feb 2023 21:35:33 +0800 Message-Id: <20230204133535.99921-2-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?1756909127072107283?= X-GMAIL-MSGID: =?utf-8?q?1756909127072107283?= From: Jason Xing Recently I encountered one case where I cannot increase the MTU size directly from 1500 to a much bigger value with XDP enabled if the server is equipped with IXGBE card, which happened on thousands of servers in production environment. After appling the current patch, we can set the maximum MTU size to 3K. This patch follows the behavior of changing MTU as i40e/ice does. Referrences: [1] commit 23b44513c3e6 ("ice: allow 3k MTU for XDP") [2] commit 0c8493d90b6b ("i40e: add XDP support for pass and drop actions") Fixes: fabf1bce103a ("ixgbe: Prevent unsupported configurations with XDP") Signed-off-by: Jason Xing --- v3: 1) modify the titile and body message. v2: 1) change the commit message. 2) modify the logic when changing MTU size suggested by Maciej and Alexander. --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ab8370c413f3..2c1b6eb60436 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -6777,6 +6777,18 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter) ixgbe_free_rx_resources(adapter->rx_ring[i]); } +/** + * ixgbe_max_xdp_frame_size - returns the maximum allowed frame size for XDP + * @adapter - device handle, pointer to adapter + */ +static int ixgbe_max_xdp_frame_size(struct ixgbe_adapter *adapter) +{ + if (PAGE_SIZE >= 8192 || adapter->flags2 & IXGBE_FLAG2_RX_LEGACY) + return IXGBE_RXBUFFER_2K; + else + return IXGBE_RXBUFFER_3K; +} + /** * ixgbe_change_mtu - Change the Maximum Transfer Unit * @netdev: network interface device structure @@ -6788,18 +6800,13 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu) { struct ixgbe_adapter *adapter = netdev_priv(netdev); - if (adapter->xdp_prog) { + if (ixgbe_enabled_xdp_adapter(adapter)) { int new_frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; - int i; - - for (i = 0; i < adapter->num_rx_queues; i++) { - struct ixgbe_ring *ring = adapter->rx_ring[i]; - if (new_frame_size > ixgbe_rx_bufsz(ring)) { - e_warn(probe, "Requested MTU size is not supported with XDP\n"); - return -EINVAL; - } + if (new_frame_size > ixgbe_max_xdp_frame_size(adapter)) { + e_warn(probe, "Requested MTU size is not supported with XDP\n"); + return -EINVAL; } }