Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Dec 5, 2018

lore

Share & tools

lore

Jens Axboe

author

2018-12-05 13:00 UTC #0 lore raw

The following changes since commit 6f3a2c116481731abdf2fbed2d0f63cf4d3ddca2:

engines/libaio: set IOCB_HIPRI if we are polling (2018-12-01 10:17:26 -0700)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 46961748140e291f0f1e966bac9aad1a3b9ad1c7:

engines/libaio: increase RLIMIT_MEMLOCK for user buffers (2018-12-04 11:27:02 -0700)

----------------------------------------------------------------
Jens Axboe (2):
engines/libaio: update for newer io_setup2() system call engines/libaio: increase RLIMIT_MEMLOCK for user buffers

 engines/libaio.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

---

Diff of recent changes:

engines/libaio.c +11 -2

index a780b2b..0333509 100644
@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libaio.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 #include "../fio.h"
 #include "../lib/pow2.h"

@@ -450,11 +452,18 @@ static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
 		flags |= IOCTX_FLAG_IOPOLL;
 	if (useriocb)
 		flags |= IOCTX_FLAG_USERIOCB;
-	if (fixedbufs)
+	if (fixedbufs) {
+		struct rlimit rlim = {
+			.rlim_cur = RLIM_INFINITY,
+			.rlim_max = RLIM_INFINITY,
+		};
+
+		setrlimit(RLIMIT_MEMLOCK, &rlim);
 		flags |= IOCTX_FLAG_FIXEDBUFS;
+	}
 
 	ret = syscall(__NR_sys_io_setup2, depth, flags, ld->user_iocbs,
-			&ld->aio_ctx);
+			NULL, NULL, &ld->aio_ctx);
 	if (!ret)
 		return 0;
 	/* fall through to old syscall */