sched/numa: Rename vma_numab_state::access_pids[] => ::pids_active[], ::next_pid_rese...

[ Upstream commit f3a6c97940fbd25d6c84c2d5642338fc99a9b35b ]

The access_pids[] field name is somewhat ambiguous as no PIDs are accessed.
Similarly, it's not clear that next_pid_reset is related to access_pids[].
Rename the fields to more accurately reflect their purpose.

[ mingo: Rename in the comments too. ]

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20231010083143.19593-3-mgorman@techsingularity.net
Stable-dep-of: f22cde4371f3 ("sched/numa: Fix the vma scan starving issue")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 830b925c2d005407355bbbfa93a51b6573a61a51..b6a4d6471b4a7257de12c82d359dba610fa0bcc2 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1732,8 +1732,8 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma)
        unsigned int pid_bit;
 
        pid_bit = hash_32(current->pid, ilog2(BITS_PER_LONG));
-       if (vma->numab_state && !test_bit(pid_bit, &vma->numab_state->access_pids[1])) {
-               __set_bit(pid_bit, &vma->numab_state->access_pids[1]);
+       if (vma->numab_state && !test_bit(pid_bit, &vma->numab_state->pids_active[1])) {
+               __set_bit(pid_bit, &vma->numab_state->pids_active[1]);
        }
 }
 #else /* !CONFIG_NUMA_BALANCING */

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index b53a13d15bbae0f0dc387ec574b6e41dad8a6393..80d9d1b7685c65dcb1b2173f0fca3cd31d9840a3 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -559,10 +559,10 @@ struct vma_numab_state {
        unsigned long next_scan;
 
        /*
-        * Time in jiffies when access_pids[] is reset to
+        * Time in jiffies when pids_active[] is reset to
         * detect phase change behaviour:
         */
-       unsigned long next_pid_reset;
+       unsigned long pids_active_reset;
 
        /*
         * Approximate tracking of PIDs that trapped a NUMA hinting
@@ -574,7 +574,7 @@ struct vma_numab_state {
         * Window moves after next_pid_reset has expired approximately
         * every VMA_PID_RESET_PERIOD jiffies:
         */
-       unsigned long access_pids[2];
+       unsigned long pids_active[2];
 };
 
 /*

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 5fc0d9cc9d9d7b85b5659ddb6b2e1b81e8a2be43..d07fb0a0da8084e2872bc1efdad6e1f08ff01d32 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3200,7 +3200,7 @@ static bool vma_is_accessed(struct vm_area_struct *vma)
        if (READ_ONCE(current->mm->numa_scan_seq) < 2)
                return true;
 
-       pids = vma->numab_state->access_pids[0] | vma->numab_state->access_pids[1];
+       pids = vma->numab_state->pids_active[0] | vma->numab_state->pids_active[1];
        return test_bit(hash_32(current->pid, ilog2(BITS_PER_LONG)), &pids);
 }
 
@@ -3316,7 +3316,7 @@ static void task_numa_work(struct callback_head *work)
                                msecs_to_jiffies(sysctl_numa_balancing_scan_delay);
 
                        /* Reset happens after 4 times scan delay of scan start */
-                       vma->numab_state->next_pid_reset =  vma->numab_state->next_scan +
+                       vma->numab_state->pids_active_reset =  vma->numab_state->next_scan +
                                msecs_to_jiffies(VMA_PID_RESET_PERIOD);
                }
 
@@ -3337,11 +3337,11 @@ static void task_numa_work(struct callback_head *work)
                 * vma for recent access to avoid clearing PID info before access..
                 */
                if (mm->numa_scan_seq &&
-                               time_after(jiffies, vma->numab_state->next_pid_reset)) {
-                       vma->numab_state->next_pid_reset = vma->numab_state->next_pid_reset +
+                               time_after(jiffies, vma->numab_state->pids_active_reset)) {
+                       vma->numab_state->pids_active_reset = vma->numab_state->pids_active_reset +
                                msecs_to_jiffies(VMA_PID_RESET_PERIOD);
-                       vma->numab_state->access_pids[0] = READ_ONCE(vma->numab_state->access_pids[1]);
-                       vma->numab_state->access_pids[1] = 0;
+                       vma->numab_state->pids_active[0] = READ_ONCE(vma->numab_state->pids_active[1]);
+                       vma->numab_state->pids_active[1] = 0;
                }
 
                do {