mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wei Huang <wei.huang2@amd.com>
To: <dmaengine@vger.kernel.org>
Cc: <vkoul@kernel.org>, <Frank.Li@kernel.org>, <shuah@kernel.org>,
	<nathan.lynch@amd.com>, <wei.huang2@amd.com>,
	<mario.limonciello@amd.com>, <Stephen.Bates@amd.com>,
	<tycho@kernel.org>, <suravee.suthikulpanit@amd.com>,
	<rientjes@google.com>, <John.Kariuki@amd.com>, <jic23@kernel.org>,
	<weixugc@google.com>, <bhelgaas@google.com>,
	<Shyam.Iyer@dell.com>, <linux-kernel@vger.kernel.org>,
	<linux-kselftest@vger.kernel.org>, <linux-pci@vger.kernel.org>
Subject: [PATCH v1 20/44] dmaengine: sdxi: implement RKey management ioctls
Date: Thu, 19 Nov 2026 14:22:56 -0600	[thread overview]
Message-ID: <20261119202321.1734355-21-wei.huang2@amd.com> (raw)
In-Reply-To: <20261119202321.1734355-1-wei.huang2@amd.com>

Implement admin-only RKey bitmap, read, and write operations over
the shared key-table ABI. Validate complete batches before modifying
memory, publish valid bits last, and issue RKey update plus sync
before reporting commit state.

Signed-off-by: Wei Huang <wei.huang2@amd.com>
---
 drivers/dma/sdxi/ioctl.c |   8 +-
 drivers/dma/sdxi/keys.c  | 270 +++++++++++++++++++++++++++++++++++++++
 drivers/dma/sdxi/keys.h  |   6 +
 3 files changed, 281 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/sdxi/ioctl.c b/drivers/dma/sdxi/ioctl.c
index 682b0b074f38..4f4b900d2542 100644
--- a/drivers/dma/sdxi/ioctl.c
+++ b/drivers/dma/sdxi/ioctl.c
@@ -31,6 +31,7 @@
 #include "context.h"
 #include "intr.h"
 #include "ioctl.h"
+#include "keys.h"
 #include "mmio.h"
 #include "process.h"
 #include "sdxi.h"
