can: provide library functions for skb allocation
PATCH v2 1/1 can: provide library functions for skb allocation
This patch makes the private functions alloc_can_skb() and alloc_can_err_skb() of the at91_can driver public and adapts all drivers to use these. While making the patch I realized, that the skb's are *not* setup consistently. It's now done as shown below:
skb->protocol = htons(ETH_P_CAN); skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; *cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame)); memset(*cf, 0, sizeof(struct can_frame));
The frame is zeroed out to avoid uninitialized data to be passed to user space. Some drivers or library code did not set "pkt_type" or "ip_summed". Also, "__constant_htons()" should not be used for runtime invocations, as pointed out by David Miller.
--- drivers/net/can/at91_can.c | 32 ---------------------------- drivers/net/can/dev.c | 42 +++++++++++++++++++++++++++++++------- drivers/net/can/sja1000/sja1000.c | 12 +--------- drivers/net/can/ti_hecc.c | 17 +++------------ drivers/net/can/usb/ems_usb.c | 16 +------------- 5 files changed, 43 insertions(+), 76 deletions(-)
drivers/net/can/dev.c +35 -7
@@ -366,17 +366,12 @@ void can_restart(unsigned long data)can_flush_echo_skb (dev);/* send restart message upstream */ - skb =dev_alloc_skb (sizeof (struct can_frame )); + skb =alloc_can_err_skb (dev, &cf);if (skb ==NULL ) { err = -ENOMEM ; goto restart; } - skb->dev = dev; - skb->protocol =htons (ETH_P_CAN ); - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); -memset (cf,0 ,sizeof (struct can_frame )); - cf->can_id =CAN_ERR_FLAG |CAN_ERR_RESTARTED ; - cf->can_dlc =CAN_ERR_DLC ; + cf->can_id |=CAN_ERR_RESTARTED ;netif_rx (skb);
@@ -449,6 +444,39 @@ static void can_setup(struct net_device dev->features =NETIF_F_NO_CSUM ; } +struct sk_buff *alloc_can_skb (struct net_device *dev,struct can_frame **cf) +{ +struct sk_buff *skb; + + skb =netdev_alloc_skb (dev,sizeof (struct can_frame )); +if (unlikely (!skb)) +return NULL ; + + skb->protocol =htons (ETH_P_CAN ); + skb->pkt_type =PACKET_BROADCAST ; + skb->ip_summed =CHECKSUM_UNNECESSARY ; + *cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); +memset (*cf,0 ,sizeof (struct can_frame )); + +return skb; +} +EXPORT_SYMBOL_GPL (alloc_can_skb); + +struct sk_buff *alloc_can_err_skb (struct net_device *dev,struct can_frame **cf) +{ +struct sk_buff *skb; + + skb =alloc_can_skb (dev, cf); +if (unlikely (!skb)) +return NULL ; + + (*cf)->can_id =CAN_ERR_FLAG ; + (*cf)->can_dlc =CAN_ERR_DLC ; + +return skb; +} +EXPORT_SYMBOL_GPL (alloc_can_err_skb); +/* * Allocate and setup space for the CAN network device */
drivers/net/can/at91_can.c +0 -32
@@ -221,38 +221,6 @@ static inline void set_mb_mode(const strset_mb_mode_prio (priv, mb, mode,0 ); } -static struct sk_buff *alloc_can_skb (struct net_device *dev, -struct can_frame **cf) -{ -struct sk_buff *skb; - - skb =netdev_alloc_skb (dev,sizeof (struct can_frame )); -if (unlikely (!skb)) -return NULL ; - - skb->protocol =htons (ETH_P_CAN ); - skb->ip_summed =CHECKSUM_UNNECESSARY ; - *cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); - -return skb; -} - -static struct sk_buff *alloc_can_err_skb (struct net_device *dev, -struct can_frame **cf) -{ -struct sk_buff *skb; - - skb =alloc_can_skb (dev, cf); -if (unlikely (!skb)) -return NULL ; - -memset (*cf,0 ,sizeof (struct can_frame )); - (*cf)->can_id =CAN_ERR_FLAG ; - (*cf)->can_dlc =CAN_ERR_DLC ; - -return skb; -} -/* * Swtich transceiver on or off */
drivers/net/can/sja1000/sja1000.c +2 -10
@@ -296,11 +296,9 @@ static void sja1000_rx(struct net_deviceuint8_t dlc;int i; - skb =dev_alloc_skb (sizeof (struct can_frame )); + skb =alloc_can_skb (dev, &cf);if (skb ==NULL )return ; - skb->dev = dev; - skb->protocol =htons (ETH_P_CAN ); fi = priv->read_reg (priv,REG_FI ); dlc = fi &0x0F ;
@@ -351,15 +349,9 @@ static int sja1000_err(struct net_deviceenum can_state state = priv->can.state;uint8_t ecc, alc; - skb =dev_alloc_skb (sizeof (struct can_frame )); + skb =alloc_can_err_skb (dev, &cf);if (skb ==NULL )return -ENOMEM ; - skb->dev = dev; - skb->protocol =htons (ETH_P_CAN ); - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); -memset (cf,0 ,sizeof (struct can_frame )); - cf->can_id =CAN_ERR_FLAG ; - cf->can_dlc =CAN_ERR_DLC ;if (isrc &IRQ_DOI ) {/* data overrun interrupt */
drivers/net/can/usb/ems_usb.c +2 -14
@@ -311,14 +311,10 @@ static void ems_usb_rx_can_msg(struct emint i;struct net_device_stats *stats = &dev->netdev->stats; - skb =netdev_alloc_skb (dev->netdev,sizeof (struct can_frame )); + skb =alloc_can_skb (dev->netdev, &cf);if (skb ==NULL )return ; - skb->protocol =htons (ETH_P_CAN ); - - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); - cf->can_id = msg->msg.can_msg.id; cf->can_dlc =min_t (u8, msg->msg.can_msg.length,8 );
@@ -346,18 +342,10 @@ static void ems_usb_rx_err(struct ems_usstruct sk_buff *skb;struct net_device_stats *stats = &dev->netdev->stats; - skb =netdev_alloc_skb (dev->netdev,sizeof (struct can_frame )); + skb =alloc_can_err_skb (dev->netdev, &cf);if (skb ==NULL )return ; - skb->protocol =htons (ETH_P_CAN ); - - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); -memset (cf,0 ,sizeof (struct can_frame )); - - cf->can_id =CAN_ERR_FLAG ; - cf->can_dlc =CAN_ERR_DLC ; -if (msg->type ==CPC_MSG_TYPE_CAN_STATE ) {u8 state = msg->msg.can_state;
drivers/net/can/ti_hecc.c +4 -13
@@ -535,18 +535,15 @@ static int ti_hecc_rx_pkt(struct ti_heccu32 data, mbx_mask;unsigned long flags; - skb =netdev_alloc_skb (priv->ndev,sizeof (struct can_frame )); + skb =alloc_can_skb (priv->ndev, &cf);if (!skb) {if (printk_ratelimit ())dev_err (priv->ndev->dev.parent, -"ti_hecc_rx_pkt: netdev_alloc_skb() failed\n" ); +"ti_hecc_rx_pkt: alloc_can_skb() failed\n" );return -ENOMEM ; } - skb->protocol =__constant_htons (ETH_P_CAN ); - skb->ip_summed =CHECKSUM_UNNECESSARY ; mbx_mask =BIT (mbxno); - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); data =hecc_read_mbx (priv, mbxno,HECC_CANMID );if (data &HECC_CANMID_IDE ) cf->can_id = (data &CAN_EFF_MASK ) |CAN_EFF_FLAG ;
@@ -656,19 +653,13 @@ static int ti_hecc_error(struct net_devistruct sk_buff *skb;/* propogate the error condition to the can stack */ - skb =netdev_alloc_skb (ndev,sizeof (struct can_frame )); + skb =alloc_can_err_skb (ndev, &cf);if (!skb) {if (printk_ratelimit ())dev_err (priv->ndev->dev.parent, -"ti_hecc_error: netdev_alloc_skb() failed\n" ); +"ti_hecc_error: alloc_can_err_skb() failed\n" );return -ENOMEM ; } - skb->protocol =__constant_htons (ETH_P_CAN ); - skb->ip_summed =CHECKSUM_UNNECESSARY ; - cf = (struct can_frame *)skb_put (skb,sizeof (struct can_frame )); -memset (cf,0 ,sizeof (struct can_frame )); - cf->can_id =CAN_ERR_FLAG ; - cf->can_dlc =CAN_ERR_DLC ;if (int_status &HECC_CANGIF_WLIF ) {/* warning level int */ if ((int_status &HECC_CANGIF_BOIF ) ==0 ) {
From: Wolfgang Grandegger <[email protected]>
Date: Sun, 18 Oct 2009 20:45:23 +0200
Quoted 12 lines
This patch makes the private functions
alloc_can_skb()andalloc_can_err_skb()of theat91_candriver public and adapts all drivers to use these. While making the patch I realized, that the skb's are *not* setup consistently. It's now done as shown below:skb->protocol = htons(ETH_P_CAN); skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; *cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame)); memset(*cf, 0, sizeof(struct can_frame));
Quoted 6 lines
The frame is zeroed out to avoid uninitialized data to be passed to user space. Some drivers or library code did not set "
pkt_type" or "ip_summed". Also, "__constant_htons()" should not be used for runtime invocations, as pointed out by David Miller.Signed-off-by Wolfgang Grandegger <[email protected]>
Applied, thanks.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Mon, 19 Oct 2009 21:54:40 -0700 (PDT)
Quoted 1 line
Applied, thanks.
Actually I have to back this out, you have to add an extern declaration for these public functions to a header the CAN drivers will see, or else there'll be build warnings and errors.
I wonder if you actually did this, but forgot that part of the change or lost it somehow while respinning this.
Please fix this up and resubmit, thanks.
Quoted 5 lines · David Miller
From: David Miller <davem-fT/PcQaiUtIeIZ0/[email protected]>
Date: Mon, 19 Oct 2009 21:54:40 -0700 (PDT)Quoted 1 line
Applied, thanks.
Quoted 7 lines
Actually I have to back this out, you have to add an extern declaration for these public functions to a header the CAN drivers will see, or else there'll be build warnings and errors.
I wonder if you actually did this, but forgot that part of the change or lost it somehow while respinning this.
Already the original patch was incomplete and I obviously forgot to compile test it. I was sure that I did that already, but, well, sorry for the inconvenience caused.
Quoted 1 line
Please fix this up and resubmit, thanks.
Will resubmit in a second.
Thanks,
Wolfgang.