Skip to contentSkip to conversation

mm-rodata_test-use-read_once-to-read-const-variable.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 14, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/rodata_test: use READ_ONCE() to read const variable
has been removed from the -mm tree. Its filename was
mm-rodata_test-use-read_once-to-read-const-variable.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Petr Tesarik <[email protected]>
Subject: mm/rodata_test: use READ_ONCE() to read const variable
Date: Tue, 19 Nov 2024 12:37:38 +0100

Patch series "Fix mm/rodata_test", v2.

Make sure that the test actually reads the read-only memory location. Verify that the variable contains the expected value rather than any non-zero value.

This patch (of 2):

The C compiler may optimize away the memory read of a const variable if its value is known at compile time.

In particular, GCC14 with -O2 generates no code at all for test 1, and it generates the following x86_64 instructions for test 3:

	cmpl	$195, 4(%rsp)
	je	.L14

That is, it replaces the read of rodata_test_data with an immediate value and compares it to the value of the local variable "zero".

Use READ_ONCE() to undo any such compiler optimizations and enforce a memory read.

---

 mm/rodata_test.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/rodata_test.c renamed from mm/rodata_test.c~mm-rodata_test-use-read_once-to-read-const-variable +2 -2
@@ -20,7 +20,7 @@ void rodata_test(void)
 
 	/* test 1: read the value */
 	/* If this test fails, some previous testrun has clobbered the state */
-	if (!rodata_test_data) {
+	if (!READ_ONCE(rodata_test_data)) {
 		pr_err("test 1 fails (start data)\n");
 		return;
 	}
@@ -33,7 +33,7 @@ void rodata_test(void)
 	}
 
 	/* test 3: check the value hasn't changed */
-	if (rodata_test_data == zero) {
+	if (READ_ONCE(rodata_test_data) == zero) {
 		pr_err("test data was changed\n");
 		return;
 	}

_

Patches currently in -mm which might be from [email protected] are