can: kvaser_usb: Update stats and state even if alloc_can_err_skb() fails
PATCH 1/4 can: kvaser_usb: Update stats and state even if alloc_can_err_skb() fails
Ensure statistics, error counters, and CAN state are updated consistently, even when alloc_can_err_skb() fails during state changes or error message frame reception.
--- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 124 +++++++----------- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 31 ++--- 2 files changed, 60 insertions(+), 95 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +50 -74
@@ -926,6 +926,42 @@ kvaser_usb_hydra_bus_status_to_can_state(const struct kvaser_usb_net_priv *priv, } } +static void kvaser_usb_hydra_change_state (struct kvaser_usb_net_priv *priv, +const struct can_berr_counter *bec, +struct can_frame *cf, +enum can_state new_state) +{ +struct net_device *netdev = priv->netdev; +enum can_state old_state = priv->can.state; +enum can_state tx_state, rx_state; + + tx_state = (bec->txerr >= bec->rxerr) ? + new_state :CAN_STATE_ERROR_ACTIVE ; + rx_state = (bec->txerr <= bec->rxerr) ? + new_state :CAN_STATE_ERROR_ACTIVE ; +can_change_state (netdev, cf, tx_state, rx_state); + +if (new_state ==CAN_STATE_BUS_OFF && old_state <CAN_STATE_BUS_OFF ) { +if (priv->can.restart_ms ==0 ) +kvaser_usb_hydra_send_simple_cmd_async (priv,CMD_STOP_CHIP_REQ ); + +can_bus_off (netdev); + } + +if (priv->can.restart_ms && + old_state >=CAN_STATE_BUS_OFF && + new_state <CAN_STATE_BUS_OFF ) { + priv->can.can_stats.restarts++; +if (cf) + cf->can_id |=CAN_ERR_RESTARTED ; + } +if (cf && new_state !=CAN_STATE_BUS_OFF ) { + cf->can_id |=CAN_ERR_CNT ; + cf->data[6 ] = bec->txerr; + cf->data[7 ] = bec->rxerr; + } +} +static void kvaser_usb_hydra_update_state (struct kvaser_usb_net_priv *priv,u8 bus_status,const struct can_berr_counter *bec)
@@ -951,41 +987,11 @@ static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv,return ; skb =alloc_can_err_skb (netdev, &cf); -if (skb) { -enum can_state tx_state, rx_state; - - tx_state = (bec->txerr >= bec->rxerr) ? - new_state :CAN_STATE_ERROR_ACTIVE ; - rx_state = (bec->txerr <= bec->rxerr) ? - new_state :CAN_STATE_ERROR_ACTIVE ; -can_change_state (netdev, cf, tx_state, rx_state); - } - -if (new_state ==CAN_STATE_BUS_OFF && old_state <CAN_STATE_BUS_OFF ) { -if (!priv->can.restart_ms) -kvaser_usb_hydra_send_simple_cmd_async - (priv,CMD_STOP_CHIP_REQ ); - -can_bus_off (netdev); - } - -if (!skb) { +kvaser_usb_hydra_change_state (priv, bec, cf, new_state); +if (skb) +netif_rx (skb); +else netdev_warn (netdev,"No memory left for err_skb\n" ); -return ; - } - -if (priv->can.restart_ms && - old_state >=CAN_STATE_BUS_OFF && - new_state <CAN_STATE_BUS_OFF ) - priv->can.can_stats.restarts++; - -if (new_state !=CAN_STATE_BUS_OFF ) { - cf->can_id |=CAN_ERR_CNT ; - cf->data[6 ] = bec->txerr; - cf->data[7 ] = bec->rxerr; - } - -netif_rx (skb); } static void kvaser_usb_hydra_state_event(const struct kvaser_usb *dev,
@@ -1080,7 +1086,6 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,struct net_device_stats *stats = &netdev->stats;struct can_frame *cf;struct sk_buff *skb; -struct skb_shared_hwtstamps *shhwtstamps;struct can_berr_counter bec;enum can_state new_state, old_state;u8 bus_status;
@@ -1097,51 +1102,22 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv, &new_state); skb =alloc_can_err_skb (netdev, &cf); +if (new_state != old_state) +kvaser_usb_hydra_change_state (priv, &bec, cf, new_state); -if (new_state != old_state) { -if (skb) { -enum can_state tx_state, rx_state; - - tx_state = (bec.txerr >= bec.rxerr) ? - new_state :CAN_STATE_ERROR_ACTIVE ; - rx_state = (bec.txerr <= bec.rxerr) ? - new_state :CAN_STATE_ERROR_ACTIVE ; - -can_change_state (netdev, cf, tx_state, rx_state); - -if (priv->can.restart_ms && - old_state >=CAN_STATE_BUS_OFF && - new_state <CAN_STATE_BUS_OFF ) - cf->can_id |=CAN_ERR_RESTARTED ; - } - -if (new_state ==CAN_STATE_BUS_OFF ) { -if (!priv->can.restart_ms) -kvaser_usb_hydra_send_simple_cmd_async - (priv,CMD_STOP_CHIP_REQ ); - -can_bus_off (netdev); - } - } - -if (!skb) { - stats->rx_dropped++; -netdev_warn (netdev,"No memory left for err_skb\n" ); -return ; - } - - shhwtstamps =skb_hwtstamps (skb); - shhwtstamps->hwtstamp = hwtstamp; +if (skb) { +struct skb_shared_hwtstamps *shhwtstamps =skb_hwtstamps (skb); - cf->can_id |=CAN_ERR_BUSERROR ; -if (new_state !=CAN_STATE_BUS_OFF ) { - cf->can_id |=CAN_ERR_CNT ; + shhwtstamps->hwtstamp = hwtstamp; + cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; cf->data[6 ] = bec.txerr; cf->data[7 ] = bec.rxerr; +netif_rx (skb); + }else { + stats->rx_dropped++; +netdev_warn (netdev,"No memory left for err_skb\n" ); } -netif_rx (skb); - priv->bec.txerr = bec.txerr; priv->bec.rxerr = bec.rxerr; }
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +10 -21
@@ -1121,8 +1121,6 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, const struct kvaser_usb_err_summary *es) {struct can_frame *cf; -struct can_frame tmp_cf = { .can_id =CAN_ERR_FLAG , - .len =CAN_ERR_DLC };struct sk_buff *skb;struct net_device_stats *stats;struct kvaser_usb_net_priv *priv;
@@ -1143,18 +1141,9 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,if (!netif_running (priv->netdev))return ; -/* Update all of the CAN interface's state and error counters before -* trying any memory allocation that can actually fail with -ENOMEM. -* -* We send a temporary stack-allocated error CAN frame to -* can_change_state() for the very same reason. -* -* TODO: Split can_change_state() responsibility between updating the -* CAN interface's state and counters, and the setting up of CAN error -* frame ID and data to userspace. Remove stack allocation afterwards. -*/ old_state = priv->can.state; -kvaser_usb_leaf_rx_error_update_can_state (priv, es, &tmp_cf); + skb =alloc_can_err_skb (priv->netdev, &cf); +kvaser_usb_leaf_rx_error_update_can_state (priv, es, cf); new_state = priv->can.state;/* If there are errors, request status updates periodically as we do
@@ -1168,13 +1157,6 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,schedule_delayed_work (&leaf->chip_state_req_work,msecs_to_jiffies (500 )); - skb =alloc_can_err_skb (priv->netdev, &cf); -if (!skb) { - stats->rx_dropped++; -return ; - } -memcpy (cf, &tmp_cf,sizeof (*cf)); -if (new_state != old_state) {if (es->status & (M16C_STATE_BUS_OFF |M16C_STATE_BUS_RESET )) {
@@ -1187,11 +1169,18 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,if (priv->can.restart_ms && old_state ==CAN_STATE_BUS_OFF && new_state <CAN_STATE_BUS_OFF ) { - cf->can_id |=CAN_ERR_RESTARTED ; +if (cf) + cf->can_id |=CAN_ERR_RESTARTED ;netif_carrier_on (priv->netdev); } } +if (!skb) { + stats->rx_dropped++; +netdev_warn (priv->netdev,"No memory left for err_skb\n" ); +return ; + } +switch (dev->driver_info->family) {case KVASER_LEAF :if (es->leaf.error_factor) {
Signature · 1 line
2.46.0
PATCH 2/4 can: kvaser_usb: Add support for CAN_CTRLMODE_BERR_REPORTING
Add support for CAN_CTRLMODE_BERR_REPORTING, allowing Bus Error Reporting to be enabled or disabled. Previously, Bus Error Reporting was always active.
--- .../net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 29 ++++++++++--------- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 13 +++++---- 3 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +2 -1
@@ -818,7 +818,8 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)init_completion (&priv->stop_comp);init_completion (&priv->flush_comp);init_completion (&priv->get_busparams_comp); - priv->can.ctrlmode_supported =CAN_CTRLMODE_CC_LEN8_DLC ; + priv->can.ctrlmode_supported =CAN_CTRLMODE_CC_LEN8_DLC | +CAN_CTRLMODE_BERR_REPORTING ; priv->dev = dev; priv->netdev = netdev;
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +16 -13
@@ -1084,8 +1084,8 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv, {struct net_device *netdev = priv->netdev;struct net_device_stats *stats = &netdev->stats; -struct can_frame *cf; -struct sk_buff *skb; +struct can_frame *cf =NULL ; +struct sk_buff *skb =NULL ;struct can_berr_counter bec;enum can_state new_state, old_state;u8 bus_status;
@@ -1101,21 +1101,24 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,kvaser_usb_hydra_bus_status_to_can_state (priv, bus_status, &bec, &new_state); - skb =alloc_can_err_skb (netdev, &cf); +if (priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) + skb =alloc_can_err_skb (netdev, &cf);if (new_state != old_state)kvaser_usb_hydra_change_state (priv, &bec, cf, new_state); -if (skb) { -struct skb_shared_hwtstamps *shhwtstamps =skb_hwtstamps (skb); +if (priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) { +if (skb) { +struct skb_shared_hwtstamps *shhwtstamps =skb_hwtstamps (skb); - shhwtstamps->hwtstamp = hwtstamp; - cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; - cf->data[6 ] = bec.txerr; - cf->data[7 ] = bec.rxerr; -netif_rx (skb); - }else { - stats->rx_dropped++; -netdev_warn (netdev,"No memory left for err_skb\n" ); + shhwtstamps->hwtstamp = hwtstamp; + cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; + cf->data[6 ] = bec.txerr; + cf->data[7 ] = bec.rxerr; +netif_rx (skb); + }else { + stats->rx_dropped++; +netdev_warn (netdev,"No memory left for err_skb\n" ); + } } priv->bec.txerr = bec.txerr;
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +8 -5
@@ -1120,8 +1120,8 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv,static void kvaser_usb_leaf_rx_error (const struct kvaser_usb *dev,const struct kvaser_usb_err_summary *es) { -struct can_frame *cf; -struct sk_buff *skb; +struct can_frame *cf =NULL ; +struct sk_buff *skb =NULL ;struct net_device_stats *stats;struct kvaser_usb_net_priv *priv;struct kvaser_usb_net_leaf_priv *leaf;
@@ -1142,7 +1142,8 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,return ; old_state = priv->can.state; - skb =alloc_can_err_skb (priv->netdev, &cf); +if (priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) + skb =alloc_can_err_skb (priv->netdev, &cf);kvaser_usb_leaf_rx_error_update_can_state (priv, es, cf); new_state = priv->can.state;
@@ -1176,8 +1177,10 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, }if (!skb) { - stats->rx_dropped++; -netdev_warn (priv->netdev,"No memory left for err_skb\n" ); +if (priv->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) { + stats->rx_dropped++; +netdev_warn (priv->netdev,"No memory left for err_skb\n" ); + }return ; }
Signature · 1 line
2.46.0
PATCH 3/4 can: kvaser_pciefd: Update stats and state even if alloc_can_err_skb() fails
In reply to Jimmy AssarssonEnsure statistics, error counters, and CAN state are updated consistently, even when alloc_can_err_skb() fails during state changes or error message frame reception.
--- drivers/net/can/kvaser_pciefd.c | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/net/can/kvaser_pciefd.c +26 -26
@@ -1234,11 +1234,15 @@ static int kvaser_pciefd_handle_data_packet(struct kvaser_pciefd *pcie, }static void kvaser_pciefd_change_state (struct kvaser_pciefd_can *can, +const struct can_berr_counter *bec,struct can_frame *cf,enum can_state new_state,enum can_state tx_state,enum can_state rx_state) { +enum can_state old_state; + + old_state = can->can.state;can_change_state (can->can.dev, cf, tx_state, rx_state);if (new_state ==CAN_STATE_BUS_OFF ) {
@@ -1254,6 +1258,18 @@ static void kvaser_pciefd_change_state(struct kvaser_pciefd_can *can,can_bus_off (ndev); } } +if (old_state ==CAN_STATE_BUS_OFF && + new_state ==CAN_STATE_ERROR_ACTIVE && + can->can.restart_ms) { + can->can.can_stats.restarts++; +if (cf) + cf->can_id |=CAN_ERR_RESTARTED ; + } +if (cf && new_state !=CAN_STATE_BUS_OFF ) { + cf->can_id |=CAN_ERR_CNT ; + cf->data[6 ] = bec->txerr; + cf->data[7 ] = bec->rxerr; + } } static void kvaser_pciefd_packet_to_state(struct kvaser_pciefd_rx_packet *p,
@@ -1299,14 +1315,7 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can,kvaser_pciefd_packet_to_state (p, &bec, &new_state, &tx_state, &rx_state); skb =alloc_can_err_skb (ndev, &cf);if (new_state != old_state) { -kvaser_pciefd_change_state (can, cf, new_state, tx_state, rx_state); -if (old_state ==CAN_STATE_BUS_OFF && - new_state ==CAN_STATE_ERROR_ACTIVE && - can->can.restart_ms) { - can->can.can_stats.restarts++; -if (skb) - cf->can_id |=CAN_ERR_RESTARTED ; - } +kvaser_pciefd_change_state (can, &bec, cf, new_state, tx_state, rx_state); } can->err_rep_cnt++;
@@ -1359,6 +1368,7 @@ static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can, {struct can_berr_counter bec;enum can_state old_state, new_state, tx_state, rx_state; +int ret =0 ; old_state = can->can.state;
@@ -1372,25 +1382,15 @@ static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can,struct can_frame *cf; skb =alloc_can_err_skb (ndev, &cf); -if (!skb) { +kvaser_pciefd_change_state (can, &bec, cf, new_state, tx_state, rx_state); +if (skb) { +kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); +netif_rx (skb); + }else { ndev->stats.rx_dropped++; -return -ENOMEM ; +netdev_warn (ndev,"No memory left for err_skb\n" ); + ret = -ENOMEM ; } - -kvaser_pciefd_change_state (can, cf, new_state, tx_state, rx_state); -if (old_state ==CAN_STATE_BUS_OFF && - new_state ==CAN_STATE_ERROR_ACTIVE && - can->can.restart_ms) { - can->can.can_stats.restarts++; - cf->can_id |=CAN_ERR_RESTARTED ; - } - -kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); - - cf->data[6 ] = bec.txerr; - cf->data[7 ] = bec.rxerr; - -netif_rx (skb); } can->bec.txerr = bec.txerr; can->bec.rxerr = bec.rxerr;
@@ -1398,7 +1398,7 @@ static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can,if (bec.txerr || bec.rxerr)mod_timer (&can->bec_poll_timer,KVASER_PCIEFD_BEC_POLL_FREQ ); -return 0 ; +return ret; } static int kvaser_pciefd_handle_status_packet(struct kvaser_pciefd *pcie,
Signature · 1 line
2.46.0
PATCH 4/4 can: kvaser_pciefd: Add support for CAN_CTRLMODE_BERR_REPORTING
In reply to Jimmy AssarssonAdd support for CAN_CTRLMODE_BERR_REPORTING, allowing Bus Error Reporting to be enabled or disabled. Previously, Bus Error Reporting was always active.
--- drivers/net/can/kvaser_pciefd.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/net/can/kvaser_pciefd.c +16 -13
@@ -999,7 +999,8 @@ static int kvaser_pciefd_setup_can_ctrls(struct kvaser_pciefd *pcie) can->can.ctrlmode_supported =CAN_CTRLMODE_LISTENONLY |CAN_CTRLMODE_FD |CAN_CTRLMODE_FD_NON_ISO | -CAN_CTRLMODE_CC_LEN8_DLC ; +CAN_CTRLMODE_CC_LEN8_DLC | +CAN_CTRLMODE_BERR_REPORTING ; status =ioread32 (can->reg_base +KVASER_PCIEFD_KCAN_STAT_REG );if (!(status &KVASER_PCIEFD_KCAN_STAT_FD )) {
@@ -1304,7 +1305,7 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can,struct can_berr_counter bec;enum can_state old_state, new_state, tx_state, rx_state;struct net_device *ndev = can->can.dev; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;struct can_frame *cf =NULL ; old_state = can->can.state;
@@ -1313,7 +1314,8 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can, bec.rxerr =FIELD_GET (KVASER_PCIEFD_SPACK_RXERR_MASK , p->header[0 ]);kvaser_pciefd_packet_to_state (p, &bec, &new_state, &tx_state, &rx_state); - skb =alloc_can_err_skb (ndev, &cf); +if (can->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) + skb =alloc_can_err_skb (ndev, &cf);if (new_state != old_state) {kvaser_pciefd_change_state (can, &bec, cf, new_state, tx_state, rx_state); }
@@ -1328,18 +1330,19 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can, can->bec.txerr = bec.txerr; can->bec.rxerr = bec.rxerr; -if (!skb) { - ndev->stats.rx_dropped++; -return -ENOMEM ; +if (can->can.ctrlmode &CAN_CTRLMODE_BERR_REPORTING ) { +if (!skb) { +netdev_warn (ndev,"No memory left for err_skb\n" ); + ndev->stats.rx_dropped++; +return -ENOMEM ; + } +kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); + cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; + cf->data[6 ] = bec.txerr; + cf->data[7 ] = bec.rxerr; +netif_rx (skb); } -kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); - cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; - cf->data[6 ] = bec.txerr; - cf->data[7 ] = bec.rxerr; - -netif_rx (skb); -return 0 ; }
Signature · 1 line
2.46.0
Quoted 5 lines · Jimmy Assarsson
Ensure statistics, error counters, and CAN state are updated consistently, even when
alloc_can_err_skb()fails during state changes or error message frame reception.Signed-off-by Jimmy Assarsson <[email protected]>
Applied all patches to linux-can-next.
As I'm merging series to linux-can(-next), it would be nice to have a cover letter the summarizes the series for future contributions. b4 will automatically include it in the merge commit.
Regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |