From patchwork Fri Feb 3 11:17:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1736924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IgA1Hkzu; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P7Y7V6h5yz23h0 for ; Fri, 3 Feb 2023 22:18:46 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P7Y7V5XTdz3f6R for ; Fri, 3 Feb 2023 22:18:46 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IgA1Hkzu; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::102e; helo=mail-pj1-x102e.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IgA1Hkzu; dkim-atps=neutral Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P7Y616313z3bjc for ; Fri, 3 Feb 2023 22:17:29 +1100 (AEDT) Received: by mail-pj1-x102e.google.com with SMTP id nm12-20020a17090b19cc00b0022c2155cc0bso4648810pjb.4 for ; Fri, 03 Feb 2023 03:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R6F5ts11MhLELHBAH/J0bhcgscz4TyhN8LZqQQ9xVG8=; b=IgA1Hkzu4DTdfzmJdcqQvI0iR953fDAQaXe/nlgYGeD9oOFr+cO/4M1aH5Sz90kVcX Aa0tLBFG00PpyWRoxbghIZ55kGzBKj3YpYLoTPlV47aef5AZUqWfk8knwSt1wVoKEB1t VORZsCqjxveYutamyca3vCSK8t6BvljpZs4Bbt7/ZUcXRnOJSKYrYYyFQPpViaPMbaz9 OIY3dLklEXk3TLchPrGiLxUmeHdNngSlYFQ10lpttU/8ZRC/xe+rtwjGhySdrL0hzHA9 4x6AX6Fb2AxOWWkYco/j+oDwKiWYQM00ajucpxaUox9Fipulm6eSf2++BYraQE6JZfij +pFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R6F5ts11MhLELHBAH/J0bhcgscz4TyhN8LZqQQ9xVG8=; b=nsQqqbhVPCwBoLjGjczjYGmuKAHIf8FpEwQuFebY7oHQFdR2sO7uTb7rQQJoA9jjVm dgJ6guwdTH/bbDucQ5iQwgsKRpE7ScebKKy/6/fcPeTnugUD5KvDswXum0I+BFywaYic BzVilPn/Z6vRh8pmMD4otR/iprjDeQgumftgCisSlzISZsm7Q+ST+QTb6GU9l25XzFm5 e+H1XtnhuHRNdGGuVHYXFenfTGAVXi3XEjKUp46eBp48wa50I52zmK/hXeIx8eNgbwyt wWZZ3lSsrTHUSGqRNY8N1K5o7u0zaN45szBCdceEKfS2OYGS5eokJMA07IPFmka4g420 pP4A== X-Gm-Message-State: AO0yUKWPzeiIrS9yH6Saf3kGN0EU3Aqh92toOB8bGHgax/tDgRi6wZi8 EclpYyEqhgvVYROkFm7YV6/N985jcwk= X-Google-Smtp-Source: AK7set/bnXOx5JOf/CukQE7RLcC+/QSb2kbtT3VXzFnfdCFpn3h0vVb+udUBR+vSQ55qLMnpFlEgaA== X-Received: by 2002:a05:6a20:3d90:b0:bc:fe09:950b with SMTP id s16-20020a056a203d9000b000bcfe09950bmr12657574pzi.10.1675423046610; Fri, 03 Feb 2023 03:17:26 -0800 (PST) Received: from bobo.ozlabs.ibm.com (193-116-117-77.tpgi.com.au. [193.116.117.77]) by smtp.gmail.com with ESMTPSA id i15-20020a63bf4f000000b004f2c088328bsm1285151pgo.43.2023.02.03.03.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 03:17:26 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/3] powerpc/64s/radix: Remove need_flush_all test from radix__tlb_flush Date: Fri, 3 Feb 2023 21:17:16 +1000 Message-Id: <20230203111718.1149852-2-npiggin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230203111718.1149852-1-npiggin@gmail.com> References: <20230203111718.1149852-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" need_flush_all is only set by arch code to instruct generic tlb_flush to flush all. It is never set by powerpc, so it can be removed. Signed-off-by: Nicholas Piggin --- arch/powerpc/mm/book3s64/radix_tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index 282359ab525b..1e451184cba4 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -1302,7 +1302,7 @@ void radix__tlb_flush(struct mmu_gather *tlb) * that flushes the process table entry cache upon process teardown. * See the comment for radix in arch_exit_mmap(). */ - if (tlb->fullmm || tlb->need_flush_all) { + if (tlb->fullmm) { __flush_all_mm(mm, true); } else if ( (psize = radix_get_mmu_psize(page_size)) == -1) { if (!tlb->freed_tables) From patchwork Fri Feb 3 11:17:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1736925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=e/Ohsw5d; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P7Y8W5VLJz23h0 for ; Fri, 3 Feb 2023 22:19:39 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P7Y8W2bDYz3f67 for ; Fri, 3 Feb 2023 22:19:39 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=e/Ohsw5d; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::62c; helo=mail-pl1-x62c.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=e/Ohsw5d; dkim-atps=neutral Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P7Y634M8vz3f6L for ; Fri, 3 Feb 2023 22:17:31 +1100 (AEDT) Received: by mail-pl1-x62c.google.com with SMTP id v23so4903151plo.1 for ; Fri, 03 Feb 2023 03:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w0/ElOy4og40E/sgS0rJoL1iS6ffRA2WFEnT5Pdlkrw=; b=e/Ohsw5dd9hY1JKjcmDQc4pC/ncOsNN8FEksS9QWLnPEePgEXZnpdq9Cn608ez0vLm Wfl/yHu28PDjsz1viBF+ukzYbtZnr0W2QrEqR+VNKYNCHan4zQzbPNHCtNO0J5d7vr/C yir1LJcQlmWpQFhia2RDY93mRMgnvnebAkgM9xZ/7YfZUMKEvkxDyCg3RC0tzv6UIDgm pGzhbQCdZQncT3PzaVFPwjj2ThaLGlQh4cPoG5KkWBInCJJ5GK7ztQmO8U4AfRO3WbI4 pBfA5r9I9WS1zHmmBAGQQ8Rz/VLh98w4sxqIqkkl3KWlz6Gfohe6myX1TAW8hQoidtTT 0JBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w0/ElOy4og40E/sgS0rJoL1iS6ffRA2WFEnT5Pdlkrw=; b=YLidmxC5zZELS2K7QybtDhNf+Klpd0+qj19dT+jDuBF+n8HG8jvuRKemVmGpaqGlM3 +LIuZrGkR6wpslYp3BWgyB23jBhxV1ki9gAwTAY0rV5BVKqz7l7KVDeCTxhwWS1gd0q7 iNHLDH8AtQUrwUSdnw6L/+nsa90ZZYzBzvGvUw/EnhdGQj2nT041UUzt9FiVVSpGljBc bzD6zHEHCn1SDgSj7aMNF/Ag18Z5VvuZI4zAGfrloQ6Gynr7HXwJjwfp4jZkfTkJsDdi SlRKhZton6SgaP94zULZl/zhU9HvQm3/NDXjldAO/txxRydbNj36Nrxto+mgh4oCwp82 5Iyg== X-Gm-Message-State: AO0yUKV9EmOXn36PyuxVGWy+9p4jdkZ/xkKnDHrswDqD6kH181RBScu6 4p2iOMtSMqT4VKpIGUAEGlOk2MR1FY4= X-Google-Smtp-Source: AK7set+sHsfWROcWN4HAO7M/EZHAfBJEzMgDdlXRrTDDvAqq9B3Lk61uF2SxWUvwLeStDQkuWpmzAQ== X-Received: by 2002:a17:90b:4c84:b0:22b:eb46:7d2 with SMTP id my4-20020a17090b4c8400b0022beb4607d2mr10016489pjb.47.1675423048967; Fri, 03 Feb 2023 03:17:28 -0800 (PST) Received: from bobo.ozlabs.ibm.com (193-116-117-77.tpgi.com.au. [193.116.117.77]) by smtp.gmail.com with ESMTPSA id i15-20020a63bf4f000000b004f2c088328bsm1285151pgo.43.2023.02.03.03.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 03:17:28 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/3] powerpc/64s/radix: mm->context.id should always be valid Date: Fri, 3 Feb 2023 21:17:17 +1000 Message-Id: <20230203111718.1149852-3-npiggin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230203111718.1149852-1-npiggin@gmail.com> References: <20230203111718.1149852-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The MMU_NO_CONTEXT checks are an unnecessary complication. Make these warn to prepare to remove them in future. Signed-off-by: Nicholas Piggin --- arch/powerpc/mm/book3s64/radix_tlb.c | 39 +++++++++++++++------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index 1e451184cba4..27aa5b0fbb3f 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -700,12 +700,13 @@ static inline void _tlbiel_va_range_multicast(struct mm_struct *mm, */ void radix__local_flush_tlb_mm(struct mm_struct *mm) { - unsigned long pid; + unsigned long pid = mm->context.id; + + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) + return; preempt_disable(); - pid = mm->context.id; - if (pid != MMU_NO_CONTEXT) - _tlbiel_pid(pid, RIC_FLUSH_TLB); + _tlbiel_pid(pid, RIC_FLUSH_TLB); preempt_enable(); } EXPORT_SYMBOL(radix__local_flush_tlb_mm); @@ -713,12 +714,13 @@ EXPORT_SYMBOL(radix__local_flush_tlb_mm); #ifndef CONFIG_SMP void radix__local_flush_all_mm(struct mm_struct *mm) { - unsigned long pid; + unsigned long pid = mm->context.id; + + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) + return; preempt_disable(); - pid = mm->context.id; - if (pid != MMU_NO_CONTEXT) - _tlbiel_pid(pid, RIC_FLUSH_ALL); + _tlbiel_pid(pid, RIC_FLUSH_ALL); preempt_enable(); } EXPORT_SYMBOL(radix__local_flush_all_mm); @@ -732,12 +734,13 @@ static void __flush_all_mm(struct mm_struct *mm, bool fullmm) void radix__local_flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr, int psize) { - unsigned long pid; + unsigned long pid = mm->context.id; + + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) + return; preempt_disable(); - pid = mm->context.id; - if (pid != MMU_NO_CONTEXT) - _tlbiel_va(vmaddr, pid, psize, RIC_FLUSH_TLB); + _tlbiel_va(vmaddr, pid, psize, RIC_FLUSH_TLB); preempt_enable(); } @@ -945,7 +948,7 @@ void radix__flush_tlb_mm(struct mm_struct *mm) enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; preempt_disable(); @@ -985,7 +988,7 @@ static void __flush_all_mm(struct mm_struct *mm, bool fullmm) enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; preempt_disable(); @@ -1024,7 +1027,7 @@ void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr, enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; preempt_disable(); @@ -1130,7 +1133,7 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm, enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; preempt_disable(); @@ -1330,7 +1333,7 @@ static void __radix__flush_tlb_range_psize(struct mm_struct *mm, enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; fullmm = (end == TLB_FLUSH_ALL); @@ -1406,7 +1409,7 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr) enum tlb_flush_type type; pid = mm->context.id; - if (unlikely(pid == MMU_NO_CONTEXT)) + if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; /* 4k page size, just blow the world */ From patchwork Fri Feb 3 11:17:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1736926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=TjtWDHoU; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P7Y9X2FvVz23gY for ; Fri, 3 Feb 2023 22:20:32 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P7Y9W6v2Jz3bjy for ; Fri, 3 Feb 2023 22:20:31 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=TjtWDHoU; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::62b; helo=mail-pl1-x62b.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=TjtWDHoU; dkim-atps=neutral Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P7Y656dnyz3f7N for ; Fri, 3 Feb 2023 22:17:33 +1100 (AEDT) Received: by mail-pl1-x62b.google.com with SMTP id m2so4889425plg.4 for ; Fri, 03 Feb 2023 03:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=48YFaNCLRJJqW41HHDBi+5xfANsipTmFh9JB3btUi5Y=; b=TjtWDHoUpxwffYtN8qHuISDw9QBSsOUf6DvC0KSlkqLkWyidL/gtRT3y0qZKQhMTMB oYmLn1RE6bLLyxZyK+AvNE5dz2IfI5V7idqQAfXIjIDX+SbHjlpuLykgSpar1siW3scH 4Nvm0z6egodNOGxJlW6j/pVWGrPxJZ0Tw9h0dU1/1Et+q4zBh59o6B5eYyFCsQxAG6XY Z/Wga6qQfShegnn6X7JPbPZSc/NLyUMbwq+UpiYRSZsoDwAm41KGcdTwDpUW0DGsvBAp 5pGhF5cS0h85LptBBd9T9ky/yqCTxmlvhSQX1HBB91ng9nh1gnPqNYhfjd2M3zNH/z65 CsYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=48YFaNCLRJJqW41HHDBi+5xfANsipTmFh9JB3btUi5Y=; b=UIQtbxvdVvMUE2/BDJ4lxo5PI4Erbkwd6cCHXm7kZLa6FhOfjGfMkBth8g2IxO7gem HinxY/FuuEbdcaqG82wGmTyLJ6Mjx0m9NRXS0pN0psl6ramVWngybpzDhTU8NoCQYb7+ uHDcSBBeclgqAN8KYVMyVvHWfN1044ZT6YtbA8dBZLd4gJSTG/B2+CXMLyPPXrRb467V fuZfOl7Kai2bl8II/sdSTSIjSkOrJX24fDHjB9H8SQ2jcbapvD82C7qDdsloHukzmzKQ 8VSDnGMi/Igkl32F568c520QPLmi/4NqANXxjeE0dL5Pn5jcoU1n8deYdtV6wqugB9fv /8vQ== X-Gm-Message-State: AO0yUKX32Hm8yvlg1RfA+yaVq6Z2rB4kIlZPBSVEg2p3ln9qjWdqcEZV z9LckNVHPGz7oFnaVvwnk967v0zIiuo= X-Google-Smtp-Source: AK7set8P9XRsTkhP6zu3BiUAVGvmERk00xG/SCrgSY7NjsX8sFtY5F/wi45XkvHJNPNVhwt9wIUFRg== X-Received: by 2002:a17:90b:1a91:b0:230:537c:a39d with SMTP id ng17-20020a17090b1a9100b00230537ca39dmr4092556pjb.0.1675423051241; Fri, 03 Feb 2023 03:17:31 -0800 (PST) Received: from bobo.ozlabs.ibm.com (193-116-117-77.tpgi.com.au. [193.116.117.77]) by smtp.gmail.com with ESMTPSA id i15-20020a63bf4f000000b004f2c088328bsm1285151pgo.43.2023.02.03.03.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 03:17:30 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 3/3] powerpc/64s/radix: Remove TLB_FLUSH_ALL test from range flushes Date: Fri, 3 Feb 2023 21:17:18 +1000 Message-Id: <20230203111718.1149852-4-npiggin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230203111718.1149852-1-npiggin@gmail.com> References: <20230203111718.1149852-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This looks like it came across from x86, but x86 uses TLB_FLUSH_ALL as a parameter to internal functions. Powerpc never sets it anywhere. Remove the associated logic and leave a warning for now. Signed-off-by: Nicholas Piggin --- arch/powerpc/mm/book3s64/radix_tlb.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c index 27aa5b0fbb3f..2608ff7cf62c 100644 --- a/arch/powerpc/mm/book3s64/radix_tlb.c +++ b/arch/powerpc/mm/book3s64/radix_tlb.c @@ -1107,6 +1107,9 @@ void radix__flush_tlb_kernel_range(unsigned long start, unsigned long end) } EXPORT_SYMBOL(radix__flush_tlb_kernel_range); +/* + * Doesn't appear to be used anywhere. Remove. + */ #define TLB_FLUSH_ALL -1UL /* @@ -1128,7 +1131,6 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm, unsigned int page_shift = mmu_psize_defs[mmu_virtual_psize].shift; unsigned long page_size = 1UL << page_shift; unsigned long nr_pages = (end - start) >> page_shift; - bool fullmm = (end == TLB_FLUSH_ALL); bool flush_pid, flush_pwc = false; enum tlb_flush_type type; @@ -1136,15 +1138,15 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm, if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; + WARN_ON_ONCE(end == TLB_FLUSH_ALL); + preempt_disable(); smp_mb(); /* see radix__flush_tlb_mm */ - type = flush_type_needed(mm, fullmm); + type = flush_type_needed(mm, false); if (type == FLUSH_TYPE_NONE) goto out; - if (fullmm) - flush_pid = true; - else if (type == FLUSH_TYPE_GLOBAL) + if (type == FLUSH_TYPE_GLOBAL) flush_pid = nr_pages > tlb_single_page_flush_ceiling; else flush_pid = nr_pages > tlb_local_single_page_flush_ceiling; @@ -1328,7 +1330,6 @@ static void __radix__flush_tlb_range_psize(struct mm_struct *mm, unsigned int page_shift = mmu_psize_defs[psize].shift; unsigned long page_size = 1UL << page_shift; unsigned long nr_pages = (end - start) >> page_shift; - bool fullmm = (end == TLB_FLUSH_ALL); bool flush_pid; enum tlb_flush_type type; @@ -1336,17 +1337,15 @@ static void __radix__flush_tlb_range_psize(struct mm_struct *mm, if (WARN_ON_ONCE(pid == MMU_NO_CONTEXT)) return; - fullmm = (end == TLB_FLUSH_ALL); + WARN_ON_ONCE(end == TLB_FLUSH_ALL); preempt_disable(); smp_mb(); /* see radix__flush_tlb_mm */ - type = flush_type_needed(mm, fullmm); + type = flush_type_needed(mm, false); if (type == FLUSH_TYPE_NONE) goto out; - if (fullmm) - flush_pid = true; - else if (type == FLUSH_TYPE_GLOBAL) + if (type == FLUSH_TYPE_GLOBAL) flush_pid = nr_pages > tlb_single_page_flush_ceiling; else flush_pid = nr_pages > tlb_local_single_page_flush_ceiling;