630399469f
Currently, atomic-long is split into two sections, one defining the
raw_atomic_long_*() ops for CONFIG_64BIT, and one defining the raw
atomic_long_*() ops for !CONFIG_64BIT.
With many lines elided, this looks like:
| #ifdef CONFIG_64BIT
| ...
| static __always_inline bool
| raw_atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)
| {
| return raw_atomic64_try_cmpxchg(v, (s64 *)old, new);
| }
| ...
| #else /* CONFIG_64BIT */
| ...
| static __always_inline bool
| raw_atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)
| {
| return raw_atomic_try_cmpxchg(v, (int *)old, new);
| }
| ...
| #endif
The two definitions are spread far apart in the file, and duplicate the
prototype, making it hard to have a legible set of kerneldoc comments.
Make this simpler by defining the C prototype once, and writing the two
definitions inline. For example, the above becomes:
| static __always_inline bool
| raw_atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)
| {
| #ifdef CONFIG_64BIT
| return raw_atomic64_try_cmpxchg(v, (s64 *)old, new);
| #else
| return raw_atomic_try_cmpxchg(v, (int *)old, new);
| #endif
| }
As we now always have a single copy of the C prototype wrapping all the
potential definitions, we now have an obvious single location for kerneldoc
comments. As a bonus, both the script and the generated file are
somewhat shorter.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230605070124.3741859-23-mark.rutland@arm.com
99 lines
2.1 KiB
Bash
Executable File
99 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
ATOMICDIR=$(dirname $0)
|
|
|
|
. ${ATOMICDIR}/atomic-tbl.sh
|
|
|
|
#gen_cast(arg, int, atomic)
|
|
gen_cast()
|
|
{
|
|
local arg="$1"; shift
|
|
local int="$1"; shift
|
|
local atomic="$1"; shift
|
|
|
|
[ "${arg%%:*}" = "p" ] || return
|
|
|
|
printf "($(gen_param_type "${arg}" "${int}" "${atomic}"))"
|
|
}
|
|
|
|
#gen_args_cast(int, atomic, arg...)
|
|
gen_args_cast()
|
|
{
|
|
local int="$1"; shift
|
|
local atomic="$1"; shift
|
|
|
|
while [ "$#" -gt 0 ]; do
|
|
local cast="$(gen_cast "$1" "${int}" "${atomic}")"
|
|
local arg="$(gen_param_name "$1")"
|
|
printf "${cast}${arg}"
|
|
[ "$#" -gt 1 ] && printf ", "
|
|
shift;
|
|
done
|
|
}
|
|
|
|
#gen_proto_order_variant(meta, pfx, name, sfx, order, arg...)
|
|
gen_proto_order_variant()
|
|
{
|
|
local meta="$1"; shift
|
|
local pfx="$1"; shift
|
|
local name="$1"; shift
|
|
local sfx="$1"; shift
|
|
local order="$1"; shift
|
|
|
|
local atomicname="${pfx}${name}${sfx}${order}"
|
|
|
|
local ret="$(gen_ret_type "${meta}" "long")"
|
|
local params="$(gen_params "long" "atomic_long" "$@")"
|
|
local argscast_32="$(gen_args_cast "int" "atomic" "$@")"
|
|
local argscast_64="$(gen_args_cast "s64" "atomic64" "$@")"
|
|
local retstmt="$(gen_ret_stmt "${meta}")"
|
|
|
|
cat <<EOF
|
|
static __always_inline ${ret}
|
|
raw_atomic_long_${atomicname}(${params})
|
|
{
|
|
#ifdef CONFIG_64BIT
|
|
${retstmt}raw_atomic64_${atomicname}(${argscast_64});
|
|
#else
|
|
${retstmt}raw_atomic_${atomicname}(${argscast_32});
|
|
#endif
|
|
}
|
|
|
|
EOF
|
|
}
|
|
|
|
cat << EOF
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
// Generated by $0
|
|
// DO NOT MODIFY THIS FILE DIRECTLY
|
|
|
|
#ifndef _LINUX_ATOMIC_LONG_H
|
|
#define _LINUX_ATOMIC_LONG_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <asm/types.h>
|
|
|
|
#ifdef CONFIG_64BIT
|
|
typedef atomic64_t atomic_long_t;
|
|
#define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
|
|
#define atomic_long_cond_read_acquire atomic64_cond_read_acquire
|
|
#define atomic_long_cond_read_relaxed atomic64_cond_read_relaxed
|
|
#else
|
|
typedef atomic_t atomic_long_t;
|
|
#define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
|
|
#define atomic_long_cond_read_acquire atomic_cond_read_acquire
|
|
#define atomic_long_cond_read_relaxed atomic_cond_read_relaxed
|
|
#endif
|
|
|
|
EOF
|
|
|
|
grep '^[a-z]' "$1" | while read name meta args; do
|
|
gen_proto "${meta}" "${name}" ${args}
|
|
done
|
|
|
|
cat <<EOF
|
|
#endif /* _LINUX_ATOMIC_LONG_H */
|
|
EOF
|