[PATCH liburing] register: add tagging and buf update helpers

[PATCH liburing] register: add tagging and buf update helpers

[Pavel Begunkov]

Add heplers for rsrc (buffers, files) updates and registration with
tags.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---

tested by:
1) using with rsrc_tags test
2) expressing previous helpers with new ones + tags=NULL

 src/include/liburing.h | 20 ++++++++++++
 src/register.c         | 72 ++++++++++++++++++++++++++++++++++++++++++
 test/rsrc_tags.c       |  8 +++++
 3 files changed, 100 insertions(+)

diff --git a/src/include/liburing.h b/src/include/liburing.h
index 9b38d23..7b364ce 100644
--- a/src/include/liburing.h
+++ b/src/include/liburing.h
@@ -125,9 +125,29 @@ extern struct io_uring_sqe *io_uring_get_sqe(struct io_uring *ring);
 extern int io_uring_register_buffers(struct io_uring *ring,
 					const struct iovec *iovecs,
 					unsigned nr_iovecs);
+extern int io_uring_register_buffers_tags(struct io_uring *ring,
+					  const struct iovec *iovecs,
+					  const __u64 *tags,
+					  unsigned nr);
+extern int io_uring_register_buffers_update_tag(struct io_uring *ring,
+						unsigned off,
+						const struct iovec *iovecs,
+						const __u64 *tags,
+						unsigned nr);
 extern int io_uring_unregister_buffers(struct io_uring *ring);
+
 extern int io_uring_register_files(struct io_uring *ring, const int *files,
 					unsigned nr_files);
+extern int io_uring_register_files_tags(struct io_uring *ring,
+					const int *files,
+					const __u64 *tags,
+					unsigned nr);
+extern int io_uring_register_files_update_tag(struct io_uring *ring,
+					      unsigned off,
+					      const int *files,
+					      const __u64 *tags,
+					      unsigned nr_files);
+
 extern int io_uring_unregister_files(struct io_uring *ring);
 extern int io_uring_register_files_update(struct io_uring *ring, unsigned off,
 					int *files, unsigned nr_files);
diff --git a/src/register.c b/src/register.c
index 994aaff..b29011a 100644
--- a/src/register.c
+++ b/src/register.c
@@ -14,6 +14,42 @@
 
 #include "syscall.h"
 
+int io_uring_register_buffers_update_tag(struct io_uring *ring, unsigned off,
+					 const struct iovec *iovecs,
+					 const __u64 *tags,
+					 unsigned nr)
+{
+	struct io_uring_rsrc_update2 up = {
+		.offset	= off,
+		.data = (unsigned long)iovecs,
+		.tags = (unsigned long)tags,
+		.nr = nr,
+	};
+	int ret;
+
+	ret = __sys_io_uring_register(ring->ring_fd,
+				      IORING_REGISTER_BUFFERS_UPDATE,
+				      &up, sizeof(up));
+	return ret < 0 ? -errno : ret;
+}
+
+int io_uring_register_buffers_tags(struct io_uring *ring,
+				   const struct iovec *iovecs,
+				   const __u64 *tags,
+				   unsigned nr)
+{
+	struct io_uring_rsrc_register reg = {
+		.nr = nr,
+		.data = (unsigned long)iovecs,
+		.tags = (unsigned long)tags,
+	};
+	int ret;
+
+	ret = __sys_io_uring_register(ring->ring_fd, IORING_REGISTER_BUFFERS2,
+				      &reg, sizeof(reg));
+	return ret < 0 ? -errno : ret;
+}
+
 int io_uring_register_buffers(struct io_uring *ring, const struct iovec *iovecs,
 			      unsigned nr_iovecs)
 {
@@ -39,6 +75,24 @@ int io_uring_unregister_buffers(struct io_uring *ring)
 	return 0;
 }
 
