* [PATCH net-next v1] ps3_gelic_net: Use napi routines for RX SKB
@ 2024-03-01 8:20 Geoff Levand
2024-03-05 4:42 ` Jakub Kicinski
2024-03-05 5:24 ` [PATCH " Ratheesh Kannoth
0 siblings, 2 replies; 3+ messages in thread
From: Geoff Levand @ 2024-03-01 8:20 UTC (permalink / raw)
To: David S. Miller, netdev
Convert the PS3 Gelic network driver's RX SK buffers over to
use the napi_alloc_frag_align and napi_build_skb routines.
Signed-off-by: Geoff Levand <geoff@infradead.org>
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index 5ee8e8980393..fb5c015851b8 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -375,14 +375,14 @@ static int gelic_card_init_chain(struct gelic_card *card,
static int gelic_descr_prepare_rx(struct gelic_card *card,
struct gelic_descr *descr)
{
- static const unsigned int rx_skb_size =
- ALIGN(GELIC_NET_MAX_FRAME, GELIC_NET_RXBUF_ALIGN) +
- GELIC_NET_RXBUF_ALIGN - 1;
+ static const unsigned int napi_buff_size =
+ round_up(GELIC_NET_MAX_FRAME, GELIC_NET_RXBUF_ALIGN);
+ struct device *dev = ctodev(card);
dma_addr_t cpu_addr;
- int offset;
+ void *napi_buff;
if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE)
- dev_info(ctodev(card), "%s: ERROR status\n", __func__);
+ dev_info(dev, "%s: ERROR status\n", __func__);
descr->hw_regs.dmac_cmd_status = 0;
descr->hw_regs.result_size = 0;
@@ -390,31 +390,34 @@ static int gelic_descr_prepare_rx(struct gelic_card *card,
descr->hw_regs.data_error = 0;
descr->hw_regs.payload.dev_addr = 0;
descr->hw_regs.payload.size = 0;
+ descr->skb = NULL;
+
+ napi_buff = napi_alloc_frag_align(napi_buff_size,
+ GELIC_NET_RXBUF_ALIGN);
+
+ if (unlikely(!napi_buff))
+ return -ENOMEM;
- descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size);
- if (!descr->skb) {
- descr->hw_regs.payload.dev_addr = 0; /* tell DMAC don't touch memory */
+ descr->skb = napi_build_skb(napi_buff, napi_buff_size);
+
+ if (unlikely(!descr->skb)) {
+ skb_free_frag(napi_buff);
return -ENOMEM;
}
- offset = ((unsigned long)descr->skb->data) &
- (GELIC_NET_RXBUF_ALIGN - 1);
- if (offset)
- skb_reserve(descr->skb, GELIC_NET_RXBUF_ALIGN - offset);
- /* io-mmu-map the skb */
- cpu_addr = dma_map_single(ctodev(card), descr->skb->data,
- GELIC_NET_MAX_FRAME, DMA_FROM_DEVICE);
- descr->hw_regs.payload.dev_addr = cpu_to_be32(cpu_addr);
- if (dma_mapping_error(ctodev(card), cpu_addr)) {
- dev_kfree_skb_any(descr->skb);
+ cpu_addr = dma_map_single(dev, napi_buff, napi_buff_size,
+ DMA_FROM_DEVICE);
+
+ if (dma_mapping_error(dev, cpu_addr)) {
+ skb_free_frag(napi_buff);
descr->skb = NULL;
- dev_info(ctodev(card),
- "%s:Could not iommu-map rx buffer\n", __func__);
+ dev_err_once(dev, "%s:Could not iommu-map rx buffer\n",
+ __func__);
gelic_descr_set_status(descr, GELIC_DESCR_DMA_NOT_IN_USE);
return -ENOMEM;
}
- descr->hw_regs.payload.size = cpu_to_be32(GELIC_NET_MAX_FRAME);
+ descr->hw_regs.payload.size = cpu_to_be32(napi_buff_size);
descr->hw_regs.payload.dev_addr = cpu_to_be32(cpu_addr);
gelic_descr_set_status(descr, GELIC_DESCR_DMA_CARDOWNED);
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
index f7d7931e51b7..e8f7de8e7e9b 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
@@ -19,10 +19,10 @@
#define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */
#define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */
-#define GELIC_NET_MAX_FRAME 2312
+#define GELIC_NET_MAX_FRAME 2312U
#define GELIC_NET_MAX_MTU 2294
#define GELIC_NET_MIN_MTU 64
-#define GELIC_NET_RXBUF_ALIGN 128
+#define GELIC_NET_RXBUF_ALIGN 128U
#define GELIC_CARD_RX_CSUM_DEFAULT 1 /* hw chksum */
#define GELIC_NET_WATCHDOG_TIMEOUT 5*HZ
#define GELIC_NET_BROADCAST_ADDR 0xffffffffffffL
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v1] ps3_gelic_net: Use napi routines for RX SKB
2024-03-01 8:20 [PATCH net-next v1] ps3_gelic_net: Use napi routines for RX SKB Geoff Levand
@ 2024-03-05 4:42 ` Jakub Kicinski
2024-03-05 5:24 ` [PATCH " Ratheesh Kannoth
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2024-03-05 4:42 UTC (permalink / raw)
To: Geoff Levand; +Cc: David S. Miller, netdev
On Fri, 1 Mar 2024 17:20:11 +0900 Geoff Levand wrote:
> + descr->skb = napi_build_skb(napi_buff, napi_buff_size);
> +
> + if (unlikely(!descr->skb)) {
> + skb_free_frag(napi_buff);
> return -ENOMEM;
> }
>
> - offset = ((unsigned long)descr->skb->data) &
> - (GELIC_NET_RXBUF_ALIGN - 1);
> - if (offset)
> - skb_reserve(descr->skb, GELIC_NET_RXBUF_ALIGN - offset);
> - /* io-mmu-map the skb */
> - cpu_addr = dma_map_single(ctodev(card), descr->skb->data,
> - GELIC_NET_MAX_FRAME, DMA_FROM_DEVICE);
> - descr->hw_regs.payload.dev_addr = cpu_to_be32(cpu_addr);
> - if (dma_mapping_error(ctodev(card), cpu_addr)) {
> - dev_kfree_skb_any(descr->skb);
> + cpu_addr = dma_map_single(dev, napi_buff, napi_buff_size,
> + DMA_FROM_DEVICE);
> +
> + if (dma_mapping_error(dev, cpu_addr)) {
> + skb_free_frag(napi_buff);
After you called napi_build_skb() you should be operating (here:
freeing) the skb not the underlying buffer.
--
pw-bot: cr
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] ps3_gelic_net: Use napi routines for RX SKB
2024-03-01 8:20 [PATCH net-next v1] ps3_gelic_net: Use napi routines for RX SKB Geoff Levand
2024-03-05 4:42 ` Jakub Kicinski
@ 2024-03-05 5:24 ` Ratheesh Kannoth
1 sibling, 0 replies; 3+ messages in thread
From: Ratheesh Kannoth @ 2024-03-05 5:24 UTC (permalink / raw)
To: netdev, linux-kernel; +Cc: Ratheesh Kannoth
On 2024-03-01 at 13:50:11, Geoff Levand (geoff@infradead.org) wrote:
> + if (unlikely(!napi_buff))
> + return -ENOMEM;
>
> - descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size);
> - if (!descr->skb) {
> - descr->hw_regs.payload.dev_addr = 0; /* tell DMAC don't touch memory */
> + descr->skb = napi_build_skb(napi_buff, napi_buff_size);
> +
> + if (unlikely(!descr->skb)) {
> + skb_free_frag(napi_buff);
> return -ENOMEM;
> }
>
> - offset = ((unsigned long)descr->skb->data) &
> - (GELIC_NET_RXBUF_ALIGN - 1);
> - if (offset)
> - skb_reserve(descr->skb, GELIC_NET_RXBUF_ALIGN - offset);
> - /* io-mmu-map the skb */
> - cpu_addr = dma_map_single(ctodev(card), descr->skb->data,
> - GELIC_NET_MAX_FRAME, DMA_FROM_DEVICE);
> - descr->hw_regs.payload.dev_addr = cpu_to_be32(cpu_addr);
> - if (dma_mapping_error(ctodev(card), cpu_addr)) {
> - dev_kfree_skb_any(descr->skb);
> + cpu_addr = dma_map_single(dev, napi_buff, napi_buff_size,
> + DMA_FROM_DEVICE);
> +
> + if (dma_mapping_error(dev, cpu_addr)) {
> + skb_free_frag(napi_buff);
skb->head is freed; dont you need to free skb as well ?
> descr->skb = NULL;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-05 5:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-01 8:20 [PATCH net-next v1] ps3_gelic_net: Use napi routines for RX SKB Geoff Levand
2024-03-05 4:42 ` Jakub Kicinski
2024-03-05 5:24 ` [PATCH " Ratheesh Kannoth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.