Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp61662iof; Sun, 5 Jun 2022 21:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDZXzh7IFRI4nn0KS/lf3OxIDVNBg92IX6MBZXDsiO5td4rv5QChCEDi+v0ES6lk8MdJ+w X-Received: by 2002:a17:90a:408f:b0:1d1:d1ba:2abb with SMTP id l15-20020a17090a408f00b001d1d1ba2abbmr59018481pjg.152.1654488554030; Sun, 05 Jun 2022 21:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654488554; cv=none; d=google.com; s=arc-20160816; b=tkMnS0RswVwSZBHvhPRHhO4OGp1Ta6KvX8BfC8M65ymLC8b06yPGNuyiU7AELCrZEl WgyM2Lbu4gUNmaDF+VI1hdGqJYfGrwXm/ZOOwxwcCO3H/lvLR06Kr3wiftkbs77IB0dQ 7oIDKIrgwBhGak3v3xtYlRyM2VPCRlUwBQ4E5hC6a8qnhss6cXhjRKukogtcDNmxRrId ftUFD3Y5Xcb491YqR432pJv4w86LudKtlxYG/slWTEau7YmnMDiZ+EYX9ha5jaTrUojG dsIzX7AwSgrcg5ZCkiNJxXuyPvEKNPZULShlgkW+u+OCO76yXoFUksg08dTET5h6tY6M XYjQ== 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=TUBfwF53I+2MtjAGYapwu8YmcHWT7Pc/VRs7clOHSnE=; b=UrqdilotxkDELzYXTJkkApyT1MrNaB3t49ZtMkBy7IrLdczuylGbYDha7oVHjfOdbV VrCzl/1H/R1HtdUXpNFl7yCt5fgN64PzOMhcjs2Szy+Qn6Xs7EEzJVhQaAhKz2aUQwxl zCon9GM+DPXRcXZffY1ZbWo31ZC45mg/1XKHRCVJhN2JAleFI3PtSFRiXmstW+UZbtGd itBK5YAq01MR5zQ6pihn4VCUiFFJH6uPZNOlP9LwCrrtKWshXMgup9VHa/eAI6JxE4rc YX2b0Esqq2QyrMWZY+5h4GiaRhnTFx5OW1gziO4SEsTof2zUQiNclW8eIL23ofuyMBRX v7Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=ZCqQKZAt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id s16-20020a170902b19000b0016353a8bebesi18261171plr.328.2022.06.05.21.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 21:09:14 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=ZCqQKZAt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 478926CF4D; Sun, 5 Jun 2022 20:48:51 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243567AbiFEDOj (ORCPT + 99 others); Sat, 4 Jun 2022 23:14:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235270AbiFEDOh (ORCPT ); Sat, 4 Jun 2022 23:14:37 -0400 Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C2FB54ECFB; Sat, 4 Jun 2022 20:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=TUBfwF53I+2MtjAGYa pwu8YmcHWT7Pc/VRs7clOHSnE=; b=ZCqQKZAt5oWK5y3REdGO4gj2itwrzw0hCp vjMDwzhzbFIT+CNKCu6HyYEssriY+d9ejF2H3ppC1IHy8KIChiT5uOskW1sxTL7Y /TqK7b4EcM+LTy6o4+T4PPcBkXg2Syn8Au7RU4wqpEvEi3rE+VIVEMvK4rRxhqMy lMYqZo8zU= Received: from localhost.localdomain (unknown [171.221.147.121]) by smtp8 (Coremail) with SMTP id DMCowADHgyE4H5xi7gqqGA--.22831S2; Sun, 05 Jun 2022 11:13:01 +0800 (CST) From: Chen Lin To: nbd@nbd.name, alexander.duyck@gmail.com Cc: john@phrozen.org, sean.wang@mediatek.com, Mark-MC.Lee@mediatek.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, 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, Chen Lin Subject: [PATCH v3] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag Date: Sun, 5 Jun 2022 11:12:37 +0800 Message-Id: <1654398757-2937-1-git-send-email-chen45464546@163.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: X-CM-TRANSID: DMCowADHgyE4H5xi7gqqGA--.22831S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZFyfKF4rCw15Jw1UJF1DZFb_yoW8AFWrpr 4Yya43ZFyxAr4DG395Aa1UZFs8Aw4xKryUKry3Z34fZwn8tFWrKFyktFW5uryakrWvkFyS yrs0vr9I9Fn5Kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pi22NAUUUUU= X-Originating-IP: [171.221.147.121] X-CM-SenderInfo: hfkh0kqvuwkkiuw6il2tof0z/xtbB2A0XnmBHK0PEJgAAsx 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 | 16 ++++++++++++++-- 1 file changed, 14 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..ba9259a 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1467,7 +1467,13 @@ 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 = (void *)__get_free_pages(GFP_ATOMIC | + __GFP_COMP | __GFP_NOWARN, + get_order(mtk_max_frag_size(MTK_MAX_LRO_RX_LENGTH))); + if (unlikely(!new_data)) { netdev->stats.rx_dropped++; goto release_desc; @@ -1914,7 +1920,13 @@ 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] = (void *)__get_free_pages(GFP_KERNEL | + __GFP_COMP | __GFP_NOWARN, + get_order(mtk_max_frag_size(MTK_MAX_LRO_RX_LENGTH))); + if (!ring->data[i]) return -ENOMEM; } -- 1.7.9.5