From patchwork Wed Nov 22 01:07:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 168053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1022437vqb; Tue, 21 Nov 2023 17:08:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6tjDFy11P784pvru+XI1ZXJ+GdRK/tyb8yKRphzho9vRpIayNRNwM63pCC+CUUceC28iO X-Received: by 2002:a17:902:db02:b0:1cc:7f53:c190 with SMTP id m2-20020a170902db0200b001cc7f53c190mr1160425plx.51.1700615337284; Tue, 21 Nov 2023 17:08:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700615337; cv=none; d=google.com; s=arc-20160816; b=aO0B+mzyhq41vbuij+WVtO3IWz00cryLTsydf7VrtbjAxaQqGdSdMy8eJWlJVipQ/w a3qU2SGh8FCNEMSZwZChAFSE9TpdIZvAvC2iUllvrBeK+mrrsylwFJ6JyGagc1uDul7r eUI+zq4PBV6B9g1azakb6BCRGFnlE8yuatt9/jFoHhIR4BsHGQs4ExD+YS6tDFcVqvJz HP3JGgLd5czJ8eApqhSZ1fRDI6ynpBJHEDbR2q5GuZJqorT/vRZe/dZ/CFcN1E7wsGbw Kvsj3iny2Lec58T8xc5W28jNB5yf3Q8Rc7A6Lr2eW0PJhOGGNdar+u4CzfBGyso90Pry R2rw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Wj2ICW1Fptg7hPvDVbuVBoYZZibiQ7SyAcM7RK2jyBY=; fh=dlotjpk72cYcmDz0+AxIEXTz48ooVBc8lhZ+ndNwuOg=; b=roFMpN9RwI+g/hMtxX1TLTBviz+O+dH841Fs2psuxiwANvTC6OPg4b0eoZLhZpgsjg gDWPFE4fOWh3jN4wPkk90y1RRv29RF29SddSgzG9E4CvamDX9/fG3TVsa6BLTysBd/a0 TFgPI+/T9RNOs5kmvZRs/Mqf9/OL2V5BvmgfpJvcHn7DaN20A3wy6cbkim1Ei8B/RmIp xWNbaPDPxdcSmNyXzyaYPwat0xZ4AU/0lBfDeYOfCw6741/ciAnPTsl4qw4R17Cc6H3o RZhX68pXuuN5Aup6XSDtpSHdJuMjxR6myibHb+2sAS+lkEDAYLdpvgGPD5+lgQpGHd9W 41/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=eq1SR9ab; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id o2-20020a170902d4c200b001cc31c32e0fsi12106763plg.91.2023.11.21.17.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 17:08:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=eq1SR9ab; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D29A2818ABC1; Tue, 21 Nov 2023 17:08:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231307AbjKVBIp (ORCPT + 99 others); Tue, 21 Nov 2023 20:08:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235053AbjKVBId (ORCPT ); Tue, 21 Nov 2023 20:08:33 -0500 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1662199 for ; Tue, 21 Nov 2023 17:08:27 -0800 (PST) Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-3b58d96a3bbso3637913b6e.1 for ; Tue, 21 Nov 2023 17:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1700615307; x=1701220107; darn=vger.kernel.org; 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=Wj2ICW1Fptg7hPvDVbuVBoYZZibiQ7SyAcM7RK2jyBY=; b=eq1SR9abgzTitUEVa1WXCZZRtNJamTF6j/hVuHV/kxEuo/1w6ja5oRlG65TCxU//PU WVcCuHAHdjowyegBpF+RMRaM61V336FgQzWVo0zNkx/6aZZoWqpg8rXAoJCEl6YIZj+F UucYvk0idUl5uZtNlCUnwJnm1HCkWLWkEV9+0keo0nqVgO/Bt6o8Lc6uFxg/xr5A/khk kjF8EkV38tZrBl9d/cu5/e2/ZT4BCOcAAueoaxZS/L3JTeV1LLntPjn1stHlE2ARTPVq wKLUfoXYHYA1PKYkAIV7/CvDSczNWgI7JcUlK0FR7jelPOr5KfGWNwBJ3zz3IOV9z3tq PIHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700615307; x=1701220107; 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=Wj2ICW1Fptg7hPvDVbuVBoYZZibiQ7SyAcM7RK2jyBY=; b=wUcK0WZDIyA9PTjTqWzDOdLoWOoJ/BtzscBbHW9b+CE2hIzHJV8LPbIfbdu+QPV5zA L/jLEPqlLgGSiNsxJFHSDgk6ggnJwU/sPOej6wxFmeP28kGkp5P+NsgTsfA89fVbE44a oDnaiKgvkL5J/tZlvhtIRk+5Jr5NxAW9hiJlk0KR3wc+al/ukiBSo7GAzc7uGw5zBAM6 MpWb9xbIJGUOQBbve55HL5Bgb1DKqJroqBOz/wifIy05wyLCcN4OG1THZpWSZ4TnnIVm lrANTQTudZ8Sjo9qkWPHLa2SOmNRUfI8VbYDUfdpTyRY6lSvCt1PEUW6xXHMNBlNkOCU MOsA== X-Gm-Message-State: AOJu0YxjM5NEqpBvYQMA0eG+ovOqygcIJDshArNgywP6PqT/FQ9uCauK 7p6H0Q97Hmmpubo3qw0X+arjOw== X-Received: by 2002:a05:6808:699:b0:3b7:673:8705 with SMTP id k25-20020a056808069900b003b706738705mr885196oig.18.1700615307054; Tue, 21 Nov 2023 17:08:27 -0800 (PST) Received: from sw06.internal.sifive.com ([4.53.31.132]) by smtp.gmail.com with ESMTPSA id bn5-20020a056a00324500b006be047268d5sm8713961pfb.174.2023.11.21.17.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 17:08:26 -0800 (PST) From: Samuel Holland To: Palmer Dabbelt , linux-riscv@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexandre Ghiti , Samuel Holland Subject: [PATCH v3 8/8] riscv: mm: Always use ASID to flush MM contexts Date: Tue, 21 Nov 2023 17:07:19 -0800 Message-ID: <20231122010815.3545294-9-samuel.holland@sifive.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231122010815.3545294-1-samuel.holland@sifive.com> References: <20231122010815.3545294-1-samuel.holland@sifive.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Tue, 21 Nov 2023 17:08:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783224427621012923 X-GMAIL-MSGID: 1783224427621012923 Even if multiple ASIDs are not supported, using the single-ASID variant of the sfence.vma instruction preserves TLB entries for global (kernel) pages. So it is always more efficient to use the single-ASID code path. Signed-off-by: Samuel Holland --- (no changes since v2) Changes in v2: - Update both copies of __flush_tlb_range() arch/riscv/include/asm/mmu_context.h | 2 -- arch/riscv/mm/context.c | 3 +-- arch/riscv/mm/tlbflush.c | 5 ++--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/mmu_context.h b/arch/riscv/include/asm/mmu_context.h index 7030837adc1a..b0659413a080 100644 --- a/arch/riscv/include/asm/mmu_context.h +++ b/arch/riscv/include/asm/mmu_context.h @@ -33,8 +33,6 @@ static inline int init_new_context(struct task_struct *tsk, return 0; } -DECLARE_STATIC_KEY_FALSE(use_asid_allocator); - #include #endif /* _ASM_RISCV_MMU_CONTEXT_H */ diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 3ca9b653df7d..20057085ab8a 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -18,8 +18,7 @@ #ifdef CONFIG_MMU -DEFINE_STATIC_KEY_FALSE(use_asid_allocator); - +static DEFINE_STATIC_KEY_FALSE(use_asid_allocator); static unsigned long num_asids; static atomic_long_t current_version; diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 23409d70440f..d6619be10341 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -90,8 +90,7 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, /* check if the tlbflush needs to be sent to other CPUs */ broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; - if (static_branch_unlikely(&use_asid_allocator)) - asid = cntx2asid(atomic_long_read(&mm->context.id)); + asid = cntx2asid(atomic_long_read(&mm->context.id)); } else { cmask = cpu_online_mask; broadcast = true; @@ -122,7 +121,7 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, { unsigned long asid = FLUSH_TLB_NO_ASID; - if (mm && static_branch_unlikely(&use_asid_allocator)) + if (mm) asid = cntx2asid(atomic_long_read(&mm->context.id)); local_flush_tlb_range_asid(start, size, stride, asid);