gcm.c tried to nest kfpu calls

Which will fail on Windows, due to variable allocations Signed-off-by: Jorgen Lundman <lundman@lundman.net>
openzfsonwindows · Nov 23, 2024 · 773833e · 773833e
1 parent 65ae459
commit 773833e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/include/os/windows/spl/sys/simd.h b/include/os/windows/spl/sys/simd.h
@@ -107,6 +107,9 @@ extern uint32_t kfpu_state;
 	XSTATE_SAVE SaveState; \
 	saveStatus = KeSaveExtendedProcessorState(kfpu_state, &SaveState);
 
+#define	kfpu_begin_cont() \
+	saveStatus = KeSaveExtendedProcessorState(kfpu_state, &SaveState);
+
 #define	kfpu_end() \
 	if (NT_SUCCESS(saveStatus)) \
 		KeRestoreExtendedProcessorState(&SaveState);

diff --git a/module/icp/algs/modes/gcm.c b/module/icp/algs/modes/gcm.c
@@ -76,6 +76,11 @@ static int gcm_init_avx(gcm_ctx_t *, const uint8_t *, size_t, const uint8_t *,
     size_t, size_t);
 #endif /* ifdef CAN_USE_GCM_ASM */
 
+/* Windows defines variables, so can't be nested */
+#ifndef kfpu_begin_cont
+#define	kfpu_begin_cont kfpu_begin
+#endif
+
 /*
  * Encrypt multiple blocks of data in GCM mode.  Decrypt for GCM mode
  * is done in another function.
@@ -1478,7 +1483,7 @@ gcm_init_avx(gcm_ctx_t *ctx, const uint8_t *iv, size_t iv_len,
 		kfpu_end();
 		gcm_format_initial_blocks(iv, iv_len, ctx, block_size,
 		    aes_copy_block, aes_xor_block);
-		kfpu_begin();
+		kfpu_begin_cont();
 	}
 
 	/* Openssl post increments the counter, adjust for that. */
@@ -1490,7 +1495,7 @@ gcm_init_avx(gcm_ctx_t *ctx, const uint8_t *iv, size_t iv_len,
 		datap += chunk_size;
 		clear_fpu_regs();
 		kfpu_end();
-		kfpu_begin();
+		kfpu_begin_cont();
 	}
 	/* Ghash the remainder and handle possible incomplete GCM block. */
 	if (bleft > 0) {