Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <94b8fcc4-12b5-8d8c-3eb3-fe1e73a25456@kernel.dk>
Date:   Fri, 21 Jul 2023 09:29:14 -0600
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH 06/10] io_uring: add support for futex wake and wait
Content-Language: en-US
From:   Jens Axboe <axboe@kernel.dk>
To:     Peter Zijlstra <peterz@infradead.org>
Cc:     io-uring@vger.kernel.org, linux-kernel@vger.kernel.org,
        andres@anarazel.de
References: <20230720221858.135240-1-axboe@kernel.dk>
 <20230720221858.135240-7-axboe@kernel.dk>
 <20230721113031.GG3630545@hirez.programming.kicks-ass.net>
 <20230721113718.GA3638458@hirez.programming.kicks-ass.net>
 <d95bfb98-8d76-f0fd-6283-efc01d0cc015@kernel.dk>
In-Reply-To: <d95bfb98-8d76-f0fd-6283-efc01d0cc015@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 7/21/23 8:43?AM, Jens Axboe wrote:
> On 7/21/23 5:37?AM, Peter Zijlstra wrote:
>> On Fri, Jul 21, 2023 at 01:30:31PM +0200, Peter Zijlstra wrote:
>>
>> Sorry, I was too quick..
>>
>> 	iof->uaddr = sqe->addr;
>> 	iof->val   = sqe->futex_val;
>> 	iof->mask  = sqe->futex_mask;
>> 	flags      = sqe->futex_flags;
>>
>> 	if (flags & ~FUTEX2_MASK)
>> 		return -EINVAL;
>>
>> 	iof->flags = futex2_to_flags(flags);
>> 	if (!futex_flags_valid(iof->flags))
>> 		return -EINVAL;
>>
>> 	if (!futex_validate_input(iof->flags, iof->val) ||
>> 	    !futex_validate_input(iof->flags, iof->mask))
>> 		return -EINVAL
> 
> Something like that should work, with some variable names fixed up. I
> just went with 'addr' for the futex address, addr2 for the value, and
> addr3 for the mask.
> 
> Rebased on top of your first 4 updated patches, and added a single patch
> that moves FUTEX2_MASK, will run some testing to validate it's all still
> sane.

FWIW, here's the io_uring incremental after that rebase. Update the
liburing futex branch as well, updating the prep helpers to take 64 bit
values for mask/val and also add the flags argument that was missing as
well. Only other addition was adding those 4 new patches instead of the
old 3 ones, and adding single patch that just moves FUTEX2_MASK to
futex.h.

All checks out fine, tests pass and it works.


diff --git a/io_uring/futex.c b/io_uring/futex.c
index 93df54dffaa0..4c9f2c841b98 100644
--- a/io_uring/futex.c
+++ b/io_uring/futex.c
@@ -18,11 +18,11 @@ struct io_futex {
 		u32 __user			*uaddr;
 		struct futex_waitv __user	*uwaitv;
 	};
-	unsigned int	futex_val;
-	unsigned int	futex_flags;
-	unsigned int	futex_mask;
-	unsigned int	futex_nr;
+	unsigned long	futex_val;
+	unsigned long	futex_mask;
 	unsigned long	futexv_owned;
+	u32		futex_flags;
+	unsigned int	futex_nr;
 };
 
 struct io_futex_data {
@@ -171,15 +171,28 @@ bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task,
 int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
 	struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);
+	u32 flags;
 
-	if (unlikely(sqe->fd || sqe->buf_index || sqe->addr3))
+	if (unlikely(sqe->fd || sqe->buf_index || sqe->file_index))
 		return -EINVAL;
 
 	iof->uaddr = u64_to_user_ptr(READ_ONCE(sqe->addr));
-	iof->futex_val = READ_ONCE(sqe->len);
-	iof->futex_mask = READ_ONCE(sqe->file_index);
-	iof->futex_flags = READ_ONCE(sqe->futex_flags);
-	if (iof->futex_flags & FUTEX_CMD_MASK)
+	iof->futex_val = READ_ONCE(sqe->addr2);
+	iof->futex_mask = READ_ONCE(sqe->addr3);
+	iof->futex_nr = READ_ONCE(sqe->len);
+	if (iof->futex_nr && req->opcode != IORING_OP_FUTEX_WAITV)
+		return -EINVAL;
+
+	flags = READ_ONCE(sqe->futex_flags);
+	if (flags & ~FUTEX2_MASK)
+		return -EINVAL;
+
+	iof->futex_flags = futex2_to_flags(flags);
+	if (!futex_flags_valid(iof->futex_flags))
+		return -EINVAL;
+
+	if (!futex_validate_input(iof->futex_flags, iof->futex_val) ||
+	    !futex_validate_input(iof->futex_flags, iof->futex_mask))
 		return -EINVAL;
 
 	iof->futexv_owned = 0;
@@ -211,7 +224,6 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 	if (ret)
 		return ret;
 
-	iof->futex_nr = READ_ONCE(sqe->off);
 	if (!iof->futex_nr || iof->futex_nr > FUTEX_WAITV_MAX)
 		return -EINVAL;
 

-- 
Jens Axboe