From: Chen Lin <chen45464546@163.com>
To: nbd@nbd.name, kuba@kernel.org
Cc: 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 <chen45464546@163.com>
Subject: [PATCH v2] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag
Date: Fri, 3 Jun 2022 16:46:08 +0800 [thread overview]
Message-ID: <1654245968-8067-1-git-send-email-chen45464546@163.com> (raw)
In-Reply-To: <2997c5b0-3611-5e00-466c-b2966f09f067@nbd.name>
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 alloc_pages when ring->frag_size > PAGE_SIZE.
Signed-off-by: Chen Lin <chen45464546@163.com>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 ++++++++++++++++++++--
1 file changed, 20 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..772d903 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1467,7 +1467,16 @@ 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 {
+ struct page *page;
+ unsigned int order = get_order(ring->frag_size);
+
+ page = alloc_pages(GFP_ATOMIC | __GFP_COMP |
+ __GFP_NOWARN, order);
+ new_data = page ? page_address(page) : NULL;
+ }
if (unlikely(!new_data)) {
netdev->stats.rx_dropped++;
goto release_desc;
@@ -1914,7 +1923,16 @@ 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 {
+ struct page *page;
+ unsigned int order = get_order(ring->frag_size);
+
+ page = alloc_pages(GFP_KERNEL | __GFP_COMP |
+ __GFP_NOWARN, order);
+ ring->data[i] = page ? page_address(page) : NULL;
+ }
if (!ring->data[i])
return -ENOMEM;
}
--
1.7.9.5
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-03 8:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 4:10 [PATCH] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev_alloc_frag Chen Lin
2022-06-03 4:24 ` Jakub Kicinski
2022-06-03 4:30 ` Felix Fietkau
2022-06-03 8:46 ` Chen Lin [this message]
2022-06-03 15:25 ` [PATCH v2] net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag Alexander Duyck
2022-06-03 15:33 ` Alexander Duyck
2022-06-05 2:22 ` Chen Lin
2022-06-05 3:12 ` [PATCH v3] " Chen Lin
2022-06-06 21:34 ` Jakub Kicinski
2022-06-06 23:39 ` [PATCH v4] " Chen Lin
2022-06-07 23:14 ` Jakub Kicinski
2022-06-08 12:43 ` Chen Lin
2022-06-08 12:46 ` [PATCH v5] " Chen Lin
2022-06-09 3:50 ` patchwork-bot+netdevbpf
2022-06-03 17:25 ` [PATCH v2] " Eric Dumazet
2022-06-03 18:59 ` Jakub Kicinski
2022-06-03 19:11 ` Eric Dumazet
2022-06-03 19:55 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1654245968-8067-1-git-send-email-chen45464546@163.com \
--to=chen45464546@163.com \
--cc=Mark-MC.Lee@mediatek.com \
--cc=alexander.duyck@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=john@phrozen.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).