Date: Tue, 9 Jan 2018 21:37:35 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r327748 - in user/jeff/numa/sys: conf kern sys Message-ID: <201801092137.w09LbZw3016279@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Tue Jan 9 21:37:35 2018 New Revision: 327748 URL: https://svnweb.freebsd.org/changeset/base/327748 Log: Remove the last vestiges of the old NUMA support. Modified: user/jeff/numa/sys/conf/files user/jeff/numa/sys/kern/init_main.c user/jeff/numa/sys/kern/init_sysent.c user/jeff/numa/sys/kern/kern_exit.c user/jeff/numa/sys/kern/kern_fork.c user/jeff/numa/sys/kern/kern_thr.c user/jeff/numa/sys/kern/kern_thread.c user/jeff/numa/sys/kern/syscalls.c user/jeff/numa/sys/kern/syscalls.master user/jeff/numa/sys/kern/systrace_args.c user/jeff/numa/sys/sys/syscall.h user/jeff/numa/sys/sys/syscall.mk user/jeff/numa/sys/sys/sysproto.h Modified: user/jeff/numa/sys/conf/files ============================================================================== --- user/jeff/numa/sys/conf/files Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/conf/files Tue Jan 9 21:37:35 2018 (r327748) @@ -3771,7 +3771,6 @@ kern/kern_module.c standard kern/kern_mtxpool.c standard kern/kern_mutex.c standard kern/kern_ntptime.c standard -kern/kern_numa.c standard kern/kern_osd.c standard kern/kern_physio.c standard kern/kern_pmc.c standard Modified: user/jeff/numa/sys/kern/init_main.c ============================================================================== --- user/jeff/numa/sys/kern/init_main.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/init_main.c Tue Jan 9 21:37:35 2018 (r327748) @@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> -#include <vm/vm_domain.h> #include <sys/copyright.h> #include <ddb/ddb.h> Modified: user/jeff/numa/sys/kern/init_sysent.c ============================================================================== --- user/jeff/numa/sys/kern/init_sysent.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/init_sysent.c Tue Jan 9 21:37:35 2018 (r327748) @@ -599,8 +599,8 @@ struct sysent sysent[] = { { AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = ppoll */ { AS(futimens_args), (sy_call_t *)sys_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 546 = futimens */ { AS(utimensat_args), (sy_call_t *)sys_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = utimensat */ - { AS(numa_getaffinity_args), (sy_call_t *)sys_numa_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 548 = numa_getaffinity */ - { AS(numa_setaffinity_args), (sy_call_t *)sys_numa_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 549 = numa_setaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = numa_getaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 549 = numa_setaffinity */ { AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 550 = fdatasync */ { AS(fstat_args), (sy_call_t *)sys_fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 551 = fstat */ { AS(fstatat_args), (sy_call_t *)sys_fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 552 = fstatat */ Modified: user/jeff/numa/sys/kern/kern_exit.c ============================================================================== --- user/jeff/numa/sys/kern/kern_exit.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/kern_exit.c Tue Jan 9 21:37:35 2018 (r327748) @@ -88,7 +88,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_page.h> #include <vm/uma.h> -#include <vm/vm_domain.h> #ifdef KDTRACE_HOOKS #include <sys/dtrace_bsd.h> Modified: user/jeff/numa/sys/kern/kern_fork.c ============================================================================== --- user/jeff/numa/sys/kern/kern_fork.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/kern_fork.c Tue Jan 9 21:37:35 2018 (r327748) @@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_extern.h> #include <vm/uma.h> -#include <vm/vm_domain.h> #ifdef KDTRACE_HOOKS #include <sys/dtrace_bsd.h> Modified: user/jeff/numa/sys/kern/kern_thr.c ============================================================================== --- user/jeff/numa/sys/kern/kern_thr.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/kern_thr.c Tue Jan 9 21:37:35 2018 (r327748) @@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$"); #include <sys/umtx.h> #include <sys/limits.h> -#include <vm/vm_domain.h> - #include <machine/frame.h> #include <security/audit/audit.h> Modified: user/jeff/numa/sys/kern/kern_thread.c ============================================================================== --- user/jeff/numa/sys/kern/kern_thread.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/kern_thread.c Tue Jan 9 21:37:35 2018 (r327748) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/vm_extern.h> #include <vm/uma.h> -#include <vm/vm_domain.h> #include <sys/eventhandler.h> /* Modified: user/jeff/numa/sys/kern/syscalls.c ============================================================================== --- user/jeff/numa/sys/kern/syscalls.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/syscalls.c Tue Jan 9 21:37:35 2018 (r327748) @@ -554,8 +554,8 @@ const char *syscallnames[] = { "ppoll", /* 545 = ppoll */ "futimens", /* 546 = futimens */ "utimensat", /* 547 = utimensat */ - "numa_getaffinity", /* 548 = numa_getaffinity */ - "numa_setaffinity", /* 549 = numa_setaffinity */ + "#548", /* 548 = numa_getaffinity */ + "#549", /* 549 = numa_setaffinity */ "fdatasync", /* 550 = fdatasync */ "fstat", /* 551 = fstat */ "fstatat", /* 552 = fstatat */ Modified: user/jeff/numa/sys/kern/syscalls.master ============================================================================== --- user/jeff/numa/sys/kern/syscalls.master Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/syscalls.master Tue Jan 9 21:37:35 2018 (r327748) @@ -997,12 +997,8 @@ 547 AUE_FUTIMESAT STD { int utimensat(int fd, \ char *path, \ struct timespec *times, int flag); } -548 AUE_NULL STD { int numa_getaffinity(cpuwhich_t which, \ - id_t id, \ - struct vm_domain_policy_entry *policy); } -549 AUE_NULL STD { int numa_setaffinity(cpuwhich_t which, \ - id_t id, const struct \ - vm_domain_policy_entry *policy); } +548 AUE_NULL UNIMPL numa_getaffinity +549 AUE_NULL UNIMPL numa_setaffinity 550 AUE_FSYNC STD { int fdatasync(int fd); } 551 AUE_FSTAT STD { int fstat(int fd, struct stat *sb); } 552 AUE_FSTATAT STD { int fstatat(int fd, char *path, \ Modified: user/jeff/numa/sys/kern/systrace_args.c ============================================================================== --- user/jeff/numa/sys/kern/systrace_args.c Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/kern/systrace_args.c Tue Jan 9 21:37:35 2018 (r327748) @@ -3160,24 +3160,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 4; break; } - /* numa_getaffinity */ - case 548: { - struct numa_getaffinity_args *p = params; - iarg[0] = p->which; /* cpuwhich_t */ - iarg[1] = p->id; /* id_t */ - uarg[2] = (intptr_t) p->policy; /* struct vm_domain_policy_entry * */ - *n_args = 3; - break; - } - /* numa_setaffinity */ - case 549: { - struct numa_setaffinity_args *p = params; - iarg[0] = p->which; /* cpuwhich_t */ - iarg[1] = p->id; /* id_t */ - uarg[2] = (intptr_t) p->policy; /* const struct vm_domain_policy_entry * */ - *n_args = 3; - break; - } /* fdatasync */ case 550: { struct fdatasync_args *p = params; @@ -8547,38 +8529,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* numa_getaffinity */ - case 548: - switch(ndx) { - case 0: - p = "cpuwhich_t"; - break; - case 1: - p = "id_t"; - break; - case 2: - p = "userland struct vm_domain_policy_entry *"; - break; - default: - break; - }; - break; - /* numa_setaffinity */ - case 549: - switch(ndx) { - case 0: - p = "cpuwhich_t"; - break; - case 1: - p = "id_t"; - break; - case 2: - p = "userland const struct vm_domain_policy_entry *"; - break; - default: - break; - }; - break; /* fdatasync */ case 550: switch(ndx) { @@ -10620,16 +10570,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* utimensat */ case 547: - if (ndx == 0 || ndx == 1) - p = "int"; - break; - /* numa_getaffinity */ - case 548: - if (ndx == 0 || ndx == 1) - p = "int"; - break; - /* numa_setaffinity */ - case 549: if (ndx == 0 || ndx == 1) p = "int"; break; Modified: user/jeff/numa/sys/sys/syscall.h ============================================================================== --- user/jeff/numa/sys/sys/syscall.h Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/sys/syscall.h Tue Jan 9 21:37:35 2018 (r327748) @@ -465,8 +465,6 @@ #define SYS_ppoll 545 #define SYS_futimens 546 #define SYS_utimensat 547 -#define SYS_numa_getaffinity 548 -#define SYS_numa_setaffinity 549 #define SYS_fdatasync 550 #define SYS_fstat 551 #define SYS_fstatat 552 Modified: user/jeff/numa/sys/sys/syscall.mk ============================================================================== --- user/jeff/numa/sys/sys/syscall.mk Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/sys/syscall.mk Tue Jan 9 21:37:35 2018 (r327748) @@ -393,8 +393,6 @@ MIASM = \ ppoll.o \ futimens.o \ utimensat.o \ - numa_getaffinity.o \ - numa_setaffinity.o \ fdatasync.o \ fstat.o \ fstatat.o \ Modified: user/jeff/numa/sys/sys/sysproto.h ============================================================================== --- user/jeff/numa/sys/sys/sysproto.h Tue Jan 9 21:36:22 2018 (r327747) +++ user/jeff/numa/sys/sys/sysproto.h Tue Jan 9 21:37:35 2018 (r327748) @@ -1698,16 +1698,6 @@ struct utimensat_args { char times_l_[PADL_(struct timespec *)]; struct timespec * times; char times_r_[PADR_(struct timespec *)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; -struct numa_getaffinity_args { - char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)]; - char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)]; - char policy_l_[PADL_(struct vm_domain_policy_entry *)]; struct vm_domain_policy_entry * policy; char policy_r_[PADR_(struct vm_domain_policy_entry *)]; -}; -struct numa_setaffinity_args { - char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)]; - char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)]; - char policy_l_[PADL_(const struct vm_domain_policy_entry *)]; const struct vm_domain_policy_entry * policy; char policy_r_[PADR_(const struct vm_domain_policy_entry *)]; -}; struct fdatasync_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; }; @@ -2145,8 +2135,6 @@ int sys_procctl(struct thread *, struct procctl_args * int sys_ppoll(struct thread *, struct ppoll_args *); int sys_futimens(struct thread *, struct futimens_args *); int sys_utimensat(struct thread *, struct utimensat_args *); -int sys_numa_getaffinity(struct thread *, struct numa_getaffinity_args *); -int sys_numa_setaffinity(struct thread *, struct numa_setaffinity_args *); int sys_fdatasync(struct thread *, struct fdatasync_args *); int sys_fstat(struct thread *, struct fstat_args *); int sys_fstatat(struct thread *, struct fstatat_args *); @@ -3039,8 +3027,6 @@ int freebsd11_mknodat(struct thread *, struct freebsd1 #define SYS_AUE_ppoll AUE_POLL #define SYS_AUE_futimens AUE_FUTIMES #define SYS_AUE_utimensat AUE_FUTIMESAT -#define SYS_AUE_numa_getaffinity AUE_NULL -#define SYS_AUE_numa_setaffinity AUE_NULL #define SYS_AUE_fdatasync AUE_FSYNC #define SYS_AUE_fstat AUE_FSTAT #define SYS_AUE_fstatat AUE_FSTATAT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801092137.w09LbZw3016279>