On Thu, Sep 23, 2021 at 02:11:05PM -0300, André Almeida wrote:
> Returns the array index of one of the awakened futexes. There’s no given
> information of how many were awakened, or any particular attribute of it
> (if it’s the first awakened, if it is of the smaller index...).
As per some native speakers on IRC, awaken isn't the right word. I've
changed it like the below.
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -252,9 +252,9 @@ static int futex_parse_waitv(struct fute
* needed. Flags for private futexes, sizes, etc. should be used on the
* individual flags of each waiter.
*
- * Returns the array index of one of the awaken futexes. There's no given
- * information of how many were awakened, or any particular attribute of it (if
- * it's the first awakened, if it is of the smaller index...).
+ * Returns the array index of one of the woken futexes. There's no given
+ * information of how many were woken, or any particular attribute of it (if
+ * it's the first woken, if it is of the smaller index...).
*/
SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters,
--- a/kernel/futex/waitwake.c
+++ b/kernel/futex/waitwake.c
@@ -384,7 +384,7 @@ static int unqueue_multiple(struct futex
* futex_wait_multiple_setup - Prepare to wait and enqueue multiple futexes
* @vs: The futex list to wait on
* @count: The size of the list
- * @awaken: Index of the last awoken futex, if any. Used to notify the
+ * @woken: Index of the last woken futex, if any. Used to notify the
* caller that it can return this index to userspace (return parameter)
*
* Prepare multiple futexes in a single step and enqueue them. This may fail if
@@ -392,11 +392,11 @@ static int unqueue_multiple(struct futex
* task is ready to interruptible sleep.
*
* Return:
- * - 1 - One of the futexes was awaken by another thread
+ * - 1 - One of the futexes was woken by another thread
* - 0 - Success
* - <0 - -EFAULT, -EWOULDBLOCK or -EINVAL
*/
-static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *awaken)
+static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *woken)
{
struct futex_hash_bucket *hb;
bool retry = false;
@@ -405,10 +405,10 @@ static int futex_wait_multiple_setup(str
/*
* Enqueuing multiple futexes is tricky, because we need to enqueue
- * each futex in the list before dealing with the next one to avoid
+ * each futex on the list before dealing with the next one to avoid
* deadlocking on the hash bucket. But, before enqueuing, we need to
* make sure that current->state is TASK_INTERRUPTIBLE, so we don't
- * absorb any awake events, which cannot be done before the
+ * loose any wake events, which cannot be done before the
* get_futex_key of the next key, because it calls get_user_pages,
* which can sleep. Thus, we fetch the list of futexes keys in two
* steps, by first pinning all the memory keys in the futex key, and
@@ -455,11 +455,11 @@ static int futex_wait_multiple_setup(str
/*
* Even if something went wrong, if we find out that a futex
- * was awaken, we don't return error and return this index to
+ * was woken, we don't return error and return this index to
* userspace
*/
- *awaken = unqueue_multiple(vs, i);
- if (*awaken >= 0)
+ *woken = unqueue_multiple(vs, i);
+ if (*woken >= 0)
return 1;
if (ret) {
@@ -491,7 +491,7 @@ static int futex_wait_multiple_setup(str
* @to: Timeout
*
* Sleep if and only if the timeout hasn't expired and no futex on the list has
- * been awaken.
+ * been woken.
*/
static void futex_sleep_multiple(struct futex_vector *vs, unsigned int count,
struct hrtimer_sleeper *to)
@@ -533,7 +533,7 @@ int futex_wait_multiple(struct futex_vec
ret = futex_wait_multiple_setup(vs, count, &hint);
if (ret) {
if (ret > 0) {
- /* A futex was awaken during setup */
+ /* A futex was woken during setup */
ret = hint;
}
return ret;
