From patchwork Fri Dec 7 06:16:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10717487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3691314E2 for ; Fri, 7 Dec 2018 06:16:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23F002EB43 for ; Fri, 7 Dec 2018 06:16:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1797D2EB2B; Fri, 7 Dec 2018 06:16:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64FFC2EB43 for ; Fri, 7 Dec 2018 06:16:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F3C36B7EE5; Fri, 7 Dec 2018 01:16:50 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 379C76B7EE6; Fri, 7 Dec 2018 01:16:50 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F5C66B7EE7; Fri, 7 Dec 2018 01:16:50 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id CDF0D6B7EE5 for ; Fri, 7 Dec 2018 01:16:49 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id n17so2428727pfk.23 for ; Thu, 06 Dec 2018 22:16:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NzK+v8SD4i+VFYwyauHYt8uHII5JYwJbxV/psygL2NI=; b=VPx7ESQmH29gU75/VMIN2L605KTLKRiNY1kIzRAFSWtHwxJIrnMnlGYsbWuSJHe/iF Z4GW+J+auAPvuc0jgYy0Ql3PuuyuLKoapT2dqD1M1ck0RGxSpsApBzJGx894C4B/2dWo oo26ZQsn5/kT89Uif2R6ItVgbzlNKa26Vw7UyVWGGlEyPYNuVBzmNw+Xsqb0m501pcJl YzyZJEHTVVepP51MrcIkl/N8P2SVvp73WVCoabW5KM30pDHUom4aVTslO4/54O+08qRq 9u02EdExFhg3RE7KvBkdnEvNqdgEwKIVscrGyMNaAwV3bOHB1nLWd8/FURjlRVdqw3zW kSHg== X-Gm-Message-State: AA+aEWaCfZ5XPTzt4kZ1/ZZwAtlFDXXIysgXIjf9OrOdp6BI1kBRgHmf mOrWK9oeitC0mFCCJJU2e9nhaN1+e6g60TZ/CV9T3QpP9dYOtidSuPvYJE//dszotPNI8e7DAgB QJ3CL58s/B77MMzII30GpOPiMJSHiRwZyVbFoTapy0gR04oWZeaP+767lGKEOR5FF49uNXPc2sg EshP+NS4c4EN9MhM/moEZciuXCDFN0nlyWdH4epe37DuSQeWG1umbVhGi98WwUhiA956y4suJsF 5dko42+SC9gSJ9hXsNWmVghfDBa1HGt2CVlvicjDASIifVZaZpbTPt/FDEmhWWg41DSMduLRQNE fnIqVq6nAoQEkUhNF3s7p7MCBnA5tKLedptSGsbKejaAi9hBgxebOlqJMeHyAtrBfSAkuyf76ED W X-Received: by 2002:a62:7c47:: with SMTP id x68mr1001480pfc.209.1544163409415; Thu, 06 Dec 2018 22:16:49 -0800 (PST) X-Received: by 2002:a62:7c47:: with SMTP id x68mr1001434pfc.209.1544163408209; Thu, 06 Dec 2018 22:16:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544163408; cv=none; d=google.com; s=arc-20160816; b=MPRTnQ5Bs/JjSdgZSf3uPx73m7IgtcrZvkXLxLN3TItHzzpiOKpQMet5yALQqmJbJM gdUdSpHodnLRKa4H1hMFoEsZ/dpGh0mgRwUfmsht1KDqg7IhMYUsIosjJRRKr7+KJpYs V9gJPUCvq1LATu4KdA5VcxjFL2XTJRnwP1QtLq8iK4YN6osAiLd6CzBhtAFumz6qpOqD O5z89NjWxNf39l3LLBdiDGHignCyhN66ZDFLxhcZDJH5RmtRm4/W6DznBEZyPrFER6QW k+QX2KsQdodknwO0xyx3Xf61qJ9sfrqhQe76kvAYminO/IrnH6WWalfL5/OLXhdPuoI2 r9wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NzK+v8SD4i+VFYwyauHYt8uHII5JYwJbxV/psygL2NI=; b=mEB+1Qb7s9ul8hya+E1dyfcoP76FoaQ/gn5FYAceL65tzfeIUgMvr6eYDGqwev30nO AJAlIMR0bbiQz7vVlpT8TEKUvvqmG/is3zKxj/aFBybD3CsFngpDXvAYBQgXMyfldhIY ZbrEOZijLKnlw1HqcOlvS8y+LY4lMC56fIJJ7yWIgKCB00fw04bvr4/Txz5pvmY7fp1C Q9DwUwU+v9luK7wbKJeyysGgkKo8abvsvd2fcuQJUd77RbUzFBfmbm0/anxTgkWkw5ZI NJkH5CvKgzbz9+EbrkowvnyBMxcy3Xk+tZIuhSJUKz1DZhkwZjhgj1/KCDtfWb79zorX Kalg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GCAm1IN+; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d82sor4208737pfm.4.2018.12.06.22.16.48 for (Google Transport Security); Thu, 06 Dec 2018 22:16:48 -0800 (PST) Received-SPF: pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GCAm1IN+; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NzK+v8SD4i+VFYwyauHYt8uHII5JYwJbxV/psygL2NI=; b=GCAm1IN+ZRxbOc7GN7uNAXJJ8+9asqSko3ZUYgKImfZU63d/DjtitlkotDu3aXwDj5 Iv1yHuvKraDNMyDD480Kx7aNGM25sdgHZaG9Wn7gXCpdWregqeUEyJQiQWwRHOr5rxZN LPaXQhG3devZMIz45D0m+r/ow6oBxqByOhh60= X-Google-Smtp-Source: AFSGD/Xhr/g/OFHfKU7UGrWKwjX5Riip3DtlLhjvwMxfgqPTmR5dk2b/UOS+VKUsgAbbsuT+kNuVPw== X-Received: by 2002:a62:4d81:: with SMTP id a123mr1066512pfb.122.1544163407669; Thu, 06 Dec 2018 22:16:47 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id z30-v6sm2995944pfg.41.2018.12.06.22.16.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 22:16:46 -0800 (PST) From: Nicolas Boichat To: Will Deacon Cc: Robin Murphy , Joerg Roedel , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Michal Hocko , Mel Gorman , Levin Alexander , Huaisheng Ye , Mike Rapoport , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yong Wu , Matthias Brugger , Tomasz Figa , yingjoe.chen@mediatek.com, hch@infradead.org, Matthew Wilcox Subject: [PATCH v5 1/3] mm: Add support for kmem caches in DMA32 zone Date: Fri, 7 Dec 2018 14:16:18 +0800 Message-Id: <20181207061620.107881-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181207061620.107881-1-drinkcat@chromium.org> References: <20181207061620.107881-1-drinkcat@chromium.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP IOMMUs using ARMv7 short-descriptor format require page tables to be allocated within the first 4GB of RAM, even on 64-bit systems. On arm64, this is done by passing GFP_DMA32 flag to memory allocation functions. For IOMMU L2 tables that only take 1KB, it would be a waste to allocate a full page using get_free_pages, so we considered 3 approaches: 1. This patch, adding support for GFP_DMA32 slab caches. 2. genalloc, which requires pre-allocating the maximum number of L2 page tables (4096, so 4MB of memory). 3. page_frag, which is not very memory-efficient as it is unable to reuse freed fragments until the whole page is freed. This change makes it possible to create a custom cache in DMA32 zone using kmem_cache_create, then allocate memory using kmem_cache_alloc. We do not create a DMA32 kmalloc cache array, as there are currently no users of kmalloc(..., GFP_DMA32). These calls will continue to trigger a warning, as we keep GFP_DMA32 in GFP_SLAB_BUG_MASK. This implies that calls to kmem_cache_*alloc on a SLAB_CACHE_DMA32 kmem_cache must _not_ use GFP_DMA32 (it is anyway redundant and unnecessary). Signed-off-by: Nicolas Boichat Acked-by: Vlastimil Babka --- Changes since v2: - Clarified commit message - Add entry in sysfs-kernel-slab to document the new sysfs file (v3 used the page_frag approach) Changes since v4: - Added details to commit message - Dropped change that removed GFP_DMA32 from GFP_SLAB_BUG_MASK: instead we can just call kmem_cache_*alloc without GFP_DMA32 parameter. This also means that we can drop PATCH 1/3, as we do not make any changes in GFP flag verification. - Dropped hunks that added cache_dma32 sysfs file, and moved the hunks to PATCH 3/3, so that maintainer can decide whether to pick the change independently. include/linux/slab.h | 2 ++ mm/slab.c | 2 ++ mm/slab.h | 3 ++- mm/slab_common.c | 2 +- mm/slub.c | 5 +++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 11b45f7ae4057c..9449b19c5f107a 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -32,6 +32,8 @@ #define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U) /* Use GFP_DMA memory */ #define SLAB_CACHE_DMA ((slab_flags_t __force)0x00004000U) +/* Use GFP_DMA32 memory */ +#define SLAB_CACHE_DMA32 ((slab_flags_t __force)0x00008000U) /* DEBUG: Store the last owner for bug hunting */ #define SLAB_STORE_USER ((slab_flags_t __force)0x00010000U) /* Panic if kmem_cache_create() fails */ diff --git a/mm/slab.c b/mm/slab.c index 73fe23e649c91a..124f8c556d27fb 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2109,6 +2109,8 @@ int __kmem_cache_create(struct kmem_cache *cachep, slab_flags_t flags) cachep->allocflags = __GFP_COMP; if (flags & SLAB_CACHE_DMA) cachep->allocflags |= GFP_DMA; + if (flags & SLAB_CACHE_DMA32) + cachep->allocflags |= GFP_DMA32; if (flags & SLAB_RECLAIM_ACCOUNT) cachep->allocflags |= __GFP_RECLAIMABLE; cachep->size = size; diff --git a/mm/slab.h b/mm/slab.h index 4190c24ef0e9df..fcf717e12f0a86 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -127,7 +127,8 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, /* Legal flag mask for kmem_cache_create(), for various configurations */ -#define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \ +#define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | \ + SLAB_CACHE_DMA32 | SLAB_PANIC | \ SLAB_TYPESAFE_BY_RCU | SLAB_DEBUG_OBJECTS ) #if defined(CONFIG_DEBUG_SLAB) diff --git a/mm/slab_common.c b/mm/slab_common.c index 70b0cc85db67f8..18b7b809c8d064 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -53,7 +53,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, SLAB_FAILSLAB | SLAB_KASAN) #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ - SLAB_ACCOUNT) + SLAB_CACHE_DMA32 | SLAB_ACCOUNT) /* * Merge control. If this is set then no merging of slab caches will occur. diff --git a/mm/slub.c b/mm/slub.c index c229a9b7dd5448..4caadb926838ef 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3583,6 +3583,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) if (s->flags & SLAB_CACHE_DMA) s->allocflags |= GFP_DMA; + if (s->flags & SLAB_CACHE_DMA32) + s->allocflags |= GFP_DMA32; + if (s->flags & SLAB_RECLAIM_ACCOUNT) s->allocflags |= __GFP_RECLAIMABLE; @@ -5671,6 +5674,8 @@ static char *create_unique_id(struct kmem_cache *s) */ if (s->flags & SLAB_CACHE_DMA) *p++ = 'd'; + if (s->flags & SLAB_CACHE_DMA32) + *p++ = 'D'; if (s->flags & SLAB_RECLAIM_ACCOUNT) *p++ = 'a'; if (s->flags & SLAB_CONSISTENCY_CHECKS) From patchwork Fri Dec 7 06:16:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10717489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18D2A17D5 for ; Fri, 7 Dec 2018 06:16:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0306C2EB2A for ; Fri, 7 Dec 2018 06:16:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFBD42EB43; Fri, 7 Dec 2018 06:16:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590692EB2A for ; Fri, 7 Dec 2018 06:16:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E86C6B7EE8; Fri, 7 Dec 2018 01:16:54 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 06D946B7EE9; Fri, 7 Dec 2018 01:16:54 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E52136B7EEA; Fri, 7 Dec 2018 01:16:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 9F4E16B7EE8 for ; Fri, 7 Dec 2018 01:16:53 -0500 (EST) Received: by mail-pg1-f197.google.com with SMTP id a18so1875296pga.16 for ; Thu, 06 Dec 2018 22:16:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=V3Tp7fi37gRl6wdbbznSGQCWZn1NXc6qZobKiQoq3w1zVY9FwViBd5NGnnSPy1h2l0 hbWoJhRmoKo+lq+0ufMhJXR5EZIrcy0YHuxiKwNIjghMlOnfN8fqv9CP96/m9pFwdogc xxO2Y58Z4/J9RD/v2N7ioFeNzgNXF+JRFNKJIbdfxaBtws1AFV9UdM8bReCczuHuU1S2 4WmTs6grmeZ/F6g+CdgTAf4re32nOVPM1t38VK9tWMDBgX9uidUmAu6rtQ87xKUpoKj9 x1yW9VWDzfFajpdVhuIfqijIWVYgG9rq4F8groNryeemvdFOLR87uQwkdDLDz0/UkwzN Mudw== X-Gm-Message-State: AA+aEWYR7+JeFszZOqjR2+CzWpGFxQs5kjfjbqoThIDH4mx0u3NiZkW+ ZaEwPbB8dCsHOQjfcGQJh6vZz2LiQSKOmwN72D8bOEU78SiKLA43Vy3IOTVBXq6wI8Xrv7qhyeq 9v0DRhYgMXzhwInx6ynhcSTX9GMQuTlXt53LZp60epQf4pWK7pyRzWnwJeRMpsvSnI+/E2Js5IP kfhopOKzWKdmIokAaFqqDYrNDnr4bPGTu1R7DYdVpdPqcjm8DXXXUZiN9uhnUJk/qOvYbLnPkw0 UZfojnuNjCZrhx4P+0OuyHHpW2vmmyCAlcvRmZTnz14cdmRGW21JK12mtZQAfZsHYKvWXzm3mtZ lgoy1jueNdxCiV1x99y6RYImZmK/KHJ2KHR3bShfmUv4BQ+cTl6dAHRCAygLEpunD/SaEAJSN55 k X-Received: by 2002:a62:18ce:: with SMTP id 197mr1071115pfy.88.1544163413308; Thu, 06 Dec 2018 22:16:53 -0800 (PST) X-Received: by 2002:a62:18ce:: with SMTP id 197mr1071072pfy.88.1544163412306; Thu, 06 Dec 2018 22:16:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544163412; cv=none; d=google.com; s=arc-20160816; b=TB94dfIskdq+z2pn66NLItd/vv33nvrMujE9U32eMz890y+HX1RvaRwUbu0wJYg83N Ow0Ha9IbOwrzkzPG7JEHg0nBk03JAHLP83ybXUZbmZE+Qg/FpE4QFeXwJaeLbr1tukNL WalxA1nxKboZjOzga3dzEC5Yr7VzIDZtNr53lRtN21z1jzW54ZP63SGvkQxB66XPwdeF +dl+yF32cLAms8/UI0DWCmqNVsyYXcswer1JeYmOdha530QSzpl4r2guUGJ7YfHJ5TH7 COQMDmKHNcwDesFnB/RpGJyRNE5RRkuHOSF8GjhizDkI4Iz6I2nVz+0EgnGzLHIb54bK eOcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=OESq85y8eUzRPJ1yhTfJaUWortHHN5qMt1bDVKaEyxpm4L71qcSFl65LX+VTsL4Hpd 9lYRwoZBbBsmS1wMjJO+b8V3G7ceXpmcQHtTGtbk2bkW/lElUmTUg2hj1ywFNm0FGYEr fnS8OHYAPatrzA7PSzpFPa+FDfyRJIFRLaYuS77hzZPEgNYgCDXxDO9WQPT6a2pp88OY mVHZwNGdyZ67NUVZgxwlJruaT2E9Cl5oRjkLHknobObAv1ZCSmZ4ClvzWhh05NBWN+oR okJxig8Cx6BAwLAc1j0ZpSm2ZBRCYIaodhQhXIogoha43MXoTAXm8LUFuTrk5DPBUFKS cpYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Gkfg+veq; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id t1sor3896677plr.61.2018.12.06.22.16.52 for (Google Transport Security); Thu, 06 Dec 2018 22:16:52 -0800 (PST) Received-SPF: pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Gkfg+veq; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=Gkfg+veq3tFoCNjzTVVK4MzF1+VxmDDREWTh7F/H38sptZ3jt6fe3ndCmar2DUe88M oshVn2q+niIJDMUfWeFJfKyH74cwlJzUYMUI+jek4GUAaKZJrUA5/Wt8W8OCBlnE+JYt uX3zOPZH8Nwsy5ulmVaJycpdrDUdwiSAerjcw= X-Google-Smtp-Source: AFSGD/XZa6HFUd/c5IPU8LIhweh/OmveFRXhgV1EPw5ux8VC+DfGZoBXt4ZppI0AFEFQOSUKgZ7anw== X-Received: by 2002:a17:902:74c1:: with SMTP id f1mr928632plt.273.1544163411694; Thu, 06 Dec 2018 22:16:51 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id z30-v6sm2995944pfg.41.2018.12.06.22.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 22:16:51 -0800 (PST) From: Nicolas Boichat To: Will Deacon Cc: Robin Murphy , Joerg Roedel , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Michal Hocko , Mel Gorman , Levin Alexander , Huaisheng Ye , Mike Rapoport , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yong Wu , Matthias Brugger , Tomasz Figa , yingjoe.chen@mediatek.com, hch@infradead.org, Matthew Wilcox Subject: [PATCH v5 2/3] iommu/io-pgtable-arm-v7s: Request DMA32 memory, and improve debugging Date: Fri, 7 Dec 2018 14:16:19 +0800 Message-Id: <20181207061620.107881-3-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181207061620.107881-1-drinkcat@chromium.org> References: <20181207061620.107881-1-drinkcat@chromium.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP IOMMUs using ARMv7 short-descriptor format require page tables (level 1 and 2) to be allocated within the first 4GB of RAM, even on 64-bit systems. For level 1/2 pages, ensure GFP_DMA32 is used if CONFIG_ZONE_DMA32 is defined (e.g. on arm64 platforms). For level 2 pages, allocate a slab cache in SLAB_CACHE_DMA32. Note that we do not explicitly pass GFP_DMA[32] to kmem_cache_zalloc, as this is not strictly necessary, and would cause a warning in mm/sl*b.c, as we did not update GFP_SLAB_BUG_MASK. Also, print an error when the physical address does not fit in 32-bit, to make debugging easier in the future. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- Changes since v2: - Commit message (v3 used the page_frag approach) Changes since v4: - Do not pass ARM_V7S_TABLE_GFP_DMA to kmem_cache_zalloc, as this is unnecessary, and would trigger a warning. drivers/iommu/io-pgtable-arm-v7s.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 445c3bde04800c..f311fe1dfa47b7 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -161,6 +161,14 @@ #define ARM_V7S_TCR_PD1 BIT(5) +#ifdef CONFIG_ZONE_DMA32 +#define ARM_V7S_TABLE_GFP_DMA GFP_DMA32 +#define ARM_V7S_TABLE_SLAB_CACHE SLAB_CACHE_DMA32 +#else +#define ARM_V7S_TABLE_GFP_DMA GFP_DMA +#define ARM_V7S_TABLE_SLAB_CACHE SLAB_CACHE_DMA +#endif + typedef u32 arm_v7s_iopte; static bool selftest_running; @@ -198,13 +206,16 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, void *table = NULL; if (lvl == 1) - table = (void *)__get_dma_pages(__GFP_ZERO, get_order(size)); + table = (void *)__get_free_pages( + __GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size)); else if (lvl == 2) - table = kmem_cache_zalloc(data->l2_tables, gfp | GFP_DMA); + table = kmem_cache_zalloc(data->l2_tables, gfp); phys = virt_to_phys(table); - if (phys != (arm_v7s_iopte)phys) + if (phys != (arm_v7s_iopte)phys) { /* Doesn't fit in PTE */ + dev_err(dev, "Page table does not fit in PTE: %pa", &phys); goto out_free; + } if (table && !(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) { dma = dma_map_single(dev, table, size, DMA_TO_DEVICE); if (dma_mapping_error(dev, dma)) @@ -737,7 +748,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, data->l2_tables = kmem_cache_create("io-pgtable_armv7s_l2", ARM_V7S_TABLE_SIZE(2), ARM_V7S_TABLE_SIZE(2), - SLAB_CACHE_DMA, NULL); + ARM_V7S_TABLE_SLAB_CACHE, NULL); if (!data->l2_tables) goto out_free_data; From patchwork Fri Dec 7 06:16:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10717491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C688D17D5 for ; Fri, 7 Dec 2018 06:16:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5C092EB3B for ; Fri, 7 Dec 2018 06:16:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A98BF2EB33; Fri, 7 Dec 2018 06:16:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19E012EB33 for ; Fri, 7 Dec 2018 06:16:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA9AE6B7EEB; Fri, 7 Dec 2018 01:16:57 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C06706B7EEC; Fri, 7 Dec 2018 01:16:57 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0DB96B7EED; Fri, 7 Dec 2018 01:16:57 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 590756B7EEB for ; Fri, 7 Dec 2018 01:16:57 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id v2so1996338plg.6 for ; Thu, 06 Dec 2018 22:16:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vfDZBvP3TWcZW6yQdou2wK6yj8xee8CfAn4H8ypmyuM=; b=is8fOZDloG/NjLT3V0DE6VdfXcVQSmsrkTXZUKbYqce2V8C+WGCQ+L1dEQr03vuwpc Lproh4hknYTkjHFac/VI8cwvtk60k8wAM2joYpUBz2q6GdLkmF6KD7FMNoqcl8v8u6eR IQ4vBZUYpjyyN6nPyhlvQREIC75N+lIiF6vfaDW/5ChV6yGm35WRNAzkxz66/4bNWRna r4LjqajyJX3yjNIeXvqkM/fG5yJWynapYsWkG5W364nBRCbU4gZNKjQU+iXk8FZKPnmw ccDTVyyCGaKIpt2B5UpVyfEqBezEclkHTNB5E0ZqCq6+C5XMiV0Kx5I7u6Pig5UMgO8p qePQ== X-Gm-Message-State: AA+aEWYVRwY92qrIT9f7oY59/E7ZiX4dvMwOx7JIjBmCAMkofzhsjfx8 Q8iW8Pm+AGERp8y8Ck/jvuImqMtqEVw8c/QjeB1BNeG5b6lzlccwG0NBJnAR6+d05kLP4IRf5Rc +Zy080zLUwX7ccUtvyHgi8iShdWv+LrPk2jAMhmyTbw34kqouy3vnaKh4G8gVSzQchO4NEJRqSd RMpdSQ2IJIBnWl9TD3xZEvYUZg5SQcwx8Nj4IStMgQfUzmEwmQQnc5HhVKv2xf8VnuA/RQZ/LDY YJjt8v7Q3ZriIYGsEH5sKtQqt1GOaPpdWc9EQV6Wb5bJB5+f8czM5uJYnZ8/S9vzPkcXVXdVamZ 6XIakXSONPtb52q5Rb7Lc7lS1Zw3oeD3H9alsgJ4eEYXaCwss0xjI+wsj+2y0an14UhGXIlbnIE 1 X-Received: by 2002:a65:64c8:: with SMTP id t8mr858865pgv.31.1544163417016; Thu, 06 Dec 2018 22:16:57 -0800 (PST) X-Received: by 2002:a65:64c8:: with SMTP id t8mr858843pgv.31.1544163416170; Thu, 06 Dec 2018 22:16:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544163416; cv=none; d=google.com; s=arc-20160816; b=tAWWl4uYaPFN8eIgQN4RXnGw9DQIhSdg9A16EpMoU4uf3V4mTlwGdkBkr2UTXcGfRe MUG1eLfrNGBfIzo6DZPvWWnVGVelWC9eUaAAZwHqsdhoU6j2+PviReQMK2KvEu2N74fT EoFCJY1Nd0D7BBD6X/6HoiTFc+zhsIOPlPjVJWKASMms1vr6aD9vYF+QXZLSGYS/7oVN 6WpL2Skuh/6CKMzFAOayB62W9rZlIhL9VAo0DENrD2N6uT/QQGNBDFEVlZW2ycgXF9KF Goprtrb1GaZVcoFL18r7nVryum9g9rD7dr5ehYvf2WLHtm88/PSQmKmiPqbbO43tZ1Cl 5zew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vfDZBvP3TWcZW6yQdou2wK6yj8xee8CfAn4H8ypmyuM=; b=gudf86VMJksaQHbMXNRUY5D3yxUMSe7R23LpwP8l3qtvhThOpPcgmpZ6sjAkG02mM7 q8wiwWpZr7JaJHuSKnxdRZ/lFun4iZ/aS3+MQf2FCgEX0oP5J8j5y3uKk3EphAK949TA mRdQOmcqa6+0sPZZxkf4Pq6pTzErc2FjeX6PhPZKsgjHvITXgPOli/3DstWp2uKMd8xv l/jvmyANGTNPUN9VyJDni/zQCfgqKY2oBlPmp5kTDpdkCBUQM//JUrCNM89SYEJv+Mqk DhyzeZi88Co1CwLyzi38bWazsDNfJt9mDTUgI/oyjwIcDNTrHeUpwlqvqhOZvwI90XUp MJZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ajW7ykpg; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i3sor3905854pli.15.2018.12.06.22.16.56 for (Google Transport Security); Thu, 06 Dec 2018 22:16:56 -0800 (PST) Received-SPF: pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ajW7ykpg; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vfDZBvP3TWcZW6yQdou2wK6yj8xee8CfAn4H8ypmyuM=; b=ajW7ykpgmnhWZg6QkL05VwuXLNY8vPub3SVB9mHKkj9yGCbbp3RyvKpsenzdB8F1TU oLn1EdtQlrOmf/uaPsNtoOjCZKEAYJPBoRxMOEDlXShDmjeohgQld96dRL+2yqHPwu17 6eJR8s89WqE/vMoVrnBAkPf/i9bLdV4xvIElw= X-Google-Smtp-Source: AFSGD/WjibF7BAGBT7JCP1KlcCBZK1mBbMEJXi1hjBLMmy0oX0rCi/RPt/SNWaq9HMeIq/lHjXLIEw== X-Received: by 2002:a17:902:7848:: with SMTP id e8mr1006902pln.100.1544163415694; Thu, 06 Dec 2018 22:16:55 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id z30-v6sm2995944pfg.41.2018.12.06.22.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 22:16:55 -0800 (PST) From: Nicolas Boichat To: Will Deacon Cc: Robin Murphy , Joerg Roedel , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Michal Hocko , Mel Gorman , Levin Alexander , Huaisheng Ye , Mike Rapoport , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yong Wu , Matthias Brugger , Tomasz Figa , yingjoe.chen@mediatek.com, hch@infradead.org, Matthew Wilcox Subject: [PATCH v5 3/3] mm: Add /sys/kernel/slab/cache/cache_dma32 Date: Fri, 7 Dec 2018 14:16:20 +0800 Message-Id: <20181207061620.107881-4-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181207061620.107881-1-drinkcat@chromium.org> References: <20181207061620.107881-1-drinkcat@chromium.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP A previous patch in this series adds support for SLAB_CACHE_DMA32 kmem caches. This adds the corresponding /sys/kernel/slab/cache/cache_dma32 entries, and fixes slabinfo tool. Signed-off-by: Nicolas Boichat --- There were different opinions on whether this sysfs entry should be added, so I'll leave it up to the mm/slub maintainers to decide whether they want to pick this up, or drop it. Documentation/ABI/testing/sysfs-kernel-slab | 9 +++++++++ mm/slub.c | 11 +++++++++++ tools/vm/slabinfo.c | 7 ++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab index 29601d93a1c2ea..d742c6cfdffbe9 100644 --- a/Documentation/ABI/testing/sysfs-kernel-slab +++ b/Documentation/ABI/testing/sysfs-kernel-slab @@ -106,6 +106,15 @@ Description: are from ZONE_DMA. Available when CONFIG_ZONE_DMA is enabled. +What: /sys/kernel/slab/cache/cache_dma32 +Date: December 2018 +KernelVersion: 4.21 +Contact: Nicolas Boichat +Description: + The cache_dma32 file is read-only and specifies whether objects + are from ZONE_DMA32. + Available when CONFIG_ZONE_DMA32 is enabled. + What: /sys/kernel/slab/cache/cpu_slabs Date: May 2007 KernelVersion: 2.6.22 diff --git a/mm/slub.c b/mm/slub.c index 4caadb926838ef..840f3719d9d543 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5104,6 +5104,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf) SLAB_ATTR_RO(cache_dma); #endif +#ifdef CONFIG_ZONE_DMA32 +static ssize_t cache_dma32_show(struct kmem_cache *s, char *buf) +{ + return sprintf(buf, "%d\n", !!(s->flags & SLAB_CACHE_DMA32)); +} +SLAB_ATTR_RO(cache_dma32); +#endif + static ssize_t usersize_show(struct kmem_cache *s, char *buf) { return sprintf(buf, "%u\n", s->usersize); @@ -5444,6 +5452,9 @@ static struct attribute *slab_attrs[] = { #ifdef CONFIG_ZONE_DMA &cache_dma_attr.attr, #endif +#ifdef CONFIG_ZONE_DMA32 + &cache_dma32_attr.attr, +#endif #ifdef CONFIG_NUMA &remote_node_defrag_ratio_attr.attr, #endif diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c index 334b16db0ebbe9..4ee1bf6e498dfa 100644 --- a/tools/vm/slabinfo.c +++ b/tools/vm/slabinfo.c @@ -29,7 +29,7 @@ struct slabinfo { char *name; int alias; int refs; - int aliases, align, cache_dma, cpu_slabs, destroy_by_rcu; + int aliases, align, cache_dma, cache_dma32, cpu_slabs, destroy_by_rcu; unsigned int hwcache_align, object_size, objs_per_slab; unsigned int sanity_checks, slab_size, store_user, trace; int order, poison, reclaim_account, red_zone; @@ -531,6 +531,8 @@ static void report(struct slabinfo *s) printf("** Hardware cacheline aligned\n"); if (s->cache_dma) printf("** Memory is allocated in a special DMA zone\n"); + if (s->cache_dma32) + printf("** Memory is allocated in a special DMA32 zone\n"); if (s->destroy_by_rcu) printf("** Slabs are destroyed via RCU\n"); if (s->reclaim_account) @@ -599,6 +601,8 @@ static void slabcache(struct slabinfo *s) *p++ = '*'; if (s->cache_dma) *p++ = 'd'; + if (s->cache_dma32) + *p++ = 'D'; if (s->hwcache_align) *p++ = 'A'; if (s->poison) @@ -1205,6 +1209,7 @@ static void read_slab_dir(void) slab->aliases = get_obj("aliases"); slab->align = get_obj("align"); slab->cache_dma = get_obj("cache_dma"); + slab->cache_dma32 = get_obj("cache_dma32"); slab->cpu_slabs = get_obj("cpu_slabs"); slab->destroy_by_rcu = get_obj("destroy_by_rcu"); slab->hwcache_align = get_obj("hwcache_align");