File cryptsetup-Check-for-physical-memory-available-... of Package cryptsetup.29833

Overview Repositories Revisions Requests Users Attributes Meta

File cryptsetup-Check-for-physical-memory-available-also-in-PBKDF-be.patch of Package cryptsetup.29833

From 7893c33d71cde09e240234c484c6c468f22c2fe7 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Mon, 3 Apr 2023 13:31:16 +0200
Subject: [PATCH] Check for physical memory available also in PBKDF benchmark.

---
 lib/internal.h        |    1 +
 lib/utils_benchmark.c |    9 +++++++++
 lib/utils_pbkdf.c     |    4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

--- a/lib/internal.h
+++ b/lib/internal.h
@@ -88,6 +88,7 @@ int crypt_benchmark_pbkdf_internal(struc
 				   struct crypt_pbkdf_type *pbkdf,
 				   size_t volume_key_size);
 
+uint32_t pbkdf_adjusted_phys_memory_kb(void);
 /* Device backend */
 struct device;
 int device_alloc(struct device **device, const char *path);
--- a/lib/utils_benchmark.c
+++ b/lib/utils_benchmark.c
@@ -243,6 +243,7 @@ int crypt_benchmark_pbkdf(struct crypt_d
 {
 	int r;
 	const char *kdf_opt;
+	uint32_t memory_kb;
 
 	if (!pbkdf || (!password && password_size))
 		return -EINVAL;
@@ -255,6 +256,14 @@ int crypt_benchmark_pbkdf(struct crypt_d
 
 	log_dbg("Running %s(%s) benchmark.", pbkdf->type, kdf_opt);
 
+	memory_kb = pbkdf_adjusted_phys_memory_kb();
+	if (memory_kb < pbkdf->max_memory_kb) {
+		log_dbg("Not enough physical memory detected, "
+			"PBKDF max memory decreased from %dkB to %dkB.",
+			pbkdf->max_memory_kb, memory_kb);
+		pbkdf->max_memory_kb = memory_kb;
+	}
+
 	r = crypt_pbkdf_perf(pbkdf->type, pbkdf->hash, password, password_size,
 			     salt, salt_size, volume_key_size, pbkdf->time_ms,
 			     pbkdf->max_memory_kb, pbkdf->parallel_threads,
--- a/lib/utils_pbkdf.c
+++ b/lib/utils_pbkdf.c
@@ -38,7 +38,7 @@ const struct crypt_pbkdf_type default_lu
 	.time_ms = DEFAULT_LUKS1_ITER_TIME
 };
 
-static uint32_t adjusted_phys_memory(void)
+uint32_t pbkdf_adjusted_phys_memory_kb(void)
 {
 	uint64_t memory_kb = crypt_getphysmemory_kb();
 
@@ -217,7 +217,7 @@ int init_pbkdf_type(struct crypt_device
 	}
 
 	if (cd_pbkdf->max_memory_kb) {
-		memory_kb = adjusted_phys_memory();
+		memory_kb = pbkdf_adjusted_phys_memory_kb();
 		if (cd_pbkdf->max_memory_kb > memory_kb) {
 			log_dbg("Not enough physical memory detected, "
 				"PBKDF max memory decreased from %dkB to %dkB.",

Places

File cryptsetup-Check-for-physical-memory-available-also-in-PBKDF-be.patch of Package cryptsetup.29833

Places