+int io_uring_register_files_update_tag(struct io_uring *ring, unsigned off,
+					const int *files, const __u64 *tags,
+					unsigned nr_files)
+{
+	struct io_uring_rsrc_update2 up = {
+		.offset	= off,
+		.data = (unsigned long)files,
+		.tags = (unsigned long)tags,
+		.nr = nr_files,
+	};
+	int ret;
+
+	ret = __sys_io_uring_register(ring->ring_fd,
+					IORING_REGISTER_FILES_UPDATE2,
+					&up, sizeof(up));
+	return ret < 0 ? -errno : ret;
+}
+
 /*
  * Register an update for an existing file set. The updates will start at
  * 'off' in the original array, and 'nr_files' is the number of files we'll
@@ -64,6 +118,24 @@ int io_uring_register_files_update(struct io_uring *ring, unsigned off,
 	return ret;
 }
 
+
+int io_uring_register_files_tags(struct io_uring *ring,
+				 const int *files, const __u64 *tags,
+				 unsigned nr)
+{
+	struct io_uring_rsrc_register reg;
+	int ret;
+
+	memset(&reg, 0, sizeof(reg));
+	reg.nr = nr;
+	reg.data = (unsigned long)files;
+	reg.tags = (unsigned long)tags;
+
+	ret = __sys_io_uring_register(ring->ring_fd, IORING_REGISTER_FILES2,
+				      &reg, sizeof(reg));
+	return ret < 0 ? -errno : ret;
+}
+
 int io_uring_register_files(struct io_uring *ring, const int *files,
 			      unsigned nr_files)
 {
diff --git a/test/rsrc_tags.c b/test/rsrc_tags.c
index 337fbb8..57b47f7 100644
--- a/test/rsrc_tags.c
+++ b/test/rsrc_tags.c
@@ -32,6 +32,10 @@ static bool check_cq_empty(struct io_uring *ring)
 	return ret == -EAGAIN;
 }
 
+/*
+ * There are io_uring_register_buffers_tags() and other wrappers,
+ * but they may change, so hand-code to specifically test this ABI.
+ */
 static int register_rsrc(struct io_uring *ring, int type, int nr,
 			  const void *arg, const __u64 *tags)
 {
@@ -52,6 +56,10 @@ static int register_rsrc(struct io_uring *ring, int type, int nr,
 	return ret ? -errno : 0;
 }
 
+/*
+ * There are io_uring_register_buffers_update_tag() and other wrappers,
+ * but they may change, so hand-code to specifically test this ABI.
+ */
 static int update_rsrc(struct io_uring *ring, int type, int nr, int off,
 			const void *arg, const __u64 *tags)
 {
-- 
2.33.0

Re: [PATCH liburing] register: add tagging and buf update helpers

[Jens Axboe]

On 8/27/21 12:46 PM, Pavel Begunkov wrote:
> Add heplers for rsrc (buffers, files) updates and registration with
> tags.

Excellent! They should go into src/liburing.map too though.

-- 
Jens Axboe

Re: [PATCH liburing] register: add tagging and buf update helpers

[Pavel Begunkov]

On 8/27/21 7:48 PM, Jens Axboe wrote:
> On 8/27/21 12:46 PM, Pavel Begunkov wrote:
>> Add heplers for rsrc (buffers, files) updates and registration with
>> tags.
> 
> Excellent! They should go into src/liburing.map too though. 

Hmm, indeed

Should it be LIBURING_2.2 or LIBURING_2.1 ?

-- 
Pavel Begunkov

Re: [PATCH liburing] register: add tagging and buf update helpers

[Pavel Begunkov]

On 8/27/21 7:51 PM, Pavel Begunkov wrote:
> On 8/27/21 7:48 PM, Jens Axboe wrote:
>> On 8/27/21 12:46 PM, Pavel Begunkov wrote:
>>> Add heplers for rsrc (buffers, files) updates and registration with
>>> tags.
>>
>> Excellent! They should go into src/liburing.map too though. 
> 
> Hmm, indeed
> 
> Should it be LIBURING_2.2 or LIBURING_2.1 ?

I mean sections in the .map file

-- 
Pavel Begunkov

Re: [PATCH liburing] register: add tagging and buf update helpers

[Jens Axboe]

On 8/27/21 12:51 PM, Pavel Begunkov wrote:
> On 8/27/21 7:48 PM, Jens Axboe wrote:
>> On 8/27/21 12:46 PM, Pavel Begunkov wrote:
>>> Add heplers for rsrc (buffers, files) updates and registration with
>>> tags.
>>
>> Excellent! They should go into src/liburing.map too though. 
> 
> Hmm, indeed
> 
> Should it be LIBURING_2.2 or LIBURING_2.1 ?

It should go into the 2.1 section, as it'll be part of 2.1 release.
Any symbols added after 2.1 has been tagged would go into a 2.2
section.

-- 
Jens Axboe

Re: [PATCH liburing] register: add tagging and buf update helpers

[Pavel Begunkov]

On 8/27/21 8:14 PM, Jens Axboe wrote:
> On 8/27/21 12:51 PM, Pavel Begunkov wrote:
>> On 8/27/21 7:48 PM, Jens Axboe wrote:
>>> On 8/27/21 12:46 PM, Pavel Begunkov wrote:
>>>> Add heplers for rsrc (buffers, files) updates and registration with
>>>> tags.
>>>
>>> Excellent! They should go into src/liburing.map too though. 
>>
>> Hmm, indeed
>>
>> Should it be LIBURING_2.2 or LIBURING_2.1 ?
> 
> It should go into the 2.1 section, as it'll be part of 2.1 release.
> Any symbols added after 2.1 has been tagged would go into a 2.2
> section.

Good, sent it out

-- 
Pavel Begunkov