@@ -95,6 +96,7 @@ static int sdxi_ioctl_get_uapi_info(struct file *file, struct sdxi_file *sf,
 		.caps = {
 			SDXI_UAPI_CAP_DEV_INFO |
 			SDXI_UAPI_CAP_DEV_ATTR_MGMT |
+			SDXI_UAPI_CAP_RKEY_MGMT |
 			SDXI_UAPI_CAP_CXT_CREATE |
 			SDXI_UAPI_CAP_CXT_EVENTFD,
 		},
@@ -569,11 +571,11 @@ static const struct sdxi_ioctl_desc sdxi_ioctls[] = {
 		       SDXI_IOCTL_A_PUBLIC_DEVICE),
 	SDXI_IOCTL_DEF(0x04, SDXI_SET_DEV_ATTR, sdxi_ioctl_set_dev_attr,
 		       SDXI_IOCTL_F_DEVICE, SDXI_IOCTL_A_ADMIN_DEVICE),
-	SDXI_IOCTL_DEF(0x05, SDXI_GET_RKEY_LIST, sdxi_ioctl_unsupported,
+	SDXI_IOCTL_DEF(0x05, SDXI_GET_RKEY_LIST, sdxi_ioctl_get_rkey_list,
 		       SDXI_IOCTL_F_DEVICE, SDXI_IOCTL_A_ADMIN_DEVICE),
-	SDXI_IOCTL_DEF(0x06, SDXI_GET_RKEYS, sdxi_ioctl_unsupported,
+	SDXI_IOCTL_DEF(0x06, SDXI_GET_RKEYS, sdxi_ioctl_get_rkeys,
 		       SDXI_IOCTL_F_DEVICE, SDXI_IOCTL_A_ADMIN_DEVICE),
-	SDXI_IOCTL_DEF(0x07, SDXI_SET_RKEYS, sdxi_ioctl_unsupported,
+	SDXI_IOCTL_DEF(0x07, SDXI_SET_RKEYS, sdxi_ioctl_set_rkeys,
 		       SDXI_IOCTL_F_DEVICE, SDXI_IOCTL_A_ADMIN_DEVICE),
 	SDXI_IOCTL_DEF(0x08, SDXI_CREATE_CXT, sdxi_ioctl_create_cxt,
 		       SDXI_IOCTL_F_DEVICE, SDXI_IOCTL_A_PUBLIC_DEVICE),
diff --git a/drivers/dma/sdxi/keys.c b/drivers/dma/sdxi/keys.c
index c2f1db0d1594..75a2855ed13d 100644
--- a/drivers/dma/sdxi/keys.c
+++ b/drivers/dma/sdxi/keys.c
@@ -7,15 +7,162 @@
 
 #include <linux/bitfield.h>
 #include <linux/dma-mapping.h>
+#include <linux/kernel.h>
 #include <linux/log2.h>
 #include <linux/sizes.h>
 #include <linux/string.h>
+#include <uapi/linux/sdxi.h>
 
+#include "admin.h"
 #include "hw.h"
+#include "ioctl.h"
 #include "keys.h"
 #include "mmio.h"
 #include "sdxi.h"
 
+#define SDXI_KEY_DEFAULT_TIMEOUT_MS	5000U
+
+static u32 sdxi_key_bitmap_bytes(u32 entries)
+{
+	return DIV_ROUND_UP(entries, 8);
+}
+
+static bool sdxi_key_entry_valid(const void *entry)
+{
+	__le16 intr_num;
+
+	memcpy(&intr_num, entry, sizeof(intr_num));
+	return le16_to_cpu(intr_num) & BIT(0);
+}
+
+static u32 sdxi_key_count_valid(const void *table, u32 entries, size_t stride)
+{
+	u32 count = 0;
+	u32 i;
+
+	for (i = 0; i < entries; i++)
+		if (sdxi_key_entry_valid((const u8 *)table + i * stride))
+			count++;
+
+	return count;
+}
+
+static u32 sdxi_key_build_bitmap(u8 *bitmap, const void *table, u32 entries,
+				 size_t stride)
+{
+	u32 bytes = sdxi_key_bitmap_bytes(entries);
+	u32 count = 0;
+	u32 i;
+
+	memset(bitmap, 0, bytes);
+	for (i = 0; i < entries; i++) {
+		if (!sdxi_key_entry_valid((const u8 *)table + i * stride))
+			continue;
+		bitmap[i / 8] |= BIT(i % 8);
+		count++;
+	}
+
+	return count;
+}
+
+static int sdxi_key_args_check(u32 argsz, size_t minimum, u32 flags,
+			       const u32 *reserved, size_t reserved_words)
+{
+	size_t i;
+
+	if (argsz < minimum || flags)
+		return -EINVAL;
+	for (i = 0; i < reserved_words; i++)
+		if (reserved[i])
+			return -EINVAL;
+
+	return 0;
+}
+
+static int sdxi_key_list_fill(struct sdxi_key_list_args *args,
+			      const void *table, u32 entries, size_t stride)
+{
+	u32 available = args->buf_size;
+	u32 required = sdxi_key_bitmap_bytes(entries);
+
+	args->argsz = sizeof(*args);
+	args->buf_size = required;
+	args->nentries = entries;
+	args->nvalid = sdxi_key_count_valid(table, entries, stride);
+
+	if (available < required)
+		return -ENOSPC;
+
+	args->nvalid = sdxi_key_build_bitmap(args->data, table, entries,
+					     stride);
+	return 0;
+}
+
+static int sdxi_key_check_indices(const struct sdxi_key_entry *keys,
+				  u32 nkeys, u32 entries,
+				  u16 *first, u16 *last)
+{
+	u16 minimum = U16_MAX;
+	u16 maximum = 0;
+	u32 i;
+
+	for (i = 0; i < nkeys; i++) {
+		if (keys[i].rsvd0 || keys[i].index >= entries)
+			return -EINVAL;
+		minimum = min_t(u16, minimum, keys[i].index);
+		maximum = max_t(u16, maximum, keys[i].index);
+	}
+
+	if (first)
+		*first = minimum;
+	if (last)
+		*last = maximum;
+	return 0;
+}
+
+static void sdxi_set_keys_init(struct sdxi_set_keys_args *args)
+{
+	args->cst_flags = 0;
+	args->commit_state = SDXI_KEY_COMMIT_NONE;
+	args->first_failed_index = 0;
+}
+
+static unsigned int
+sdxi_set_keys_timeout(const struct sdxi_set_keys_args *args)
+{
+	return args->timeout_ms ?: SDXI_KEY_DEFAULT_TIMEOUT_MS;
+}
+
+static int sdxi_rkey_validate(const struct sdxi_rkey_ent *entry)
+{
+	u16 intr_num = le16_to_cpu(entry->intr_num);
+	u32 pasid = le32_to_cpu(entry->pasid);
+
+	if (intr_num & BIT(15))
+		return -EINVAL;
+	if (pasid & ~(SDXI_RKEY_ENT_PASID | SDXI_RKEY_ENT_PR |
+		      SDXI_RKEY_ENT_PH))
+		return -EINVAL;
+	if (memchr_inv(entry->rsvd_0, 0, sizeof(entry->rsvd_0)))
+		return -EINVAL;
+
+	return 0;
+}
+
+static void sdxi_rkey_store(struct sdxi_rkey_ent *destination,
+			    const struct sdxi_rkey_ent *source)
+{
+	struct sdxi_rkey_ent entry = *source;
+	u16 intr_num = le16_to_cpu(source->intr_num);
+
+	entry.intr_num = cpu_to_le16(intr_num & ~SDXI_RKEY_ENT_VL);
+	WRITE_ONCE(destination->intr_num, 0);
+	dma_wmb();
+	memcpy(destination, &entry, sizeof(entry));
+	dma_wmb();
+	WRITE_ONCE(destination->intr_num, source->intr_num);
+}
+
 int sdxi_keys_init(struct sdxi_dev *sdxi, u64 cap1)
 {
 	size_t table_size;
@@ -57,3 +204,126 @@ void sdxi_keys_exit(struct sdxi_dev *sdxi)
 	sdxi->rkey_order = 0;
 	sdxi->rkey_cap = false;
 }
+
+int sdxi_ioctl_get_rkey_list(struct file *file, struct sdxi_file *sf,
+			     void *data)
+{
+	struct sdxi_key_list_args *args = data;
+	struct sdxi_dev *sdxi = sf->process->sdxi;
+	int ret;
+
+	ret = sdxi_key_args_check(args->argsz, sizeof(*args), args->flags,
+				  &args->rsvd0, 1);
+	if (ret)
+		return ret;
+	if (!sdxi->rkey_cap)
+		return -EOPNOTSUPP;
+	if (!sdxi->rkey_table)
+		return -ENODEV;
+
+	mutex_lock(&sdxi->rkey_lock);
+	ret = sdxi_key_list_fill(args, sdxi->rkey_table,
+				 sdxi->rkey_entries,
+				 sizeof(*sdxi->rkey_table));
+	mutex_unlock(&sdxi->rkey_lock);
+	return ret;
+}
+
+int sdxi_ioctl_get_rkeys(struct file *file, struct sdxi_file *sf, void *data)
+{
+	struct sdxi_get_keys_args *args = data;
+	struct sdxi_dev *sdxi = sf->process->sdxi;
+	u32 i;
+	int ret;
+
+	ret = sdxi_key_args_check(args->argsz, sizeof(*args), args->flags,
+				  &args->rsvd0, 1);
+	if (ret)
+		return ret;
+	if (!sdxi->rkey_cap)
+		return -EOPNOTSUPP;
+	if (!sdxi->rkey_table)
+		return -ENODEV;
+	if (args->nkeys > sdxi->rkey_entries)
+		return -EINVAL;
+
+	ret = sdxi_key_check_indices(args->entries, args->nkeys,
+				     sdxi->rkey_entries, NULL, NULL);
+	if (ret)
+		return ret;
+
+	args->argsz = sizeof(*args);
+	mutex_lock(&sdxi->rkey_lock);
+	for (i = 0; i < args->nkeys; i++)
+		memcpy(args->entries[i].data,
+		       &sdxi->rkey_table[args->entries[i].index],
+		       sizeof(args->entries[i].data));
+	mutex_unlock(&sdxi->rkey_lock);
+
+	return 0;
+}
+
+int sdxi_ioctl_set_rkeys(struct file *file, struct sdxi_file *sf, void *data)
+{
+	struct sdxi_set_keys_args *args = data;
+	struct sdxi_dev *sdxi = sf->process->sdxi;
+	u16 first;
+	u16 last;
+	u32 i;
+	int ret;
+
+	ret = sdxi_key_args_check(args->argsz, sizeof(*args), args->flags,
+				  args->rsvd0, ARRAY_SIZE(args->rsvd0));
+	if (ret)
+		return ret;
+
+	args->argsz = sizeof(*args);
+	sdxi_set_keys_init(args);
+
+	if (!sdxi->rkey_cap)
+		return -EOPNOTSUPP;
+	if (!sdxi->rkey_table)
+		return -ENODEV;
+	if (!args->nkeys) {
+		args->commit_state = SDXI_KEY_COMMIT_ALL;
+		return 0;
+	}
+	if (args->nkeys > sdxi->rkey_entries)
+		return -EINVAL;
+
+	ret = sdxi_key_check_indices(args->entries, args->nkeys,
+				     sdxi->rkey_entries, &first, &last);
+	if (ret)
+		return ret;
+
+	mutex_lock(&sdxi->rkey_lock);
+	for (i = 0; i < args->nkeys; i++) {
+		struct sdxi_rkey_ent entry;
+
+		memcpy(&entry, args->entries[i].data, sizeof(entry));
+		ret = sdxi_rkey_validate(&entry);
+		if (ret)
+			goto out_unlock;
+	}
+
+	for (i = 0; i < args->nkeys; i++) {
+		struct sdxi_rkey_ent entry;
+
+		memcpy(&entry, args->entries[i].data, sizeof(entry));
+		sdxi_rkey_store(&sdxi->rkey_table[args->entries[i].index],
+				&entry);
+	}
+	dma_wmb();
+
+	ret = sdxi_adm_rkey_update_sync(sdxi, first, last,
+					sdxi_set_keys_timeout(args), NULL);
+	if (ret) {
+		args->commit_state = SDXI_KEY_COMMIT_PARTIAL;
+		goto out_unlock;
+	}
+
+	args->commit_state = SDXI_KEY_COMMIT_ALL;
+out_unlock:
+	mutex_unlock(&sdxi->rkey_lock);
+	return ret;
+}
diff --git a/drivers/dma/sdxi/keys.h b/drivers/dma/sdxi/keys.h
index c479da651526..fed5c20a2cfc 100644
--- a/drivers/dma/sdxi/keys.h
+++ b/drivers/dma/sdxi/keys.h
@@ -11,8 +11,14 @@
 #include <linux/types.h>
 
 struct sdxi_dev;
+struct file;
+struct sdxi_file;
 
 int sdxi_keys_init(struct sdxi_dev *sdxi, u64 cap1);
 void sdxi_keys_exit(struct sdxi_dev *sdxi);
+int sdxi_ioctl_get_rkey_list(struct file *file, struct sdxi_file *sf,
+			     void *data);
+int sdxi_ioctl_get_rkeys(struct file *file, struct sdxi_file *sf, void *data);
+int sdxi_ioctl_set_rkeys(struct file *file, struct sdxi_file *sf, void *data);
 
 #endif /* DMA_SDXI_KEYS_H */
-- 
2.56.1


  parent reply	other threads:[~2026-11-19 20:27 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 20:22 [PATCH v1 00/44] dmaengine: sdxi: add userspace control and management support Wei Huang
2026-11-19 20:22 ` [PATCH v1 01/44] dmaengine: sdxi: cache hardware version for feature gating Wei Huang
2026-11-19 20:22 ` [PATCH v1 02/44] dmaengine: sdxi: define key and error MMIO registers Wei Huang
2026-11-19 20:22 ` [PATCH v1 03/44] dmaengine: sdxi: define SDXI hardware layouts Wei Huang
2026-11-19 20:22 ` [PATCH v1 04/44] dmaengine: sdxi: encode admin descriptors Wei Huang
2026-11-19 20:22 ` [PATCH v1 05/44] dmaengine: sdxi: support timeout-aware completion waits Wei Huang
2026-11-19 20:22 ` [PATCH v1 06/44] dmaengine: sdxi: support the full context table hierarchy Wei Huang
2026-11-19 20:22 ` [PATCH v1 07/44] dmaengine: sdxi: implement synchronous admin operations Wei Huang
2026-11-19 20:22 ` [PATCH v1 08/44] dmaengine: sdxi: add core RKey table management Wei Huang
2026-11-19 20:22 ` [PATCH v1 09/44] dmaengine: sdxi: handle hardware error logs Wei Huang
2026-11-19 20:22 ` [PATCH v1 10/44] dmaengine: sdxi: separate context and submission resources Wei Huang
2026-11-19 20:22 ` [PATCH v1 11/44] dmaengine: sdxi: support userspace context lifetimes Wei Huang
2026-11-19 20:22 ` [PATCH v1 12/44] dmaengine: sdxi: route context interrupts to eventfd Wei Huang
2026-11-19 20:22 ` [PATCH v1 13/44] dmaengine: sdxi: kill user contexts on fatal errors Wei Huang
2026-11-19 20:22 ` [PATCH v1 14/44] dmaengine: sdxi: define the ioctl UAPI surface Wei Huang
2026-11-19 20:22 ` [PATCH v1 15/44] dmaengine: sdxi: add internal ioctl definitions Wei Huang
2026-11-19 20:22 ` [PATCH v1 16/44] dmaengine: sdxi: register core character devices Wei Huang
2026-11-19 20:22 ` [PATCH v1 17/44] dmaengine: sdxi: implement fixed-size ioctl dispatch Wei Huang
2026-11-19 20:22 ` [PATCH v1 18/44] dmaengine: sdxi: implement userspace context file operations Wei Huang
2026-11-19 20:22 ` [PATCH v1 19/44] dmaengine: sdxi: validate and copy key ioctl payloads Wei Huang
2026-11-19 20:22 ` Wei Huang [this message]
2026-11-19 20:22 ` [PATCH v1 21/44] dmaengine: sdxi: implement AKey management ioctls Wei Huang
2026-11-19 20:22 ` [PATCH v1 22/44] dmaengine: sdxi: expose operation-group discovery Wei Huang
2026-11-19 20:22 ` [PATCH v1 23/44] dmaengine: sdxi: implement typed vendor admin transport Wei Huang
2026-11-19 20:23 ` [PATCH v1 24/44] dmaengine: sdxi: expose character device attributes Wei Huang
2026-11-19 20:23 ` [PATCH v1 25/44] dmaengine: sdxi: add PF and VF device naming Wei Huang
2026-11-19 20:23 ` [PATCH v1 26/44] dmaengine: sdxi: add SDXI trace events Wei Huang
2026-11-19 20:23 ` [PATCH v1 27/44] dmaengine: sdxi: support suspend and resume Wei Huang
2026-11-19 20:23 ` [PATCH v1 28/44] dmaengine: sdxi: amd: define QoS request formats Wei Huang
2026-11-19 20:23 ` [PATCH v1 29/44] dmaengine: sdxi: amd: add QoS validation scaffolding Wei Huang
2026-11-19 20:23 ` [PATCH v1 30/44] dmaengine: sdxi: amd: build QoS admin descriptors Wei Huang
2026-11-19 20:23 ` [PATCH v1 31/44] dmaengine: sdxi: amd: prevalidate QoS operations Wei Huang
2026-11-19 20:23 ` [PATCH v1 32/44] dmaengine: sdxi: amd: execute QoS vendor operations Wei Huang
2026-11-19 20:23 ` [PATCH v1 33/44] dmaengine: sdxi: amd: register QoS vendor handler Wei Huang
2026-11-19 20:23 ` [PATCH v1 34/44] dmaengine: sdxi: amd: test QoS validation with KUnit Wei Huang
2026-11-19 20:23 ` [PATCH v1 35/44] selftests: sdxi: add build scaffold Wei Huang
2026-11-19 20:23 ` [PATCH v1 36/44] selftests: sdxi: add shared descriptor and context helpers Wei Huang
2026-11-19 20:23 ` [PATCH v1 37/44] selftests: sdxi: test context creation Wei Huang
2026-11-19 20:23 ` [PATCH v1 38/44] selftests: sdxi: test NOP descriptor submission Wei Huang
2026-11-19 20:23 ` [PATCH v1 39/44] selftests: sdxi: test copy submission and ring wrap Wei Huang
2026-11-19 20:23 ` [PATCH v1 40/44] selftests: sdxi: exercise dataplane error paths Wei Huang
2026-11-19 20:23 ` [PATCH v1 41/44] selftests: sdxi: test device ioctls Wei Huang
2026-11-19 20:23 ` [PATCH v1 42/44] selftests: sdxi: test vendor admin ioctls Wei Huang
2026-11-19 20:23 ` [PATCH v1 43/44] selftests: sdxi: test RKey ioctls Wei Huang
2026-11-19 20:23 ` [PATCH v1 44/44] MAINTAINERS: cover SDXI UAPI, vendor files, and selftests Wei Huang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119202321.1734355-21-wei.huang2@amd.com \
    --to=wei.huang2@amd.com \
    --cc=Frank.Li@kernel.org \
    --cc=John.Kariuki@amd.com \
    --cc=Shyam.Iyer@dell.com \
    --cc=Stephen.Bates@amd.com \
    --cc=bhelgaas@google.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=nathan.lynch@amd.com \
    --cc=rientjes@google.com \
    --cc=shuah@kernel.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=tycho@kernel.org \
    --cc=vkoul@kernel.org \
    --cc=weixugc@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®