From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B842C43603 for ; Wed, 4 Dec 2019 18:25:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 436F9205ED for ; Wed, 4 Dec 2019 18:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483910; bh=/apV2zLk0V62ZzWk8+H2uE8yvtGpn8y547OMVbqc97o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C+Y6X+Y2b4j0UiQiwFBpHy/ZkAOLsh6jf/dqeMIuylz3jjeYwjgh57oNmpsQDcHdw 5Q7TMHbk3a1layGGJhDCjtqw+Iu0g586mg7n0RPnDDxM8F6jK1p6grn7nWaq0DTkPW 7BzXZdls8qlszovfZoug0ju+iAeE6B3PGK7Er7iI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729959AbfLDSZJ (ORCPT ); Wed, 4 Dec 2019 13:25:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:42224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729613AbfLDSBe (ORCPT ); Wed, 4 Dec 2019 13:01:34 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5434C2084B; Wed, 4 Dec 2019 18:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482493; bh=/apV2zLk0V62ZzWk8+H2uE8yvtGpn8y547OMVbqc97o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCpMtGPNAEabsXwIuOBcRIA0XooLgaPzdHmytvIW3l6CJTpmn60KiIzBSaE3k0XLn fid0Mvr1L4hu1HvPtLEZrbkvO9DwXBz2SF3sv2S1iOHDqI3j8AGi1QWwY2nQQtjne0 UFwc0VclKmvNEaRjGLo2pQuD+EPgPROIFVRvkG/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Kleine-Budde , Sasha Levin Subject: [PATCH 4.14 019/209] can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM Date: Wed, 4 Dec 2019 18:53:51 +0100 Message-Id: <20191204175322.847524200@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Kleine-Budde [ Upstream commit 4e9016bee3bf0c24963097edace034ff205b565c ] If the rx-offload skb_queue is full or the skb allocation fails (due to OOM), the mailbox contents is discarded. This patch adds the incrementing of the rx_fifo_errors statistics counter. Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/rx-offload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c index c0e51a2f8e4fc..b068e2320c794 100644 --- a/drivers/net/can/rx-offload.c +++ b/drivers/net/can/rx-offload.c @@ -134,8 +134,10 @@ static struct sk_buff *can_rx_offload_offload_one(struct can_rx_offload *offload ret = offload->mailbox_read(offload, &cf_overflow, ×tamp, n); - if (ret) + if (ret) { offload->dev->stats.rx_dropped++; + offload->dev->stats.rx_fifo_errors++; + } return NULL; } -- 2.20.1