1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/crypto/vmx/aes_xts.c b/drivers/crypto/vmx/aes_xts.c
index 8bd9aff0f55f..e9954a7d4694 100644
--- a/drivers/crypto/vmx/aes_xts.c
+++ b/drivers/crypto/vmx/aes_xts.c
@@ -116,32 +116,39 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc,
                 ret = enc? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req);
                 skcipher_request_zero(req);
         } else {
+                blkcipher_walk_init(&walk, dst, src, nbytes);
+
+                ret = blkcipher_walk_virt(desc, &walk);
+
                 preempt_disable();
                 pagefault_disable();
                 enable_kernel_vsx();
 
-                blkcipher_walk_init(&walk, dst, src, nbytes);
-
-                ret = blkcipher_walk_virt(desc, &walk);
                 iv = walk.iv;
                 memset(tweak, 0, AES_BLOCK_SIZE);
                 aes_p8_encrypt(iv, tweak, &ctx->tweak_key);
 
+                disable_kernel_vsx();
+                pagefault_enable();
+                preempt_enable();
+
                 while ((nbytes = walk.nbytes)) {
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_vsx();
                         if (enc)
                                 aes_p8_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
                                                 nbytes & AES_BLOCK_MASK, &ctx->enc_key, NULL, tweak);
                         else
                                 aes_p8_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
                                                 nbytes & AES_BLOCK_MASK, &ctx->dec_key, NULL, tweak);
+                        disable_kernel_vsx();
+                        pagefault_enable();
+                        preempt_enable();
 
                         nbytes &= AES_BLOCK_SIZE - 1;
                         ret = blkcipher_walk_done(desc, &walk, nbytes);
                 }
-
-                disable_kernel_vsx();
-                pagefault_enable();
-                preempt_enable();
         }
         return ret;
 }