Skip to contentSkip to conversation

Upgrade to Clang 23 and git tree link update

PATCH Applied Ammar Faizi 2 participants 6 messages Jul 24 – Jul 25 io_uring

lore
Share & tools
lore
#0 lore raw

cover Upgrade to Clang 23 and git tree link update

Hi Jens,

This series upgrades the Clang version used in the CI to 23, and also fixes some new warnings that are now found in Clang 23:

iopoll.c:26:12: error: variable 'no_hybrid' set but not used [-Werror,-Wunused-but-set-global] recvmsg-inc-tail.c:66:25: error: variable 'no_recv_mshot' set but not used [-Werror,-Wunused-but-set-global] reg-wait.c:26:13: error: variable 'has_kernel_regions' set but not used [-Werror,-Wunused-but-set-global]

no_hybrid has been unused since commit c5eead2659ef ("test/iopoll:
fix over-eager no_hybrid check"); no_recv_mshot was never used since it was introduced. has_kernel_regions has been unused since commit 30ce99006af9 ("test/reg-wait: basic test + probing of kernel regions").

Lastly, this series also updates the git tree links in the .pc.in and .spec files to point to the new git tree location.

The old git tree link:

https://git.kernel.dk/cgit/liburing/

is dead. Replace it with the new kernel.org git tree:

https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/

---

Ammar Faizi (4):
test: Remove unused global variables found by clang-23
ci: Fix the wrong cc_pkg comparison
ci: Upgrade clang version to 23
liburing{{,-ffi}.pc.in,.spec}: Replace old git tree links with the new one

 .github/workflows/ci.yml | 8 ++++----
 debian/control           | 6 +++---
 debian/copyright         | 2 +-
 liburing-ffi.pc.in       | 2 +-
 liburing.pc.in           | 2 +-
 liburing.spec            | 2 +-
 test/iopoll.c            | 5 +----
 test/recvmsg-inc-tail.c  | 3 +--
 test/reg-wait.c          | 8 ++------
 9 files changed, 15 insertions(+), 23 deletions(-)

base-commit: 639d05b5e7f202ca8a400fc3158d91fa30914883

Signature · 1 line
Ammar Faizi
#1 lore raw

PATCH 1/4 test: Remove unused global variables found by clang-23

In preparation for upgrading to Clang 23, fix the following warnings:

iopoll.c:26:12: error: variable 'no_hybrid' set but not used [-Werror,-Wunused-but-set-global] recvmsg-inc-tail.c:66:25: error: variable 'no_recv_mshot' set but not used [-Werror,-Wunused-but-set-global] reg-wait.c:26:13: error: variable 'has_kernel_regions' set but not used [-Werror,-Wunused-but-set-global]

no_hybrid has been unused since commit c5eead2659ef ("test/iopoll:
fix over-eager no_hybrid check"); no_recv_mshot was never used since it was introduced. has_kernel_regions has been unused since commit 30ce99006af9 ("test/reg-wait: basic test + probing of kernel regions").

Fixes c5eead2659ef ("test/iopoll: fix over-eager no_hybrid check")
Fixes 3891a21ffec6 ("Add test case for minimum length left for incremental buffers")
Fixes 30ce99006af9 ("test/reg-wait: basic test + probing of kernel regions")
Cc Christian Mazakas <[email protected]>
---
 test/iopoll.c           | 5 +----
 test/recvmsg-inc-tail.c | 3 +--
 test/reg-wait.c         | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)
test/iopoll.c +1 -4
index 98230657a2fa..d68fde10e3f2 100644
@@ -23,7 +23,6 @@
 static struct iovec *vecs;
 static int no_buf_select;
 static int no_iopoll;
-static int no_hybrid;
 
 static int provide_buffers(struct io_uring *ring)
 {
@@ -372,10 +371,8 @@ static int test_io(const char *file, int write, int sqthread, int fixed,
 		return 0;
 	}
 	if (ret != T_SETUP_OK) {
-		if (ring_flags & IORING_SETUP_HYBRID_IOPOLL) {
-			no_hybrid = 1;
+		if (ring_flags & IORING_SETUP_HYBRID_IOPOLL)
 			return 0;
-		}
 		fprintf(stderr, "ring create failed: %d\n", ret);
 		return 1;
 	}
test/recvmsg-inc-tail.c +1 -2
index 29b6c2b4a96f..6be1bbf7a73e 100644
@@ -63,7 +63,7 @@
 
 static const int expected_bids[NR_SENDS] = { 0, 0, 1, 1, 1, 2, 2, 2, 3 };
 
-static int no_buf_ring, no_recv_mshot;
+static int no_buf_ring;
 
 static int setup_buf_ring(struct io_uring *ring, void **buf_mem,
 			  struct io_uring_buf_ring **out_br)
@@ -195,7 +195,6 @@ static int test(void)
 		}
 
 		if (cqe->res == -EINVAL || cqe->res == -ENOTSUP) {
-			no_recv_mshot = 1;
 			io_uring_cqe_seen(&ring, cqe);
 			ret_val = T_EXIT_SKIP;
 			goto out_close;
test/reg-wait.c +2 -6
index af517a1f2936..ea4c3405de53 100644
@@ -23,8 +23,6 @@ static const struct io_uring_reg_wait brief_wait = {
 	.ts.tv_nsec = 1000,
 };
 
-static bool has_kernel_regions;
-
 static int test_wait_reg_offset(struct io_uring *ring,
 				 unsigned wait_nr, unsigned long offset)
 {
@@ -382,16 +380,14 @@ static int test_regions(void)
 	rd.flags = 0;
 	rd.user_addr = 0;
 	ret = test_try_register_region(&mr, true);
-	if (ret == -EINVAL) {
-		has_kernel_regions = false;
+	if (ret == -EINVAL)
 		goto out;
-	}
+
 	if (ret) {
 		fprintf(stderr, "test_try_register_region() failed kernel alloc %i\n", ret);
 		return T_EXIT_FAIL;
 	}
 
-	has_kernel_regions = true;
 	rd.flags = 0;
 	rd.user_addr = uring_ptr_to_u64(buffer);
 	ret = test_try_register_region(&mr, true);
Signature · 1 line
Ammar Faizi
#2 lore raw

PATCH 2/4 ci: Fix the wrong `cc_pkg` comparison

In reply to Ammar Faizi

Commit 7a65e5a4f294 ("github: Build all newly pushed commits") nested the cc_pkg variable into build_args, but the if statement is still using the old matrix variable. Fix it; the correct variable is matrix.build_args.cc_pkg.

Fixes 7a65e5a4f294 ("github: Build all newly pushed commits")
Cc Christian Mazakas <[email protected]>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.github/workflows/ci.yml +1 -1
index 355541167424..842cdead6fef 100644
@@ -204,7 +204,7 @@ jobs:
 
       - name: Install Compilers
         run: |
-          if [[ "${{matrix.cc_pkg}}" == "clang" ]]; then \
+          if [[ "${{matrix.build_args.cc_pkg}}" == "clang" ]]; then \
             wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh; \
             sudo bash /tmp/llvm.sh 22; \
             sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 400; \
Signature · 1 line
Ammar Faizi
#3 lore raw

PATCH 3/4 ci: Upgrade clang version to 23

In reply to Ammar Faizi

Clang 23 is now available. Upgrade the clang version used in the CI.

Cc Christian Mazakas <[email protected]>
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
.github/workflows/ci.yml +3 -3
index 842cdead6fef..1149fabf58f2 100644
@@ -206,9 +206,9 @@ jobs:
         run: |
           if [[ "${{matrix.build_args.cc_pkg}}" == "clang" ]]; then \
             wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh; \
-            sudo bash /tmp/llvm.sh 22; \
-            sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 400; \
-            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 400; \
+            sudo bash /tmp/llvm.sh 23; \
+            sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-23 400; \
+            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-23 400; \
           else \
             sudo apt-get update -y; \
             sudo apt-get install -y ${{matrix.build_args.cc_pkg}} ${{matrix.build_args.cxx_pkg}}; \
Signature · 1 line
Ammar Faizi
#4 lore raw

PATCH 4/4 liburing{{,-ffi}.pc.in,.spec}: Replace dead git tree links with the new one

In reply to Ammar Faizi

The old git tree link:

https://git.kernel.dk/cgit/liburing/

is dead. Replace it with the new kernel.org git tree:

https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/

Cc Stefan Hajnoczi <[email protected]>
Cc Guillem Jover <[email protected]>
Cc Changcheng Liu <[email protected]>
---
 debian/control     | 6 +++---
 debian/copyright   | 2 +-
 liburing-ffi.pc.in | 2 +-
 liburing.pc.in     | 2 +-
 liburing.spec      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
debian/control +3 -3
index e79ff11cd187..14ca43b4e399 100644
@@ -5,9 +5,9 @@ Maintainer: Liu Changcheng <[email protected]>
 Build-Depends:
   debhelper-compat (= 13)
 Standards-Version: 4.1.4
-Homepage: https://git.kernel.dk/cgit/liburing/tree/README
-Vcs-Git: https://git.kernel.dk/liburing
-Vcs-Browser: https://git.kernel.dk/cgit/liburing/
+Homepage: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/tree/README
+Vcs-Git: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git
+Vcs-Browser: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git
 
 Package: liburing2
 Architecture: linux-any
debian/copyright +1 -1
index 0b3f3eb04db4..25d39e79b9ec 100644
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: liburing
-Source: https://git.kernel.dk/cgit/liburing/
+Source: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/
 
 Files: *
 Copyright: 2019 Jens Axboe <[email protected]>
liburing-ffi.pc.in +1 -1
index 71943acca14a..400d43fa783b 100644
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: @NAME@
 Version: @VERSION@
 Description: io_uring FFI library
-URL: https://git.kernel.dk/cgit/liburing/
+URL: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/
 
 Libs: -L${libdir} -luring-ffi
 Cflags: -I${includedir}
liburing.pc.in +1 -1
index 2c879b2cdc90..7ada05167f35 100644
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: @NAME@
 Version: @VERSION@
 Description: io_uring library
-URL: https://git.kernel.dk/cgit/liburing/
+URL: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/
 
 Libs: -L${libdir} -luring
 Cflags: -I${includedir}
liburing.spec +1 -1
index 1d0a72fbd31e..2c396813d434 100644
@@ -5,7 +5,7 @@ Summary: Linux-native io_uring I/O access library
 License: (GPLv2 with exceptions and LGPLv2+) or MIT
 Source0: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz
 Source1: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz.asc
-URL: https://git.kernel.dk/cgit/liburing/
+URL: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git/
 BuildRequires: gcc
 BuildRequires: make
 
Signature · 1 line
Ammar Faizi
maintainer Applied
#5 lore raw
In reply to Ammar Faizi
Quoted 8 lines · Ammar Faizi

This series upgrades the Clang version used in the CI to 23, and also fixes some new warnings that are now found in Clang 23:

iopoll.c:26:12: error: variable 'no_hybrid' set but not used [-Werror,-Wunused-but-set-global] recvmsg-inc-tail.c:66:25: error: variable 'no_recv_mshot' set but not used [-Werror,-Wunused-but-set-global] reg-wait.c:26:13: error: variable 'has_kernel_regions' set but not used [-Werror,-Wunused-but-set-global]

[...]

Applied, thanks!

[1/4] test: Remove unused global variables found by clang-23

      commit: ca274ec7289fd4ea56f20651be1814b9614b2745
[2/4] ci: Fix the wrong `cc_pkg` comparison
      commit: 3a6320a6008afee1c8febf16a9aa1428084a146f
[3/4] ci: Upgrade clang version to 23
      commit: 4acaaeceb71cc5915cf11f9a2463c1467d460847
[4/4] liburing{{,-ffi}.pc.in,.spec}: Replace dead git tree links with the new one
      commit: b12a090919b400b401e5eb35be2065429fb6489e

Best regards,

Signature · 1 line
Jens Axboe