From patchwork Wed Jun 7 00:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13269878 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 3FEE4C7EE29 for ; Wed, 7 Jun 2023 00:56:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E5F36B0071; Tue, 6 Jun 2023 20:56:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 596478E0001; Tue, 6 Jun 2023 20:56:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45DD76B0074; Tue, 6 Jun 2023 20:56:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3309E6B0071 for ; Tue, 6 Jun 2023 20:56:38 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F2E19C0636 for ; Wed, 7 Jun 2023 00:56:37 +0000 (UTC) X-FDA: 80874136434.10.A639655 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 576F6A0017 for ; Wed, 7 Jun 2023 00:56:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=UoU8zsk4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of npiggin@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=npiggin@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686099395; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=bxUSbOn/cQ7COb96lv6UMi7n7+g7FzwMELmWuTwfcnQ=; b=bOMr26cBqhNSYXNqNTArCK3fZ1IwU5UJ+bG8ArOQSX+n7CqcHQ4EWGZGfbS8h+6qGpC88Y Njxz1T16tcXtKvV15ZvumYcrx91Mf1fwij6Qt6TZa+11EHELpO1/YJAPmx1mewKWpo7U5F Um/kICePWpZHv3htKTLGdTSUdKqH+PM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=UoU8zsk4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of npiggin@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=npiggin@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686099395; a=rsa-sha256; cv=none; b=ZfUbbldMDP1eCNAKZbnlxnrTM3ttHNAhrK0lwKssT0OeLDuNWulDgp5vECAILUjVDxEI/U U7IC7ex7JLftBc0DD+Q0otiGzqNgdJk7jmrF5CkYnUzIkiLS5XTXBYmiy7J/EejJutSOUD dBnqSYCny+rPOg1v7Ot3SXjKZCAQDMY= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b18474cbb6so39557465ad.1 for ; Tue, 06 Jun 2023 17:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686099394; x=1688691394; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bxUSbOn/cQ7COb96lv6UMi7n7+g7FzwMELmWuTwfcnQ=; b=UoU8zsk44fp1tGyhcECM5q0mMqWNEiKQqhAHIjo6wE0A1Ai3c5163j+ebN2jL5KRk5 3qF2ig5GkXjaMzjtiC3dWnbwrzPtElcPumIhFZYjoP+VYcK/1N7/Sqks1uRwo+e2y739 V6iIhzUzVXlcSoYfE0O/uv1CivLO+U2Lev/dt0Q0UkNiTkwxLPC+eC4rtArh4AjGEuG+ dBhW+vu5XSKoizeIEPMBqZpqFWfYvIWCKZnf45WT6K3f7qw4xwWFxWA/znAr+YsDRvb7 ue1DUcna35qO6NpwbAGbnFMzPwgw19Cq7LN9mRKt4Ptw9cRXFtlyjcyhS+Qn61Ln2NV1 bVbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686099394; x=1688691394; 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=bxUSbOn/cQ7COb96lv6UMi7n7+g7FzwMELmWuTwfcnQ=; b=NRiVjqUaxlfLpgDEKiPoI9klAAzSPJ9hqkdSfKyNeZSH9En8bZOOxw+r9qtlyRdEue nLH5zMtebOZRLDDvvvGpPpdvdrfWy6e5LBetrrzh2/SXE3q7ftU+WaYHTXZwDbsVoRG0 lfHv44LiSgtVFyuBSMUhmECEL2/EWxzJdP1mQTOu+5B1bVX/Mkpm5ec4a+jjARkN7yAl MNrngAw1kLvOmphyOBnVW5LMX1t8Mwfv9V7pPtcHaNz61dZZQTdBWvr9/+7EZcgnc0Yn 7DMDFJ+i9MyknPDaknbw653/f2RqUx3D6MSH1x4UkdUFFRvvQXvXXbnB3Cf/TPD3gcLd 6u9Q== X-Gm-Message-State: AC+VfDxHHpSxl+/HRr0KtNtQhPRCmsobijfpi8UEvtQ2WiVNuoR5Jn6E oKHdFS51kyQ3MTw82ciQGnA= X-Google-Smtp-Source: ACHHUZ6cC97mmOeODTPPycHtrlBmRG+pO3ZcBSrvfESxyU+j2DXFthfuNBgiZOOIH+wdxm2FYNDvfQ== X-Received: by 2002:a17:902:f68c:b0:1b0:5425:2165 with SMTP id l12-20020a170902f68c00b001b054252165mr3386891plg.29.1686099394122; Tue, 06 Jun 2023 17:56:34 -0700 (PDT) Received: from wheely.local0.net (193-116-206-233.tpgi.com.au. [193.116.206.233]) by smtp.gmail.com with ESMTPSA id a6-20020a170902ecc600b001b00dae8771sm9108178plh.201.2023.06.06.17.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 17:56:33 -0700 (PDT) From: Nicholas Piggin To: Andrew Morton Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, Sachin Sant Subject: [PATCH] lazy tlb: consolidate lazy tlb mm switching fix Date: Wed, 7 Jun 2023 10:56:22 +1000 Message-Id: <20230607005622.583318-1-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: igwceymi7bghyx8t15zb57ifpz7fpzds X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 576F6A0017 X-HE-Tag: 1686099395-856774 X-HE-Meta: U2FsdGVkX1/R6jjteLf5zCt5jqnmuws+XRR9TKLa+3w5NUXI16p8/352EjOtKopF/jrOZ1zL3be0OaG3WVQTYN9Q7iE6fNP9L+3dYY438qc4cjOV+t7fDRcpZCj595hfzwWS8eXSpOIkasvvKXPJT+kwi33n5qvYn1U2mXfvTIEe16xYdUrakyz97Im0ru6HlCOtA5Tr2YiHNVOmLgyQAxkxpDmT2f+26jxJAhZjMM57/woZJr8Si4YfvYlzP6nboBnUCUwH+kkZcBQuKlXG8y6UBnzsTUMR2TEzP9/BnsskVsflvGUTbQmEp1JHPTKdJjbwz9q29qsZdSCKkrW3RH58rwsCmWvIZbHB8uCIQPWBlYj+jlAbQxJExibq0p7Ja8D8ZMoJAlTpQbrXsU048VfW/4MMp6he2HNAjPDOkzL/cw1Yycdp0JkP7IiiaP9/OnvZBNMFF71J+eOGnu3tLYz+UePu3Sb4n+FmhQWg0xcJE4YIJuQGps2bjc5IOpDzdGMltQFAyl7BWlZExSEdB747E2MPqZhfm14+bqvxDv+pGwnNywJYdD0KQi/xzUOO6lSnIFIsgITUZv5V2vAwxA4nlKPHlcmG0NFa9sKpPOKLU6QE1d8aVHSC1dLTs8CCJg632XcVA/UqPslBWf92MFtrMxi8AMVQdh4Z/tvPeRfw9Fwwl+Gl8+OjE1g3rFPN+PT4DHW5fR7GRiI8hGfTNBXQNRVs4j9rQ7Iwwti4+GvOxVJrKnbs1tbcitXfTZfcHxGQYA6vh/3a2Ykl1F5E4k5pciKhPvqmxegqRUKDAzVOUk9auO1GXlli35QMkFssd15HqkjUdyAE6asMYTFWeqtj6ToUjN3XLMZnXkFVsDKe28dS+9ojsCnLZ4+o5VQfV+jWasTES6kYiILDcZYN922BTkThf8/DwldGlOzzXTKsvS2G+KILr1xnWaZBtaAcyQ2L5PZUVefh/A/623p 7UQcydgi EqmjP4lJoHJEsahBr404qp1x6s3QUZX+4TfM01ow4rQlW4UzIo6dVeO88jq6YgiSk7aTDQN38HMa5anXkzH8c1mcNzCeSpS8ondH7lYm4BiEd0J3+PEC4UGTwTdCrwCFi5SsQ+QD0zyC2sEe6jeJuV/KMQXIfasOVcLGo/H23/OX1oKZMkVfJPPuAVpbXZuvOr/WENs/sb4jQRgjj/RbczwDf7mTmvoWX9Am7m012cxrO2uLl9xpyw5cKD4o0u6gbITN3a2NBuP+509pNEXUC/ZkHHlU3LhdSHbWGgo/7MWI3F3xYPukpjj/mSM2v5IPUJW5SYg3V7wS2AyTfZZMW0JiVFjHQC4Fh0vWXrY8RH2Jp8fbLz5zXgZokZeP1T8SZfrt+o6hKeUtRZiwgXu6NRUudCZEgR0dX2+JtpCagiFtzo9e/yxsycRpb6+pab0uvSPjA8LJBCMLzf3RT6LDHsyC26TE6pL1vl5oi7oNHhrIE9LH8Kw4sMyV1Fw== 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: Fix an upstream powerpc bug that was discovered with a WARN_ON added in "lazy tlb: consolidate lazy tlb mm switching": Switching mm and tinkering with current->active_mm should be done with irqs disabled. There is a path where exit_lazy_flush_tlb can be called with irqs enabled: exit_lazy_flush_tlb flush_type_needed __flush_all_mm tlb_finish_mmu exit_mmap Which results in the switching being incorrectly with irqs enabled. Link: https://lore.kernel.org/linuxppc-dev/87a5xcgopc.fsf@mail.lhotse/T/#m105488939d0cd9f980978ed2fdeeb89bf731e673 Fixes: a665eec0a22e1 ("powerpc/64s/radix: Fix mm_cpumask trimming race vs k> I will send that fix upstream, which will end up conflicting with these. The resolution will be to take akpm's side of the merge (with this patch). Or drop the patch when it conflicts and I'll resend it rebased on the fix. Signed-off-by: Nicholas Piggin --- arch/powerpc/mm/book3s64/radix_tlb.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index 90953cf9f648..8d71fe8f5cdb 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -795,8 +795,16 @@ void exit_lazy_flush_tlb(struct mm_struct *mm, bool always_flush) goto out; if (current->active_mm == mm) { - /* Is a kernel thread and is using mm as the lazy tlb */ + unsigned long flags; + + /* + * It is a kernel thread and is using mm as the lazy tlb, so + * switch it to init_mm. This is not always called from IPI + * (e.g., flush_type_needed), so must disable irqs. + */ + local_irq_save(flags); kthread_end_lazy_tlb_mm(); + local_irq_restore(flags); } /*