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 A5509C54E67 for ; Wed, 27 Mar 2024 06:24:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21A726B0085; Wed, 27 Mar 2024 02:24:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CADE6B0087; Wed, 27 Mar 2024 02:24:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BAA76B008A; Wed, 27 Mar 2024 02:24:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F08496B0085 for ; Wed, 27 Mar 2024 02:24:09 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 92E39A09DA for ; Wed, 27 Mar 2024 06:24:09 +0000 (UTC) X-FDA: 81941829018.15.F05604A Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by imf14.hostedemail.com (Postfix) with ESMTP id C5368100002 for ; Wed, 27 Mar 2024 06:24:07 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="ddZ5N/Oy"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf14.hostedemail.com: domain of cuiyunhui@bytedance.com designates 209.85.160.54 as permitted sender) smtp.mailfrom=cuiyunhui@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711520647; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8oWEwBijHMiAPbYhHlQ1tO5hUF/k22snxI3OcFkt4Sg=; b=g7woMlKSj5pGc6hYZCqcOzn+vGN6gaDml3plOhB8nGN5TPJrEZLUoEMrbUX3uvXMxRaPG9 KXssyhT3QLvC7I5Hj6R+2feavPduR/DyCiPWnSme3QRxIrYwrMRvUHG9M706bqOTTTx+K+ g6xmrT8OvWqJl5GeHDjc7EmG5EqFkZI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="ddZ5N/Oy"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf14.hostedemail.com: domain of cuiyunhui@bytedance.com designates 209.85.160.54 as permitted sender) smtp.mailfrom=cuiyunhui@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711520647; a=rsa-sha256; cv=none; b=e3bszN6uWXANOssJB/F9g0LE/g86jH24cnitPNZPsmZLunbzRmWFOWspzljFPxfTs0i4hd OgehJ/Zl2QuS7TAs5D6rgwCgzJeuL5lUF3lqfd5BbPrFO40WSwuQFyQKnhqu6oegMjyjIX ks5IPfghIEiHmkCBUjz4hB15etLGogc= Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-222b6a05bb1so3807775fac.3 for ; Tue, 26 Mar 2024 23:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1711520647; x=1712125447; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8oWEwBijHMiAPbYhHlQ1tO5hUF/k22snxI3OcFkt4Sg=; b=ddZ5N/Oyh+68+EtWSaYQ6McnpcOzH/Z9HStGJ7hLR8OHg8fwx8kiMME9i1wBljL2zr X+q1CC3X97wUqkORFvKidRwvEb8IEjZXH791Pm0Dt5MSgW7Mol0cA7xQlfkV1ZlUQ5fV ERADPl3I/9kbZV9HJMSrPIZssulyS20Cj3cexMa/0hxQ061vriYPsYPtHuliLVXtBtBa QNMUvtCUT2dhlHwbXwxUZjxTnZFI0kiGk82iWDiKD313i7hrl9QYu2lkim4C2J4iXDuh tSWa2bx3UDKPAkuE4+xV2AJ1EtqfmgjAAac/KtXuMhb389zq0H0vx3GNRXtYrU6cWFJM 0yGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711520647; x=1712125447; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8oWEwBijHMiAPbYhHlQ1tO5hUF/k22snxI3OcFkt4Sg=; b=T0YYHQgT0v+8vcZ2qvMbGPCb4uQ1O7IHdjpWb8+fEjGHLiYJYctSkVD2ZC/Bpj+hCf gDASeNQU/OfDSWo0hqgRYPSfqa3YwokuvoGIUQdT1/BDx/HB+zewZkcKINwSJMzxTAK1 mvmqDQRVBGLNMm6Tb9zK8b3OKbbpf76vDsobPGDqHLY9H1WDh6vnX0eHNL76O3dkvT2z wyBYqzNaZ8mBM2TtGqUI6nQDctgGcDTipkZkDBv53/uLdOWtw8uELWFw4EkcBxntAV3Z 0ItOpqQFuuQNDFksBbTDw76GDe47qb7AeGyyuOzzNAxQY3yu9JEMq+p3Ji8kDcxgtfcE DaSw== X-Forwarded-Encrypted: i=1; AJvYcCUwStj1kltRp4tAH/tkOxofUpydsF5rPd9OpbFgK+yNkkXQpZyP2sIUTxy1bzfn9FW1R2NRZ+u8bewY8CtshtEsupk= X-Gm-Message-State: AOJu0Yzyr5oHeZZ7QfdRqJ+pNfrEmhMhuaQ6ZeLtPBxsPqbFonF8wh66 PFNHJcoibqCd0XMrgo5ycjuT1Z4Jp5kW1xsE3l0WiLHgN30WQTFQr8Z/GxWLRpEcOLBnICsmEUG /PIMhQvLpKgkJ+bKIXK4aFmQGJcMDkJl49mQpLw== X-Google-Smtp-Source: AGHT+IFhEeq410DvQa9oQZkS0m0EYwn1s+oHwhpUn2R8jvumRu2oImrFD/ysHx9vuZwjm+EIqRm8Kd2Z30d1RvDrk8A= X-Received: by 2002:a05:6870:788c:b0:22a:107c:4dd6 with SMTP id hc12-20020a056870788c00b0022a107c4dd6mr3948186oab.40.1711520646891; Tue, 26 Mar 2024 23:24:06 -0700 (PDT) MIME-Version: 1.0 References: <20240327045035.368512-1-samuel.holland@sifive.com> <20240327045035.368512-7-samuel.holland@sifive.com> In-Reply-To: <20240327045035.368512-7-samuel.holland@sifive.com> From: yunhui cui Date: Wed, 27 Mar 2024 14:23:56 +0800 Message-ID: Subject: Re: [External] [PATCH v6 06/13] riscv: mm: Combine the SMP and UP TLB flush code To: Samuel Holland Cc: Palmer Dabbelt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexandre Ghiti , Jisheng Zhang Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: C5368100002 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 6kapzps3h5wefygi6tyhtfaporxx6gxs X-HE-Tag: 1711520647-786112 X-HE-Meta: U2FsdGVkX1+0qZibKeHQ5jH972+AQq/aygN4uoRzpcOYjaPPxaZT4TP2K6FiqVbDY5bHV0gO9FAnMNLuEpckyugf56qaucINn2RLnXOGNvvEgsbQRZ6ZCYYloEVVloanKqtvvMd0+G6cjFhqRKR0lVJj/bm5OqWYU43lm6trRyFGe3Sg/LnRRxvx4qSE+m4GltrChB15JZGFYlNM/zh3HCV4ilmCKaiSM5vdYtYBPElJNGCPEQ8X4WfrHwN+499EVC1tI6q1TWwiFj36Pk1zWn1VIdts978psi+TgpdvBUUxlA78f/p7g76V61Znsm/Vq5/8LY8G22ya8m34DKENeGF2jif2Chh6M/InBSYP6Me0PmL2qN1si+dnb1Qd0oXgl720eeQ1CkwnuRLU1zoMtNfAioM8QZQNHBAEPgCYMrpga9OBAfDg3m3jCdiiKHJ9JgKvzH25gNI0yZyFOxpLWIrIO0uB5b1WD7CmloFbWFlv4UbPtJaimRV3VMRPD8BS8BXQOwOPYuz2tcERtMlxoh/hKv03zUfpUlBG6ThUwwh+8FSP+Q8SYBTwjgBfdpmoP9mAJWuiYgIHHA3BHg5hEENqmW8qW5ZicBFtp0JyFPAineMykholLQEDbC1N8yxU3IqAo0N4PTXBAVrL8vL3L0P0gAaQKQVqmoOzej8BlqXPBNmSpE3/rionxnwzrLT7mTlpNi590CHpfQilR8fNUpDcXGvUsv86wYwSyLX6llI9rL9mG6JZKIgn9+fLz86eHwH/Qz7L8b+zgBxqdKjZ/BYHnGnQxY167IrbLExzp97QzNQjfqTHRfTH9vPCLUbSVNzjr2lUzF+hqQKJ4GZNB9/zsRpQYqzX0rmGkEm4vOULwdX0uHDtkxQxrY5bdHbt3u1e24+S+o8YvITS4vN9Y23T9BVuzg6TpHXOkReI5CBw93ukqaF+3xYOCQxWCYHjFxVrcPTi4An6hLTcajm k90UGqbh YImoayLTemNoOk6jWDLeDntIRt4u6m02OMdPYxvPz5ecIBfbSMrUQa+tKFfYy+QPF4g9eHWFX2vbMKjlkeSGZLiHfGI9SISeR24Y6hBqwgMNNRCXlq71J4PKZfwyjXUu3ls/pWwP1BiC8mUlcqom/RruquOQRF7zKL/mAOvrXUtO5vJLxKk+bi5L2JS/YfsoXFmRIGmmfdOUwzYyoNTy8USArgvuodxyFVFt8zVwnYVJow5kO1ZtKJ06GOgPbL0Z5qEI5V5GZhGu8KnLwnnNS8FlnHh2yHn8TXdHjvHKlcjozughvvFEUYO1128HFmMcfd2hl+aZnI5rRnU+jTVs7oML4kUUJkZUaAqhty3teyYlEQxhNbJSb07xe8au3hrHl7edsusoLMKKlvBQr8AjjjYdcNNbUyuEtSe3m7lLAJ5EdB06X9IWWkrEEOXXLKWxK0ziI 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: List-Subscribe: List-Unsubscribe: Hi Samuel, On Wed, Mar 27, 2024 at 12:51=E2=80=AFPM Samuel Holland wrote: > > In SMP configurations, all TLB flushing narrower than flush_tlb_all() > goes through __flush_tlb_range(). Do the same in UP configurations. > > This allows UP configurations to take advantage of recent improvements > to the code in tlbflush.c, such as support for huge pages and flushing > multiple-page ranges. > > Reviewed-by: Alexandre Ghiti > Signed-off-by: Samuel Holland > --- > > (no changes since v4) > > Changes in v4: > - Merge the two copies of __flush_tlb_range() and rely on the compiler > to optimize out the broadcast path (both clang and gcc do this) > - Merge the two copies of flush_tlb_all() and rely on constant folding > > Changes in v2: > - Move the SMP/UP merge earlier in the series to avoid build issues > - Make a copy of __flush_tlb_range() instead of adding ifdefs inside > - local_flush_tlb_all() is the only function used on !MMU (smpboot.c) > > arch/riscv/Kconfig | 2 +- > arch/riscv/include/asm/tlbflush.h | 31 +++---------------------------- > arch/riscv/mm/Makefile | 5 +---- > 3 files changed, 5 insertions(+), 33 deletions(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index be09c8836d56..442532819a44 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -60,7 +60,7 @@ config RISCV > select ARCH_USE_MEMTEST > select ARCH_USE_QUEUED_RWLOCKS > select ARCH_USES_CFI_TRAPS if CFI_CLANG > - select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP && MMU > + select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU > select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/t= lbflush.h > index 4112cc8d1d69..4f86424b1ba5 100644 > --- a/arch/riscv/include/asm/tlbflush.h > +++ b/arch/riscv/include/asm/tlbflush.h > @@ -27,12 +27,7 @@ static inline void local_flush_tlb_page(unsigned long = addr) > { > ALT_FLUSH_TLB_PAGE(__asm__ __volatile__ ("sfence.vma %0" : : "r" = (addr) : "memory")); > } > -#else /* CONFIG_MMU */ > -#define local_flush_tlb_all() do { } while (0) > -#define local_flush_tlb_page(addr) do { } while (0) > -#endif /* CONFIG_MMU */ > > -#if defined(CONFIG_SMP) && defined(CONFIG_MMU) > void flush_tlb_all(void); > void flush_tlb_mm(struct mm_struct *mm); > void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, > @@ -54,28 +49,8 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_un= map_batch *batch, > unsigned long uaddr); > void arch_flush_tlb_batched_pending(struct mm_struct *mm); > void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch); > - > -#else /* CONFIG_SMP && CONFIG_MMU */ > - > -#define flush_tlb_all() local_flush_tlb_all() > -#define flush_tlb_page(vma, addr) local_flush_tlb_page(addr) > - > -static inline void flush_tlb_range(struct vm_area_struct *vma, > - unsigned long start, unsigned long end) > -{ > - local_flush_tlb_all(); > -} > - > -/* Flush a range of kernel pages */ > -static inline void flush_tlb_kernel_range(unsigned long start, > - unsigned long end) > -{ > - local_flush_tlb_all(); > -} > - > -#define flush_tlb_mm(mm) flush_tlb_all() > -#define flush_tlb_mm_range(mm, start, end, page_size) flush_tlb_all() > -#define local_flush_tlb_kernel_range(start, end) flush_tlb_all() > -#endif /* !CONFIG_SMP || !CONFIG_MMU */ > +#else /* CONFIG_MMU */ > +#define local_flush_tlb_all() do { } while (0) > +#endif /* CONFIG_MMU */ > > #endif /* _ASM_RISCV_TLBFLUSH_H */ > diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile > index 2c869f8026a8..cbe4d775ef56 100644 > --- a/arch/riscv/mm/Makefile > +++ b/arch/riscv/mm/Makefile > @@ -13,14 +13,11 @@ endif > KCOV_INSTRUMENT_init.o :=3D n > > obj-y +=3D init.o > -obj-$(CONFIG_MMU) +=3D extable.o fault.o pageattr.o pgtable.o > +obj-$(CONFIG_MMU) +=3D extable.o fault.o pageattr.o pgtable.o tlbflush.o > obj-y +=3D cacheflush.o > obj-y +=3D context.o > obj-y +=3D pmem.o > > -ifeq ($(CONFIG_MMU),y) > -obj-$(CONFIG_SMP) +=3D tlbflush.o > -endif > obj-$(CONFIG_HUGETLB_PAGE) +=3D hugetlbpage.o > obj-$(CONFIG_PTDUMP_CORE) +=3D ptdump.o > obj-$(CONFIG_KASAN) +=3D kasan_init.o > -- > 2.43.1 > This is cleaner than my previous modification to support UP __flush_tlb_ran= ge. So: Reviewed-by: Yunhui Cui Thanks, Yunhui