diff options
| author |   Alexander Lobakin <bloodyreaper@yandex.ru> | 2020-06-05 15:53:24 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-05 13:13:11 -0700 |
| commit | e22437207683a9099d5fb3a1b5cc8f5c7b24a583 (patch) | |
| tree | 79a723b982279361a2b9eafee5827ff9fc9ff951 /drivers/net | |
| parent | ethtool: linkinfo: remove an unnecessary NULL check (diff) | |
| download | wireguard-linux-e22437207683a9099d5fb3a1b5cc8f5c7b24a583.tar.xz wireguard-linux-e22437207683a9099d5fb3a1b5cc8f5c7b24a583.zip | |
net: ethernet: mvneta: fix MVNETA_SKB_HEADROOM alignment
Commit ca23cb0bc50f ("mvneta: MVNETA_SKB_HEADROOM set last 3 bits to zero")
added headroom alignment check against 8.
Hovewer (if we imagine that NET_SKB_PAD or XDP_PACKET_HEADROOM is not
aligned to cacheline size), it actually aligns headroom down, while
skb/xdp_buff headroom should be *at least* equal to one of the values
(depending on XDP prog presence).
So, fix the check to align the value up. This satisfies both
hardware/driver and network stack requirements.
Fixes: ca23cb0bc50f ("mvneta: MVNETA_SKB_HEADROOM set last 3 bits to zero")
Signed-off-by: Alexander Lobakin <bloodyreaper@yandex.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 011cd26953d9..4cc9abd61c43 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -325,7 +325,7 @@ cache_line_size()) /* Driver assumes that the last 3 bits are 0 */ -#define MVNETA_SKB_HEADROOM (max(XDP_PACKET_HEADROOM, NET_SKB_PAD) & ~0x7) +#define MVNETA_SKB_HEADROOM ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) #define MVNETA_SKB_PAD (SKB_DATA_ALIGN(sizeof(struct skb_shared_info) + \ MVNETA_SKB_HEADROOM)) #define MVNETA_SKB_SIZE(len) (SKB_DATA_ALIGN(len) + MVNETA_SKB_PAD) |