1 files changed, 18 insertions, 2 deletions

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 404e9558e879..ebe4ded0c55d 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -191,9 +191,25 @@ static inline unsigned int crypto_queue_len(struct crypto_queue *queue)
         return queue->qlen;
 }
 
-/* These functions require the input/output to be aligned as u32. */
 void crypto_inc(u8 *a, unsigned int size);
-void crypto_xor(u8 *dst, const u8 *src, unsigned int size);
+void __crypto_xor(u8 *dst, const u8 *src, unsigned int size);
+
+static inline void crypto_xor(u8 *dst, const u8 *src, unsigned int size)
+{
+        if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&
+            __builtin_constant_p(size) &&
+            (size % sizeof(unsigned long)) == 0) {
+                unsigned long *d = (unsigned long *)dst;
+                unsigned long *s = (unsigned long *)src;
+
+                while (size > 0) {
+                        *d++ ^= *s++;
+                        size -= sizeof(unsigned long);
+                }
+        } else {
+                __crypto_xor(dst, src, size);
+        }
+}
 
 int blkcipher_walk_done(struct blkcipher_desc *desc,
                         struct blkcipher_walk *walk, int err);