From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A4D112CDBE for ; Sat, 5 Sep 2026 00:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788569036; cv=none; b=hOWG63UhilxPnFJhqhEN20jtIjQW5bZ6w50sNjcMZ+sxAomXNZ4Ly2HkoE303vgkioGtinGc4sttAlx4EzxdiyCitX16jOeNhGJ5wjjx2vdbj2HkxUgPux3Dgv7TS+M/FztOlOTwUbiro1qGva87Ir0g6644vkLFcNm5djAWqYA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788569036; c=relaxed/simple; bh=yce5xvY7O+7CZnWZ7p8VAMy6woPEKOXi/tOKiQ7Zpdw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OhMgIcKS0xf8Ybz2KKOXrvF/WXDlbBUusKDFLxGoi2gUF0SpRkENqnIrJsaR3xsmU5TKJnzcNy3muJD/GeTucIM50DjoAJ76YXZ1niIvCLi8xSvogfb4aym8qcEtvWiEmpwzlOHxtvgwoIa58GMYMniREn4gMFAv7WZmBNLrV2A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gui+71bi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gui+71bi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F06B01F00A3F; Sat, 5 Sep 2026 00:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788569034; bh=sO8nIB/KwR6kOV/L6ATBUFC+htalxp/LRbOr3G/stTo=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=gui+71biTd2qi2JzAVA383OnGYK/IYkHa5nnFdNlGOsiLq3IG/zdpf0JZ01ZAborP L7JTjQcFNUkscoibe2+i+SdxGuVOtU24t+Zl/t5HBzA9JG6GdAMDPYOSvuXo9/FScI TNPGhe9DPYzcb4g7VV+4cLr6zu6YMLAdaMQ1rsmLCTWv54QOrcLp2ZhWuG3AzhjB/J EHNzUbdwrUi6tlulRpvYjcbsahndoa4aUygoIgiGZ1PnWuFGD0bKZk0/9Tgaz1QFXy H+a1xkvejEOz7VkoYbzTfRDOpceIuKxa7TCG6uqpCCVa4IUJtxJBXZWnUJ05Cvscr5 uIf8oxRiDmCVA== From: "Rob Herring (Arm)" Date: Fri, 04 Sep 2026 19:43:28 -0500 Subject: [PATCH v2 09/19] accel: ethosu: Reject unsupported commands 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: 7bit Message-Id: <20260904-ethosu-fixes-v2-9-3767738756a4@kernel.org> References: <20260904-ethosu-fixes-v2-0-3767738756a4@kernel.org> In-Reply-To: <20260904-ethosu-fixes-v2-0-3767738756a4@kernel.org> To: Tomeu Vizoso , Oded Gabbay , Frank Li , Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.16-dev The command-stream validator does not model U85 branches, indexed DMA, or OFM transposes. A branch can bypass the linear validation state, indexed DMA accesses an unchecked index buffer, and a transpose changes the feature-map address calculation. Reject those commands and configurations, as well as the reserved DMA stride mode and feature-map formats. Reject command-stream IRQs because they can signal job completion before later commands finish. Fixes: 5a5e9c0228e6 ("accel: Add Arm Ethos-U NPU driver") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Rob Herring (Arm) --- v2: - no changes --- drivers/accel/ethosu/ethosu_device.h | 4 ++++ drivers/accel/ethosu/ethosu_gem.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/drivers/accel/ethosu/ethosu_device.h b/drivers/accel/ethosu/ethosu_device.h index 1eca8590e68d..c330048dbcca 100644 --- a/drivers/accel/ethosu/ethosu_device.h +++ b/drivers/accel/ethosu/ethosu_device.h @@ -86,14 +86,18 @@ struct gen_pool; #define PMU_EV_TYPE_CYCLES 0x11 #define PMU_EV_TYPE_IDLE 0x20 +#define NPU_DMA_REGION_INDEX_MODE BIT(11) + enum ethosu_cmds { NPU_OP_STOP = 0x0, + NPU_OP_IRQ = 0x1, NPU_OP_CONV = 0x2, NPU_OP_DEPTHWISE = 0x3, NPU_OP_POOL = 0x5, NPU_OP_ELEMENTWISE = 0x6, NPU_OP_RESIZE = 0x7, // U85 only NPU_OP_DMA_START = 0x10, + NPU_OP_BRANCH = 0x4100, // U85 only NPU_SET_IFM_PAD_TOP = 0x100, NPU_SET_IFM_PAD_LEFT = 0x101, NPU_SET_IFM_PAD_RIGHT = 0x102, diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c index ec2832eb9a07..c913c95e48ae 100644 --- a/drivers/accel/ethosu/ethosu_gem.c +++ b/drivers/accel/ethosu/ethosu_gem.c @@ -641,6 +641,9 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, cmd_state_set_reg(&st, cmd); switch (cmd) { + case NPU_OP_BRANCH: + case NPU_OP_IRQ: + return -EINVAL; case NPU_OP_STOP: if (i != size / 4 - 1) return -EINVAL; @@ -734,6 +737,8 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, st.ifm.depth = param; break; case NPU_SET_IFM_PRECISION: + if (((param >> 6) & 0x3) > 1) + return -EINVAL; st.ifm.precision = param; break; case NPU_SET_IFM_BROADCAST: @@ -777,6 +782,10 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, st.ofm.depth = param; break; case NPU_SET_OFM_PRECISION: + if (((param >> 6) & 0x3) > 1) + return -EINVAL; + if (!ethosu_is_u65(edev) && (param & GENMASK(13, 11))) + return -EINVAL; st.ofm.precision = param; break; case NPU_SET_OFM_REGION: @@ -811,6 +820,8 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, st.ifm2.broadcast = param; break; case NPU_SET_IFM2_PRECISION: + if (((param >> 6) & 0x3) > 1) + return -EINVAL; st.ifm2.precision = param; break; case NPU_SET_IFM2_REGION: @@ -885,18 +896,26 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, break; case NPU_SET_DMA0_SRC_REGION: + if (param & NPU_DMA_REGION_INDEX_MODE) + return -EINVAL; if (param & 0x100) st.dma.src.region = -1; else st.dma.src.region = param & 0x7; st.dma.src.mode = (param >> 9) & 0x3; + if (st.dma.src.mode == 3) + return -EINVAL; break; case NPU_SET_DMA0_DST_REGION: + if (param & NPU_DMA_REGION_INDEX_MODE) + return -EINVAL; if (param & 0x100) st.dma.dst.region = -1; else st.dma.dst.region = param & 0x7; st.dma.dst.mode = (param >> 9) & 0x3; + if (st.dma.dst.mode == 3) + return -EINVAL; break; case NPU_SET_DMA0_SIZE0: st.dma.size0 = param; -- 2.53.0