From nobody Thu Sep 19 16:16:08 2024 Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A79FE16B388 for ; Mon, 5 Aug 2024 18:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722882685; cv=none; b=XjIX4TSkHqSbRmF/eDu/Fkb5SR8e2/3UNDEnXrfS6lnuCA2lJ4+3gDFNrjotzYr9rLEPOw1empnz/wpbr+e0T6Q2tzomhzZhguqJ3s94ASf9JuGXOp04w7z77kqYGnsunnKAwstj29BU13XPhgpDjiPiSRxPuB3+IHJQ3/+o0i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722882685; c=relaxed/simple; bh=1sCAMwHlLhrTJzQWswIXJnmmANEP5KJsAtG838cx+CU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fgxGhbsLRUDIZCXRJfqdnxTeqKcVLHaszULklX04IqD/ni0e1gjwc0mhV0yq3HfPh8WHhjghRRxapzQ1/rVxYw2tgvW67BLO+iMSgO3P1m01VotHAJO7GjH7g2d0NgaHB441yIl2uKB2oxw+I5MJ10QbSHUjYc/KAi7G1Ktl2NQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=Dhj8A0l1; arc=none smtp.client-ip=209.85.166.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="Dhj8A0l1" Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-39b2da8537dso6076715ab.0 for ; Mon, 05 Aug 2024 11:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1722882683; x=1723487483; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+JGlrEXu3NtOZu5ryCLf4wFhjQ6Lr9D+AY1HpLPHozk=; b=Dhj8A0l1T2+6XVR7ZfoX51L4Chh/K7x8xlxr0f3spvHa8A35r1tnxuP17OfwXTV2uj tdz9dWaHJNf/2XRE7kzMxOWSukXl1EwsHqFE8lx9q9JQfhpLgPsGCGDghgVmU3JUj+9M h+7vUbIvZUWtZJZr/Id+o054jiSFq8jDZ7W9/ZVIogYFWlCWbnqWQWzJhUdDe7UKwLcb 23r+qK/5hcgjnb/m6gAN7O1Um8idcFp7UDG9/CKB6KkzcVCGfRxUDq0LEACQ1W5pPzbi GC9TEqPe27Eecb9f0qbCVvGJkMkBq34M7xlPN5f0U9RyWZRZM0BMtRZdpn1jPIwReORq 6YRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722882683; x=1723487483; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+JGlrEXu3NtOZu5ryCLf4wFhjQ6Lr9D+AY1HpLPHozk=; b=EU3hSY11v0f8r21EC+Y+Vl+d/qOmKf+FRu4hstCVDBgThKYqpOUZrhbOV7n6IR+1x3 tK30cCdtB1v+ImABMRlJq/xLeI+IyuW+hPgfDF/XisVpuvu6Wuw7Dv28+wndj0CgN1NT 9hgn5L/fD5FgUhChy/HikKW81TK+1g5O1ItvnvdKBONPpfUeYIU8Vs9A40bcWzp1BoNn phcX6tmnN1Yn0dy69MvoltEYWV4HnwgBEN3xBt21wicw+9goxZW63fbIFsFxFN91/Jwp ecBTQXtc+D+1V3u8sTeHqFBSAF9tATRf43YTa/Re29pe7Ak+dyM7kH/kDEeVPK3tYnWR hALA== X-Forwarded-Encrypted: i=1; AJvYcCU9rFp8/ohKcL/BGSi04bNfOZFCqV9rhEr0FxTgGj033/BC3gxkiXDiRLohE2+onw8ZsVZFRG1UTK6xbb05L2iLZ0Oa8+plX7ETghj4 X-Gm-Message-State: AOJu0YxR1LD1IpP3NCVIef2xpHsalXWSHhr84rnMPlUloDIwwm9JhwkT KS+p82f1di8iKdUXMbCkNK8Cp4nhcu7J7csN+Fetr19O3IPCoTMoPgpv8OEg27OuzBbsvvH04Vs Z X-Google-Smtp-Source: AGHT+IHksmBssQdErDi7l3d3mDIMU7STM/GX8eeApV/gOKjo26laMPcbWqj8OJnsZcu3YNThhvyYJw== X-Received: by 2002:a92:c52e:0:b0:39a:16b2:7290 with SMTP id e9e14a558f8ab-39b201c25d2mr98433625ab.9.1722882682647; Mon, 05 Aug 2024 11:31:22 -0700 (PDT) Received: from blmsp.fritz.box ([2001:4091:a245:8609:c1c4:a4f8:94c8:31f2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-39b20a9af29sm30867925ab.13.2024.08.05.11.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 11:31:22 -0700 (PDT) From: Markus Schneider-Pargmann To: Chandrasekar Ramakrishnan , Marc Kleine-Budde , Vincent Mailhol , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= , Markus Schneider-Pargmann , Judith Mendez , Tony Lindgren , Simon Horman Cc: Matthias Schiffer , Linux regression tracking , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] can: m_can: Do not cancel timer from within timer Date: Mon, 5 Aug 2024 20:30:44 +0200 Message-ID: <20240805183047.305630-5-msp@baylibre.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805183047.305630-1-msp@baylibre.com> References: <20240805183047.305630-1-msp@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On setups without interrupts, the interrupt handler is called from a timer callback. For non-peripheral receives napi is scheduled, interrupts are disabled and the timer is canceled with a blocking call. In case of an error this can happen as well. Check if napi is scheduled in the timer callback after the interrupt handler executed. If napi is scheduled, the timer is disabled. It will be reenabled by m_can_poll(). Return error values from the interrupt handler so that interrupt threads and timer callback can deal differently with it. In case of the timer we only disable the timer. The rest will be done when stopping the interface. Fixes: b382380c0d2d ("can: m_can: Add hrtimer to generate software interrup= t") Fixes: a163c5761019 ("can: m_can: Start/Cancel polling timer together with = interrupts") Signed-off-by: Markus Schneider-Pargmann --- drivers/net/can/m_can/m_can.c | 57 ++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 42ed7f0fea78..f2fc862fb21c 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -487,7 +487,7 @@ static inline void m_can_disable_all_interrupts(struct = m_can_classdev *cdev) =20 if (!cdev->net->irq) { dev_dbg(cdev->dev, "Stop hrtimer\n"); - hrtimer_cancel(&cdev->hrtimer); + hrtimer_try_to_cancel(&cdev->hrtimer); } } =20 @@ -1201,11 +1201,15 @@ static void m_can_coalescing_update(struct m_can_cl= assdev *cdev, u32 ir) HRTIMER_MODE_REL); } =20 -static irqreturn_t m_can_isr(int irq, void *dev_id) +/* This interrupt handler is called either from the interrupt thread or a + * hrtimer. This has implications like cancelling a timer won't be possible + * blocking. + */ +static int m_can_interrupt_handler(struct m_can_classdev *cdev) { - struct net_device *dev =3D (struct net_device *)dev_id; - struct m_can_classdev *cdev =3D netdev_priv(dev); + struct net_device *dev =3D cdev->net; u32 ir; + int ret; =20 if (pm_runtime_suspended(cdev->dev)) return IRQ_NONE; @@ -1232,11 +1236,9 @@ static irqreturn_t m_can_isr(int irq, void *dev_id) m_can_disable_all_interrupts(cdev); napi_schedule(&cdev->napi); } else { - int pkts; - - pkts =3D m_can_rx_handler(dev, NAPI_POLL_WEIGHT, ir); - if (pkts < 0) - goto out_fail; + ret =3D m_can_rx_handler(dev, NAPI_POLL_WEIGHT, ir); + if (ret < 0) + return ret; } } =20 @@ -1254,8 +1256,9 @@ static irqreturn_t m_can_isr(int irq, void *dev_id) } else { if (ir & (IR_TEFN | IR_TEFW)) { /* New TX FIFO Element arrived */ - if (m_can_echo_tx_event(dev) !=3D 0) - goto out_fail; + ret =3D m_can_echo_tx_event(dev); + if (ret !=3D 0) + return ret; } } =20 @@ -1263,16 +1266,31 @@ static irqreturn_t m_can_isr(int irq, void *dev_id) can_rx_offload_threaded_irq_finish(&cdev->offload); =20 return IRQ_HANDLED; +} =20 -out_fail: - m_can_disable_all_interrupts(cdev); - return IRQ_HANDLED; +static irqreturn_t m_can_isr(int irq, void *dev_id) +{ + struct net_device *dev =3D (struct net_device *)dev_id; + struct m_can_classdev *cdev =3D netdev_priv(dev); + int ret; + + ret =3D m_can_interrupt_handler(cdev); + if (ret < 0) { + m_can_disable_all_interrupts(cdev); + return IRQ_HANDLED; + } + + return ret; } =20 static enum hrtimer_restart m_can_coalescing_timer(struct hrtimer *timer) { struct m_can_classdev *cdev =3D container_of(timer, struct m_can_classdev= , hrtimer); =20 + if (cdev->can.state =3D=3D CAN_STATE_BUS_OFF || + cdev->can.state =3D=3D CAN_STATE_STOPPED) + return HRTIMER_NORESTART; + irq_wake_thread(cdev->net->irq, cdev->net); =20 return HRTIMER_NORESTART; @@ -1973,8 +1991,17 @@ static enum hrtimer_restart hrtimer_callback(struct = hrtimer *timer) { struct m_can_classdev *cdev =3D container_of(timer, struct m_can_classdev, hrtimer); + int ret; =20 - m_can_isr(0, cdev->net); + if (cdev->can.state =3D=3D CAN_STATE_BUS_OFF || + cdev->can.state =3D=3D CAN_STATE_STOPPED) + return HRTIMER_NORESTART; + + ret =3D m_can_interrupt_handler(cdev); + + /* On error or if napi is scheduled to read, stop the timer */ + if (ret < 0 || napi_is_scheduled(&cdev->napi)) + return HRTIMER_NORESTART; =20 hrtimer_forward_now(timer, ms_to_ktime(HRTIMER_POLL_INTERVAL_MS)); =20 --=20 2.45.2