Just a boring patchset.
- Address the recent io_uring-udp bug report on GitHub.
- No more sign-compare warnings on the GitHub build bot.
- Kill trailing whitespaces (manpage).
Signed-off-by: Ammar Faizi <[email protected]>
---
Ammar Faizi (3):
io_uring-udp: Fix the wrong `inet_ntop()` argument
github: Append `-Wno-sign-compare` to the GitHub build bot CFLAGS
man/io_uring_register_{buffers,files}: Kill trailing whitespaces
.github/workflows/build.yml | 2 +-
examples/io_uring-udp.c | 2 +-
man/io_uring_register_buffers.3 | 10 +++++-----
man/io_uring_register_files.3 | 22 +++++++++++-----------
4 files changed, 18 insertions(+), 18 deletions(-)
base-commit: 0dd82f0c63d468c5b3d9510af642968ce6e8ee21
--
Ammar Faizi
The verbose output shows the wrong IP address. The second argument of
inet_ntop() should be a pointer to the binary representation of the IP
address. Fix it.
Reported-by: @mczka # A GitHub user
Cc: Dylan Yudaken <[email protected]>
Closes: https://github.com/axboe/liburing/pull/815
Fixes: https://github.com/axboe/liburing/issues/814
Fixes: 61d472b51e761e61c ("add an example for a UDP server")
Signed-off-by: Ammar Faizi <[email protected]>
---
examples/io_uring-udp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/io_uring-udp.c b/examples/io_uring-udp.c
index a07c3e2a6f20cd17..b81a5e7c47afd9c8 100644
--- a/examples/io_uring-udp.c
+++ b/examples/io_uring-udp.c
@@ -275,7 +275,7 @@ static int process_cqe_recv(struct ctx *ctx, struct io_uring_cqe *cqe,
const char *name;
struct sockaddr_in *addr = io_uring_recvmsg_name(o);
- name = inet_ntop(ctx->af, addr, buff, sizeof(buff));
+ name = inet_ntop(ctx->af, &addr->sin_addr, buff, sizeof(buff));
if (!name)
name = "<INVALID>";
fprintf(stderr, "received %u bytes %d from %s:%d\n",
--
Ammar Faizi
Kill the sign-compare warning on the GitHub build bot because Jens
doesn't like it. See commit 4c79857b9354 ("examples/send-zerocopy:
cleanups").
Signed-off-by: Ammar Faizi <[email protected]>
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29b80bfec1d208c0..fed5b38c3a507336 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,7 +86,7 @@ jobs:
cxx: mips-linux-gnu-g++
env:
- FLAGS: -g -O3 -Wall -Wextra -Werror ${{matrix.extra_flags}}
+ FLAGS: -g -O3 -Wall -Wextra -Werror -Wno-sign-compare ${{matrix.extra_flags}}
# Flags for building sources in src/ dir only.
LIBURING_CFLAGS: ${{matrix.liburing_extra_flags}}
--
Ammar Faizi
Kill trailing whitespaces introduced in e628f65b6a6e and e709d2cf2f39.
The "git am" would have noticed this, but those commits were merged via
a pull request.
Cc: Rutvik Patel <[email protected]>
Signed-off-by: Ammar Faizi <[email protected]>
---
man/io_uring_register_buffers.3 | 10 +++++-----
man/io_uring_register_files.3 | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/man/io_uring_register_buffers.3 b/man/io_uring_register_buffers.3
index 4f7d25a9fc1a887c..00861d917ed08566 100644
--- a/man/io_uring_register_buffers.3
+++ b/man/io_uring_register_buffers.3
@@ -40,9 +40,9 @@ belonging to the
The
.BR io_uring_register_buffers_tags (3)
-function behaves the same as
+function behaves the same as
.BR io_uring_register_buffers (3)
-function but additionally takes
+function but additionally takes
.I tags
parameter. See
.B IORING_REGISTER_BUFFERS2
@@ -69,8 +69,8 @@ manipulating the page reference counts for each IO.
The
.BR io_uring_register_buffers_update_tag (3)
-function updates registered buffers with new ones, either turning a sparse
-entry into a real one, or replacing an existing entry. The
+function updates registered buffers with new ones, either turning a sparse
+entry into a real one, or replacing an existing entry. The
.I off
is offset on which to start the update
.I nr
@@ -90,7 +90,7 @@ On success
.BR io_uring_register_buffers_tags (3)
and
.BR io_uring_register_buffers_sparse (3)
-return 0.
+return 0.
.BR io_uring_register_buffers_update_tag (3)
return number of buffers updated.
On failure they return
diff --git a/man/io_uring_register_files.3 b/man/io_uring_register_files.3
index 10ea665448b1694c..a4b00abf021edd09 100644
--- a/man/io_uring_register_files.3
+++ b/man/io_uring_register_files.3
@@ -46,9 +46,9 @@ for subsequent operations.
The
.BR io_uring_register_files_tags (3)
-function behaves the same as
+function behaves the same as
.BR io_uring_register_files (3)
-function but additionally takes
+function but additionally takes
.I tags
parameter. See
.B IORING_REGISTER_BUFFERS2
@@ -72,9 +72,9 @@ shared, for example if the process has ever created any threads, then this
cost goes up even more. Using registered files reduces the overhead of
file reference management across requests that operate on a file.
-The
-.BR io_uring_register_files_update (3)
-function updates existing registered files. The
+The
+.BR io_uring_register_files_update (3)
+function updates existing registered files. The
.I off
is offset on which to start the update
.I nr_files
@@ -83,13 +83,13 @@ number of files defined by the array
belonging to the
.IR ring .
-The
+The
.BR io_uring_register_files_update_tag (3)
-function behaves the same as
-.BR io_uring_register_files_update (3)
-function but additionally takes
+function behaves the same as
+.BR io_uring_register_files_update (3)
+function but additionally takes
.I tags
-parameter. See
+parameter. See
.B IORING_REGISTER_BUFFERS2
for the resource tagging description.
@@ -99,7 +99,7 @@ On success
.BR io_uring_register_files_tags (3)
and
.BR io_uring_register_files_sparse (3)
-return 0.
+return 0.
.BR io_uring_register_files_update (3)
and
.BR io_uring_register_files_update_tag (3)
--
Ammar Faizi
On Wed, 08 Mar 2023 03:38:27 +0700, Ammar Faizi wrote:
> Just a boring patchset.
>
> - Address the recent io_uring-udp bug report on GitHub.
> - No more sign-compare warnings on the GitHub build bot.
> - Kill trailing whitespaces (manpage).
>
>
> [...]
Applied, thanks!
[1/3] io_uring-udp: Fix the wrong `inet_ntop()` argument
commit: 4f1b8850dc1f18c0160917669c64eda879093304
[2/3] github: Append `-Wno-sign-compare` to the GitHub build bot CFLAGS
commit: fe4d0be3a96e33aef265bfe8509b088846736fe7
[3/3] man/io_uring_register_{buffers,files}: Kill trailing whitespaces
commit: 9e4190aed43f25b2986155a2f6019fc2fc89920f
Best regards,
--
Jens Axboe