From patchwork Thu Oct 19 20:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Wolsieffer X-Patchwork-Id: 155707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp642570vqb; Thu, 19 Oct 2023 13:46:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHslWPPXJa9wybRxmQVB46B+CbJlkIvNPte/347auxPOa3cUbnWh2FK8QrYxacty+TtAXz+ X-Received: by 2002:a05:6830:1d97:b0:6bc:d519:d7b3 with SMTP id y23-20020a0568301d9700b006bcd519d7b3mr3416956oti.37.1697748403262; Thu, 19 Oct 2023 13:46:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697748403; cv=none; d=google.com; s=arc-20160816; b=xqWn7cMyYpvNhoQPwxZ48ynFkuUycGrdf4aoTSm2YVClgFbHCqGnm02N0QM1ql9sZ7 YjmrhwQJF6C03z0xJZrUQNCskq5lVeTA68xwaJMHKfh1gZPxVXOftVtBWVGkb4nTg4/+ rdzQqRU/nT1qZ9UvPdXZM+lxpMDLFQFUPcFDYgVL0XmoHsYReJ/0q0ZSKBInI0e9B4Vq aemZHlZcRz3IdfTIn0gyb4VjHcA3YVwECbfh7YK4gz8B7NDuJwexOhJmNZ2H185KBVBf X9XGt1oF74NI7+tzZzRS9YLR4ItWNsQn1UIW+iHiieomVzYXpxqaeVAJZ48JTMKOv2wo 9y0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7EOVMhlF0O2opQmvwajTcnPxn6OrPW52BLfQ9FmcEZk=; fh=QC4XswVxxhLPrz1QAoXDqWFayN85XfJ9gf0S2niwB7A=; b=PptH7kUnGXx/Lts5fP56Nz/SBITtNIH8/Lz6qZLwezKlR8VD6R5A2Eo4+MidjCywB0 gEAuaQagh0+2jKN3QAW+GijJks4hRIHyxij5QJOkcrYuckmvZ5e8h1fXOAa8lRoVAJyh SqfYTb0F6hNFKK2XHqWeIJtbaA1Y4WejMuBWLHIx3AwMpyFyR+ETW/V4544aUXU0FGFg iwjw+9z3XF1ye+IzFLmSNRNHs8VFBndfjakwYigxgT+WYeoJQrfIyW4jueHRvOdedHYM c8fLznMt319MXyfpcBqXwvBr7dJP89bCrlOMEUMGMOG626VEckTPuMvraMG0XNTM0Jzk fnSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hefring-com.20230601.gappssmtp.com header.s=20230601 header.b="mOSH/3bb"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k70-20020a633d49000000b00584b293d17fsi369273pga.550.2023.10.19.13.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 13:46:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@hefring-com.20230601.gappssmtp.com header.s=20230601 header.b="mOSH/3bb"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 45011827C1B2; Thu, 19 Oct 2023 13:46:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346564AbjJSUqh (ORCPT + 26 others); Thu, 19 Oct 2023 16:46:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346553AbjJSUqf (ORCPT ); Thu, 19 Oct 2023 16:46:35 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A704A3 for ; Thu, 19 Oct 2023 13:46:33 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7788ebea620so3563385a.3 for ; Thu, 19 Oct 2023 13:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hefring-com.20230601.gappssmtp.com; s=20230601; t=1697748392; x=1698353192; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7EOVMhlF0O2opQmvwajTcnPxn6OrPW52BLfQ9FmcEZk=; b=mOSH/3bb6etptMMPdeTl8LJnyyCjFIqrv8bXbiz9zJepXsmXH4BUcaWwfNX5lM/nCz oFaBDizx+Q+JWN+0tUI6Yeln0OqrfhJ44wixaYyrh4AfdixTFWeN5aCtU+ThdYON8k1l LYCyAaIXs3Q9Z3O0zwLZ6Y89t9f8+4m5jN8S3B0Kgu9ToAjqZkufGxcuM23ZOns544nJ kbxjtdxzZoGhI2MTaS8HrWAHBcHwore24m6LKpNbINByt7Le4ArjgJ6/rXoBQBlR+XfZ OvJPEzs4izTFY/Ym4XotTrnU88mEDb03sAFBh8M05WjkvEpeS5YIocdw3BDxBQg6DzJR ttGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697748392; x=1698353192; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7EOVMhlF0O2opQmvwajTcnPxn6OrPW52BLfQ9FmcEZk=; b=qkyodojJS53HuOE02AK8EmCufPW2/pvUniYG3X9YSx0d0SdfHmKUKVEm1tdOL9K+DD R3gDALv+EFPqIFP7UqKfeFDCLievZ3N3z14XnMZXUazoADI53IFAIipLp2pakLFNp2bw EKV6+Nd8hPs0c1beXMbJa1XSsM/eAIqKfEx/1PktB5mzdHpGlEVURsnb5gR793nxSYfN mJ0uiyq2wzaGrXXTaqEPbeOAmCyPrPjo5uYQV+n0zE1VOsaO9P/5fw/29xq2/1d7AHKn 3KYed4qyup0gugXkjjLNO2VMXATlAwtRsvnWjgkjH7nhXOtcKNAj5imN6POi7i/RXAqE qwNg== X-Gm-Message-State: AOJu0YxP+TEyTsVBIWciQwsmT882gy2620nPL3wwiYJhEt2G3HNTeC8C Uj3WNC6rB7ngeiWRx4yW4XE9KvKW6y4R82kND68= X-Received: by 2002:ac8:584f:0:b0:417:a2f9:bba6 with SMTP id h15-20020ac8584f000000b00417a2f9bba6mr3722055qth.60.1697748392295; Thu, 19 Oct 2023 13:46:32 -0700 (PDT) Received: from localhost.localdomain ([50.212.55.89]) by smtp.gmail.com with ESMTPSA id j9-20020ac84409000000b0041811e71890sm83771qtn.33.2023.10.19.13.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 13:46:31 -0700 (PDT) From: Ben Wolsieffer To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , =?utf-8?q?Andr=C3=A9_Almeida?= , Sebastian Andrzej Siewior , Ben Wolsieffer Subject: [PATCH] futex: Don't include process in key on no-MMU Date: Thu, 19 Oct 2023 16:45:49 -0400 Message-ID: <20231019204548.1236437-2-ben.wolsieffer@hefring.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_FILL_THIS_FORM_SHORT,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 13:46:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780218229759985835 X-GMAIL-MSGID: 1780218229759985835 On no-MMU, all futexes are treated as private because there is no need to map a virtual address to physical to match the futex across processes. This doesn't quite work though, because private futexes include the current process's mm_struct as part of their key. This makes it impossible for one process to wake up a shared futex being waited on in another process. This patch fixes this bug by excluding the mm_struct from the key. With a single address space, the futex address is already a unique key. Fixes: 784bdf3bb694 ("futex: Assume all mappings are private on !MMU systems") Signed-off-by: Ben Wolsieffer --- kernel/futex/core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 514e4582b863..d4141b054718 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -248,7 +248,17 @@ int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key *key, * but access_ok() should be faster than find_vma() */ if (!fshared) { - key->private.mm = mm; + /* + * On no-MMU, shared futexes are treated as private, therefore + * we must not include the current process in the key. Since + * there is only one address space, the address is a unique key + * on its own. + */ + if (IS_ENABLED(CONFIG_MMU)) + key->private.mm = mm; + else + key->private.mm = NULL; + key->private.address = address; return 0; }