Skip to contentSkip to conversation

selftests/proc: make proc-maps-race work with READ_IMPLIES_EXEC

PATCH Applied Karl Mehltretter 2 participants 2 messages Aug 8 – Aug 24

Subsystems (4)
Memory management VFS Kselftest Proc filesystem
lore
Share & tools
lore

Karl Mehltretter

author
#0 lore raw

PATCH v2 1/1 selftests/proc: make proc-maps-race work with READ_IMPLIES_EXEC

test_maps_tearing_from_split times out when READ_IMPLIES_EXEC is set. This happens by default on pre-ARMv6 CPUs, which lack no-execute support.

split_vma() re-maps the first page with mod_info->prot | PROT_EXEC to make it differ from its neighbours. With READ_IMPLIES_EXEC the original mapping is already executable, so no split occurs and the test hangs waiting for the modifier child.

Use PROT_NONE for the split mapping, which always differs from its readable neighbours.

Fixes beb69e817246 ("selftests/proc: add /proc/pid/maps tearing from vma split test")
Assisted-by Codex:gpt-5.6-terra
Signed-off-by Karl Mehltretter <[email protected]>

---
Tested on:
- QEMU versatilepb/ARM926EJ-S: maps and smaps fail before, pass after
- QEMU realview-eb-mpcore/ARM11MPCore: maps and smaps pass before and after

Changes since v1:
- v1 went out without any recipients in To: and received no reply in 19 days.
- No functional change. reworked the commit message.

v1: https://lore.kernel.org/all/[email protected]/

 tools/testing/selftests/proc/proc-maps-race.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/proc/proc-maps-race.c +2 -1
index 1026d8c400e1..415eccb70468 100644
@@ -490,7 +490,8 @@ static bool query_addr_at(int maps_fd, void *addr,
 
 static inline bool split_vma(FIXTURE_DATA(proc_maps_race) *self)
 {
-	return mmap(self->mod_info->addr, self->page_size, self->mod_info->prot | PROT_EXEC,
+	/* PROT_NONE differs from both readable neighbors. */
+	return mmap(self->mod_info->addr, self->page_size, PROT_NONE,
 		    MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) != MAP_FAILED;
 }
Signature · 1 line
2.53.0
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Karl Mehltretter

test_maps_tearing_from_split times out when READ_IMPLIES_EXEC is set. This happens by default on pre-ARMv6 CPUs, which lack no-execute support.

split_vma() re-maps the first page with mod_info->prot | PROT_EXEC to make it differ from its neighbours. With READ_IMPLIES_EXEC the original mapping is already executable, so no split occurs and the test hangs waiting for the modifier child.

Quoted 6 lines

Use PROT_NONE for the split mapping, which always differs from its readable neighbours.

Fixes beb69e817246 ("selftests/proc: add /proc/pid/maps tearing from vma split test")
Assisted-by Codex:gpt-5.6-terra
Signed-off-by Karl Mehltretter <[email protected]>

Sorry for missing both versions.

Acked-by Suren Baghdasaryan <[email protected]>
Quoted 30 lines

---
Tested on:
- QEMU versatilepb/ARM926EJ-S: maps and smaps fail before, pass after
- QEMU realview-eb-mpcore/ARM11MPCore: maps and smaps pass before and after

Changes since v1:
- v1 went out without any recipients in To: and received no reply in 19 days.
- No functional change. reworked the commit message.

v1: https://lore.kernel.org/all/[email protected]/

 tools/testing/selftests/proc/proc-maps-race.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/proc/proc-maps-race.c +2 -2
index 1026d8c400e1..415eccb70468 100644
@@ -490,7 +490,8 @@ static bool query_addr_at(int maps_fd, void *addr,
 
 static inline bool split_vma(FIXTURE_DATA(proc_maps_race) *self)
 {
-       return mmap(self->mod_info->addr, self->page_size, self->mod_info->prot | PROT_EXEC,
+       /* PROT_NONE differs from both readable neighbors. */
+       return mmap(self->mod_info->addr, self->page_size, PROT_NONE,
                    MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) != MAP_FAILED;
 }
 
--

2.53.0