From: Peter Zijlstra <peterz@infradead.org>
To: andrealmeid@collabora.com, tglx@linutronix.de, mingo@redhat.com,
dvhart@infradead.org, rostedt@goodmis.org, bigeasy@linutronix.de
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
kernel@collabora.com, krisman@collabora.com,
linux-api@vger.kernel.org, libc-alpha@sourceware.org,
mtk.manpages@gmail.com, dave@stgolabs.net, arnd@arndb.de
Subject: [PATCH 07/20] futex: Rename hash_futex()
Date: Wed, 15 Sep 2021 16:07:17 +0200 [thread overview]
Message-ID: <20210915141525.047819744@infradead.org> (raw)
In-Reply-To: 20210915140710.596174479@infradead.org
In order to prepare introducing these symbols into the global
namespace; rename:
s/hash_futex/hash_futex/g
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/futex/core.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -279,7 +279,7 @@ struct futex_hash_bucket {
/*
* The base of the bucket array and its size are always used together
- * (after initialization only in hash_futex()), so ensure that they
+ * (after initialization only in futex_hash()), so ensure that they
* reside in the same cacheline.
*/
static struct {
@@ -380,13 +380,13 @@ static inline int hb_waiters_pending(str
}
/**
- * hash_futex - Return the hash bucket in the global hash
+ * futex_hash - Return the hash bucket in the global hash
* @key: Pointer to the futex key for which the hash is calculated
*
* We hash on the keys returned from get_futex_key (see below) and return the
* corresponding hash bucket in the global hash.
*/
-static struct futex_hash_bucket *hash_futex(union futex_key *key)
+static struct futex_hash_bucket *futex_hash(union futex_key *key)
{
u32 hash = jhash2((u32 *)key, offsetof(typeof(*key), both.offset) / 4,
key->both.offset);
@@ -885,7 +885,7 @@ static void exit_pi_state_list(struct ta
next = head->next;
pi_state = list_entry(next, struct futex_pi_state, list);
key = pi_state->key;
- hb = hash_futex(&key);
+ hb = futex_hash(&key);
/*
* We can race against put_pi_state() removing itself from the
@@ -1634,7 +1634,7 @@ int futex_wake(u32 __user *uaddr, unsign
if (unlikely(ret != 0))
return ret;
- hb = hash_futex(&key);
+ hb = futex_hash(&key);
/* Make sure we really have tasks to wakeup */
if (!hb_waiters_pending(hb))
@@ -1731,8 +1731,8 @@ int futex_wake_op(u32 __user *uaddr1, un
if (unlikely(ret != 0))
return ret;
- hb1 = hash_futex(&key1);
- hb2 = hash_futex(&key2);
+ hb1 = futex_hash(&key1);
+ hb2 = futex_hash(&key2);
retry_private:
double_lock_hb(hb1, hb2);
@@ -2172,8 +2172,8 @@ int futex_requeue(u32 __user *uaddr1, un
if (requeue_pi && match_futex(&key1, &key2))
return -EINVAL;
- hb1 = hash_futex(&key1);
- hb2 = hash_futex(&key2);
+ hb1 = futex_hash(&key1);
+ hb2 = futex_hash(&key2);
retry_private:
hb_waiters_inc(hb2);
@@ -2415,7 +2415,7 @@ static inline struct futex_hash_bucket *
{
struct futex_hash_bucket *hb;
- hb = hash_futex(&q->key);
+ hb = futex_hash(&q->key);
/*
* Increment the counter before taking the lock so that
@@ -3177,7 +3177,7 @@ int futex_unlock_pi(u32 __user *uaddr, u
if (ret)
return ret;
- hb = hash_futex(&key);
+ hb = futex_hash(&key);
spin_lock(&hb->lock);
/*
next prev parent reply other threads:[~2021-09-15 14:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 14:07 [PATCH 00/20] futex: splitup and waitv syscall Peter Zijlstra
2021-09-15 14:07 ` [PATCH 01/20] futex: Move to kernel/futex/ Peter Zijlstra
2021-09-15 14:07 ` [PATCH 02/20] futex: Split out syscalls Peter Zijlstra
2021-09-15 14:07 ` [PATCH 03/20] futex: Rename {,__}{,un}queue_me() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 04/20] futex: Rename futex_wait_queue_me() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 05/20] futex: Rename: queue_{,un}lock() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 06/20] futex: Rename __unqueue_futex() Peter Zijlstra
2021-09-15 14:07 ` Peter Zijlstra [this message]
2021-09-15 15:17 ` [PATCH 07/20] futex: Rename hash_futex() André Almeida
2021-09-15 15:22 ` Peter Zijlstra
2021-09-15 14:07 ` [PATCH 08/20] futex: Rename: {get,cmpxchg}_futex_value_locked() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 09/20] futex: Split out PI futex Peter Zijlstra
2021-09-15 14:07 ` [PATCH 10/20] futex: Rename: hb_waiter_{inc,dec,pending}() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 11/20] futex: Rename: match_futex() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 12/20] futex: Rename mark_wake_futex() Peter Zijlstra
2021-09-15 14:07 ` [PATCH 13/20] futex: Split out requeue Peter Zijlstra
2021-09-15 14:07 ` [PATCH 14/20] futex: Split out wait/wake Peter Zijlstra
2021-09-15 14:07 ` [PATCH 15/20] futex: Simplify double_lock_hb() Peter Zijlstra
2021-09-15 15:13 ` [PATCH 00/20] futex: splitup and waitv syscall André Almeida
[not found] ` <20210915141525.621568509@infradead.org>
2021-09-15 15:20 ` [PATCH 16/20] futex: Implement sys_futex_waitv() André Almeida
2021-09-15 15:37 ` Peter Zijlstra
2021-09-15 17:34 ` Paul Eggert
2021-09-16 14:49 ` Thomas Gleixner
2021-09-16 18:54 ` André Almeida
2021-09-15 18:47 ` Arnd Bergmann
2021-09-15 16:29 ` André Almeida
2021-09-15 18:24 ` [PATCH 00/20] futex: splitup and waitv syscall André Almeida
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915141525.047819744@infradead.org \
--to=peterz@infradead.org \
--cc=andrealmeid@collabora.com \
--cc=arnd@arndb.de \
--cc=bigeasy@linutronix.de \
--cc=dave@stgolabs.net \
--cc=dvhart@infradead.org \
--cc=kernel@collabora.com \
--cc=krisman@collabora.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mtk.manpages@gmail.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).