Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2496041iof; Wed, 8 Jun 2022 06:14:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2svN4MbnIxO6hxv3SwMbeGJENmVz11Q/C+msW4PpOLvrupZcBSwfMTi0vOkUbYuQxLdPB X-Received: by 2002:a17:902:c411:b0:165:11ed:9287 with SMTP id k17-20020a170902c41100b0016511ed9287mr34177696plk.110.1654694073537; Wed, 08 Jun 2022 06:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654694073; cv=none; d=google.com; s=arc-20160816; b=qB//XhR+vQjL2KBbHX+xfVKA/yWZhjdr8F3x1FWjpP1OYPmLV+GLQacqiWq5kA2sHo qTM4FgVHYfnyXKrKZk3AU6ig8L4gTXa34SpiA/tb9mm64+VUiDh/f7GDp50LJN952F/O XxjFVblhT2A2q8rEFQJiaOs2hFMZszNrt3XMe5uLFfIIaWPl0M7uAvg8zU3eG8cfvqq3 HRorNPoLmWYl7vdjMPcgmqbyY16POMiss9QeuTvpEQOM+WNXNhgvxcET8eBe4blYzMKG HSUjRfI70HOq0rc8wtZd7YBfstjfwJmT7VrxmFwE9yYsSCYEfHkrlUQQLQcP55FBTFwd Tnqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=LvqB+oCn++tayjaTVTUBZXPkGSvkcgZKDldpZZY9yS8=; b=Bkp/VU8Z6VKfSzU4xre1S6hhZsFUqJ+s4vDAVZ1BzUhsnza4RgWUNFlFydtY+aGU7D xaMT1oFM1ukvktz/fz4kOg2saMbONw1Brwr9xzYVwZaOwyvi7D22nXDZdWk32XJ4USHM b4bHE+uf2kRPSHVg9tV7Xq47/hSem0+At2uNP0o9+sCTojnD9cCYnJMZ3CbQ6KdE8lfz knthaZq2Qj55ji2AWd5sG+nxPtiHf4O43JtnV8/jDy6c16nQn81ZufUHyr0G9NZo6ASw rDc0wVueJI80RT96d8CwsW5t+J2VgV3pfuqD8yjfyU0ylbEY70rynKyLXSh/vAJ83zSn 4uZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=VBm9IRZq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id jf13-20020a170903268d00b0016370e98895si27735342plb.244.2022.06.08.06.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 06:14:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=VBm9IRZq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2E27410788D; Wed, 8 Jun 2022 05:48:13 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239500AbiFHMsD (ORCPT + 99 others); Wed, 8 Jun 2022 08:48:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230261AbiFHMsB (ORCPT ); Wed, 8 Jun 2022 08:48:01 -0400 Received: from m12-17.163.com (m12-17.163.com [220.181.12.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 077EEBC9B; Wed, 8 Jun 2022 05:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=LvqB+oCn++tayjaTVT UBZXPkGSvkcgZKDldpZZY9yS8=; b=VBm9IRZqrjQMnsWOoil6bShC0ooCRYhb7j VLEpL/PeIbHgWz0AP5twjtd9xakdtQTNIdjwdZwaSYPtHwPMQc34I5/C3f+wdtYj 2aphTboobzoNVqtgOpR/sFx3YeXjXipSQYrvl9WHB/S8h9Ju60xceH8M6WCrWM+0 8CqeXHGhs= Received: from localhost.localdomain (unknown [171.221.147.121]) by smtp13 (Coremail) with SMTP id EcCowAC3rJxTmqBiHla6Gw--.54176S2; Wed, 08 Jun 2022 20:47:19 +0800 (CST) From: Chen Lin To: kuba@kernel.org Cc: nbd@nbd.name, john@phrozen.org, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, matthias.bgg@gmail.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, alexander.duyck@gmail.com, Chen Lin Subject: [PATCH v5] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag Date: Wed, 8 Jun 2022 20:46:53 +0800 Message-Id: <1654692413-2598-1-git-send-email-chen45464546@163.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20220607161413.655dd63f@kernel.org> References: <20220607161413.655dd63f@kernel.org> X-CM-TRANSID: EcCowAC3rJxTmqBiHla6Gw--.54176S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZFyfKF13AF45WF15tr45GFg_yoW8uryrpr 4UKa43AF48Jr47G395Aa1DZa1Yyw4IgrWUKFy3Z34fZ345tFWrtFyktFW5WFySkrWvkF1S yFs8Zr9xursxtw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piIPf9UUUUU= X-Originating-IP: [171.221.147.121] X-CM-SenderInfo: hfkh0kqvuwkkiuw6il2tof0z/1tbiGhganlaECDCbOQAAsO X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 When rx_flag == MTK_RX_FLAGS_HWLRO, rx_data_len = MTK_MAX_LRO_RX_LENGTH(4096 * 3) > PAGE_SIZE. netdev_alloc_frag is for alloction of page fragment only. Reference to other drivers and Documentation/vm/page_frags.rst Branch to use __get_free_pages when ring->frag_size > PAGE_SIZE. Signed-off-by: Chen Lin --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index b3b3c07..aba0d84 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -899,6 +899,17 @@ static bool mtk_rx_get_desc(struct mtk_eth *eth, struct mtk_rx_dma_v2 *rxd, return true; } +static void *mtk_max_lro_buf_alloc(gfp_t gfp_mask) +{ + unsigned long data; + unsigned int size = mtk_max_frag_size(MTK_MAX_LRO_RX_LENGTH); + + data = __get_free_pages(gfp_mask | __GFP_COMP | __GFP_NOWARN, + get_order(size)); + + return (void *)data; +} + /* the qdma core needs scratch memory to be setup */ static int mtk_init_fq_dma(struct mtk_eth *eth) { @@ -1467,7 +1478,10 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, goto release_desc; /* alloc new buffer */ - new_data = napi_alloc_frag(ring->frag_size); + if (ring->frag_size <= PAGE_SIZE) + new_data = napi_alloc_frag(ring->frag_size); + else + new_data = mtk_max_lro_buf_alloc(GFP_ATOMIC); if (unlikely(!new_data)) { netdev->stats.rx_dropped++; goto release_desc; @@ -1914,7 +1928,10 @@ static int mtk_rx_alloc(struct mtk_eth *eth, int ring_no, int rx_flag) return -ENOMEM; for (i = 0; i < rx_dma_size; i++) { - ring->data[i] = netdev_alloc_frag(ring->frag_size); + if (ring->frag_size <= PAGE_SIZE) + ring->data[i] = netdev_alloc_frag(ring->frag_size); + else + ring->data[i] = mtk_max_lro_buf_alloc(GFP_KERNEL); if (!ring->data[i]) return -ENOMEM; } -- 1.7.9.5