From 061dd4747e1fc1bf1e4c8b9fa408ac7c3d7dfa6a Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Mon, 23 May 2022 20:27:05 +0200 Subject: [PATCH] initial package creation Signed-off-by: Toshaan Bharvani --- ...ext-cp.c-cope-with-variable-SIGSTKSZ.patch | 74 +++++++++++ SPECS/liburing.spec | 121 ++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 SOURCES/8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch create mode 100644 SPECS/liburing.spec diff --git a/SOURCES/8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch b/SOURCES/8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch new file mode 100644 index 0000000..b057b85 --- /dev/null +++ b/SOURCES/8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch @@ -0,0 +1,74 @@ +examples/ucontext-cp.c: cope with variable SIGSTKSZ + +BZ: 1980845 + +commit 8aac320ae8445c5434ab3be1761414a5247e5d42 +Author: Stefan Hajnoczi +Date: Tue Apr 13 16:03:19 2021 +0100 + + examples/ucontext-cp.c: cope with variable SIGSTKSZ + + The size of C arrays at file scope must be constant. The following + compiler error occurs with recent upstream glibc (2.33.9000): + + CC ucontext-cp + ucontext-cp.c:31:23: error: variably modified ‘stack_buf’ at file scope + 31 | unsigned char stack_buf[SIGSTKSZ]; + | ^~~~~~~~~ + make[1]: *** [Makefile:26: ucontext-cp] Error 1 + + The following glibc commit changed SIGSTKSZ from a constant value to a + variable: + + commit 6c57d320484988e87e446e2e60ce42816bf51d53 + Author: H.J. Lu + Date: Mon Feb 1 11:00:38 2021 -0800 + + sysconf: Add _SC_MINSIGSTKSZ/_SC_SIGSTKSZ [BZ #20305] + ... + +# define SIGSTKSZ sysconf (_SC_SIGSTKSZ) + + Allocate the stack buffer explicitly to avoid declaring an array at file + scope. + + Cc: H.J. Lu + Signed-off-by: Stefan Hajnoczi + Signed-off-by: Jens Axboe + +diff --git a/examples/ucontext-cp.c b/examples/ucontext-cp.c +index 0b2a6b5..ea0c934 100644 +--- a/examples/ucontext-cp.c ++++ b/examples/ucontext-cp.c +@@ -28,7 +28,7 @@ + + typedef struct { + struct io_uring *ring; +- unsigned char stack_buf[SIGSTKSZ]; ++ unsigned char *stack_buf; + ucontext_t ctx_main, ctx_fnew; + } async_context; + +@@ -115,8 +115,13 @@ static int setup_context(async_context *pctx, struct io_uring *ring) + perror("getcontext"); + return -1; + } +- pctx->ctx_fnew.uc_stack.ss_sp = &pctx->stack_buf; +- pctx->ctx_fnew.uc_stack.ss_size = sizeof(pctx->stack_buf); ++ pctx->stack_buf = malloc(SIGSTKSZ); ++ if (!pctx->stack_buf) { ++ perror("malloc"); ++ return -1; ++ } ++ pctx->ctx_fnew.uc_stack.ss_sp = pctx->stack_buf; ++ pctx->ctx_fnew.uc_stack.ss_size = SIGSTKSZ; + pctx->ctx_fnew.uc_link = &pctx->ctx_main; + + return 0; +@@ -174,6 +179,7 @@ static void copy_file_wrapper(arguments_bundle *pbundle) + free(iov.iov_base); + close(pbundle->infd); + close(pbundle->outfd); ++ free(pbundle->pctx->stack_buf); + free(pbundle->pctx); + free(pbundle); + diff --git a/SPECS/liburing.spec b/SPECS/liburing.spec new file mode 100644 index 0000000..6681035 --- /dev/null +++ b/SPECS/liburing.spec @@ -0,0 +1,121 @@ +Name: liburing +Version: 0.7 +Release: 7%{?dist} +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/ +BuildRequires: gcc +BuildRequires: make + +Patch0: 8aac320-examples-ucontext-cp.c-cope-with-variable-SIGSTKSZ.patch + +%description +Provides native async IO for the Linux kernel, in a fast and efficient +manner, for both buffered and O_DIRECT. + +%package devel +Summary: Development files for Linux-native io_uring I/O access library +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +This package provides header files to include and libraries to link with +for the Linux-native io_uring. + +%prep +%autosetup -p1 + +%build +%set_build_flags +./configure --prefix=%{_prefix} --libdir=/%{_libdir} --libdevdir=/%{_libdir} --mandir=%{_mandir} --includedir=%{_includedir} + +%make_build + +%install +%make_install + +%files +%attr(0755,root,root) %{_libdir}/liburing.so.* +%license COPYING + +%files devel +%{_includedir}/liburing/ +%{_includedir}/liburing.h +%{_libdir}/liburing.so +%exclude %{_libdir}/liburing.a +%{_libdir}/pkgconfig/* +%{_mandir}/man2/* + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 0.7-7 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Jul 09 2021 Jeff Moyer - 0.7-6 +- Fix up use of SIGSTKSZ (Jeff Moyer) +- Resolves: rhbz#1980845 + +* Fri Apr 16 2021 Mohan Boddu - 0.7-5 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 19 2020 Davide Cavalca - 0.7-3 +- Drop exclude for armv7hl as it's no longer necessary + +* Tue Jul 28 2020 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Stefan Hajnoczi - 0.7-1 +- Add io_uring_cq_eventfd_toggle() helper for new IORING_CQ_EVENTFD_DISABLED flag +- Add IORING_OP_TEE +- Documentation fixes and improvements + +* Thu May 7 2020 Stefan Hajnoczi - 0.6-1 +- add io_uring_prep_splice() +- add io_uring_prep_provide_buffers() +- add io_uring_prep_remove_buffers() +- add io_uring_register_eventfd_async() +- reinstate io_uring_unregister_eventfd() (it was accidentally removed in 0.4) + +* Thu Mar 19 2020 Stefan Hajnoczi - 0.5-1 +- Update license to GPL-2.0 OR MIT +- Add io_uring_prep_epoll_ctl() +- Add io_uring_get_probe(), io_uring_get_probe_ring() +- Add io_uring_register_probe() +- Add io_uring_{register,unregister}_personality() +- Add io_uring_prep_{recv,send}() +- Add io_uring_prep_openat2() +- Add io_uring_ring_dontfork() +- Add io_uring_prep_read() and io_uring_prep_write() +- Documentation fixes and improvements + +* Wed Jan 29 2020 Fedora Release Engineering - 0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 7 2020 Stefan Hajnoczi - 0.3-1 +- Add IORING_OP_STATX +- Add IORING_OP_OPENAT/IORING_OP_CLOSE helpers +- Add prep helpers for IORING_OP_FILES_UPDATE and IORING_OP_FALLOCATE +- Add io_uring_prep_connect() helper +- Add io_uring_wait_cqe_nr() +- Add IORING_OP_ASYNC_CANCEL and prep helper + +* Thu Oct 31 2019 Jeff Moyer - 0.2-1 +- Add io_uring_cq_ready() +- Add io_uring_peek_batch_cqe() +- Add io_uring_prep_accept() +- Add io_uring_prep_{recv,send}msg() +- Add io_uring_prep_timeout_remove() +- Add io_uring_queue_init_params() +- Add io_uring_register_files_update() +- Add io_uring_sq_space_left() +- Add io_uring_wait_cqe_timeout() +- Add io_uring_wait_cqes() +- Add io_uring_wait_cqes_timeout() + +* Tue Jan 8 2019 Jens Axboe - 0.1 +- Initial version