From: Robert Hancock <hancock@sedsystems.ca>
To: netdev@vger.kernel.org
Cc: anirudh@xilinx.com, John.Linn@xilinx.com, andrew@lunn.ch,
Robert Hancock <hancock@sedsystems.ca>
Subject: [PATCH net-next v3 01/19] net: axienet: Fix casting of pointers to u32
Date: Tue, 4 Jun 2019 15:43:28 -0600 [thread overview]
Message-ID: <1559684626-24775-2-git-send-email-hancock@sedsystems.ca> (raw)
In-Reply-To: <1559684626-24775-1-git-send-email-hancock@sedsystems.ca>
This driver was casting skb pointers to u32 and storing them as such in
the DMA buffer descriptor, which is obviously broken on 64-bit. The area
of the buffer descriptor being used is not accessed by the hardware and
has sufficient room for a 32 or 64-bit pointer, so just store the skb
pointer as such.
Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
---
drivers/net/ethernet/xilinx/xilinx_axienet.h | 11 +++-------
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 26 ++++++++++++-----------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index 011adae..e09dc14 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -356,9 +356,6 @@
* @app2: MM2S/S2MM User Application Field 2.
* @app3: MM2S/S2MM User Application Field 3.
* @app4: MM2S/S2MM User Application Field 4.
- * @sw_id_offset: MM2S/S2MM Sw ID
- * @reserved5: Reserved and not used
- * @reserved6: Reserved and not used
*/
struct axidma_bd {
u32 next; /* Physical address of next buffer descriptor */
@@ -373,11 +370,9 @@ struct axidma_bd {
u32 app1; /* TX start << 16 | insert */
u32 app2; /* TX csum seed */
u32 app3;
- u32 app4;
- u32 sw_id_offset;
- u32 reserved5;
- u32 reserved6;
-};
+ u32 app4; /* Last field used by HW */
+ struct sk_buff *skb;
+} __aligned(XAXIDMA_BD_MINIMUM_ALIGNMENT);
/**
* struct axienet_local - axienet private per device data
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 831967f..1bace60 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -159,8 +159,7 @@ static void axienet_dma_bd_release(struct net_device *ndev)
for (i = 0; i < RX_BD_NUM; i++) {
dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys,
lp->max_frm_size, DMA_FROM_DEVICE);
- dev_kfree_skb((struct sk_buff *)
- (lp->rx_bd_v[i].sw_id_offset));
+ dev_kfree_skb(lp->rx_bd_v[i].skb);
}
if (lp->rx_bd_v) {
@@ -227,7 +226,7 @@ static int axienet_dma_bd_init(struct net_device *ndev)
if (!skb)
goto out;
- lp->rx_bd_v[i].sw_id_offset = (u32) skb;
+ lp->rx_bd_v[i].skb = skb;
lp->rx_bd_v[i].phys = dma_map_single(ndev->dev.parent,
skb->data,
lp->max_frm_size,
@@ -595,14 +594,15 @@ static void axienet_start_xmit_done(struct net_device *ndev)
dma_unmap_single(ndev->dev.parent, cur_p->phys,
(cur_p->cntrl & XAXIDMA_BD_CTRL_LENGTH_MASK),
DMA_TO_DEVICE);
- if (cur_p->app4)
- dev_consume_skb_irq((struct sk_buff *)cur_p->app4);
+ if (cur_p->skb)
+ dev_consume_skb_irq(cur_p->skb);
/*cur_p->phys = 0;*/
cur_p->app0 = 0;
cur_p->app1 = 0;
cur_p->app2 = 0;
cur_p->app4 = 0;
cur_p->status = 0;
+ cur_p->skb = NULL;
size += status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;
packets++;
@@ -707,7 +707,7 @@ static inline int axienet_check_tx_bd_space(struct axienet_local *lp,
}
cur_p->cntrl |= XAXIDMA_BD_CTRL_TXEOF_MASK;
- cur_p->app4 = (unsigned long)skb;
+ cur_p->skb = skb;
tail_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
/* Start the transfer */
@@ -742,13 +742,15 @@ static void axienet_recv(struct net_device *ndev)
while ((cur_p->status & XAXIDMA_BD_STS_COMPLETE_MASK)) {
tail_p = lp->rx_bd_p + sizeof(*lp->rx_bd_v) * lp->rx_bd_ci;
- skb = (struct sk_buff *) (cur_p->sw_id_offset);
- length = cur_p->app4 & 0x0000FFFF;
dma_unmap_single(ndev->dev.parent, cur_p->phys,
lp->max_frm_size,
DMA_FROM_DEVICE);
+ skb = cur_p->skb;
+ cur_p->skb = NULL;
+ length = cur_p->app4 & 0x0000FFFF;
+
skb_put(skb, length);
skb->protocol = eth_type_trans(skb, ndev);
/*skb_checksum_none_assert(skb);*/
@@ -783,7 +785,7 @@ static void axienet_recv(struct net_device *ndev)
DMA_FROM_DEVICE);
cur_p->cntrl = lp->max_frm_size;
cur_p->status = 0;
- cur_p->sw_id_offset = (u32) new_skb;
+ cur_p->skb = new_skb;
++lp->rx_bd_ci;
lp->rx_bd_ci %= RX_BD_NUM;
@@ -1343,8 +1345,8 @@ static void axienet_dma_err_handler(unsigned long data)
(cur_p->cntrl &
XAXIDMA_BD_CTRL_LENGTH_MASK),
DMA_TO_DEVICE);
- if (cur_p->app4)
- dev_kfree_skb_irq((struct sk_buff *) cur_p->app4);
+ if (cur_p->skb)
+ dev_kfree_skb_irq(cur_p->skb);
cur_p->phys = 0;
cur_p->cntrl = 0;
cur_p->status = 0;
@@ -1353,7 +1355,7 @@ static void axienet_dma_err_handler(unsigned long data)
cur_p->app2 = 0;
cur_p->app3 = 0;
cur_p->app4 = 0;
- cur_p->sw_id_offset = 0;
+ cur_p->skb = NULL;
}
for (i = 0; i < RX_BD_NUM; i++) {
--
1.8.3.1
next prev parent reply other threads:[~2019-06-04 21:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 21:43 [PATCH net-next v3 00/19] Xilinx axienet driver updates (v3) Robert Hancock
2019-06-04 21:43 ` Robert Hancock [this message]
2019-06-04 21:43 ` [PATCH net-next v3 02/19] net: axienet: Use standard IO accessors Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 03/19] net: axienet: fix MDIO bus naming Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 04/19] net: axienet: add X86 and ARM as supported platforms Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 05/19] net: axienet: Use clock framework to get device clock rate Robert Hancock
2019-06-04 22:12 ` Andrew Lunn
2019-06-04 21:43 ` [PATCH net-next v3 06/19] net: axienet: fix teardown order of MDIO bus Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 07/19] net: axienet: Re-initialize MDIO registers properly after reset Robert Hancock
2019-06-04 22:18 ` Andrew Lunn
2019-06-04 22:39 ` Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 08/19] net: axienet: Cleanup DMA device reset and halt process Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 09/19] net: axienet: Make RX/TX ring sizes configurable Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 10/19] net: axienet: Add DMA registers to ethtool register dump Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 11/19] net: axienet: Support shared interrupts Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 12/19] net: axienet: Add optional support for Ethernet core interrupt Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 13/19] net: axienet: Fix race condition causing TX hang Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 14/19] net: axienet: Make missing MAC address non-fatal Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 15/19] net: axienet: stop interface during shutdown Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 16/19] net: axienet: Fix MDIO bus parent node detection Robert Hancock
2019-06-04 22:03 ` Andrew Lunn
2019-06-04 21:43 ` [PATCH net-next v3 17/19] net: axienet: document axistream-connected attribute Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 18/19] net: axienet: make use of axistream-connected attribute optional Robert Hancock
2019-06-04 21:43 ` [PATCH net-next v3 19/19] net: axienet: convert to phylink API Robert Hancock
2019-06-04 21:58 ` [PATCH net-next v3 00/19] Xilinx axienet driver updates (v3) Andrew Lunn
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=1559684626-24775-2-git-send-email-hancock@sedsystems.ca \
--to=hancock@sedsystems.ca \
--cc=John.Linn@xilinx.com \
--cc=andrew@lunn.ch \
--cc=anirudh@xilinx.com \
--cc=netdev@vger.kernel.org \
/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).