From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795186695; b=JYstllr/1UzU5i8z5wroC7cPYsYsQ7C/j0rOdE8SEhoNidn2hy0BMjGfBGQ9Dk0jyy/Y qtQnqtVp+KX52I+fInojyiJhW374ELHvRXD5bHComGUaJS3njI/kjovHL53HmSLTBw4sA +DoCkbDawr18lwhRJg/Ss2xk+jn0E48d8IFKX7LMvOrjfmt7Jb7qpUyKE+J0p8qf2FsBp sgQEHiuxm+TnAcdeQoqjhLRB0pa62w+DlTfUGNtsxv4phidhxiuVFhSKAFcubjB3676sx 2iI2J6r0dNclm+la3/8NZwlqvD+SRJ6qB1LM4pB9D3QFZrBAAmpc23uBsmfvjzNH08A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795186695; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer; bh=WQ37ZlA/FuLt9Ww1LuE5B6cX/Ui66F2frIk0XS03iN8=; b=WoirUt4polMWs8+uslkrDF0WT4i0lP0OADUEPlIK1ES3TJ6ARkr2ctxpO96vAUPQDVOX nbEKdtEldaD2/pfhvJk2OUGuU3R0gi+MRUEuIqfM2md/IeObdt0Jpfqufw53LfloXtUU7 KxHZSIBSqSC1qGODb5wyX7AMCQKcGYLRxL+3Z8JWTZeDYnspiY1RSkJkBWq//WHrP4IMF Z3cUr8jvNc9DaINovNHBoM1T/c9L6V8aSMpJE6SDj2R1rpYjLyVv1/3SHuIES66LGUwfJ tz/q8mSXVkygOOr46TLAthhxX1ny/M4KELy2X9V0S5/08xy2iX3FuiSjylChLSulVzg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cJNqaX8B; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B479606A320 for ; Fri, 20 Nov 2026 14:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cJNqaX8B Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFB8D1F000C4; Fri, 20 Nov 2026 14:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795186694; bh=WQ37ZlA/FuLt9Ww1LuE5B6cX/Ui66F2frIk0XS03iN8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=cJNqaX8BAD93S8HZ2s8vJ5iqf8v0SFdwUDgqf1nbExFdtdszjhXhxrQW3VZKhyvP1 k85mJU41/01R+Br3db1PdMgPuZJQEwWNv6AAaYmjxf2zeSC+JAyU9FqUXnMc4m+L1H UgdxH1aIe+taLH5ICUPtOtQ0297Z+eAk3a78HcnwYlDaFkZHFRlGp86ok5yJSKcOHx 5LYfoaDlztkP/RoAzF69iUAcqBS3QhW/cgKW8vehZs7VFrOpJiOg+Pmz6JnwbXQjW8 gsQ1lP6jjf5r9nULUXsqM3J3BTqNhUKqtTqBcZskbfGCfnOHbWlt0dq2kdo6nndahZ yEDVM9aD688hw== From: "Rob Herring (Arm)" Date: Fri, 20 Nov 2026 08:57:31 -0600 Subject: [PATCH v5 07/19] accel: ethosu: Reject unsupported commands and params X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261120-ethosu-fixes-v5-7-52d459acdb84@kernel.org> References: <20261120-ethosu-fixes-v5-0-52d459acdb84@kernel.org> In-Reply-To: <20261120-ethosu-fixes-v5-0-52d459acdb84@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 any unhandled operation commands or out of range registers, 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 Signed-off-by: Rob Herring (Arm) --- v5: - Handle undefined pooling and elementwise modes v4: - Combine "accel: ethosu: Reject unsupported commands" and "accel: ethosu: Reject reserved command encodings" - Move NPU_CMD_CTRL_CMD1 to "accel: ethosu: Track command stream register setup" - Rework checks for unknown op cmds and reserved bits v2: - no changes --- drivers/accel/ethosu/ethosu_device.h | 4 +++ drivers/accel/ethosu/ethosu_gem.c | 48 +++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/accel/ethosu/ethosu_device.h b/drivers/accel/ethosu/ethosu_device.h index 7fd9c7439691..1ea7638287f0 100644 --- a/drivers/accel/ethosu/ethosu_device.h +++ b/drivers/accel/ethosu/ethosu_device.h @@ -86,6 +86,8 @@ struct gen_pool; #define PMU_EV_TYPE_CYCLES 0x11 #define PMU_EV_TYPE_IDLE 0x20 +#define NPU_DMA_REGION_INDEX_MODE BIT(11) + #define NPU_CMD_CTRL_CMD1 BIT(14) enum ethosu_cmds { @@ -96,6 +98,8 @@ enum ethosu_cmds { NPU_OP_ELEMENTWISE = 0x6, NPU_OP_RESIZE = 0x7, // U85 only NPU_OP_DMA_START = 0x10, + NPU_OP_DMA_WAIT = 0x11, + NPU_OP_KERNEL_WAIT = 0x12, 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 af8a0c45039b..9a66d8439408 100644 --- a/drivers/accel/ethosu/ethosu_gem.c +++ b/drivers/accel/ethosu/ethosu_gem.c @@ -190,6 +190,16 @@ static bool cmd_state_reg_is_set(struct cmd_state *st, u16 cmd) return reg < NPU_CMD0_REGS && test_bit(reg, st->cmd0); } +static bool cmd_is_register(u16 cmd) +{ + u16 reg = cmd & ~NPU_CMD_CTRL_CMD1; + + if (cmd & NPU_CMD_CTRL_CMD1) + return reg < NPU_CMD1_REGS; + + return cmd >= 0x100 && cmd < NPU_CMD0_REGS; +} + static u64 cmd_to_addr(u32 *cmd) { return (((u64)cmd[0] & 0xff0000) << 16) | cmd[1]; @@ -652,6 +662,9 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, cmd_state_set_reg(&st, cmd); switch (cmd) { + case NPU_OP_DMA_WAIT: + case NPU_OP_KERNEL_WAIT: + break; case NPU_OP_STOP: if (i != size / 4 - 1) return -EINVAL; @@ -691,6 +704,8 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, return ret; break; case NPU_OP_POOL: + if (param > (ethosu_is_u65(edev) ? 2 : 7)) + return -EINVAL; use_ifm = param != 0x4; // pooling mode if (!cmd_state_reg_is_set(&st, NPU_SET_OFM_PRECISION)) return -EINVAL; @@ -701,6 +716,19 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, return ret; break; case NPU_OP_ELEMENTWISE: + switch (param) { + case 0 ... 9: + break; + case 10 ... 11: /* lsr, div */ + case 16 ... 19: /* comparisons */ + case 33 ... 36: /* bitwise operations */ + case 42: /* and_not */ + if (ethosu_is_u65(edev)) + return -EINVAL; + break; + default: + return -EINVAL; + } if (!ethosu_is_u65(edev) && !cmd_state_reg_is_set(&st, NPU_SET_IFM_BROADCAST)) return -EINVAL; @@ -745,6 +773,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: @@ -788,6 +818,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: @@ -822,6 +856,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: @@ -896,18 +932,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; @@ -937,7 +981,9 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, st.dma.src.len = st.dma.dst.len = addr; break; default: - break; + if (cmd_is_register(cmd)) + break; + return -EINVAL; } } -- 2.53.0