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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 712B5C47091 for ; Sat, 29 May 2021 23:51:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ED85C6100C for ; Sat, 29 May 2021 23:51:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED85C6100C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=dabbelt.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5E9916B006C; Sat, 29 May 2021 19:51:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 598A76B006E; Sat, 29 May 2021 19:51:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 439E66B0070; Sat, 29 May 2021 19:51:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 067BD6B006C for ; Sat, 29 May 2021 19:51:34 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 89F56180284E9 for ; Sat, 29 May 2021 23:51:34 +0000 (UTC) X-FDA: 78195918108.35.B9E3281 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf22.hostedemail.com (Postfix) with ESMTP id 33C58C00CBE0 for ; Sat, 29 May 2021 23:51:24 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id e22so5449107pgv.10 for ; Sat, 29 May 2021 16:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=8UImWCr2XVFitJoBQVTHt3iV6JOy0UxslMS+oB/yncg=; b=w/ASenlrlYpoSgmPGAUNBpcrDCpZFcQhoW++hsBDOGf9S8cr4HPj9mCywbL3m32AB/ FkfDqqUTYjALltd8MsFQVzK+XJKnuB5uBffBtyuyNSbpEvY51Y+YSBcyozgpgVPIhsl4 gSkNAp/AZrPe1wwIb8UV011ifeU7vO4ukx6BuyLcM76tCvr1Uy/aoQq0EgTwtXI339ZE yvotJShBaEPsozN/z+qKcAcoWfuuffE+sy1Y2IKgiPOTeSJKRcqrZMljgjP+p6CReia5 ltKCmOEzmEjTPnBEqZmlyI5k3pTk5oxpJp0XPPe5YII8ZSbANX5Us7f8mWD7bzf7OiUF n5+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=8UImWCr2XVFitJoBQVTHt3iV6JOy0UxslMS+oB/yncg=; b=tAAQCJRx1dq+0V6aKi5wbesYIfWYDIZhWuFrkNe0t+t9BbE25bad4g2BMYd9Gv9i6w TUzRCLUN/24aCujRNcy4XGx2aGqPBRhOlclz5QHc+4nheqTlnKaB6jYTBP4wKdmIM0f8 0oLpjf2O3LV9JfT5A1ltVgcJSqUyh+YISXrG7ar5Jl+2IF+QUZfTEGdqsQDdl6TXrGGr Cssh2vK4zXYmACcWuxdeuonym2roxVuALQMAed5exH6BegzdNN4CI7HbI2mv1PZQDl5r EIUn8wBIZpb0rTaYRN0lLOtlRWNNwk9qhgmDmLKcY/WJ++a017H1cn6fC3jsv1s+pAX4 fTxQ== X-Gm-Message-State: AOAM530LB2dWVVcN7qYTWh6WnXJIayVfHSHfpADaLCKWnm/evCCZaI1C zFHUwa32g4d/vsakeRcT9XSu6g== X-Google-Smtp-Source: ABdhPJxVMvbtNLEA8KHH03zcvYuWVttTsQO8pYCDwf0GD8YJkvMEKOKNYDHbevN2fpsnwnTRTOFYRA== X-Received: by 2002:a63:7204:: with SMTP id n4mr16027141pgc.78.1622332293157; Sat, 29 May 2021 16:51:33 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id g29sm7743523pgm.11.2021.05.29.16.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 16:51:32 -0700 (PDT) Date: Sat, 29 May 2021 16:51:32 -0700 (PDT) X-Google-Original-Date: Sat, 29 May 2021 16:51:28 PDT (-0700) Subject: Re: [PATCH v2] mm: generalize ZONE_[DMA|DMA32] In-Reply-To: <20210528074557.17768-1-wangkefeng.wang@huawei.com> CC: akpm@linux-foundation.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, wangkefeng.wang@huawei.com, catalin.marinas@arm.com, will@kernel.org, geert@linux-m68k.org, tsbogend@alpha.franken.de, davem@davemloft.net, mingo@redhat.com, bp@alien8.de, rth@twiddle.net, linux@armlinux.org.uk, rppt@linux.ibm.com From: Palmer Dabbelt To: wangkefeng.wang@huawei.com Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=dabbelt-com.20150623.gappssmtp.com header.s=20150623 header.b="w/ASenlr"; spf=pass (imf22.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=palmer@dabbelt.com; dmarc=none X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 33C58C00CBE0 X-Stat-Signature: opwjx1oqqdd4qddbe5pwojqxm6sz7dbm X-HE-Tag: 1622332284-281469 Content-Transfer-Encoding: quoted-printable 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: On Fri, 28 May 2021 00:45:57 PDT (-0700), wangkefeng.wang@huawei.com wrot= e: > ZONE_[DMA|DMA32] configs have duplicate definitions on platforms > that subscribe them. Instead, just make them generic options which > can be selected on applicable platforms. > > Also only x86/arm64 architectures could enable both ZONE_DMA and > ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone > configurable and visible on the two architectures. > > Cc: Andrew Morton > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Geert Uytterhoeven > Cc: Thomas Bogendoerfer > Cc: "David S. Miller" > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: Palmer Dabbelt > Cc: Richard Henderson > Cc: Russell King > Acked-by: Catalin Marinas # for arm64 > Acked-by: Geert Uytterhoeven # for m68k > Acked-by: Mike Rapoport > Signed-off-by: Kefeng Wang Acked-by: Palmer Dabbelt # for RISC-V > --- > v2: > -i386 can't enable ZONE_DMA32, fix it. > -make ZONE_DMA default y on X86 as before. > -collect ACKs > > arch/alpha/Kconfig | 5 +---- > arch/arm/Kconfig | 3 --- > arch/arm64/Kconfig | 9 +-------- > arch/ia64/Kconfig | 4 +--- > arch/m68k/Kconfig | 5 +---- > arch/microblaze/Kconfig | 4 +--- > arch/mips/Kconfig | 7 ------- > arch/powerpc/Kconfig | 4 ---- > arch/powerpc/platforms/Kconfig.cputype | 1 + > arch/riscv/Kconfig | 5 +---- > arch/s390/Kconfig | 4 +--- > arch/sparc/Kconfig | 5 +---- > arch/x86/Kconfig | 15 ++------------- > mm/Kconfig | 12 ++++++++++++ > 14 files changed, 23 insertions(+), 60 deletions(-) > > diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig > index 5998106faa60..6a69a14c4825 100644 > --- a/arch/alpha/Kconfig > +++ b/arch/alpha/Kconfig > @@ -40,6 +40,7 @@ config ALPHA > select MMU_GATHER_NO_RANGE > select SET_FS > select SPARSEMEM_EXTREME if SPARSEMEM > + select ZONE_DMA > help > The Alpha is a 64-bit general-purpose processor designed and > marketed by the Digital Equipment Corporation of blessed memory, > @@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY > bool > default y > > -config ZONE_DMA > - bool > - default y > - > config GENERIC_ISA_DMA > bool > default y > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 24804f11302d..000c3f80b58e 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY > config ARCH_MAY_HAVE_PC_FDC > bool > > -config ZONE_DMA > - bool > - > config ARCH_SUPPORTS_UPROBES > def_bool y > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 9f1d8566bbf9..42794474f37f 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -42,6 +42,7 @@ config ARM64 > select ARCH_HAS_SYSCALL_WRAPPER > select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT > select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST > + select ARCH_HAS_ZONE_DMA_SET if EXPERT > select ARCH_HAVE_ELF_PROT > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select ARCH_INLINE_READ_LOCK if !PREEMPTION > @@ -307,14 +308,6 @@ config GENERIC_CSUM > config GENERIC_CALIBRATE_DELAY > def_bool y > > -config ZONE_DMA > - bool "Support DMA zone" if EXPERT > - default y > - > -config ZONE_DMA32 > - bool "Support DMA32 zone" if EXPERT > - default y > - > config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE > def_bool y > > diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig > index 279252e3e0f7..fd8503a0088a 100644 > --- a/arch/ia64/Kconfig > +++ b/arch/ia64/Kconfig > @@ -60,6 +60,7 @@ config IA64 > select NUMA if !FLATMEM > select PCI_MSI_ARCH_FALLBACKS if PCI_MSI > select SET_FS > + select ZONE_DMA32 > default y > help > The Itanium Processor Family is Intel's 64-bit successor to > @@ -72,9 +73,6 @@ config 64BIT > select ATA_NONSTANDARD if ATA > default y > > -config ZONE_DMA32 > - def_bool y > - > config MMU > bool > default y > diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig > index 372e4e69c43a..05a729c6ad7f 100644 > --- a/arch/m68k/Kconfig > +++ b/arch/m68k/Kconfig > @@ -34,6 +34,7 @@ config M68K > select SET_FS > select UACCESS_MEMCPY if !MMU > select VIRT_TO_BUS > + select ZONE_DMA > > config CPU_BIG_ENDIAN > def_bool y > @@ -62,10 +63,6 @@ config TIME_LOW_RES > config NO_IOPORT_MAP > def_bool y > > -config ZONE_DMA > - bool > - default y > - > config HZ > int > default 1000 if CLEOPATRA > diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig > index 0660f47012bc..14a67a42fcae 100644 > --- a/arch/microblaze/Kconfig > +++ b/arch/microblaze/Kconfig > @@ -43,6 +43,7 @@ config MICROBLAZE > select MMU_GATHER_NO_RANGE > select SPARSE_IRQ > select SET_FS > + select ZONE_DMA > > # Endianness selection > choice > @@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN > > endchoice > > -config ZONE_DMA > - def_bool y > - > config ARCH_HAS_ILOG2_U32 > def_bool n > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index ed51970c08e7..430d5324f1af 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -3277,13 +3277,6 @@ config I8253 > select CLKSRC_I8253 > select CLKEVT_I8253 > select MIPS_EXTERNAL_TIMER > - > -config ZONE_DMA > - bool > - > -config ZONE_DMA32 > - bool > - > endmenu > > config TRAD_SIGNALS > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 088dd2afcfe4..0f78bb383a12 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -403,10 +403,6 @@ config PPC_ADV_DEBUG_DAC_RANGE > config PPC_DAWR > bool > > -config ZONE_DMA > - bool > - default y if PPC_BOOK3E_64 > - > config PGTABLE_LEVELS > int > default 2 if !PPC64 > diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/plat= forms/Kconfig.cputype > index f998e655b570..7d271de8fcbd 100644 > --- a/arch/powerpc/platforms/Kconfig.cputype > +++ b/arch/powerpc/platforms/Kconfig.cputype > @@ -111,6 +111,7 @@ config PPC_BOOK3E_64 > select PPC_FPU # Make it a choice ? > select PPC_SMP_MUXED_IPI > select PPC_DOORBELL > + select ZONE_DMA > > endchoice > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index a8ad8eb76120..d29643dee126 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -103,6 +103,7 @@ config RISCV > select SYSCTL_EXCEPTION_TRACE > select THREAD_INFO_IN_TASK > select UACCESS_MEMCPY if !MMU > + select ZONE_DMA32 if 64BIT > > config ARCH_MMAP_RND_BITS_MIN > default 18 if 64BIT > @@ -132,10 +133,6 @@ config MMU > Select if you want MMU-based virtualised addressing space > support by paged memory management. If unsure, say 'Y'. > > -config ZONE_DMA32 > - bool > - default y if 64BIT > - > config VA_BITS > int > default 32 if 32BIT > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index b4c7c34069f8..daab9d56957a 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -2,9 +2,6 @@ > config MMU > def_bool y > > -config ZONE_DMA > - def_bool y > - > config CPU_BIG_ENDIAN > def_bool y > > @@ -210,6 +207,7 @@ config S390 > select THREAD_INFO_IN_TASK > select TTY > select VIRT_CPU_ACCOUNTING > + select ZONE_DMA > # Note: keep the above list sorted alphabetically > > config SCHED_OMIT_FRAME_POINTER > diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig > index 164a5254c91c..39679664cc9a 100644 > --- a/arch/sparc/Kconfig > +++ b/arch/sparc/Kconfig > @@ -59,6 +59,7 @@ config SPARC32 > select CLZ_TAB > select HAVE_UID16 > select OLD_SIGACTION > + select ZONE_DMA > > config SPARC64 > def_bool 64BIT > @@ -141,10 +142,6 @@ config HIGHMEM > default y if SPARC32 > select KMAP_LOCAL > > -config ZONE_DMA > - bool > - default y if SPARC32 > - > config GENERIC_ISA_DMA > bool > default y if SPARC32 > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 0045e1b44190..11cf8a0d6800 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -33,6 +33,7 @@ config X86_64 > select NEED_DMA_MAP_STATE > select SWIOTLB > select ARCH_HAS_ELFCORE_COMPAT > + select ZONE_DMA32 > > config FORCE_DYNAMIC_FTRACE > def_bool y > @@ -93,6 +94,7 @@ config X86 > select ARCH_HAS_SYSCALL_WRAPPER > select ARCH_HAS_UBSAN_SANITIZE_ALL > select ARCH_HAS_DEBUG_WX > + select ARCH_HAS_ZONE_DMA_SET if EXPERT > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI > select ARCH_MIGHT_HAVE_PC_PARPORT > @@ -343,9 +345,6 @@ config ARCH_SUSPEND_POSSIBLE > config ARCH_WANT_GENERAL_HUGETLB > def_bool y > > -config ZONE_DMA32 > - def_bool y if X86_64 > - > config AUDIT_ARCH > def_bool y if X86_64 > > @@ -393,16 +392,6 @@ config CC_HAS_SANE_STACKPROTECTOR > > menu "Processor type and features" > > -config ZONE_DMA > - bool "DMA memory allocation support" if EXPERT > - default y > - help > - DMA memory allocation support allows devices with less than 32-bit > - addressing to allocate within the first 16MB of address space. > - Disable if no such devices will be used. > - > - If unsure, say Y. > - > config SMP > bool "Symmetric multi-processing support" > help > diff --git a/mm/Kconfig b/mm/Kconfig > index 02d44e3420f5..16930f40f293 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -789,6 +789,18 @@ config ARCH_HAS_CACHE_LINE_SIZE > config ARCH_HAS_PTE_DEVMAP > bool > > +config ARCH_HAS_ZONE_DMA_SET > + bool > + > +config ZONE_DMA > + bool "Support DMA zone" if ARCH_HAS_ZONE_DMA_SET > + default y if ARM64 || X86 > + > +config ZONE_DMA32 > + bool "Support DMA32 zone" if ARCH_HAS_ZONE_DMA_SET > + depends on !X86_32 > + default y if ARM64 > + > config ZONE_DEVICE > bool "Device memory (pmem, HMM, etc...) hotplug support" > depends on MEMORY_HOTPLUG