netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
	kernel@pengutronix.de, Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH net-next 14/21] can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM
Date: Fri, 28 Jul 2023 09:56:07 +0200	[thread overview]
Message-ID: <20230728075614.1014117-15-mkl@pengutronix.de> (raw)
In-Reply-To: <20230728075614.1014117-1-mkl@pengutronix.de>

In case of an RX overflow error from the CAN controller and an OOM
where no skb can be allocated, the error counters are not incremented.

Fix this by first incrementing the error counters and then allocate
the skb.

Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices")
Link: https://lore.kernel.org/all/20230718-gs_usb-cleanups-v1-7-c3b9154ec605@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/usb/gs_usb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 0d0a3405ba19..e302d7d568aa 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -631,6 +631,9 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
 	}
 
 	if (hf->flags & GS_CAN_FLAG_OVERFLOW) {
+		stats->rx_over_errors++;
+		stats->rx_errors++;
+
 		skb = alloc_can_err_skb(netdev, &cf);
 		if (!skb)
 			goto resubmit_urb;
@@ -638,8 +641,6 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
 		cf->can_id |= CAN_ERR_CRTL;
 		cf->len = CAN_ERR_DLC;
 		cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
-		stats->rx_over_errors++;
-		stats->rx_errors++;
 		netif_rx(skb);
 	}
 
-- 
2.40.1



  parent reply	other threads:[~2023-07-28  7:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-28  7:55 [PATCH net-next 0/21] pull-request: can-next 2023-07-28 Marc Kleine-Budde
2023-07-28  7:55 ` [PATCH net-next 01/21] dt-bindings: net: can: Add support for Allwinner D1 CAN controller Marc Kleine-Budde
2023-07-28  9:00   ` patchwork-bot+netdevbpf
2023-07-28  7:55 ` [PATCH net-next 02/21] riscv: dts: allwinner: d1: Add CAN controller nodes Marc Kleine-Budde
2023-07-28  7:55 ` [PATCH net-next 03/21] can: sun4i_can: Add acceptance register quirk Marc Kleine-Budde
2023-07-28  7:55 ` [PATCH net-next 04/21] MAINTAINERS: Add myself as maintainer of the ems_pci.c driver Marc Kleine-Budde
2023-07-28  7:55 ` [PATCH net-next 05/21] can: sun4i_can: Add support for the Allwinner D1 Marc Kleine-Budde
2023-07-28  7:55 ` [PATCH net-next 06/21] can: peak_usb: remove unused/legacy peak_usb_netif_rx() function Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 07/21] can: Explicitly include correct DT includes, part 2 Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 08/21] can: gs_usb: remove leading space from goto labels Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 09/21] can: gs_usb: gs_usb_probe(): align block comment Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 10/21] can: gs_usb: gs_usb_set_timestamp(): remove return statements form void function Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 11/21] can: gs_usb: uniformly use "parent" as variable name for struct gs_usb Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 12/21] can: gs_usb: gs_usb_receive_bulk_callback(): make use of netdev Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 13/21] can: gs_usb: gs_usb_receive_bulk_callback(): make use of stats Marc Kleine-Budde
2023-07-28  7:56 ` Marc Kleine-Budde [this message]
2023-07-28  7:56 ` [PATCH net-next 15/21] can: gs_usb: gs_can_start_xmit(), gs_can_open(): clean up printouts in error path Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 16/21] can: gs_usb: gs_can_close(): don't complain about failed device reset during ndo_stop Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 17/21] can: gs_usb: gs_destroy_candev(): remove not needed usb_kill_anchored_urbs() Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 18/21] can: gs_usb: gs_usb_disconnect(): " Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 19/21] can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp() Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 20/21] can: rx-offload: add can_rx_offload_get_echo_skb_queue_tail() Marc Kleine-Budde
2023-07-28  7:56 ` [PATCH net-next 21/21] can: gs_usb: convert to NAPI/rx-offload to avoid OoO reception Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230728075614.1014117-15-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).