Skip to content

Commit

Permalink
net: cpsw: avoid alignment faults by taking NET_IP_ALIGN into account
Browse files Browse the repository at this point in the history 
Both versions of the CPSW driver declare a CPSW_HEADROOM_NA macro that
takes NET_IP_ALIGN into account, but fail to use it appropriately when
storing incoming packets in memory. This results in the IPv4 source and
destination addresses to appear misaligned in memory, which causes
aligment faults that need to be fixed up in software.

So let's switch from CPSW_HEADROOM to CPSW_HEADROOM_NA where needed.
This gets rid of any alignment faults on the RX path on a Beaglebone
White.

Fixes: 9ed4050 ("net: ethernet: ti: cpsw: add XDP support")
Cc: Grygorii Strashko <[email protected]>
Cc: Ilias Apalodimas <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@ardbiesheuvel @davem330
ardbiesheuvel authored and davem330 committed Jan 19, 2022
1 parent dded089 commit 1771afd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/ti/cpsw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
struct cpsw_common *cpsw = ndev_to_cpsw(xmeta->ndev);
int pkt_size = cpsw->rx_packet_max;
int ret = 0, port, ch = xmeta->ch;
int headroom = CPSW_HEADROOM;
int headroom = CPSW_HEADROOM_NA;
struct net_device *ndev = xmeta->ndev;
struct cpsw_priv *priv;
struct page_pool *pool;
Expand Down Expand Up @@ -392,7 +392,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
}

if (priv->xdp_prog) {
int headroom = CPSW_HEADROOM, size = len;
int size = len;

xdp_init_buff(&xdp, PAGE_SIZE, &priv->xdp_rxq[ch]);
if (status & CPDMA_RX_VLAN_ENCAP) {
Expand Down Expand Up @@ -442,7 +442,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
xmeta->ndev = ndev;
xmeta->ch = ch;

dma = page_pool_get_dma_addr(new_page) + CPSW_HEADROOM;
dma = page_pool_get_dma_addr(new_page) + CPSW_HEADROOM_NA;
ret = cpdma_chan_submit_mapped(cpsw->rxv[ch].ch, new_page, dma,
pkt_size, 0);
if (ret < 0) {
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/ti/cpsw_new.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
{
struct page *new_page, *page = token;
void *pa = page_address(page);
int headroom = CPSW_HEADROOM;
int headroom = CPSW_HEADROOM_NA;
struct cpsw_meta_xdp *xmeta;
struct cpsw_common *cpsw;
struct net_device *ndev;
Expand Down Expand Up @@ -336,7 +336,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
}

if (priv->xdp_prog) {
int headroom = CPSW_HEADROOM, size = len;
int size = len;

xdp_init_buff(&xdp, PAGE_SIZE, &priv->xdp_rxq[ch]);
if (status & CPDMA_RX_VLAN_ENCAP) {
Expand Down Expand Up @@ -386,7 +386,7 @@ static void cpsw_rx_handler(void *token, int len, int status)
xmeta->ndev = ndev;
xmeta->ch = ch;

dma = page_pool_get_dma_addr(new_page) + CPSW_HEADROOM;
dma = page_pool_get_dma_addr(new_page) + CPSW_HEADROOM_NA;
ret = cpdma_chan_submit_mapped(cpsw->rxv[ch].ch, new_page, dma,
pkt_size, 0);
if (ret < 0) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/ti/cpsw_priv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv)
xmeta->ndev = priv->ndev;
xmeta->ch = ch;

dma = page_pool_get_dma_addr(page) + CPSW_HEADROOM;
dma = page_pool_get_dma_addr(page) + CPSW_HEADROOM_NA;
ret = cpdma_chan_idle_submit_mapped(cpsw->rxv[ch].ch,
page, dma,
cpsw->rx_packet_max,
Expand Down

0 comments on commit 1771afd

Please sign in to comment.