svn commit: r366290 - stable/12/sys/vm

[Mark Johnston]

Author: markj
Date: Wed Sep 30 13:33:28 2020
New Revision: 366290
URL: https://svnweb.freebsd.org/changeset/base/366290

Log:
  MFC r366091:
  Flag vm_reserv and vm_phys sysctls as MPSAFE.

Modified:
  stable/12/sys/vm/vm_phys.c
  stable/12/sys/vm/vm_reserv.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/vm/vm_phys.c
==============================================================================
--- stable/12/sys/vm/vm_phys.c	Wed Sep 30 13:21:17 2020	(r366289)
+++ stable/12/sys/vm/vm_phys.c	Wed Sep 30 13:33:28 2020	(r366290)
@@ -131,17 +131,23 @@ CTASSERT(VM_LOWMEM_BOUNDARY < VM_DMA32_BOUNDARY);
 #endif
 
 static int sysctl_vm_phys_free(SYSCTL_HANDLER_ARGS);
-SYSCTL_OID(_vm, OID_AUTO, phys_free, CTLTYPE_STRING | CTLFLAG_RD,
-    NULL, 0, sysctl_vm_phys_free, "A", "Phys Free Info");
+SYSCTL_OID(_vm, OID_AUTO, phys_free,
+    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_vm_phys_free, "A",
+    "Phys Free Info");
 
 static int sysctl_vm_phys_segs(SYSCTL_HANDLER_ARGS);
-SYSCTL_OID(_vm, OID_AUTO, phys_segs, CTLTYPE_STRING | CTLFLAG_RD,
-    NULL, 0, sysctl_vm_phys_segs, "A", "Phys Seg Info");
+SYSCTL_OID(_vm, OID_AUTO, phys_segs,
+    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_vm_phys_segs, "A",
+    "Phys Seg Info");
 
 #ifdef NUMA
 static int sysctl_vm_phys_locality(SYSCTL_HANDLER_ARGS);
-SYSCTL_OID(_vm, OID_AUTO, phys_locality, CTLTYPE_STRING | CTLFLAG_RD,
-    NULL, 0, sysctl_vm_phys_locality, "A", "Phys Locality Info");
+SYSCTL_OID(_vm, OID_AUTO, phys_locality,
+    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_vm_phys_locality, "A",
+    "Phys Locality Info");
 #endif
 
 SYSCTL_INT(_vm, OID_AUTO, ndomains, CTLFLAG_RD,

Modified: stable/12/sys/vm/vm_reserv.c
==============================================================================
--- stable/12/sys/vm/vm_reserv.c	Wed Sep 30 13:21:17 2020	(r366289)
+++ stable/12/sys/vm/vm_reserv.c	Wed Sep 30 13:33:28 2020	(r366290)
@@ -278,8 +278,10 @@ SYSCTL_PROC(_vm_reserv, OID_AUTO, fullpop, CTLTYPE_INT
 
 static int sysctl_vm_reserv_partpopq(SYSCTL_HANDLER_ARGS);
 
-SYSCTL_OID(_vm_reserv, OID_AUTO, partpopq, CTLTYPE_STRING | CTLFLAG_RD, NULL, 0,
-    sysctl_vm_reserv_partpopq, "A", "Partially populated reservation queues");
+SYSCTL_OID(_vm_reserv, OID_AUTO, partpopq,
+    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
+    sysctl_vm_reserv_partpopq, "A",
+    "Partially populated reservation queues");
 
 static counter_u64_t vm_reserv_reclaimed = EARLY_COUNTER;
 SYSCTL_COUNTER_U64(_vm_reserv, OID_AUTO, reclaimed, CTLFLAG_RD,