Skip to content

Commit

Permalink
Improve the spinloop pause / yield hint
Browse files Browse the repository at this point in the history
Unfortunately, C still lacks a standard function for pause (x86,
sparc) or yeild (arm) instructions, for use in spin lock or CAS loops.
BIND has its own based on vendor intrinsics or inline asm.

Previously, it was buried in the `isc_rwlock` implementation. This
commit renames `isc_rwlock_pause()` to `isc_pause()` and moves
it into <isc/pause.h>.

This commit also fixes the configure script so that it detects ARM
yield support on systems that identify as `aarch*` instead of `arm*`.

On 64-bit ARM systems we now use the ISB (instruction synchronization
barrier) instruction in preference to yield. The ISB instruction
pauses the CPU for longer, several nanoseconds, which is more like the
x86 pause instruction. There are more details in a Rust pull request,
which also refers to MySQL making the same change:
rust-lang/rust#84725
  • Loading branch information
fanf2 committed Feb 14, 2023
1 parent f32d334 commit 436b76b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 30 deletions.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
6097. [port] Improve support for yield / pause instructions in spin
loops on AArch64 platforms. [GL !7469]

6096. [bug] Fix RPZ reference counting error on shutdown in
dns__rpz_timer_cb(). [GL #3866]

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ AC_C_VOLATILE
# Check for yield support on ARM processors
#
AS_CASE([$host],
[arm*],
[AC_MSG_CHECKING([for yield instruction support])
[arm*|aarch64*],
[AC_MSG_CHECKING([for ARM yield instruction support])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[]],
[[__asm__ __volatile__ ("yield")]])],
Expand Down
1 change: 1 addition & 0 deletions lib/isc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ libisc_la_HEADERS = \
include/isc/once.h \
include/isc/os.h \
include/isc/parseint.h \
include/isc/pause.h \
include/isc/portset.h \
include/isc/print.h \
include/isc/quota.h \
Expand Down
42 changes: 42 additions & 0 deletions lib/isc/include/isc/pause.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/

#pragma once

#if defined(__x86_64__)
#include <immintrin.h>
#define isc_pause() _mm_pause()
#elif defined(__i386__)
#define isc_pause() __asm__ __volatile__("rep; nop")
#elif defined(__ia64__)
#define isc_pause() __asm__ __volatile__("hint @pause")
#elif defined(__aarch64__)
#define isc_pause() __asm__ __volatile__("isb")
#elif defined(__arm__) && HAVE_ARM_YIELD
#define isc_pause() __asm__ __volatile__("yield")
#elif defined(sun) && (defined(__sparc) || defined(__sparc__))
#include <synch.h>
#define isc_pause() smt_pause()
#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
#define isc_pause() __asm__ __volatile__("pause")
#elif defined(__ppc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || \
defined(_ARCH_PWR2) || defined(_POWER)
#define isc_pause() __asm__ volatile("or 27,27,27")
#else
#define isc_pause() sched_yield()
#endif

#define isc_pause_n(iters) \
for (size_t __pause = 0; __pause < iters; __pause++) { \
isc_pause(); \
}
30 changes: 2 additions & 28 deletions lib/isc/rwlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@
#include <stdbool.h>
#include <stddef.h>

#if defined(sun) && (defined(__sparc) || defined(__sparc__))
#include <synch.h> /* for smt_pause(3c) */
#endif /* if defined(sun) && (defined(__sparc) || defined(__sparc__)) */

#include <isc/atomic.h>
#include <isc/magic.h>
#include <isc/pause.h>
#include <isc/print.h>
#include <isc/rwlock.h>
#include <isc/util.h>
Expand All @@ -42,29 +39,6 @@
#define RWLOCK_MAX_ADAPTIVE_COUNT 100
#endif /* ifndef RWLOCK_MAX_ADAPTIVE_COUNT */

#if defined(_MSC_VER)
#include <intrin.h>
#define isc_rwlock_pause() YieldProcessor()
#elif defined(__x86_64__)
#include <immintrin.h>
#define isc_rwlock_pause() _mm_pause()
#elif defined(__i386__)
#define isc_rwlock_pause() __asm__ __volatile__("rep; nop")
#elif defined(__ia64__)
#define isc_rwlock_pause() __asm__ __volatile__("hint @pause")
#elif defined(__arm__) && HAVE_ARM_YIELD
#define isc_rwlock_pause() __asm__ __volatile__("yield")
#elif defined(sun) && (defined(__sparc) || defined(__sparc__))
#define isc_rwlock_pause() smt_pause()
#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
#define isc_rwlock_pause() __asm__ __volatile__("pause")
#elif defined(__ppc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || \
defined(_ARCH_PWR2) || defined(_POWER)
#define isc_rwlock_pause() __asm__ volatile("or 27,27,27")
#else /* if defined(_MSC_VER) */
#define isc_rwlock_pause()
#endif /* if defined(_MSC_VER) */

#ifdef ISC_RWLOCK_TRACE
#include <stdio.h> /* Required for fprintf/stderr. */

Expand Down Expand Up @@ -331,7 +305,7 @@ isc__rwlock_lock(isc__rwlock_t *rwl, isc_rwlocktype_t type) {
rwlock_lock(rwl, type);
break;
}
isc_rwlock_pause();
isc_pause();
} while (isc_rwlock_trylock(rwl, type) != ISC_R_SUCCESS);

atomic_fetch_add_release(&rwl->spins, (cnt - spins) / 8);
Expand Down

0 comments on commit 436b76b

Please sign in to comment.