From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 0E164408022 for ; Mon, 13 Jul 2026 12:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783944694; cv=none; b=Zv6yaveGRrmqLMzU877l2kD2RNOVPY1gDoDQIoQUqatNh4uNlFKRIDSWdOEAuOKKHYaPO47S7kSmgKvs9jhFzvKxK0mUlFZ9W3JTthWvN41DRvDlObeoOSSzVNIDpRSWtD8SzLJ1wx2L/aNTIpJYeWdMCAWe/D8qqWLh0FFaQb4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783944694; c=relaxed/simple; bh=PdPDblUOn/WdFcz0v/ad9NxuPCUExDaGjMo+g3Frs3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=md31BcXxVmUD1ljbkrf1hIBE9eLG3frpK5p4KgBBYcyOLvBr8Uy54b9Kg/V/ExWMfrrV9uUIg2CWmMm54zJ5JaVlGVA2YNRT3EMgi0TT6HTYd/OHBDjWj3K1kTDN7Ol8KwkC9tABw+5X33CbdSX9U42NAfh20tGtZODX68b9fpQ= 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=o2N95+fS; arc=none smtp.client-ip=209.85.216.49 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="o2N95+fS" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-38511175ad3so2410476a91.2 for ; Mon, 13 Jul 2026 05:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783944692; x=1784549492; darn=vger.kernel.org; h=content-transfer-encoding:content-type: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=PKJfzcOO3DPVFtYYdFmzNXMgq4lw0a0uxvJDNfRGA24=; b=o2N95+fSvtnQBbxQmd/l5AZzbWf7C8AD/N8gsbj3hbKkEkrTdE4R7lLPDoFEPfS/wt eH3oI751UNyOPGG5ZAzwjLGCzGqEj6otaKKExQ1mYirWn/+Dc7prPr+C0EIKM9NFE3gZ C6NZAaV8zJxVYXQlfe5gemnYcg0vPwJBU5BQAo8+1D3QqhlgTwhToFVBcAP5sNfftnTf +tRMGSrL4Y9oTGGSAtJ18XigSxqizvAxFiTDXL4hLgOQ0oR7Mr2K1wTX/leILfIaOtRm oddhJ1DuLfIgFnYOhVTx6BZIda7/5C4/PXCy+rXYPL609xzRtoE0aMZlyrUptQ42GnTN ZCRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783944692; x=1784549492; h=content-transfer-encoding:content-type: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=PKJfzcOO3DPVFtYYdFmzNXMgq4lw0a0uxvJDNfRGA24=; b=YLQzxG8gI1fxZ4r/JWspRQeGTNAcYvlV/fZGGpCKn7vsB+BmL7IAV9a4sZNaYKaBy5 7xprxqpC8AmUJbS66lGnQtapsCSzsstClzUVDw3/tSSMih6k7vT1gKos4E6itEPXArC/ hOObsaTDgoYH0b4USRIn46eXZyzsnia/dgy94G09Gb5c62sZYD4IhOp1eXYDOI5snNUh wpPLy40nb0pOXhkJefCsNpszkKB0EWq301KdJ9dek1A19mz1j+YJUo0x8O8zlEVEWQSX EQ4KbOiXsHwY/AQj3Y/gn1TMr5ArpUbpqTuNU6IXTf1paZDuMrvzhy/Wx7rk2VbMhC+5 CpcA== X-Forwarded-Encrypted: i=1; AHgh+RonO5FEvc/SrlxPMG8PgSvy/7OEafINJvR6nvcSmuV4v7AdXlpszWmdmZyJv10IAYnnLEN4qRpSNug6oXA=@vger.kernel.org X-Gm-Message-State: AOJu0YyGWTtm+gyYLCK9khB4iJFzhoHWtn0Z4PXc06rezS2Xa1TTTkE1 EH8SsJ9wCuA/BKNQ3NgcujOIue8yM9moJhJpxSDXOKtaDM5pZX0qSjMX X-Gm-Gg: AfdE7clixZgs/zsHaTHb4rnsTagQofoxJApcMlIqTJ5UJTPT8RQoYHNt7b+HXNVXCJe iZpMxh9rIa1rFOL4XrDoBBUd+yDeqFvwdtJvV3ETUmweviM+nw76MeFeMZXZlGNfOUiBrL4u7xr 8Wq37gZrZgGDKiWGVqaqgYNyR61L0WC2jEp1h8bEKaT81/+rJVLNGAfTSqnLtIBQlogK8l0PU5H 8/2pjSF6+9BeVR3lItCpO+kMU2aWfFa+p4Zkgk10s8LonxOnRIJdzdrBAM9BczCE55GWC7lqabU o5Vn02PsaGJlZzoh3K/60EImXUHBmxUYr+59Sog3944yqHtPKWSGmJ9yndw3IRPy/x5qI6o2+rp UqWFqsQrrh1PbE31u6T+vN63Iy5wI4r9A2rhxh1ig8aRguUkS//7dHMnJDwfz93GHdF9AbE1UaA 62LDYvXvv+Vw== X-Received: by 2002:a17:90b:180c:b0:38e:fbe:b67b with SMTP id 98e67ed59e1d1-38e0fbeb818mr766655a91.0.1783944692422; Mon, 13 Jul 2026 05:11:32 -0700 (PDT) Received: from rockpi-5b ([45.112.0.180]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-311747f7293sm67756935eec.3.2026.07.13.05.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 05:11:31 -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 , Nicolas Dufresne Subject: [PATCH v7 15/19] media: meson: vdec: Fix concurrent firmware loading race and hardware timeout Date: Mon, 13 Jul 2026 17:37:10 +0530 Message-ID: <20260713120840.17427-16-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The vdec_1 firmware loader used static variables for DMA buffer addresses (`mc_addr`, `mc_addr_map`). This made allocations global across sessions, corrupting state when multiple decoders loaded firmware concurrently. Under stress this triggered KASAN reports, lost references, and memory leaks. Making mc_addr and mc_addr_map local to each load call, eliminating cross‑session races. The firmware DMA completion check also relied on a raw decrement loop of 1000 iterations. On modern CPUs this loop completed far too quickly, often before hardware signaled ready, producing false "DMA hang" errors. Replacing the busy‑wait loop with readl_poll_timeout_atomic(), providing a bounded, microsecond scale poll with proper timeout semantics. Cc: Nicolas Dufresne Signed-off-by: Anand Moon --- drivers/staging/media/meson/vdec/vdec_1.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_1.c b/drivers/staging/media/meson/vdec/vdec_1.c index a65cb49594465..27363c9a5af3c 100644 --- a/drivers/staging/media/meson/vdec/vdec_1.c +++ b/drivers/staging/media/meson/vdec/vdec_1.c @@ -29,14 +29,14 @@ vdec_1_load_firmware(struct amvdec_session *sess, const char *fwname) struct amvdec_core *core = sess->core; struct device *dev = core->dev_dec; struct amvdec_codec_ops *codec_ops = sess->fmt_out->codec_ops; - static void *mc_addr; - static dma_addr_t mc_addr_map; + void *mc_addr; + dma_addr_t mc_addr_map; int ret; - u32 i = 1000; + u32 val; ret = request_firmware(&fw, fwname, dev); if (ret < 0) - return -EINVAL; + return ret; if (fw->size < MC_SIZE) { dev_err(dev, "Firmware size %zu is too small. Expected %u.\n", @@ -63,11 +63,11 @@ vdec_1_load_firmware(struct amvdec_session *sess, const char *fwname) amvdec_write_dos(core, IMEM_DMA_COUNT, MC_SIZE / 4); amvdec_write_dos(core, IMEM_DMA_CTRL, (0x8000 | (7 << 16))); - while (--i && amvdec_read_dos(core, IMEM_DMA_CTRL) & 0x8000); - - if (i == 0) { + ret = readl_poll_timeout_atomic(core->dos_base + IMEM_DMA_CTRL, val, + !(val & 0x8000), 10, 10000); + if (ret) { dev_err(dev, "Firmware load fail (DMA hang?)\n"); - ret = -EINVAL; + ret = -ETIMEDOUT; goto free_mc; } -- 2.50.1