* [PATCH 0/2] media: verisilicon: Fix VDPU2 decoder error handling
@ 2026-11-19 6:20 Arun Iyengar via B4 Relay
2026-11-19 6:20 ` [PATCH 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay
2026-11-19 6:20 ` [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error Arun Iyengar via B4 Relay
0 siblings, 2 replies; 4+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 6:20 UTC (permalink / raw)
To: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel,
Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman,
Boris Brezillon, Hans Verkuil
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Arun Iyengar, stable
The VDPU2 decoder reports failed decodes as done and is not reset
after an error, so it can keep accessing freed buffers.
Tested on an Orange Pi 5 (RK3588S), KASAN v7.3 based kernel: 72 H.264
fluster runs, no IOMMU faults or stalls; with patch 1 alone, an earlier
run faulted. The VP8 test vectors pass (61/61). Two H.264 vectors
(FI1_Sony_E, MR8_BT_B) fail in 1 to 4 of 249 runs each, with patch 1
alone as with both. Build-tested on media next. MPEG-2, RK3399 and
RK3568 untested.
Independent of "Recover the Rockchip VPUs from faults and timeouts"
v3 [1]; the two only conflict in one #include line.
Developed with Claude (Anthropic), which wrote the code and the commit
messages. I reviewed every change.
[1] https://lore.kernel.org/r/20261113-hantro-robust-v3-0-82383c722ad2@gmail.com
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
Arun Iyengar (2):
media: verisilicon: Don't report VDPU2 decoder errors as success
media: verisilicon: Reset the VDPU2 decoder after an error
.../media/platform/verisilicon/rockchip_vpu_hw.c | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
---
base-commit: aa0f4c41d4870a18e65772a1817af16427200371
change-id: 20261115-vdpu2-errreset-8688700393a3
Best regards,
--
Arun Iyengar <aiyengar1990@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success 2026-11-19 6:20 [PATCH 0/2] media: verisilicon: Fix VDPU2 decoder error handling Arun Iyengar via B4 Relay @ 2026-11-19 6:20 ` Arun Iyengar via B4 Relay 2026-11-19 6:20 ` [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error Arun Iyengar via B4 Relay 1 sibling, 0 replies; 4+ messages in thread From: Arun Iyengar via B4 Relay @ 2026-11-19 6:20 UTC (permalink / raw) To: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman, Boris Brezillon, Hans Verkuil Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel, Arun Iyengar, stable From: Arun Iyengar <aiyengar1990@gmail.com> The VDPU2 interrupt handler completes the job as done whenever the decoder raised an interrupt. DEC_IRQ is set for every interrupt, including timeouts, bus errors and stream errors, so failed decodes are returned to userspace as valid frames. Check the picture ready bit instead, as the G1 handler does. Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399") Cc: stable@vger.kernel.org Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com> --- drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c index 02673be9878e..4bc1bdb41c70 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c @@ -391,7 +391,7 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id) u32 status; status = vdpu_read(vpu, VDPU_REG_INTERRUPT); - state = (status & VDPU_REG_INTERRUPT_DEC_IRQ) ? + state = (status & VDPU_REG_INTERRUPT_DEC_RDY_INT) ? VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR; vdpu_write(vpu, 0, VDPU_REG_INTERRUPT); -- 2.55.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error 2026-11-19 6:20 [PATCH 0/2] media: verisilicon: Fix VDPU2 decoder error handling Arun Iyengar via B4 Relay 2026-11-19 6:20 ` [PATCH 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay @ 2026-11-19 6:20 ` Arun Iyengar via B4 Relay 2026-11-19 15:29 ` Nicolas Dufresne 1 sibling, 1 reply; 4+ messages in thread From: Arun Iyengar via B4 Relay @ 2026-11-19 6:20 UTC (permalink / raw) To: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman, Boris Brezillon, Hans Verkuil Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel, Arun Iyengar, stable From: Arun Iyengar <aiyengar1990@gmail.com> After a stream or bus error the decoder can still access the buffers of the failed picture. On RK3588 these accesses hit buffers userspace had already freed: IOMMU page faults, an IOMMU that can no longer stall and corrupted output for the next job. Soft-reset the decoder on every error interrupt, as the vendor driver does, and wait for the reset to complete. Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399") Cc: stable@vger.kernel.org Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com> --- .../media/platform/verisilicon/rockchip_vpu_hw.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c index 4bc1bdb41c70..01cd449f3ab2 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c @@ -7,6 +7,7 @@ */ #include <linux/clk.h> +#include <linux/iopoll.h> #include "hantro.h" #include "hantro_jpeg.h" @@ -384,6 +385,21 @@ static irqreturn_t rockchip_vpu1_vepu_irq(int irq, void *dev_id) return IRQ_HANDLED; } +/* + * After an error the decoder can still have bus accesses of the failed + * picture in flight; reset it before its buffers go back to userspace. + */ +static void rockchip_vpu2_dec_soft_reset(struct hantro_dev *vpu) +{ + u32 val; + + vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS); + vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET); + if (read_poll_timeout_atomic(vdpu_read, val, !val, 0, 5, false, vpu, + VDPU_REG_SOFT_RESET)) + dev_warn_ratelimited(vpu->dev, "decoder soft reset timed out\n"); +} + static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id) { struct hantro_dev *vpu = dev_id; @@ -396,6 +412,8 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id) vdpu_write(vpu, 0, VDPU_REG_INTERRUPT); vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL); + if (state != VB2_BUF_STATE_DONE) + rockchip_vpu2_dec_soft_reset(vpu); hantro_irq_done(vpu, state); @@ -482,8 +500,7 @@ static void rockchip_vpu2_dec_reset(struct hantro_ctx *ctx) struct hantro_dev *vpu = ctx->dev; vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT); - vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS); - vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET); + rockchip_vpu2_dec_soft_reset(vpu); } static void rockchip_vpu2_enc_reset(struct hantro_ctx *ctx) -- 2.55.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error 2026-11-19 6:20 ` [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error Arun Iyengar via B4 Relay @ 2026-11-19 15:29 ` Nicolas Dufresne 0 siblings, 0 replies; 4+ messages in thread From: Nicolas Dufresne @ 2026-11-19 15:29 UTC (permalink / raw) To: aiyengar1990, Benjamin Gaignard, Philipp Zabel, Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman, Boris Brezillon, Hans Verkuil Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel, stable [-- Attachment #1: Type: text/plain, Size: 3187 bytes --] Le jeudi 19 novembre 2026 à 06:20 +0000, Arun Iyengar via B4 Relay a écrit : > From: Arun Iyengar <aiyengar1990@gmail.com> > > After a stream or bus error the decoder can still access the buffers of > the failed picture. On RK3588 these accesses hit buffers userspace had > already freed: IOMMU page faults, an IOMMU that can no longer stall and > corrupted output for the next job. > > Soft-reset the decoder on every error interrupt, as the vendor driver > does, and wait for the reset to complete. Its not because the vendor use a big hammer that we should use it upstream. We fixed a lot of these driver bugs by handling specific error correctly. When the TRM says the IP will self reset, it does, and you should not add extra overhead there unless you can prove something is broken. Please check G2 IRQ handler, its more aligned to were we want to bring all the IRQ handlers in this driver. Nicolas > > Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399") > Cc: stable@vger.kernel.org > Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com> > --- > .../media/platform/verisilicon/rockchip_vpu_hw.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c > index 4bc1bdb41c70..01cd449f3ab2 100644 > --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c > +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c > @@ -7,6 +7,7 @@ > */ > > #include <linux/clk.h> > +#include <linux/iopoll.h> > > #include "hantro.h" > #include "hantro_jpeg.h" > @@ -384,6 +385,21 @@ static irqreturn_t rockchip_vpu1_vepu_irq(int irq, void *dev_id) > return IRQ_HANDLED; > } > > +/* > + * After an error the decoder can still have bus accesses of the failed > + * picture in flight; reset it before its buffers go back to userspace. > + */ > +static void rockchip_vpu2_dec_soft_reset(struct hantro_dev *vpu) > +{ > + u32 val; > + > + vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS); > + vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET); > + if (read_poll_timeout_atomic(vdpu_read, val, !val, 0, 5, false, vpu, > + VDPU_REG_SOFT_RESET)) > + dev_warn_ratelimited(vpu->dev, "decoder soft reset timed out\n"); > +} > + > static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id) > { > struct hantro_dev *vpu = dev_id; > @@ -396,6 +412,8 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id) > > vdpu_write(vpu, 0, VDPU_REG_INTERRUPT); > vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL); > + if (state != VB2_BUF_STATE_DONE) > + rockchip_vpu2_dec_soft_reset(vpu); > > hantro_irq_done(vpu, state); > > @@ -482,8 +500,7 @@ static void rockchip_vpu2_dec_reset(struct hantro_ctx *ctx) > struct hantro_dev *vpu = ctx->dev; > > vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT); > - vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS); > - vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET); > + rockchip_vpu2_dec_soft_reset(vpu); > } > > static void rockchip_vpu2_enc_reset(struct hantro_ctx *ctx) [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-19 15:29 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2026-11-19 6:20 [PATCH 0/2] media: verisilicon: Fix VDPU2 decoder error handling Arun Iyengar via B4 Relay 2026-11-19 6:20 ` [PATCH 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay 2026-11-19 6:20 ` [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error Arun Iyengar via B4 Relay 2026-11-19 15:29 ` Nicolas Dufresne
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®