From patchwork Fri Jul 14 13:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13313726 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB7C0EB64DC for ; Fri, 14 Jul 2023 14:16:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 692DC8D0006; Fri, 14 Jul 2023 10:16:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 409A88D0005; Fri, 14 Jul 2023 10:16:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14D578D0007; Fri, 14 Jul 2023 10:16:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AC2A78D0006 for ; Fri, 14 Jul 2023 10:16:33 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 706E414029F for ; Fri, 14 Jul 2023 14:16:33 +0000 (UTC) X-FDA: 81010417866.06.79A1B3F Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf25.hostedemail.com (Postfix) with ESMTP id 4F1F8A001D for ; Fri, 14 Jul 2023 14:16:30 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=k0AkkJTw; dmarc=none; spf=none (imf25.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689344191; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=98fwNtpV0Bbvya3mBoauq7smkVWN16/6yjAoJPAxLCQ=; b=5rjpPHyeO1bKvMlsko1r4S1LYdaeBHRq+wvJipX8o8PdVvkpbO4W6JkF8sGN2mV3C2jWa0 +Ua7Y60TTPMtorxblphFjJUnztTzMhXnrQyPyaTs+MOVt7p8Wv4GViRoTBdOIGqZBeuayE 2UlWWbmNCOkcoiQmASdXLVmKszOC774= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=k0AkkJTw; dmarc=none; spf=none (imf25.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689344191; a=rsa-sha256; cv=none; b=dpA7gFIsipiDDtQKsnYOkNz5jQai2POMkza6JTAWI+5v29RooPbtN9BJoCsV2j1+Kd+M1G FK4AW746muGjt9FmG8WSwqN2QqEUVco2Ja729sqIZGzcJTnfWAzjnRwVygPlbG9YhtMeN3 Bv84OxTtIL/l3fZYeJyiPNRgbwRZi7U= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=98fwNtpV0Bbvya3mBoauq7smkVWN16/6yjAoJPAxLCQ=; b=k0AkkJTwfkefz5URce2ntHKAIC 6CkN91KKm1sEDmU8seNl1uV4Im1FILXye+5BHlydSaZELYf9BNA3/k7+QifPdr1WwzxLzYcvHvf6T P1AJrThlTJ4nWZgI8kec0ij5yNMrSO/t5B/BJ5VDAX+AR7E+PAaN9ykyCq7vT6csjBMqdhA19nELp lEz1sIwnXytxoy8hFGNf0qkpI0+Ch+wz56SHgu5eT13eNOFZ9pHKXoHl5VNSgkeZfGyJrfRhvnzkm 2UMzg2C3u8KfvGSkocm2zB5m0xp474j8eyUMo0BZX3hXkqvYrbCtZ7F7zHwbFS4yTB9IgE5FV80uX dly3b80w==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qKJah-006Iiw-21; Fri, 14 Jul 2023 14:16:16 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id A0834300362; Fri, 14 Jul 2023 16:16:13 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 691B3213728B7; Fri, 14 Jul 2023 16:16:13 +0200 (CEST) Message-ID: <20230714141218.813185695@infradead.org> User-Agent: quilt/0.66 Date: Fri, 14 Jul 2023 15:39:02 +0200 From: Peter Zijlstra To: tglx@linutronix.de, axboe@kernel.dk Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, dvhart@infradead.org, dave@stgolabs.net, andrealmeid@igalia.com, Andrew Morton , urezki@gmail.com, hch@infradead.org, lstoakes@gmail.com, Arnd Bergmann , linux-api@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, malteskarupke@web.de Subject: [RFC][PATCH 03/10] futex: Flag conversion References: <20230714133859.305719029@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4F1F8A001D X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4n3tjpchcn1juk67q3g9ytqa1ryk5ex9 X-HE-Tag: 1689344190-815927 X-HE-Meta: U2FsdGVkX1/FUM+96CxK3MGJcrgG+sW+qGAcJeq6/UyRoXK5/00vSNk9aTQphm5AVIjAuZzmRrqwLCOIOR2F5B2+cW/OsSWNqLIbCWnurvJmydWIggXDAZBs6BLqUUQKIkI8XN10g4tXwnxwq3O7eBzqsKLfnXWwYkf05HKrzNxzlrPdwrDEgBv/L3YkB5klUO+I1TX9PhMigMPfWiZuFrK3qC0QIKfLicTuKwmWxm2yvMRtpeLlWlpNhvbapMc1R/LkFDvp5nQTfuWZ+yq5QAPgQwL+KrXasugrEXyw0gisvdGxtUFydUT3ZyLEsDQkxf1kID9rIU5JOT+9+aPC/5hUpgEZje4I7nwXJ861ZofU8Vksazqzxo4ajyEq39r+3fSOqw+pVgavjkY6lXwEfXiidqzSl49U2462RXOQBhGzUijNjBg2qjHMrBJNAd6DFJooUlUMMKR5sESnJIItfQu+K7F5sXIq/RtJ8AZwO9aZvQaJEzpYH3ey5Acn37CmTklqyoHehhb3lgei4YjOlV1r43W1ZADDdUyf2UbWvJo70Z2MAsguFzfhIrUptfOj0NglOFpDdwTeJ5+HlKYzILcN7fBNudbeKYiqs05zco+ChE+VoHou2CNniD6NxPNjxAwly0LnUpVR6U2TPpbbsA+E/X2MzJjxKZLJXv9UFMd4J06hYLiVhkdMwPH0cHoywai8kAkiA+lvGiIwTUajIQf/lv/NzrzSsoWV58xmm+n3RF/A75RpkokSPtfo7eXjX4DgjbtUvbgzkxOfChMSJfKL0jJFvtKe9HqQcmCahOrxieW+JNYFTydp7JV+idRR53IljWZBaWzIO48U0r5ksYVJgvtWCjN48xzfUu2L5V81EG4h5ehmcnk+FsTY4lDxuXeCgXa3pkbkZ3GDvQrPyKfeL8Hx7W8QchziIpE1tGzS+M7vFJTY/OSL/tSC43fFNHdTCTqc8rPbxo06O+I sYIl1/Sy HmWoR8ZV9csyoN8uSgYhlu3Bn60CcBvcinFcfZoljkwTJQAtU95Zj9nY5DMw+3hfSOXGTabwO0Mhtc0cZmJxXEUAqg+F4UMlXxYQCaxiemBMUbswA90VC1u4of7agW54pP05f5/nVdB7xVk+66XUS+tv947ac5iQ1L/p/w6ocIfYIjq0Mlgr+9HrLUMp7yIgQkaqi3zjTTuiAcFA61jJU0ruwh0i9DuFqN8OLmAP2U8jnTvwZYZxhDGFd5SYJ1vrz957PJhoOBw/eeKWA61dF5P+b4Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Futex has 3 sets of flags: - legacy futex op bits - futex2 flags - internal flags Add a few helpers to convert from the API flags into the internal flags. Signed-off-by: Peter Zijlstra (Intel) --- kernel/futex/futex.h | 48 +++++++++++++++++++++++++++++++++++++++++++++--- kernel/futex/syscalls.c | 21 +++++++++++++-------- kernel/futex/waitwake.c | 4 ++-- 3 files changed, 60 insertions(+), 13 deletions(-) --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -16,8 +16,15 @@ * Futex flags used to encode options to functions and preserve them across * restarts. */ +#define FLAGS_SIZE_8 0x00 +#define FLAGS_SIZE_16 0x01 +#define FLAGS_SIZE_32 0x02 +#define FLAGS_SIZE_64 0x03 + +#define FLAGS_SIZE_MASK 0x03 + #ifdef CONFIG_MMU -# define FLAGS_SHARED 0x01 +# define FLAGS_SHARED 0x10 #else /* * NOMMU does not have per process address space. Let the compiler optimize @@ -25,8 +32,43 @@ */ # define FLAGS_SHARED 0x00 #endif -#define FLAGS_CLOCKRT 0x02 -#define FLAGS_HAS_TIMEOUT 0x04 +#define FLAGS_CLOCKRT 0x20 +#define FLAGS_HAS_TIMEOUT 0x40 +#define FLAGS_NUMA 0x80 + +/* FUTEX_ to FLAGS_ */ +static inline unsigned int futex_to_flags(unsigned int op) +{ + unsigned int flags = FLAGS_SIZE_32; + + if (!(op & FUTEX_PRIVATE_FLAG)) + flags |= FLAGS_SHARED; + + if (op & FUTEX_CLOCK_REALTIME) + flags |= FLAGS_CLOCKRT; + + return flags; +} + +/* FUTEX2_ to FLAGS_ */ +static inline unsigned int futex2_to_flags(unsigned int flags2) +{ + unsigned int flags = flags2 & FUTEX2_64; + + if (!(flags2 & FUTEX2_PRIVATE)) + flags |= FLAGS_SHARED; + + if (flags2 & FUTEX2_NUMA) + flags |= FLAGS_NUMA; + + return flags; +} + +static inline unsigned int futex_size(unsigned int flags) +{ + unsigned int size = flags & FLAGS_SIZE_MASK; + return 1 << size; /* {0,1,2,3} -> {1,2,4,8} */ +} #ifdef CONFIG_FAIL_FUTEX extern bool should_fail_futex(bool fshared); --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -85,15 +85,12 @@ SYSCALL_DEFINE3(get_robust_list, int, pi long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, u32 __user *uaddr2, u32 val2, u32 val3) { + unsigned int flags = futex_to_flags(op); int cmd = op & FUTEX_CMD_MASK; - unsigned int flags = 0; - if (!(op & FUTEX_PRIVATE_FLAG)) - flags |= FLAGS_SHARED; - - if (op & FUTEX_CLOCK_REALTIME) { - flags |= FLAGS_CLOCKRT; - if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && + if (flags & FLAGS_CLOCKRT) { + if (cmd != FUTEX_WAIT_BITSET && + cmd != FUTEX_WAIT_REQUEUE_PI && cmd != FUTEX_LOCK_PI2) return -ENOSYS; } @@ -201,6 +198,8 @@ static int futex_parse_waitv(struct fute unsigned int i; for (i = 0; i < nr_futexes; i++) { + unsigned int bits, flags; + if (copy_from_user(&aux, &uwaitv[i], sizeof(aux))) return -EFAULT; @@ -210,7 +209,13 @@ static int futex_parse_waitv(struct fute if ((aux.flags & FUTEX2_64) != FUTEX2_32) return -EINVAL; - futexv[i].w.flags = aux.flags; + flags = futex2_to_flags(aux.flags); + bits = 8 * futex_size(flags); + + if (bits < 64 && aux.val >> bits) + return -EINVAL; + + futexv[i].w.flags = flags; futexv[i].w.val = aux.val; futexv[i].w.uaddr = aux.uaddr; futexv[i].q = futex_q_init; --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -419,11 +419,11 @@ static int futex_wait_multiple_setup(str */ retry: for (i = 0; i < count; i++) { - if ((vs[i].w.flags & FUTEX_PRIVATE_FLAG) && retry) + if (!(vs[i].w.flags & FLAGS_SHARED) && retry) continue; ret = get_futex_key(u64_to_user_ptr(vs[i].w.uaddr), - !(vs[i].w.flags & FUTEX_PRIVATE_FLAG), + vs[i].w.flags & FLAGS_SHARED, &vs[i].q.key, FUTEX_READ); if (unlikely(ret))