From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 00C52400E0C for ; Mon, 13 Jul 2026 12:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783944588; cv=none; b=PHHoMQjHBEh9t84rS3TRglKeZ0omWIk6998MmCDDj3NNj0BmuM0IoB+a1mHX9AJQkGI0UlZlodHbgLYXcIPyHNttdLJExmwNNkYUV0SDZFXyjJTP99Wlpm/Lqg0F0uftM/u+cau1cGi33Lrv69DPmxHW4/BrcKxV1YbqFeAEc4g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783944588; c=relaxed/simple; bh=ny5o3zfT0fuGJoeS4GUfxj8Tt3OekTQ0Vscu+ywukhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IgkEl5raBOTyLBf1N2KVW+OwXtcNA6cDLstGkG78RtTeNfnQG1FBu5uuu5Qf/VylPfWFeZ1ZyYa/M/Fv6Gn6IuocfsJNbhd0qenhBgu+eEX3JTHtiRlZqyyS3joAd1Hc6enWxDpRlrN989AtMXefGsREBVBsx5aB2u8+YYaWvzw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=knK5Y4NG; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="knK5Y4NG" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-38deea72eebso930971a91.1 for ; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783944586; x=1784549386; darn=lists.linux.dev; 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:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=knK5Y4NGisBj+N5fyxD9CDH1fdcNQKTzM41DoTJi8tTOmMUFepXx595AHjYzoEtPeU 6OgiZ/MiMDi+J5gnzPzx+J/kzpSLaCpxMbV0Qag6b2N5MG/Xo6wqYXyOAF9BFT1u7P41 VwtiDgRj8znNc7GE+sN5nvGVrZBF/invSK9t+lSJnGPnhHQVPE3KBArA0JQSLybPYckx nxMHq/wAcx+Ajc5U2AKEDgwTibt9kVH2KAb4HGUCNgdcuaIsmTXmHc6xAx94/s8vT8U3 BcquoMNekYflrOLakAvDxufVWDo+c6vQfw6PmTMRyHFuDcHfqNi3hKqcoPe687Hw3B0U yWlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783944586; x=1784549386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=okFceoyOA1NDpB93F+n0UCfmXU/iGkqn8lSFXIS1onyE9Rl7t4SYXJ+74YExu9Dr2B FvrfYVUgR3Xo/EEWAZYA3ihHndHivz6gNDNdWohg20BTkh4BJvKVODr25fcDy9lgRhL6 WVtVHgBYSsf3fiSc73HV+kXJlMPk1gVRqyokvhpx5Km0j4oSBefWHsdoHesdS+kTexSo JhP7jGOLKQfmTOS/QqnYMEO1NffRdbNNU7CnlhCKRLSIknwd8F/l2VvJ4uJ93QRu0frp f98SPD6IteagzRdvmPDa2YBcKjuFtQNwnkr5+uIYPO1rDkIT3tCaJPDecaftkZLiLaM7 Z5tg== X-Forwarded-Encrypted: i=1; AHgh+Ros7tHkVhOJdUjrB4Ypx+vprQsLvRzSBGzVPw3kgtwpjDSTv0ANU4IQwMNlpV7+xVf2GQKNNkCuvBQGRAU5@lists.linux.dev X-Gm-Message-State: AOJu0Yx2XYqxwGJW92OgQ6aNCFTA0iHpKLQmfDusNRiV2bfKu/R4hk9o 5G+Am2/iq5IydcJMl1eZHoWp8sWRr8+doIv+ZUs8kX6Ddi+ZlaKidVRU X-Gm-Gg: AfdE7ckA15sNhgy0PaX6e+kL1aXlj+z+8HVedindwKjZXLBS+HAn9zkizy6v8aRkGz9 vc4eMBWlaTs20RiusuQ8CZLuiiuuIuUQkyL5R/NrxQJrc/kxhBJm9wIB9CMKNh7zuN9jALUPOYC tyLx3Mothf1EJOCZS8WUa3w5Ij2SjsvJ4bEVqpfUmkiASngPlZYr6jf4lLNccRYv+ol338o4642 mvJQLe3mDqdK+MG5zj5thQiqxuOKdGRnG66y+LrnfJxZtMhzG8HeJrroaxkTev9Kc5ZStcZJUIP Vcv1yHa7BPnINArH+TumT4ldHNEEIE82kcvSSi/uHZsb4b/ZNEajmXu00qZwQyoeumtgpwVvKCl U6C/wJXzJagkljKyPKGpOX7YkA/vASDeYsk6LzVLQhxuHIObp59r6oPu58dwkZX9AvQbcdY1Ur3 y+8VrfHFwOFkTIh52GlmJu X-Received: by 2002:a17:90b:4ac1:b0:38d:e0c4:c955 with SMTP id 98e67ed59e1d1-38de0c4ca49mr5634290a91.15.1783944586225; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) Received: from rockpi-5b ([45.112.0.180]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-311747f7293sm67756935eec.3.2026.07.13.05.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 05:09:45 -0700 (PDT) From: Anand Moon To: Neil Armstrong , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Mauro Carvalho Chehab , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-amlogic@lists.infradead.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS), linux-staging@lists.linux.dev (open list:STAGING SUBSYSTEM) Cc: Anand Moon , Doruk Tan Ozturk , Sashiko Subject: [PATCH v7 05/19] media: meson: vdec: Fix race condition and synchronize esparser IRQ Date: Mon, 13 Jul 2026 17:37:00 +0530 Message-ID: <20260713120840.17427-6-linux.amoon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260713120840.17427-1-linux.amoon@gmail.com> References: <20260713120840.17427-1-linux.amoon@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit During session teardown sequences in vdec_stop_streaming() and vdec_close(), the 'esparser' hardware interrupt handler can still be actively triggered or executing on another CPU core. This creates a transient race condition where the ISR attempts to handle stream data and allocate internal tracking state structures after session contexts have been modified or freed. Update esparser_isr() to read the current session context utilizing an smp_load_acquire() barrier snapshot. If the pointer resolves to NULL, terminate processing early with IRQ_HANDLED to protect against concurrent dismantling. Suggested-by: Doruk Tan Ozturk Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260521090944.F35401F00A3D@smtp.kernel.org/ Signed-off-by: Anand Moon --- drivers/staging/media/meson/vdec/esparser.c | 8 ++++++++ drivers/staging/media/meson/vdec/vdec.c | 4 ++++ drivers/staging/media/meson/vdec/vdec.h | 2 ++ 3 files changed, 14 insertions(+) diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c index 4632346f04a9e..37749ede308c6 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -60,6 +60,12 @@ static irqreturn_t esparser_isr(int irq, void *dev) { int int_status; struct amvdec_core *core = dev; + struct amvdec_session *sess; + + /* Secure an atomic snapshot to protect against concurrent teardown */ + sess = smp_load_acquire(&core->cur_sess); + if (!sess) + return IRQ_HANDLED; int_status = amvdec_read_parser(core, PARSER_INT_STATUS); amvdec_write_parser(core, PARSER_INT_STATUS, int_status); @@ -439,6 +445,8 @@ int esparser_init(struct platform_device *pdev, struct amvdec_core *core) if (irq < 0) return irq; + core->esparser_irq = irq; + ret = devm_request_irq(dev, irq, esparser_isr, IRQF_SHARED, "esparserirq", core); if (ret) { diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 7ae3d5a9dd6ab..7689ffdb2e500 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -486,6 +486,8 @@ static void vdec_stop_streaming(struct vb2_queue *q) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); vdec_poweroff(sess); vdec_free_canvas(sess); @@ -994,6 +996,8 @@ static int vdec_close(struct file *file) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); if (!IS_ERR_OR_NULL(sess->recycle_thread)) { kthread_stop(sess->recycle_thread); diff --git a/drivers/staging/media/meson/vdec/vdec.h b/drivers/staging/media/meson/vdec/vdec.h index d165c343fd022..c4639cf33e73e 100644 --- a/drivers/staging/media/meson/vdec/vdec.h +++ b/drivers/staging/media/meson/vdec/vdec.h @@ -68,6 +68,7 @@ struct amvdec_session; * @cur_sess: current decoding session * @lock: video device lock * @vdec_irq: irq for video decoding + * @esparser_irq: irq for elementary stream parsing */ struct amvdec_core { void __iomem *dos_base; @@ -95,6 +96,7 @@ struct amvdec_core { struct amvdec_session *cur_sess; struct mutex lock; int vdec_irq; + int esparser_irq; }; /** -- 2.50.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AB261C43458 for ; Mon, 13 Jul 2026 12:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:To:From:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=nUBgZCKM+htApC XZkMpHCFyW24S+OJfiVQ2s39odpMa0EfMppTccZu8wcbi+Y1GKEwLSNVF47JBxi+QAJa4+CRBNAeZ 05+NmzgqdNZgzsEo64ncYi0Qp5iv/MC5qeEBNEgRqTXuygPGzuHAm41W0ekV/SS9KGNGXXFzwx4Gh YxMuT0BecVwQqh/A/0FoWMUagvp835GMl+pH1m/w3URc82SwAHhTON3RpgJfsGIFXgQLOdCPfKn0u bGtelY18Vt2XXoZlCD6AA7eQSbAruIjHIRlTCgGqIh7RkxHUyW9kiSV2V5G22NlSEIooxiPoWFxIw 9dQ6wZ8gv9bzqu6vvmDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjFTr-000000098N9-19Qe; Mon, 13 Jul 2026 12:09:51 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjFTn-000000098Kg-0lP5 for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2026 12:09:49 +0000 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-381018b9375so3449447a91.0 for ; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783944586; x=1784549386; darn=lists.infradead.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:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=PcMstQAoQMFrOVg6idDXxm20aYk7FiQZNByC5zsK6xXm/NdbJ/TRwPD3psqjTVhx7t htiwlbak7NdQ+x7WPvVkewvMC2NPZtVOQigAfEaaTTkM8Npnf5y8qq198T0HdWE8B/OL LMlhvkc190TwT2a7oi2QRyIgNm9pCQKZ+irN9zrxFGqjm9rbI0UzfmYQwvtJnsT7Go96 JCpQyXVw+NYV1fKobIxG2Sb/UB6oVzmOSsnLTXdabyYCWl0TuRqRIEupqE46HaN6McEJ Z7ie1FDg3AOU+AwfeGfXXpqlk+L4cNYzTabQ+qYav/9PQyo71j6+pPz1JQiiM/UmtYka SU6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783944586; x=1784549386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=IE6y+ktfwwU7H+rix+as2JvgetiOtImxalR/pJd3aYRAvYx0Z5gP828Vjmg+PsOsC1 LrVtFWRAQez+DQlJU7qNQmVslo5iRhhaRTLDZpryeUsbDMdQs/e4KNcHsJYE6JQzQzXi 6NGzFl90kNaw0jL7yeJ1jN73pl3+oToqUC+7k4aUT8WD5fmB/C+vBIyJfHFRH6N+g37X 55yOhaNi3GRtQNPi0Y+oOqpbqzh/VvtYkAbmFvesku52oYUfPho7/M5UA9LdmvAWOtVt 5g4GTMWVZPcfyxIJiRCyTN8l7iPlCtwLMN4IfUW68YIVwG2o1hiYWQS5bE/fwd6Avbco vSQA== X-Forwarded-Encrypted: i=1; AHgh+RoYVRE1GiltRV5HpkwveZ8PfcuojDtTlLYeAZeFTsxBwmzxwmjShhS/VwUpvO+WPgcghOCiawE3PxsV5wIoCSc/@lists.infradead.org X-Gm-Message-State: AOJu0YwZaH4mpseR2k7do4e1uYWJNWGmPcW73hdQ7G4KbVaXdhiUjhTW YFdgmJO4apw7QSXiAFD03y5Uz+iXg3yF1kaiXFcBH0XDd9532svZpZWe X-Gm-Gg: AfdE7ck6gnb05wU9lM1I/QnvmPOp7x//9gdf0QytzBmqAjZV+p2EEx+9KZFYg12pcPw fZRRFNnpB+DX3WOugZC+fuGZSRnd06absXZSibtvC1n1zSoqxNn++7LYKRMYyvOJnNLf3pJBMlm 1EuLVEyBA/VEkGgQeBYXt4hOr5EeKmwARngS20wOHEBOsHpTFxrDjbgy3o8V3jgJJc/EHQTaeMG HasXPFdfSFMe40DTQ9dDklAUEH29+vEyR6I5qXOfdkXYPpQrR/LbL7hwDFqwMXHvAT4Hm04UQH8 1FvWJNgPa7+7dLS9TWAVy6HgAw68C6rK/Z6eNLR0uwahpIvB6WEUS0j2Q+UoRgMwU5F44SgNvlq 2TjsWwOfqQodXl2/xjhLuPsexbiR4x4hjNBOb0FJcFfY/A4twkPSU9roS6y3KJ4zn1EC/CKbJ79 cmG3dUK8XHJF2zhxlb3grW X-Received: by 2002:a17:90b:4ac1:b0:38d:e0c4:c955 with SMTP id 98e67ed59e1d1-38de0c4ca49mr5634290a91.15.1783944586225; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) Received: from rockpi-5b ([45.112.0.180]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-311747f7293sm67756935eec.3.2026.07.13.05.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 05:09:45 -0700 (PDT) From: Anand Moon To: Neil Armstrong , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Mauro Carvalho Chehab , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-amlogic@lists.infradead.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS), linux-staging@lists.linux.dev (open list:STAGING SUBSYSTEM) Subject: [PATCH v7 05/19] media: meson: vdec: Fix race condition and synchronize esparser IRQ Date: Mon, 13 Jul 2026 17:37:00 +0530 Message-ID: <20260713120840.17427-6-linux.amoon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260713120840.17427-1-linux.amoon@gmail.com> References: <20260713120840.17427-1-linux.amoon@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260713_050948_366232_8BC08F3F X-CRM114-Status: GOOD ( 17.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Doruk Tan Ozturk , Sashiko Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org During session teardown sequences in vdec_stop_streaming() and vdec_close(), the 'esparser' hardware interrupt handler can still be actively triggered or executing on another CPU core. This creates a transient race condition where the ISR attempts to handle stream data and allocate internal tracking state structures after session contexts have been modified or freed. Update esparser_isr() to read the current session context utilizing an smp_load_acquire() barrier snapshot. If the pointer resolves to NULL, terminate processing early with IRQ_HANDLED to protect against concurrent dismantling. Suggested-by: Doruk Tan Ozturk Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260521090944.F35401F00A3D@smtp.kernel.org/ Signed-off-by: Anand Moon --- drivers/staging/media/meson/vdec/esparser.c | 8 ++++++++ drivers/staging/media/meson/vdec/vdec.c | 4 ++++ drivers/staging/media/meson/vdec/vdec.h | 2 ++ 3 files changed, 14 insertions(+) diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c index 4632346f04a9e..37749ede308c6 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -60,6 +60,12 @@ static irqreturn_t esparser_isr(int irq, void *dev) { int int_status; struct amvdec_core *core = dev; + struct amvdec_session *sess; + + /* Secure an atomic snapshot to protect against concurrent teardown */ + sess = smp_load_acquire(&core->cur_sess); + if (!sess) + return IRQ_HANDLED; int_status = amvdec_read_parser(core, PARSER_INT_STATUS); amvdec_write_parser(core, PARSER_INT_STATUS, int_status); @@ -439,6 +445,8 @@ int esparser_init(struct platform_device *pdev, struct amvdec_core *core) if (irq < 0) return irq; + core->esparser_irq = irq; + ret = devm_request_irq(dev, irq, esparser_isr, IRQF_SHARED, "esparserirq", core); if (ret) { diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 7ae3d5a9dd6ab..7689ffdb2e500 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -486,6 +486,8 @@ static void vdec_stop_streaming(struct vb2_queue *q) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); vdec_poweroff(sess); vdec_free_canvas(sess); @@ -994,6 +996,8 @@ static int vdec_close(struct file *file) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); if (!IS_ERR_OR_NULL(sess->recycle_thread)) { kthread_stop(sess->recycle_thread); diff --git a/drivers/staging/media/meson/vdec/vdec.h b/drivers/staging/media/meson/vdec/vdec.h index d165c343fd022..c4639cf33e73e 100644 --- a/drivers/staging/media/meson/vdec/vdec.h +++ b/drivers/staging/media/meson/vdec/vdec.h @@ -68,6 +68,7 @@ struct amvdec_session; * @cur_sess: current decoding session * @lock: video device lock * @vdec_irq: irq for video decoding + * @esparser_irq: irq for elementary stream parsing */ struct amvdec_core { void __iomem *dos_base; @@ -95,6 +96,7 @@ struct amvdec_core { struct amvdec_session *cur_sess; struct mutex lock; int vdec_irq; + int esparser_irq; }; /** -- 2.50.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5015CC43458 for ; Mon, 13 Jul 2026 12:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V2Wm//zZewKGdNQiVuqmpNX02KhXqjHRZxoqbnJxGr8=; b=L7KpOvCkX2fYTk XA1bp+f35idjtBI2x4duIdt6ufrqPO9C9DEHBpWFjm9UylceiT7Y3gwWorYEQ/pEjmQaZbpeZuaiI XPPmhw7uDztmIkiGR4Rlfx1bGEodu/v2LcnX+dkc55hDMarLR1Kfz72ZmpzyA+CSLt/a5xsO7PVtM CbF13jKx3sjV6oO9FJvdESQ+42fBJDDIeQBTnP013hFG6VnCpJQMeqrAPUG9pBlv/XuhA7YA/pNdI RbeJDGOVrPnKCT05tFp2wtLiimJ7YeF8m1iH98KegJC5+yeshxoYtLD4R3oEiYzF8CzFFfcRboIZX 7cnSrUj3OmwVbLg9atGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjFTs-000000098Nj-1VpT; Mon, 13 Jul 2026 12:09:52 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjFTn-000000098Ki-0l09 for linux-amlogic@lists.infradead.org; Mon, 13 Jul 2026 12:09:50 +0000 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-3847e8b0f3aso2505472a91.3 for ; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783944586; x=1784549386; darn=lists.infradead.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:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=PcMstQAoQMFrOVg6idDXxm20aYk7FiQZNByC5zsK6xXm/NdbJ/TRwPD3psqjTVhx7t htiwlbak7NdQ+x7WPvVkewvMC2NPZtVOQigAfEaaTTkM8Npnf5y8qq198T0HdWE8B/OL LMlhvkc190TwT2a7oi2QRyIgNm9pCQKZ+irN9zrxFGqjm9rbI0UzfmYQwvtJnsT7Go96 JCpQyXVw+NYV1fKobIxG2Sb/UB6oVzmOSsnLTXdabyYCWl0TuRqRIEupqE46HaN6McEJ Z7ie1FDg3AOU+AwfeGfXXpqlk+L4cNYzTabQ+qYav/9PQyo71j6+pPz1JQiiM/UmtYka SU6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783944586; x=1784549386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Krigkeb0EY7ngMYX+Y7ADjdq0pOv6Fpp5Q1fhmmedpo=; b=AQJ1PbA5tQbDLebBRk4wugVBA1YpxrQuk5kOmWak2EPJ1qPdKcYMMG6jwwqoPJjJc7 TMYKfyGFzQ+ieIJhSkG0JmWtEvUq7hGUksSoUqAsAR7pkpqnaA8xCGQEXG6ieHTzOSM5 sGqBO/Z00zn1jzlCX33bzIA/5bbthwYgmh4uxPqGyjSX+7jIH3pBtKjX9v9GUGoQaDX3 WHxuQqa5yytEB+Tl5OhRipyBfX0mYa1UA95kVn0MhNo8QflxHjRIhsGz0yzVdOD8RPqK jro6Us+rC0uJdk/MookGfD+ejuIxKyZ+bjczRQ7aki8uPfZGNSEKXzeWSigZkmz4Z4Eg h98g== X-Forwarded-Encrypted: i=1; AHgh+RoW1dFEYwynLQPfQ+AYDIDPqJQZoi/FnpwM0hvSQ7ynmTxl7UDaZIKFyA9+TN6Q3WB0J8koHyyyYzFe6gAI@lists.infradead.org X-Gm-Message-State: AOJu0Yzd0Y1CJ+yiPq43bwi88AqB/U7lycSoF0pcnn42kwpPFlFU8FOS 83mnY1ulkvYseb0ZqstpUexsSCPtfNuW4spNcxcDzyp2jdf5+NU2K/oN X-Gm-Gg: AfdE7clz80yxUc1Ebbcsvvsq9VvlHQCSAUPMtsbTwZPB3T+TymS0x7LKFERnxj+hYxQ +z9tWcbINdGrOMsWoXN/N1Lg1dNEcsfv1B+Xs/T8EY6lGZWNgRn1GnQFdVkny9EJIGED3+ih3wx qbIBR1pzmLfl3mmkbqlDIKiCBsODfNcHmx9ygt7un2r4YZjm4SQr8Rk+yJ63nf6ejK096YhAN99 heohFHwEQ1cqtJh9DSqVKRsya9mHH2EmyugkWbdZFE1ThGK2YfylxBoTI+p/JSFnWOiZIjotNHh fd2VrwsZ4p+ClqEPrSPg7HM5Qh8RCWFGjN3ChnF/Chl9zyqVCIoHreuVDLXNzV5rI+d8Dicxrv2 /E/Wk3lgWXlxoojmGvvVOOkEWeeoPF1fgS0QZOBx5Afz37menl1mM/1xkolaK3nt9iCOENUYSih tYjzGkQANC7xUGCkipvMA6 X-Received: by 2002:a17:90b:4ac1:b0:38d:e0c4:c955 with SMTP id 98e67ed59e1d1-38de0c4ca49mr5634290a91.15.1783944586225; Mon, 13 Jul 2026 05:09:46 -0700 (PDT) Received: from rockpi-5b ([45.112.0.180]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-311747f7293sm67756935eec.3.2026.07.13.05.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 05:09:45 -0700 (PDT) From: Anand Moon To: Neil Armstrong , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Mauro Carvalho Chehab , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-amlogic@lists.infradead.org (open list:DRM DRIVERS FOR AMLOGIC SOCS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Amlogic Meson SoC support), linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS), linux-staging@lists.linux.dev (open list:STAGING SUBSYSTEM) Subject: [PATCH v7 05/19] media: meson: vdec: Fix race condition and synchronize esparser IRQ Date: Mon, 13 Jul 2026 17:37:00 +0530 Message-ID: <20260713120840.17427-6-linux.amoon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260713120840.17427-1-linux.amoon@gmail.com> References: <20260713120840.17427-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260713_050948_368991_616614F7 X-CRM114-Status: GOOD ( 16.34 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Doruk Tan Ozturk , Sashiko Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org During session teardown sequences in vdec_stop_streaming() and vdec_close(), the 'esparser' hardware interrupt handler can still be actively triggered or executing on another CPU core. This creates a transient race condition where the ISR attempts to handle stream data and allocate internal tracking state structures after session contexts have been modified or freed. Update esparser_isr() to read the current session context utilizing an smp_load_acquire() barrier snapshot. If the pointer resolves to NULL, terminate processing early with IRQ_HANDLED to protect against concurrent dismantling. Suggested-by: Doruk Tan Ozturk Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260521090944.F35401F00A3D@smtp.kernel.org/ Signed-off-by: Anand Moon --- drivers/staging/media/meson/vdec/esparser.c | 8 ++++++++ drivers/staging/media/meson/vdec/vdec.c | 4 ++++ drivers/staging/media/meson/vdec/vdec.h | 2 ++ 3 files changed, 14 insertions(+) diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c index 4632346f04a9e..37749ede308c6 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -60,6 +60,12 @@ static irqreturn_t esparser_isr(int irq, void *dev) { int int_status; struct amvdec_core *core = dev; + struct amvdec_session *sess; + + /* Secure an atomic snapshot to protect against concurrent teardown */ + sess = smp_load_acquire(&core->cur_sess); + if (!sess) + return IRQ_HANDLED; int_status = amvdec_read_parser(core, PARSER_INT_STATUS); amvdec_write_parser(core, PARSER_INT_STATUS, int_status); @@ -439,6 +445,8 @@ int esparser_init(struct platform_device *pdev, struct amvdec_core *core) if (irq < 0) return irq; + core->esparser_irq = irq; + ret = devm_request_irq(dev, irq, esparser_isr, IRQF_SHARED, "esparserirq", core); if (ret) { diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 7ae3d5a9dd6ab..7689ffdb2e500 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -486,6 +486,8 @@ static void vdec_stop_streaming(struct vb2_queue *q) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); vdec_poweroff(sess); vdec_free_canvas(sess); @@ -994,6 +996,8 @@ static int vdec_close(struct file *file) /* Synchronize and flush pending hardware interrupt service routines */ synchronize_irq(core->vdec_irq); + /* Ensure esparser ISR finishes executing */ + synchronize_irq(core->esparser_irq); if (!IS_ERR_OR_NULL(sess->recycle_thread)) { kthread_stop(sess->recycle_thread); diff --git a/drivers/staging/media/meson/vdec/vdec.h b/drivers/staging/media/meson/vdec/vdec.h index d165c343fd022..c4639cf33e73e 100644 --- a/drivers/staging/media/meson/vdec/vdec.h +++ b/drivers/staging/media/meson/vdec/vdec.h @@ -68,6 +68,7 @@ struct amvdec_session; * @cur_sess: current decoding session * @lock: video device lock * @vdec_irq: irq for video decoding + * @esparser_irq: irq for elementary stream parsing */ struct amvdec_core { void __iomem *dos_base; @@ -95,6 +96,7 @@ struct amvdec_core { struct amvdec_session *cur_sess; struct mutex lock; int vdec_irq; + int esparser_irq; }; /** -- 2.50.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic