From d0e748d286cfdd3346ca67539006d10b09f74a88 Mon Sep 17 00:00:00 2001
From: Omar Sandoval <osandov@osandov.com>
Date: Wed, 6 Mar 2024 13:25:45 -0800
Subject: [PATCH] vmtest.config: enable more options for fsrefs.py tests

CONFIG_UPROBE_EVENTS was called CONFIG_UPROBE_EVENT before Linux 4.11.
Also enable CONFIG_DNOTIFY, CONFIG_FANOTIFY, and CONFIG_PERF_EVENTS
explicitly for the future.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
---
 vmtest/config.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/vmtest/config.py b/vmtest/config.py
index ac8dd440..17f6fbb0 100644
--- a/vmtest/config.py
+++ b/vmtest/config.py
@@ -39,7 +39,7 @@ SUPPORTED_KERNEL_VERSIONS = (
 )
 
 KERNEL_ORG_COMPILER_VERSION = "12.2.0"
-VMTEST_KERNEL_VERSION = 25
+VMTEST_KERNEL_VERSION = 26
 
 
 BASE_KCONFIG = """
@@ -153,8 +153,15 @@ CONFIG_READ_ONLY_THP_FOR_FS=y
 # For tools/fsrefs.py tests.
 CONFIG_BINFMT_MISC=m
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_DNOTIFY=y
+CONFIG_FANOTIFY=y
 CONFIG_INOTIFY_USER=y
+CONFIG_PERF_EVENTS=y
 CONFIG_SWAP=y
+# We need to try two names here because of Linux kernel commit 6b0b7551428e
+# ("perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS") (in
+# v4.11).
+CONFIG_UPROBE_EVENT=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_USER_NS=y
 """