Skip to contentSkip to conversation

gpiolib: fix line event timestamps for nested irqs

PATCH In review Bartosz Golaszewski 3 participants 3 messages Jan 16, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpiolib: fix line event timestamps for nested irqs

From: Bartosz Golaszewski <[email protected]>

Nested interrupts run inside the calling thread's context and the top half handler is never called which means that we never read the timestamp.

This issue came up when trying to read line events from a gpiochip using regmap_irq_chip for interrupts.

Fix it by reading the timestamp from the irq thread function if it's still 0 by the time the second handler is called.

Fixes d58f2bf261fd ("gpio: Timestamp events in hardirq handler")

---
Hi Sasha,

this is a backport for v4.19.y series. The original patch didn't apply due to a conflict.

 drivers/gpio/gpiolib.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpio/gpiolib.c +9 -1
index a8e01d99919c..b3ab6c428423 100644
@@ -817,7 +817,15 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p)
 	/* Do not leak kernel stack to userspace */
 	memset(&ge, 0, sizeof(ge));
 
-	ge.timestamp = le->timestamp;
+	/*
+	 * We may be running from a nested threaded interrupt in which case
+	 * we didn't get the timestamp from lineevent_irq_handler().
+	 */
+	if (!le->timestamp)
+		ge.timestamp = ktime_get_real_ns();
+	else
+		ge.timestamp = le->timestamp;
+
 	level = gpiod_get_value_cansleep(le->desc);
 
 	if (le->eflags & GPIOEVENT_REQUEST_RISING_EDGE
Signature · 1 line
2.19.1
#1 lore raw
Quoted 12 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Nested interrupts run inside the calling thread's context and the top half handler is never called which means that we never read the timestamp.

This issue came up when trying to read line events from a gpiochip using regmap_irq_chip for interrupts.

Fix it by reading the timestamp from the irq thread function if it's still 0 by the time the second handler is called.

Quoted 8 lines
Fixes d58f2bf261fd ("gpio: Timestamp events in hardirq handler")

---
Hi Sasha,

this is a backport for v4.19.y series. The original patch didn't apply due to a conflict.

What is the git commit id for this patch in Linus's tree?

thanks,

greg k-h

#2 lore raw

śr., 16 sty 2019 o 17:02 Greg KH <[email protected]> napisał(a):

Quoted 20 lines · Bartosz Golaszewski
Quoted 18 lines

From: Bartosz Golaszewski <[email protected]>

Nested interrupts run inside the calling thread's context and the top half handler is never called which means that we never read the timestamp.

This issue came up when trying to read line events from a gpiochip using regmap_irq_chip for interrupts.

Fix it by reading the timestamp from the irq thread function if it's still 0 by the time the second handler is called.

Fixes d58f2bf261fd ("gpio: Timestamp events in hardirq handler")

---
Hi Sasha,

Quoted 5 lines
Quoted 2 lines

this is a backport for v4.19.y series. The original patch didn't apply due to a conflict.

What is the git commit id for this patch in Linus's tree?

I'm not sure if you mean Linus Torvalds or Linus Walleij (through whom my GPIO patches go) but neither has picked this one up yet. I'm not sure why it got processed for stable already, I thought it must go into Linus Torvalds' master branch first.

Anyway, in my GPIO branch its commit id is 8d694dcdbbdcfe4f27a52bcc6f2ce733ba5ec53c and it should get merged into Linus Walleij's tree soon. I have already sent a PR.

Best regards,
Bartosz Golaszewski