Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 12 Jan 2020 05:08:57 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r356653 - head/sys/vm
Message-ID:  <202001120508.00C58v07014627@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mjg
Date: Sun Jan 12 05:08:57 2020
New Revision: 356653
URL: https://svnweb.freebsd.org/changeset/base/356653

Log:
  vm: add missing CLTFLAG_MPSAFE annotations
  
  This covers all vm/* files.

Modified:
  head/sys/vm/memguard.c
  head/sys/vm/uma_core.c
  head/sys/vm/vm_glue.c
  head/sys/vm/vm_kern.c
  head/sys/vm/vm_reserv.c
  head/sys/vm/vnode_pager.c

Modified: head/sys/vm/memguard.c
==============================================================================
--- head/sys/vm/memguard.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/memguard.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -237,7 +237,7 @@ memguard_sysinit(void)
 	    CTLFLAG_RD, &memguard_mapsize,
 	    "MemGuard KVA size");
 	SYSCTL_ADD_PROC(NULL, parent, OID_AUTO, "mapused",
-	    CTLFLAG_RD | CTLTYPE_ULONG, NULL, 0, memguard_sysctl_mapused, "LU",
+	    CTLFLAG_RD | CTLFLAG_MPSAFE | CTLTYPE_ULONG, NULL, 0, memguard_sysctl_mapused, "LU",
 	    "MemGuard KVA used");
 }
 SYSINIT(memguard, SI_SUB_KLD, SI_ORDER_ANY, memguard_sysinit, NULL);

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/uma_core.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -330,10 +330,10 @@ SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND,
 
 SYSCTL_NODE(_vm, OID_AUTO, uma, CTLFLAG_RW, 0, "Universal Memory Allocator");
 
-SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLTYPE_INT,
+SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLFLAG_MPSAFE|CTLTYPE_INT,
     0, 0, sysctl_vm_zone_count, "I", "Number of UMA zones");
 
-SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT,
+SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLFLAG_MPSAFE|CTLTYPE_STRUCT,
     0, 0, sysctl_vm_zone_stats, "s,struct uma_type_header", "Zone Stats");
 
 static int zone_warnings = 1;

Modified: head/sys/vm/vm_glue.c
==============================================================================
--- head/sys/vm/vm_glue.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/vm_glue.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -281,9 +281,9 @@ sysctl_kstack_cache_size(SYSCTL_HANDLER_ARGS)
 		uma_zone_set_maxcache(kstack_cache, kstack_cache_size);
 	return (error);
 }
-SYSCTL_PROC(_vm, OID_AUTO, kstack_cache_size, CTLTYPE_INT|CTLFLAG_RW,
-	&kstack_cache_size, 0, sysctl_kstack_cache_size, "IU",
-	"Maximum number of cached kernel stacks");
+SYSCTL_PROC(_vm, OID_AUTO, kstack_cache_size,
+    CTLTYPE_INT|CTLFLAG_MPSAFE|CTLFLAG_RW, &kstack_cache_size, 0,
+    sysctl_kstack_cache_size, "IU", "Maximum number of cached kernel stacks");
 
 /*
  * Create the kernel stack (including pcb for i386) for a new thread.

Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/vm_kern.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -880,5 +880,5 @@ debug_vm_lowmem(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 
-SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem, CTLTYPE_INT | CTLFLAG_RW, 0, 0,
+SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem, CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, 0,
     debug_vm_lowmem, "I", "set to trigger vm_lowmem event with given flags");

Modified: head/sys/vm/vm_reserv.c
==============================================================================
--- head/sys/vm/vm_reserv.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/vm_reserv.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -273,8 +273,8 @@ SYSCTL_COUNTER_U64(_vm_reserv, OID_AUTO, freed, CTLFLA
 
 static int sysctl_vm_reserv_fullpop(SYSCTL_HANDLER_ARGS);
 
-SYSCTL_PROC(_vm_reserv, OID_AUTO, fullpop, CTLTYPE_INT | CTLFLAG_RD, NULL, 0,
-    sysctl_vm_reserv_fullpop, "I", "Current number of full reservations");
+SYSCTL_PROC(_vm_reserv, OID_AUTO, fullpop, CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD,
+    NULL, 0, sysctl_vm_reserv_fullpop, "I", "Current number of full reservations");
 
 static int sysctl_vm_reserv_partpopq(SYSCTL_HANDLER_ARGS);
 

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Sun Jan 12 04:53:22 2020	(r356652)
+++ head/sys/vm/vnode_pager.c	Sun Jan 12 05:08:57 2020	(r356653)
@@ -119,9 +119,9 @@ struct pagerops vnodepagerops = {
 
 static struct domainset *vnode_domainset = NULL;
 
-SYSCTL_PROC(_debug, OID_AUTO, vnode_domainset, CTLTYPE_STRING | CTLFLAG_RW,
-    &vnode_domainset, 0, sysctl_handle_domainset, "A",
-    "Default vnode NUMA policy");
+SYSCTL_PROC(_debug, OID_AUTO, vnode_domainset,
+    CTLTYPE_STRING | CTLFLAG_MPSAFE | CTLFLAG_RW, &vnode_domainset, 0,
+    sysctl_handle_domainset, "A", "Default vnode NUMA policy");
 
 static int nvnpbufs;
 SYSCTL_INT(_vm, OID_AUTO, vnode_pbufs, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001120508.00C58v07014627>