Author: pkelsey Date: Thu Jan 25 02:45:21 2018 New Revision: 328386 URL: https://svnweb.freebsd.org/changeset/base/328386
Log: MFC r316648: Corrected misspelled versions of rendezvous. The MFC maintains smp_no_rendevous_barrier() as a symbol alias of smp_no_rendezvous_barrier(). __FreeBSD_version bumped to indicate presence of the new name smp_no_rendezvous_barrier(). Reviewed by: gnn, jhb (email), kib Differential Revision: https://reviews.freebsd.org/D10313 Modified: stable/11/sys/amd64/amd64/pmap.c stable/11/sys/amd64/include/counter.h stable/11/sys/arm/arm/pmap-v6.c stable/11/sys/arm/include/counter.h stable/11/sys/arm64/include/counter.h stable/11/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/amd64/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/arm/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/i386/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c stable/11/sys/cddl/dev/dtrace/riscv/dtrace_subr.c stable/11/sys/dev/acpica/acpi_cpu.c stable/11/sys/i386/i386/pmap.c stable/11/sys/i386/include/counter.h stable/11/sys/kern/kern_rmlock.c stable/11/sys/kern/subr_smp.c stable/11/sys/mips/include/counter.h stable/11/sys/powerpc/include/counter.h stable/11/sys/powerpc/ofw/ofw_machdep.c stable/11/sys/riscv/include/counter.h stable/11/sys/sparc64/include/counter.h stable/11/sys/sys/param.h stable/11/sys/sys/smp.h stable/11/sys/x86/x86/tsc.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/pmap.c ============================================================================== --- stable/11/sys/amd64/amd64/pmap.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/amd64/amd64/pmap.c Thu Jan 25 02:45:21 2018 (r328386) @@ -1753,7 +1753,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_ act.newpde = newpde; CPU_SET(cpuid, &active); smp_rendezvous_cpus(active, - smp_no_rendevous_barrier, pmap_update_pde_action, + smp_no_rendezvous_barrier, pmap_update_pde_action, pmap_update_pde_teardown, &act); } else { pmap_update_pde_store(pmap, pde, newpde); Modified: stable/11/sys/amd64/include/counter.h ============================================================================== --- stable/11/sys/amd64/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/amd64/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -69,8 +69,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/arm/arm/pmap-v6.c ============================================================================== --- stable/11/sys/arm/arm/pmap-v6.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/arm/arm/pmap-v6.c Thu Jan 25 02:45:21 2018 (r328386) @@ -3367,7 +3367,7 @@ pmap_change_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_o act.va = va; act.npte1 = npte1; act.update = PCPU_GET(cpuid); - smp_rendezvous_cpus(all_cpus, smp_no_rendevous_barrier, + smp_rendezvous_cpus(all_cpus, smp_no_rendezvous_barrier, pmap_update_pte1_action, NULL, &act); sched_unpin(); } else { Modified: stable/11/sys/arm/include/counter.h ============================================================================== --- stable/11/sys/arm/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/arm/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -70,8 +70,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/arm64/include/counter.h ============================================================================== --- stable/11/sys/arm64/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/arm64/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -68,8 +68,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -134,8 +134,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void Modified: stable/11/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -125,8 +125,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void @@ -331,7 +331,7 @@ dtrace_gethrtime_init(void *arg) smp_rendezvous_cpus(map, NULL, dtrace_gethrtime_init_cpu, - smp_no_rendevous_barrier, (void *)(uintptr_t) i); + smp_no_rendezvous_barrier, (void *)(uintptr_t) i); tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc; } Modified: stable/11/sys/cddl/dev/dtrace/arm/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/arm/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/arm/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -136,8 +136,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void Modified: stable/11/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -127,8 +127,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void @@ -333,7 +333,7 @@ dtrace_gethrtime_init(void *arg) smp_rendezvous_cpus(map, NULL, dtrace_gethrtime_init_cpu, - smp_no_rendevous_barrier, (void *)(uintptr_t) i); + smp_no_rendezvous_barrier, (void *)(uintptr_t) i); tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc; } Modified: stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -131,8 +131,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void Modified: stable/11/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -133,8 +133,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void @@ -212,7 +212,7 @@ dtrace_gethrtime_init(void *arg) smp_rendezvous_cpus(map, NULL, dtrace_gethrtime_init_cpu, - smp_no_rendevous_barrier, (void *)(uintptr_t) i); + smp_no_rendezvous_barrier, (void *)(uintptr_t) i); timebase_skew[i] = tgt_cpu_tsc - hst_cpu_tsc; } Modified: stable/11/sys/cddl/dev/dtrace/riscv/dtrace_subr.c ============================================================================== --- stable/11/sys/cddl/dev/dtrace/riscv/dtrace_subr.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/cddl/dev/dtrace/riscv/dtrace_subr.c Thu Jan 25 02:45:21 2018 (r328386) @@ -137,8 +137,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, v else CPU_SETOF(cpu, &cpus); - smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func, - smp_no_rendevous_barrier, arg); + smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, arg); } static void Modified: stable/11/sys/dev/acpica/acpi_cpu.c ============================================================================== --- stable/11/sys/dev/acpica/acpi_cpu.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/dev/acpica/acpi_cpu.c Thu Jan 25 02:45:21 2018 (r328386) @@ -466,8 +466,8 @@ disable_idle(struct acpi_cpu_softc *sc) * is called and executed in such a context with interrupts being re-enabled * right before return. */ - smp_rendezvous_cpus(cpuset, smp_no_rendevous_barrier, NULL, - smp_no_rendevous_barrier, NULL); + smp_rendezvous_cpus(cpuset, smp_no_rendezvous_barrier, NULL, + smp_no_rendezvous_barrier, NULL); } static void Modified: stable/11/sys/i386/i386/pmap.c ============================================================================== --- stable/11/sys/i386/i386/pmap.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/i386/i386/pmap.c Thu Jan 25 02:45:21 2018 (r328386) @@ -1200,7 +1200,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_ act.newpde = newpde; CPU_SET(cpuid, &active); smp_rendezvous_cpus(active, - smp_no_rendevous_barrier, pmap == kernel_pmap ? + smp_no_rendezvous_barrier, pmap == kernel_pmap ? pmap_update_pde_kernel : pmap_update_pde_user, pmap_update_pde_teardown, &act); } else { Modified: stable/11/sys/i386/include/counter.h ============================================================================== --- stable/11/sys/i386/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/i386/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -148,8 +148,8 @@ counter_u64_zero_inline(counter_u64_t c) *(uint64_t *)((char *)c + sizeof(struct pcpu) * i) = 0; critical_exit(); } else { - smp_rendezvous(smp_no_rendevous_barrier, - counter_u64_zero_one_cpu, smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, + counter_u64_zero_one_cpu, smp_no_rendezvous_barrier, c); } } #endif Modified: stable/11/sys/kern/kern_rmlock.c ============================================================================== --- stable/11/sys/kern/kern_rmlock.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/kern/kern_rmlock.c Thu Jan 25 02:45:21 2018 (r328386) @@ -549,9 +549,9 @@ _rm_wlock(struct rmlock *rm) */ #ifdef SMP smp_rendezvous_cpus(readcpus, - smp_no_rendevous_barrier, + smp_no_rendezvous_barrier, rm_cleanIPI, - smp_no_rendevous_barrier, + smp_no_rendezvous_barrier, rm); #else Modified: stable/11/sys/kern/subr_smp.c ============================================================================== --- stable/11/sys/kern/subr_smp.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/kern/subr_smp.c Thu Jan 25 02:45:21 2018 (r328386) @@ -451,7 +451,7 @@ smp_rendezvous_action(void) * function. Ensure all CPUs have completed the setup * function before moving on to the action function. */ - if (local_setup_func != smp_no_rendevous_barrier) { + if (local_setup_func != smp_no_rendezvous_barrier) { if (smp_rv_setup_func != NULL) smp_rv_setup_func(smp_rv_func_arg); atomic_add_int(&smp_rv_waiters[1], 1); @@ -462,7 +462,7 @@ smp_rendezvous_action(void) if (local_action_func != NULL) local_action_func(local_func_arg); - if (local_teardown_func != smp_no_rendevous_barrier) { + if (local_teardown_func != smp_no_rendezvous_barrier) { /* * Signal that the main action has been completed. If a * full exit rendezvous is requested, then all CPUs will @@ -821,11 +821,18 @@ SYSINIT(cpu_mp_setvariables, SI_SUB_TUNABLES, SI_ORDER mp_setvariables_for_up, NULL); #endif /* SMP */ +/* + * smp_no_rendevous_barrier was renamed to smp_no_rendezvous_barrier + * in __FreeBSD_version 1101508, with the old name remaining in 11.x + * as an alias for compatibility. The old name will be gone in 12.0 + * (__FreeBSD_version >= 1200028). + */ +__strong_reference(smp_no_rendezvous_barrier, smp_no_rendevous_barrier); void -smp_no_rendevous_barrier(void *dummy) +smp_no_rendezvous_barrier(void *dummy) { #ifdef SMP - KASSERT((!smp_started),("smp_no_rendevous called and smp is started")); + KASSERT((!smp_started),("smp_no_rendezvous called and smp is started")); #endif } Modified: stable/11/sys/mips/include/counter.h ============================================================================== --- stable/11/sys/mips/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/mips/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -72,8 +72,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/powerpc/include/counter.h ============================================================================== --- stable/11/sys/powerpc/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/powerpc/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -72,8 +72,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif @@ -138,8 +138,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/powerpc/ofw/ofw_machdep.c ============================================================================== --- stable/11/sys/powerpc/ofw/ofw_machdep.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/powerpc/ofw/ofw_machdep.c Thu Jan 25 02:45:21 2018 (r328386) @@ -528,8 +528,8 @@ openfirmware(void *args) #ifdef SMP rv_args.args = args; rv_args.in_progress = 1; - smp_rendezvous(smp_no_rendevous_barrier, ofw_rendezvous_dispatch, - smp_no_rendevous_barrier, &rv_args); + smp_rendezvous(smp_no_rendezvous_barrier, ofw_rendezvous_dispatch, + smp_no_rendezvous_barrier, &rv_args); result = rv_args.retval; #else result = openfirmware_core(args); Modified: stable/11/sys/riscv/include/counter.h ============================================================================== --- stable/11/sys/riscv/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/riscv/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -71,8 +71,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/sparc64/include/counter.h ============================================================================== --- stable/11/sys/sparc64/include/counter.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/sparc64/include/counter.h Thu Jan 25 02:45:21 2018 (r328386) @@ -71,8 +71,8 @@ static inline void counter_u64_zero_inline(counter_u64_t c) { - smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu, - smp_no_rendevous_barrier, c); + smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu, + smp_no_rendezvous_barrier, c); } #endif Modified: stable/11/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/sys/param.h Thu Jan 25 02:45:21 2018 (r328386) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1101507 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101508 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/11/sys/sys/smp.h ============================================================================== --- stable/11/sys/sys/smp.h Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/sys/smp.h Thu Jan 25 02:45:21 2018 (r328386) @@ -240,7 +240,14 @@ extern struct mtx smp_ipi_mtx; int quiesce_all_cpus(const char *, int); int quiesce_cpus(cpuset_t, const char *, int); +/* + * smp_no_rendevous_barrier was renamed to smp_no_rendezvous_barrier + * in __FreeBSD_version 1101508, with the old name remaining in 11.x + * as an alias for compatibility. The old name will be gone in 12.0 + * (__FreeBSD_version >= 1200028). + */ void smp_no_rendevous_barrier(void *); +void smp_no_rendezvous_barrier(void *); void smp_rendezvous(void (*)(void *), void (*)(void *), void (*)(void *), Modified: stable/11/sys/x86/x86/tsc.c ============================================================================== --- stable/11/sys/x86/x86/tsc.c Thu Jan 25 00:09:44 2018 (r328385) +++ stable/11/sys/x86/x86/tsc.c Thu Jan 25 02:45:21 2018 (r328386) @@ -443,12 +443,12 @@ retry: for (i = 0, tsc = data; i < N; i++, tsc += size) smp_rendezvous(tsc_read_0, tsc_read_1, tsc_read_2, tsc); smp_tsc = 1; /* XXX */ - smp_rendezvous(smp_no_rendevous_barrier, comp_smp_tsc, - smp_no_rendevous_barrier, data); + smp_rendezvous(smp_no_rendezvous_barrier, comp_smp_tsc, + smp_no_rendezvous_barrier, data); if (!smp_tsc && adj < smp_tsc_adjust) { adj++; - smp_rendezvous(smp_no_rendevous_barrier, adj_smp_tsc, - smp_no_rendevous_barrier, data); + smp_rendezvous(smp_no_rendezvous_barrier, adj_smp_tsc, + smp_no_rendezvous_barrier, data); goto retry; } free(data, M_TEMP); _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
