From mboxrd@z Thu Jan 1 00:00:00 1970 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 8267FE7071F for ; Thu, 21 Sep 2023 11:28:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB9636B01B1; Thu, 21 Sep 2023 07:28:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D67156B01F9; Thu, 21 Sep 2023 07:28:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7CFB6B01FE; Thu, 21 Sep 2023 07:28:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B71476B01B1 for ; Thu, 21 Sep 2023 07:28:58 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8A4B7140DF4 for ; Thu, 21 Sep 2023 11:28:58 +0000 (UTC) X-FDA: 81260382756.05.8E880CB Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf19.hostedemail.com (Postfix) with ESMTP id CE7E51A0027 for ; Thu, 21 Sep 2023 11:28:56 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=D2+0fnUy; spf=none (imf19.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695295736; 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=UZPFE2ZScTicMie2LbY/rLHSb/ea3l5YRQ8Geimizx8=; b=Vn7DuF+Y12HTlLUUHaY38S84YA2ud8RaU1D76hYt+5OftfO7Fnl4S1Pl9c+FVy1SikA/wG IcMD88w3lR9mQltUVHXGOwFZdn/M8yu7G+4efEfwHzoDVYmrAlMQxcilSR0sd9+qGYJ5jQ jz8uNFkyFIUlBD8fv4VTRlI7e8m5tk0= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=D2+0fnUy; spf=none (imf19.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695295736; a=rsa-sha256; cv=none; b=ouGJvCzVJpZdMVnyz2j/KL4m+ZuamDGRu0qMlVwTVbcWQgWHhGVHqtL4DhmIauyL89/LCk 9cHKSPky2AaydFpRZYTF2/9LVOQb/C/CMGbfhVbQN4Yoso+FmS8QTjMIB5Vh78G2WqFddg R812GmM4e+76jVdyxVduRRwHDn1u0PE= 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=UZPFE2ZScTicMie2LbY/rLHSb/ea3l5YRQ8Geimizx8=; b=D2+0fnUyypGBp3tmehpApHtBuE RnJo83xqyajrpKhjalpbKvZ+nGASRjTehHdoMNEhFFbTcsMZXNEJLm5K1AwRxz7Hx/fTASdxtRhBO zohke4ebc70ACqv8Bs7aQndNOXz9ac9ZANpPzFBrOQ+RyKLLvLq/F29cabLPlXJbmlNe4x7U3YzAj CxhoAB6qRbKq148GeIUfQzuoCLGewVVsVQtiU45YMCM4+B7uyU9yU2RrlLxkSF/Fj0+YTFgao96V8 1zSsgA3Ssz8jktwFUDjRfiOf68jkKJufk5rw+2mIG7SIRiJkGC5VD+RKhcC+J5orR8ZLAEtgTlYUz zhFFmjAQ==; 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 1qjHQN-00FJvt-1M; Thu, 21 Sep 2023 11:00:49 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 0) id 058B53005B2; Thu, 21 Sep 2023 13:00:43 +0200 (CEST) Message-Id: <20230921105248.282857501@noisy.programming.kicks-ass.net> User-Agent: quilt/0.65 Date: Thu, 21 Sep 2023 12:45:13 +0200 From: peterz@infradead.org 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: [PATCH v3 08/15] futex: Propagate flags into get_futex_key() References: <20230921104505.717750284@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-futex2-get_futex_key-flags.patch X-Rspamd-Queue-Id: CE7E51A0027 X-Rspam-User: X-Stat-Signature: 879r4roqoioasty9q1oko6fo7t9zo8hg X-Rspamd-Server: rspam01 X-HE-Tag: 1695295736-897283 X-HE-Meta: U2FsdGVkX19ggH8I27pdd7ru9LcVs6AJ44IGQMlCCo6ZoKG1BWna2Rhj57ahqbeGaEOUUc1yViWylDCrJ2JWCLia/w4kvdhkN6KrbxK0HZXiSuvDx6BEDR6EOlt2wHCSbP6zrW0vaKyMP1G4BpcQlGKTKc1HP8hx+qoQjFw7/ZBll6zeTPRs77RrLIfqLY6p5f+N1AhxfxW1e5j4habg6CN9fOdH0/Dk12lQRa7JL+HNuI/i28hSgEWsFjKmyI7NeoQOL0ap1JT303hSEuza17hTJZkQc+23gzhi1w4D5604jEaPuBvf7ixo2FBLE7wphHKP9LfY4b5Vv/0GdAOm7+Mzk2ehdttYEFWenU1C/BnJNLPTt+YEDdQioCFM7YJEs3F75m2mkEA5h/QHrd6Hq0RhcFTeZBF1S/G2i9ceoZdxQe4P24x9mPimJ4IeT3PJb9v3XOuE1n0MYJF5/BfmYrPqPDidw8XeBJJh0DEfdi5nkflVqORrR4/w0amyT1EkhQ08DwuiRo6SzR3OI5DTzAIV0d9JORKhNzcsstM4oL12cQQzsZ3IlO6JS9GHTpgwDiIjKJg2NG5tFCXz2sCvyyGQj/+Q1K8fwKCfvcZbHvkaO9xbLom3sxhiRo8ovKMGMlp7S4DcUB46mMTDrzShZtwXGEkuyH54LaGZgqw7GUwuoTfJHHuPbc+x+CCOeLZlZBTDg1eqoz9nT7001QrVn9u7G/sG3uDJN8UBX654Ktyw9CxOJvxxxnn4uJF7i79H3+cOpccMbIhzgTkt0nkbnT9hXhkm+qaXJVjnU694XN54Mctu9N+wllVe3bSWmplfdfE2lJPuBJ5s/uxP+lfImeoDRI5xsdX8wsgc3p0HBVGlnKX4agKlD2KIPkAzkbPHVXMLhnTnb0LN2t+L9EICulxC78qdYw8hW6iyxQkZ5/tvV6j4GrGFkveyWrtheNvXn8CwhJOQdQHSgxxPJ+V c/jbscyH Grw9mS/gWZ+P2AgkY3Ph+CzcqKi3nJAVGivAFOegecMgaMM7xmpixS1/5MZVom6POsRfl5IDcUgeh+R3P3jUYfjdEz9JTmrxELPpRFDT7hqBQGj7fEU0TTq8mbEQfeBRZ2fOG7ucBrOBROmAhszaKFgUYhz8vEYrUZNmjxFrKMsb/EJ54KXqQbTEVqQP6Z5QeHjdyyLi70h54BfgoQOCadZmQXCvLmbromQzGfSERtT83Ef4Vydquk/zwuA== 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: Instead of only passing FLAGS_SHARED as a boolean, pass down flags as a whole. No functional change intended. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Thomas Gleixner --- kernel/futex/core.c | 5 ++++- kernel/futex/futex.h | 2 +- kernel/futex/pi.c | 4 ++-- kernel/futex/requeue.c | 6 +++--- kernel/futex/waitwake.c | 14 +++++++------- 5 files changed, 17 insertions(+), 14 deletions(-) Index: linux-2.6/kernel/futex/core.c =================================================================== --- linux-2.6.orig/kernel/futex/core.c +++ linux-2.6/kernel/futex/core.c @@ -193,7 +193,7 @@ static u64 get_inode_sequence_number(str /** * get_futex_key() - Get parameters which are the keys for a futex * @uaddr: virtual address of the futex - * @fshared: false for a PROCESS_PRIVATE futex, true for PROCESS_SHARED + * @flags: FLAGS_* * @key: address where result is stored. * @rw: mapping needs to be read/write (values: FUTEX_READ, * FUTEX_WRITE) @@ -217,7 +217,7 @@ static u64 get_inode_sequence_number(str * * lock_page() might sleep, the caller should not hold a spinlock. */ -int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key *key, +int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key, enum futex_access rw) { unsigned long address = (unsigned long)uaddr; @@ -226,6 +226,9 @@ int get_futex_key(u32 __user *uaddr, boo struct folio *folio; struct address_space *mapping; int err, ro = 0; + bool fshared; + + fshared = flags & FLAGS_SHARED; /* * The futex address must be "naturally" aligned. Index: linux-2.6/kernel/futex/futex.h =================================================================== --- linux-2.6.orig/kernel/futex/futex.h +++ linux-2.6/kernel/futex/futex.h @@ -184,7 +184,7 @@ enum futex_access { FUTEX_WRITE }; -extern int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key *key, +extern int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key, enum futex_access rw); extern struct hrtimer_sleeper * Index: linux-2.6/kernel/futex/pi.c =================================================================== --- linux-2.6.orig/kernel/futex/pi.c +++ linux-2.6/kernel/futex/pi.c @@ -933,7 +933,7 @@ int futex_lock_pi(u32 __user *uaddr, uns to = futex_setup_timer(time, &timeout, flags, 0); retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key, FUTEX_WRITE); + ret = get_futex_key(uaddr, flags, &q.key, FUTEX_WRITE); if (unlikely(ret != 0)) goto out; @@ -1129,7 +1129,7 @@ retry: if ((uval & FUTEX_TID_MASK) != vpid) return -EPERM; - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_WRITE); + ret = get_futex_key(uaddr, flags, &key, FUTEX_WRITE); if (ret) return ret; Index: linux-2.6/kernel/futex/requeue.c =================================================================== --- linux-2.6.orig/kernel/futex/requeue.c +++ linux-2.6/kernel/futex/requeue.c @@ -424,10 +424,10 @@ int futex_requeue(u32 __user *uaddr1, un } retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, + ret = get_futex_key(uaddr2, flags, &key2, requeue_pi ? FUTEX_WRITE : FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -789,7 +789,7 @@ int futex_wait_requeue_pi(u32 __user *ua */ rt_mutex_init_waiter(&rt_waiter); - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret = get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) goto out; Index: linux-2.6/kernel/futex/waitwake.c =================================================================== --- linux-2.6.orig/kernel/futex/waitwake.c +++ linux-2.6/kernel/futex/waitwake.c @@ -145,13 +145,13 @@ int futex_wake(u32 __user *uaddr, unsign struct futex_hash_bucket *hb; struct futex_q *this, *next; union futex_key key = FUTEX_KEY_INIT; - int ret; DEFINE_WAKE_Q(wake_q); + int ret; if (!bitset) return -EINVAL; - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_READ); + ret = get_futex_key(uaddr, flags, &key, FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -248,10 +248,10 @@ int futex_wake_op(u32 __user *uaddr1, un DEFINE_WAKE_Q(wake_q); retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret = get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) return ret; @@ -426,7 +426,7 @@ retry: continue; ret = get_futex_key(u64_to_user_ptr(vs[i].w.uaddr), - vs[i].w.flags & FLAGS_SHARED, + vs[i].w.flags, &vs[i].q.key, FUTEX_READ); if (unlikely(ret)) @@ -438,7 +438,7 @@ retry: for (i = 0; i < count; i++) { u32 __user *uaddr = (u32 __user *)(unsigned long)vs[i].w.uaddr; struct futex_q *q = &vs[i].q; - u32 val = (u32)vs[i].w.val; + u32 val = vs[i].w.val; hb = futex_q_lock(q); ret = futex_get_value_locked(&uval, uaddr); @@ -602,7 +602,7 @@ int futex_wait_setup(u32 __user *uaddr, * while the syscall executes. */ retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q->key, FUTEX_READ); + ret = get_futex_key(uaddr, flags, &q->key, FUTEX_READ); if (unlikely(ret != 0)) return ret;