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: <d95bfb98-8d76-f0fd-6283-efc01d0cc015@kernel.dk>
Date:   Fri, 21 Jul 2023 08:43:48 -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
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>
From:   Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20230721113718.GA3638458@hirez.programming.kicks-ass.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

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.

-- 
Jens Axboe