fscrypt: use unbound workqueue for decryption

[ Upstream commit 36dd26e0c8d42699eeba87431246c07c28075bae ]

Improve fscrypt read performance by switching the decryption workqueue
from bound to unbound.  With the bound workqueue, when multiple bios
completed on the same CPU, they were decrypted on that same CPU.  But
with the unbound queue, they are now decrypted in parallel on any CPU.

Although fscrypt read performance can be tough to measure due to the
many sources of variation, this change is most beneficial when
decryption is slow, e.g. on CPUs without AES instructions.  For example,
I timed tarring up encrypted directories on f2fs.  On x86 with AES-NI
instructions disabled, the unbound workqueue improved performance by
about 25-35%, using 1 to NUM_CPUs jobs with 4 or 8 CPUs available.  But
with AES-NI enabled, performance was unchanged to within ~2%.

I also did the same test on a quad-core ARM CPU using xts-speck128-neon
encryption.  There performance was usually about 10% better with the
unbound workqueue, bringing it closer to the unencrypted speed.

The unbound workqueue may be worse in some cases due to worse locality,
but I think it's still the better default.  dm-crypt uses an unbound
workqueue by default too, so this change makes fscrypt match.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 73de1446c8d43241f383c946ba00e62e4fbb967e..1a8962569b5caecf81344e5a905a6c9ad68ec4ab 100644 (file)
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -517,8 +517,17 @@ EXPORT_SYMBOL(fscrypt_initialize);
  */
 static int __init fscrypt_init(void)
 {
+       /*
+        * Use an unbound workqueue to allow bios to be decrypted in parallel
+        * even when they happen to complete on the same CPU.  This sacrifices
+        * locality, but it's worthwhile since decryption is CPU-intensive.
+        *
+        * Also use a high-priority workqueue to prioritize decryption work,
+        * which blocks reads from completing, over regular application tasks.
+        */
        fscrypt_read_workqueue = alloc_workqueue("fscrypt_read_queue",
-                                                       WQ_HIGHPRI, 0);
+                                                WQ_UNBOUND | WQ_HIGHPRI,
+                                                num_online_cpus());
        if (!fscrypt_read_workqueue)
                goto fail;