Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 21

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit e2d1cce0f1c5617467f95ac2154212179451ba85:

test: add test for switching to tausworthe64 (2026-01-15 21:02:38 -0500)

are available in the Git repository at:

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

for you to fetch changes up to bfe306e16932382069d4c4de3eb0bae9de1e9b09:

Fixups for rbd luks support (2026-01-20 12:56:59 -0700)

----------------------------------------------------------------
David Mohren (1):
engines/rbd: add support for LUKS encryption

Jens Axboe (3):
Merge branch 'io_uring_zbc_support' of https://github.com/mannanal/fio
Merge branch 'rbd-encryption-support' of https://github.com/Greenpepper15/fio
Fixups for rbd luks support

Vishal Jose Mannanal (1):
Add ZBD (Zoned Block Device) support to io_uring engine

 HOWTO.rst          | 16 ++++++++++
 configure          | 25 ++++++++++++++++
 engines/io_uring.c | 47 +++++++++++++++++++++++++++++
 engines/rbd.c      | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 fio.1              | 13 +++++++++
 5 files changed, 185 insertions(+), 2 deletions(-)

---

Diff of recent changes:

HOWTO.rst +16 -0
index b1642cf0..fb607aa4 100644
@@ -2891,6 +2891,22 @@ with the caveat that when used on the command line, they must come after the
         Touching all objects affects ceph caches and likely impacts test results.
         Enabled by default.
 
+.. option:: rbd_encryption_format=str : [rbd]
+
+		Specifies the encryption format of the RBD image. Supported values are
+		``luks1`` and ``luks2``. If set, :option:`rbd_encryption_passphrase`
+		must also be specified. Note that the image must have been
+		previously formatted using :command:`rbd encryption format <image>`;
+		the fio rbd engine will only attempt to load the encryption
+		context, not format the image. The RBD encryption feature is
+		disabled by default. Support for this feature requires librbd
+		version 16.2 (Ceph Pacific) or later.
+
+.. option:: rbd_encryption_passphrase=str : [rbd]
+
+		The passphrase used to unlock the encrypted RBD image. Required if
+		:option:`rbd_encryption_format` is set.
+
 .. option:: pool=str :
 
    [rbd,rados]
configure +25 -0
index 64e58b65..dca87255 100755
@@ -2011,6 +2011,28 @@ fi
 print_config "rbd_invalidate_cache" "$rbd_inval"
 fi
 
+##########################################
+# check for rbd_encryption_load()
+if test "$rbd_encryption" != "yes" ; then
+  rbd_encryption="no"
+fi
+if test "$rbd" = "yes" ; then
+cat > $TMPC << EOF
+#include <rbd/librbd.h>
+
+int main(int argc, char **argv)
+{
+  rbd_image_t image;
+
+  return rbd_encryption_load(image, RBD_ENCRYPTION_FORMAT_LUKS1, 0, 0);
+}
+EOF
+if compile_prog "" "-lrbd -lrados" "rbd_encryption"; then
+    rbd_encryption="yes"
+fi
+  print_config "rbd_encryption_load" "$rbd_encryption"
+fi
+
 ##########################################
 # Check whether we have setvbuf
 if test "$setvbuf" != "yes" ; then
@@ -3221,6 +3243,9 @@ fi
 if test "$rbd_inval" = "yes" ; then
   output_sym "CONFIG_RBD_INVAL"
 fi
+if test "$rbd_encryption" = "yes" ; then
+  output_sym "CONFIG_RBD_ENCRYPTION"
+fi
 if test "$setvbuf" = "yes" ; then
   output_sym "CONFIG_SETVBUF"
 fi
engines/io_uring.c +47 -0

59 lines not on this page · raw message

engines/rbd.c +84 -2

114 lines not on this page · raw message

fio.1 +13 -0
index 3ee154ed..071ad0e9 100644
@@ -2637,6 +2637,19 @@ During initialization, touch (create if do not exist) all objects (files).
 Touching all objects affects ceph caches and likely impacts test results.
 Enabled by default.
 .TP
+.BI (rbd)rbd_encryption_format \fR=\fPstr
+Specifies the encryption format of the RBD image. Supported values are
+`luks1' and `luks2'. If set, \fBrbd_encryption_passphrase\fR must
+also be specified. Note that the image must have been previously formatted
+using `rbd encryption format <image>'; the fio rbd engine will only
+attempt to load the encryption context, not format the image.
+The RBD encryption feature is disabled by default.
+Support for this feature requires librbd version 16.2 (Ceph Pacific) or later.
+.TP
+.BI (rbd)rbd_encryption_passphrase \fR=\fPstr
+The passphrase used to unlock the encrypted RBD image. Required if
+\fBrbd_encryption_format\fR is set.
+.TP
 .BI (http)http_host \fR=\fPstr
 Hostname to connect to.  HTTP port 80 is used automatically when the value 
 of the \fBhttps\fP parameter is \fBoff\fP, and HTTPS port 443 if it is \fBon\fP.