* [RFC PATCH 1/3] net: macb: use netdev_tx_t return type for ndo_start_xmit functions
2018-07-18 12:58 [RFC PATCH 0/3] net: macb: add pad and fcs support Claudiu Beznea
@ 2018-07-18 12:58 ` Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 2/3] net: macb: move checksum clearing outside of spinlock Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 3/3] net: macb: add support for padding and fcs computation Claudiu Beznea
2 siblings, 0 replies; 6+ messages in thread
From: Claudiu Beznea @ 2018-07-18 12:58 UTC (permalink / raw)
To: nicolas.ferre, davem
Cc: netdev, jennifer.dahm, nathan.sullivan, Claudiu Beznea
Use netdev_tx_t return type for ndo_start_xmit function of macb driver.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/net/ethernet/cadence/macb_main.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 96cc03a6d942..860436474c3e 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1651,7 +1651,7 @@ static inline int macb_clear_csum(struct sk_buff *skb)
return 0;
}
-static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
u16 queue_index = skb_get_queue_mapping(skb);
struct macb *bp = netdev_priv(dev);
@@ -1660,6 +1660,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned int desc_cnt, nr_frags, frag_size, f;
unsigned int hdrlen;
bool is_lso, is_udp = 0;
+ netdev_tx_t ret = NETDEV_TX_OK;
is_lso = (skb_shinfo(skb)->gso_size != 0);
@@ -1739,7 +1740,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
unlock:
spin_unlock_irqrestore(&bp->lock, flags);
- return NETDEV_TX_OK;
+ return ret;
}
static void macb_init_rx_buffer_size(struct macb *bp, size_t size)
@@ -3547,7 +3548,8 @@ static int at91ether_close(struct net_device *dev)
}
/* Transmit packet */
-static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
struct macb *lp = netdev_priv(dev);
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [RFC PATCH 2/3] net: macb: move checksum clearing outside of spinlock
2018-07-18 12:58 [RFC PATCH 0/3] net: macb: add pad and fcs support Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 1/3] net: macb: use netdev_tx_t return type for ndo_start_xmit functions Claudiu Beznea
@ 2018-07-18 12:58 ` Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 3/3] net: macb: add support for padding and fcs computation Claudiu Beznea
2 siblings, 0 replies; 6+ messages in thread
From: Claudiu Beznea @ 2018-07-18 12:58 UTC (permalink / raw)
To: nicolas.ferre, davem
Cc: netdev, jennifer.dahm, nathan.sullivan, Claudiu Beznea
Move checksum clearing outside of spinlock. The SKB is protected by
networking lock (HARD_TX_LOCK()).
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/net/ethernet/cadence/macb_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 860436474c3e..1c12afe4a0ce 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1662,6 +1662,11 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
bool is_lso, is_udp = 0;
netdev_tx_t ret = NETDEV_TX_OK;
+ if (macb_clear_csum(skb)) {
+ dev_kfree_skb_any(skb);
+ return ret;
+ }
+
is_lso = (skb_shinfo(skb)->gso_size != 0);
if (is_lso) {
@@ -1717,11 +1722,6 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}
- if (macb_clear_csum(skb)) {
- dev_kfree_skb_any(skb);
- goto unlock;
- }
-
/* Map socket buffer for DMA transfer */
if (!macb_tx_map(bp, queue, skb, hdrlen)) {
dev_kfree_skb_any(skb);
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [RFC PATCH 3/3] net: macb: add support for padding and fcs computation
2018-07-18 12:58 [RFC PATCH 0/3] net: macb: add pad and fcs support Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 1/3] net: macb: use netdev_tx_t return type for ndo_start_xmit functions Claudiu Beznea
2018-07-18 12:58 ` [RFC PATCH 2/3] net: macb: move checksum clearing outside of spinlock Claudiu Beznea
@ 2018-07-18 12:58 ` Claudiu Beznea
2018-07-18 17:54 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Claudiu Beznea @ 2018-07-18 12:58 UTC (permalink / raw)
To: nicolas.ferre, davem
Cc: netdev, jennifer.dahm, nathan.sullivan, Claudiu Beznea
For packets with computed IP/TCP/UDP checksum there is no need to tell
hardware to recompute it. For such kind of packets hardware expects
the packet to be at least 64 bytes and FCS to be computed.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/net/ethernet/cadence/macb_main.c | 70 ++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 1c12afe4a0ce..43d700191f82 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -10,6 +10,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/clk.h>
+#include <linux/crc32.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -1565,6 +1566,9 @@ static unsigned int macb_tx_map(struct macb *bp,
if (i == queue->tx_head) {
ctrl |= MACB_BF(TX_LSO, lso_ctrl);
ctrl |= MACB_BF(TX_TCP_SEQ_SRC, seq_ctrl);
+ if ((bp->dev->features & NETIF_F_HW_CSUM) &&
+ skb->ip_summed != CHECKSUM_PARTIAL && !lso_ctrl)
+ ctrl |= MACB_BIT(TX_NOCRC);
} else
/* Only set MSS/MFS on payload descriptors
* (second or later descriptor)
@@ -1651,6 +1655,67 @@ static inline int macb_clear_csum(struct sk_buff *skb)
return 0;
}
+static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
+{
+ struct sk_buff *nskb;
+ int padlen = ETH_ZLEN - (*skb)->len;
+ int headroom = skb_headroom(*skb);
+ int tailroom = skb_tailroom(*skb);
+ bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb);
+ u32 fcs;
+
+ if (!(ndev->features & NETIF_F_HW_CSUM) ||
+ !((*skb)->ip_summed != CHECKSUM_PARTIAL) ||
+ skb_shinfo(*skb)->gso_size) /* Not available for GSO */
+ return 0;
+
+ if (padlen <= 0) {
+ /* FCS could be appeded to tailroom. */
+ if (tailroom >= ETH_FCS_LEN)
+ goto add_fcs;
+ /* FCS could be appeded by moving data to headroom. */
+ else if (!cloned && headroom + tailroom >= ETH_FCS_LEN)
+ padlen = 0;
+ /* No room for FCS, need to reallocate skb. */
+ else
+ padlen = ETH_FCS_LEN - tailroom;
+ } else {
+ /* Add room for FCS. */
+ padlen += ETH_FCS_LEN;
+ }
+
+ if (!cloned && headroom + tailroom >= padlen) {
+ (*skb)->data = memmove((*skb)->head, (*skb)->data, (*skb)->len);
+ skb_set_tail_pointer(*skb, (*skb)->len);
+ } else {
+ nskb = skb_copy_expand(*skb, 0, padlen, GFP_ATOMIC);
+ if (!nskb)
+ return -ENOMEM;
+
+ dev_kfree_skb_any(*skb);
+ *skb = nskb;
+ }
+
+ if (padlen) {
+ if (padlen >= ETH_FCS_LEN)
+ skb_put_zero(*skb, padlen - ETH_FCS_LEN);
+ else
+ skb_trim(*skb, ETH_FCS_LEN - padlen);
+ }
+
+add_fcs:
+ /* set FCS to packet */
+ fcs = crc32_le(~0, (*skb)->data, (*skb)->len);
+ fcs = ~fcs;
+
+ skb_put_u8(*skb, fcs & 0xff);
+ skb_put_u8(*skb, (fcs >> 8) & 0xff);
+ skb_put_u8(*skb, (fcs >> 16) & 0xff);
+ skb_put_u8(*skb, (fcs >> 24) & 0xff);
+
+ return 0;
+}
+
static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
u16 queue_index = skb_get_queue_mapping(skb);
@@ -1667,6 +1732,11 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
return ret;
}
+ if (macb_pad_and_fcs(&skb, dev)) {
+ dev_kfree_skb_any(skb);
+ return ret;
+ }
+
is_lso = (skb_shinfo(skb)->gso_size != 0);
if (is_lso) {
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [RFC PATCH 3/3] net: macb: add support for padding and fcs computation
2018-07-18 12:58 ` [RFC PATCH 3/3] net: macb: add support for padding and fcs computation Claudiu Beznea
@ 2018-07-18 17:54 ` David Miller
2018-07-19 7:03 ` Claudiu Beznea
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2018-07-18 17:54 UTC (permalink / raw)
To: claudiu.beznea; +Cc: nicolas.ferre, netdev, jennifer.dahm, nathan.sullivan
From: Claudiu Beznea <claudiu.beznea@microchip.com>
Date: Wed, 18 Jul 2018 15:58:09 +0300
>
> +static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
> +{
> + struct sk_buff *nskb;
> + int padlen = ETH_ZLEN - (*skb)->len;
> + int headroom = skb_headroom(*skb);
> + int tailroom = skb_tailroom(*skb);
> + bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb);
> + u32 fcs;
Please keep local variable ordered from longest to shortest line
(ie. reverse christmas tree format).
Thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [RFC PATCH 3/3] net: macb: add support for padding and fcs computation
2018-07-18 17:54 ` David Miller
@ 2018-07-19 7:03 ` Claudiu Beznea
0 siblings, 0 replies; 6+ messages in thread
From: Claudiu Beznea @ 2018-07-19 7:03 UTC (permalink / raw)
To: David Miller; +Cc: nicolas.ferre, netdev, jennifer.dahm, nathan.sullivan
On 18.07.2018 20:54, David Miller wrote:
> From: Claudiu Beznea <claudiu.beznea@microchip.com>
> Date: Wed, 18 Jul 2018 15:58:09 +0300
>
>>
>> +static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
>> +{
>> + struct sk_buff *nskb;
>> + int padlen = ETH_ZLEN - (*skb)->len;
>> + int headroom = skb_headroom(*skb);
>> + int tailroom = skb_tailroom(*skb);
>> + bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb);
>> + u32 fcs;
>
> Please keep local variable ordered from longest to shortest line
> (ie. reverse christmas tree format).
OK! Thank you!
>
> Thank you.
>
^ permalink raw reply [flat|nested] 6+ messages in thread