From patchwork Mon Dec 10 01:15:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10720487 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 C7B8C91E for ; Mon, 10 Dec 2018 01:15:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5FCF29DB6 for ; Mon, 10 Dec 2018 01:15:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9B6529E16; Mon, 10 Dec 2018 01:15:28 +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 62E6229DB6 for ; Mon, 10 Dec 2018 01:15:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85D3A8E0004; Sun, 9 Dec 2018 20:15:26 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8099E8E0001; Sun, 9 Dec 2018 20:15:26 -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 6D2E88E0004; Sun, 9 Dec 2018 20:15:26 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 2B1428E0001 for ; Sun, 9 Dec 2018 20:15:26 -0500 (EST) Received: by mail-pl1-f198.google.com with SMTP id e68so7213692plb.3 for ; Sun, 09 Dec 2018 17:15:26 -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=v53ohYgIFcKZc+mDiZ2r46NylU67jRR5KKW/neccYeA=; b=dLEk1TlPb7D0US7HpEpnfue48xBAsGGNyF1gGOnsq6mYKaAUaKzwXsnLZN/nLo3yFF 4/J10xZuvT8JUNz14cQDpz0gP8GBAUiaOxAZeQGJwT5QQxV2mkdSO3R+Q4F6FtZVE/ER WhfH5nYpaoK87zKWSlZfJxghwAYfw7iUNPRac38vJ+RPWjBaLwC05IzZshbOGO/Xn3yk liPPj1QijZCxy43vs65hEVg2jHQMWOwg37XUkiWl8tu70k2ic8JvWA0ohW3YJY4pY9as PK4Op1v99pC5DX9OcYkveDEO+bh2rgpXx47cBv4hhy2gOuLF/+4TfzyqDeXHk3sHf724 qevg== X-Gm-Message-State: AA+aEWa+sfcLy5ChVCIUoFuosvkY/4uR3hryJppd0qiBFrMO88sF2SfG WX2Bhp8Wo8ZeAemVoJxtDCH44DiQ+DOsRUhvOVAaQIfAXtKwV+4jZMrX0djEZm4BdgSgIm8DOeC F8bliss5viHnQRSNJv3KFFLY2tpOJUtSdwMlLoo7KKjU+zGn9Zo4HG6GrVHpfgxzS28wo4isTku h/FgSCC6hQPFwiaiAhnhvnLacKBshu+uMQWOiOVXH4bxCENCkqM1oF9a+pt7v1BEgvdbs5DHMON sFWNV54L3WU7PqTJAJjXpbKCuvH8nU8aFFIsAXEml9b5C0Sei1XzgWbVQkmfTDW05Jl/rcnV5Nd Be/yQOklFc886ft47B9p6MtyALmL75KrplgqihIxtlI1bue40O+uv0lGjWQOkZgNZy9qkSWVUny b X-Received: by 2002:a63:d252:: with SMTP id t18mr9273820pgi.133.1544404525692; Sun, 09 Dec 2018 17:15:25 -0800 (PST) X-Received: by 2002:a63:d252:: with SMTP id t18mr9273760pgi.133.1544404524529; Sun, 09 Dec 2018 17:15:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544404524; cv=none; d=google.com; s=arc-20160816; b=chqxzqWCKnv2xgmQpKslCSS0QXyvZsjP0oS2PKdMft0iDPAxnJh5hR+vZC0x10A9XA YWyXlMPQWbt4f27j9x9Zce1aapvsQ1cdY+h41Y/RIy1sJrXL3X6CKjwKMc0DpBZQ2Jfk SDFmoMBo3aemH4nj3N6uKdsAKr4YSOupTVWCwnLdi8CaBaUC6Ni3Jo3HVR2LPB5J/qcA N/LKp79ReO7T9O+wfIb8OQT5PZorb7pQVVlP2/xKR6RZZL7nxYKbnSvskQOvoKnOhJUg iyfusTGdxgSrGbMzMjA4+4f5cISELI5L77VevXli5IHsto/072oGnlzV2qlt4RUMYsA8 FI3A== 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=v53ohYgIFcKZc+mDiZ2r46NylU67jRR5KKW/neccYeA=; b=AkU9BAR7trF/sQp2VrzerTWPTw9yXWD45CKids8jP/Qh4Ufx/zk6+YvTlaBvg2EwsP xf/PHF5wjFHawP6t/HnBpiDMj3sLBreucVmHBbQFEE3u2S0eiKCQF+sNf8Bd6NIDUR8w 3thBM1vSs/l8E7Gi/UX3Y7WRsFkuWuch9lGPzUw9VYOOB2/Bzqs8Ac7M7cHj/zedbwqw wVjiS0/bEBnfwNYDy5Zwa8WbhIDmcf+MS4htZevWJAkTaAGp+V96OnQzbFtPqo4f3Hcv wcMxURd/kvINnHF8Qia74nZFo3wbWoVYcni1nHhipi+FVrtj3P8GQHmDBWRNoJpTAJNp 3Bng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ijv+q4uF; 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 k196sor14426089pga.61.2018.12.09.17.15.24 for (Google Transport Security); Sun, 09 Dec 2018 17:15:24 -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=ijv+q4uF; 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=v53ohYgIFcKZc+mDiZ2r46NylU67jRR5KKW/neccYeA=; b=ijv+q4uFF8KDF+QVUFKj4U7gDtHtuEMw2oXVDmRjV9m90MMKozoV1SK3nr52Wfp0/J ajATJ4LwgXlkyBvI59+Xz/whZ5lXnl1xFMyxaVDC48lOag5w3FEwkupx/cXvgovw0NEw a4MdWfhyHdW1vGax/L6Sp9Y541uDVzZX/hMKs= X-Google-Smtp-Source: AFSGD/XQbPEpb5m4zF9JWDJwwHdQG1vS8O1vSqI9U4Qq0Ub4rwSWo9QtX4mH9YSjDkYW879bfhIqJw== X-Received: by 2002:a63:194f:: with SMTP id 15mr9299413pgz.192.1544404524069; Sun, 09 Dec 2018 17:15:24 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id b10sm16516336pfj.183.2018.12.09.17.15.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Dec 2018 17:15:23 -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 , hsinyi@chromium.org, stable@vger.kernel.org Subject: [PATCH v6 1/3] mm: Add support for kmem caches in DMA32 zone Date: Mon, 10 Dec 2018 09:15:02 +0800 Message-Id: <20181210011504.122604-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181210011504.122604-1-drinkcat@chromium.org> References: <20181210011504.122604-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). Cc: stable@vger.kernel.org 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. (no change since v5) 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 Mon Dec 10 01:15:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10720489 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 2B7ED91E for ; Mon, 10 Dec 2018 01:15:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1965729DB6 for ; Mon, 10 Dec 2018 01:15:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A87C29E16; Mon, 10 Dec 2018 01:15:32 +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 791CD29DB6 for ; Mon, 10 Dec 2018 01:15:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76FE58E0005; Sun, 9 Dec 2018 20:15:30 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 746478E0001; Sun, 9 Dec 2018 20:15:30 -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 610B18E0005; Sun, 9 Dec 2018 20:15:30 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 21F1F8E0001 for ; Sun, 9 Dec 2018 20:15:30 -0500 (EST) Received: by mail-pf1-f199.google.com with SMTP id 82so8641389pfs.20 for ; Sun, 09 Dec 2018 17:15:30 -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=3zyI5zxZwGodfMTrNuDET37rIHixML6NRWv3fhvncg0=; b=sJzOh5cDn5Gka5SOd+yCUbbWJAWosJhIARahJs9l5aLkykcs1g59WW63sDJTAchq5k 54HZcf32eQPoLWP0KdgWeI4v2vT02yWfBa6n4HxvfA9RD6HEdDua/thGFRElIuenaRU4 2S1jFUw1vHjTHPcHViAxnXz7xUgTIyaztW4jRijKlWa5sin7684TMErYm9mQe97UUjn4 h8ZJSbzYWHyIOFmKdzCk65K/5lbxhKyx/aw/S9Kp29YYblvMpb1c9rivFd59xqzJF2vA bte41WUZJk5NP9rtwGFgdNBx3SrRqwUxaeFZOVSGv+j6r1pupIn2rPtgGB+/PysF3K9P idPQ== X-Gm-Message-State: AA+aEWZZGtOPPr3wPBkXTN2ve8FXWmfQ1vuf70g302mSpUFqAvoCKinU SPov6+ry4woLwkc6AHjisAm+nyHkT5E2HC3/DA+Erfu64uuP1q5Dsqgu2W3IxnmS/9qOAp12KdH qVnSFO5HuSj1rImyS+YrstxDKi/mUvpFaMz7rd+tIQwsMYlbv2fhTaj+X6dR92YgKhwJw9RuJlT 2nY1/jEi9RFRi6izqlIhdsTJs66tSlYNed+120sOGIclds6lC95pLnP6XvgHwUbkKZRTGZoc5cx VZVY8wWQbT4ZvrL0k4ZIAX4uMJFGbLWtrM0WzTDQi6hVxTLdeyd6hrwcRwnWMvd7SZxQ9v3kMJz eSb8pkRt+ior9G1InCUHvAnZ32ue9LUFN5eqicOF2FeXiJgbZvSvhIq7FqGq+yyELBS5vo9pIxv 3 X-Received: by 2002:a62:ab0d:: with SMTP id p13mr10471030pff.211.1544404529726; Sun, 09 Dec 2018 17:15:29 -0800 (PST) X-Received: by 2002:a62:ab0d:: with SMTP id p13mr10470989pff.211.1544404528783; Sun, 09 Dec 2018 17:15:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544404528; cv=none; d=google.com; s=arc-20160816; b=vFn72VOHaPLdIuN4DF4yxsFN3EOr0c6/nfNuRDIM4QCAAXDTbiA9Fu77atMIsKi4Uq E2SOacK9frE62bxNictSP7VKdpBoI/4alYKqQCrC703M1qLlx8OuwBTiOfrmj0zkfTxw +ZwjV25T/xp3mqMtR86lb6qL0InRBJTlmvrJV2/XNztZWQAKJ68DHP6MDfQCqZLwMVIN SHInYIWqsZEl4uMfZBprJv9BO3Ywg2jS+7t3w9Y8x82G8u3RHOi3pl3HZq1yQ4jjlyfm FEwm1tV4H9aL7ITV/wH56VXzBdOJFRhIyRTk6/6p0eUWp38YhZat48D7n7oDKkw3EJz+ jL6A== 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=3zyI5zxZwGodfMTrNuDET37rIHixML6NRWv3fhvncg0=; b=adfaw5uqiJ+WCDJLTmcpyJm5vYUUIFGu7N74BZkka+X2ljy/Jx459Ox/P7h/kPNiKo ln4Mr0AbHDqMgBTpoIc1shx9KmMr1/n/Ux1Dl6kooB5wuGoWtP0GDh6pLTe9A3Q+dYiz 9ezuzaUmEZMo915BL2RI7XUrRmTGnhauHpxaBxK7WzbzoyObUIK2kSP60stWBG0NYG9c SeCaxgybJqPsBAadKt7OJdb/xFLJzMnJSg5WPsfx6gYQZfJhleXutBN5LFGHCFwcmb9H XBIGVNCwks65qhGHtNDjWA5cWhEtTC1FRACHHcDegMogxXNQsc25QLl6YARU9vtYNirJ jShw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=F4dSAwLa; 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 n12sor14951329pgs.60.2018.12.09.17.15.28 for (Google Transport Security); Sun, 09 Dec 2018 17:15:28 -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=F4dSAwLa; 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=3zyI5zxZwGodfMTrNuDET37rIHixML6NRWv3fhvncg0=; b=F4dSAwLagRa3eNfp8xVsBcj5GpG/ybNbaaAygiLhss+vwu7nAPzQ6u6tFw1OlDVwdk OGFjnIPRhzQSnsSC+yj3pYAIYoaIzKv8E3NvGpEVdV3OjzxbwUzEHIbS0NOPFgvoefvT TIA08R0lL8xmw8DW6FTHsu5otufjdV5lXsirc= X-Google-Smtp-Source: AFSGD/UweY//RlIzHQzR4czsV/CUhCbYkqwlM4MbLxoZIZ/Pxxkz5U+J4ofgZQwt5fWHP6ylViFjDQ== X-Received: by 2002:a63:4187:: with SMTP id o129mr8507789pga.370.1544404528270; Sun, 09 Dec 2018 17:15:28 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id b10sm16516336pfj.183.2018.12.09.17.15.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Dec 2018 17:15:27 -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 , hsinyi@chromium.org, stable@vger.kernel.org Subject: [PATCH v6 2/3] iommu/io-pgtable-arm-v7s: Request DMA32 memory, and improve debugging Date: Mon, 10 Dec 2018 09:15:03 +0800 Message-Id: <20181210011504.122604-3-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181210011504.122604-1-drinkcat@chromium.org> References: <20181210011504.122604-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. Cc: stable@vger.kernel.org Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat Acked-by: Will Deacon Acked-by: Will Deacon --- 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. Changes since v5: - Rename ARM_V7S_TABLE_SLAB_CACHE to ARM_V7S_TABLE_SLAB_FLAGS. 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..d2fdb192f7610f 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_FLAGS SLAB_CACHE_DMA32 +#else +#define ARM_V7S_TABLE_GFP_DMA GFP_DMA +#define ARM_V7S_TABLE_SLAB_FLAGS 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_FLAGS, NULL); if (!data->l2_tables) goto out_free_data; From patchwork Mon Dec 10 01:15:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10720491 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 1C88591E for ; Mon, 10 Dec 2018 01:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B84929DB6 for ; Mon, 10 Dec 2018 01:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3B9D29E16; Mon, 10 Dec 2018 01:15:35 +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 6C10C29DB6 for ; Mon, 10 Dec 2018 01:15:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BEF98E0006; Sun, 9 Dec 2018 20:15:34 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 76C998E0001; Sun, 9 Dec 2018 20:15:34 -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 635BE8E0006; Sun, 9 Dec 2018 20:15:34 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 237EA8E0001 for ; Sun, 9 Dec 2018 20:15:34 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id r16so6432671pgr.15 for ; Sun, 09 Dec 2018 17:15:34 -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=bDHo2G57TH3bcKVmO7L4FOO4ZhAAEjCAIwPeVa/m8Iw=; b=Vaj/fGFrBq2dDWfZ9hRbnE/9vsMn9WKsPqQFHrjz/imvXQyvGJsEEl0CqUYgPVEMJU DlpAFVELkYs8xOy4fxA1tlEeREn+5JCDuMGNZjThJyW7WDTWwZ6UnF/qNvfwI6JT+j41 MlPKBbbsxWt/EDTDYDVlsato8omH6JpZC7KNSYn2YIa/+8bT3STeLLo7erDIims20dfn 5N60nmYdPkssWCGTr9Ky5H24veNBLNfgCuLWJewM1amkzQhrE/j8p5egLUELxyDor3tE VeErD+PCqVm7PGhW4ilyGHjaxD+oSZvrvI01ahoO0YYUg8i8cEue9hL020uFgoMl0i1w 3zPA== X-Gm-Message-State: AA+aEWbk0+QXzlRaAJEgoGwCQzJ3KEEh5E0patdgyPxTTXJ6zXgPkIup XLBuwPaT5dI21brpSrK5D8if0Q/tgAFoN3eRtwKUJ/E1b9FFcObhfT8vGsujd3A+SXo/p9X0rPR oRDcjoyJHBJZs71O2757TUo2UFtoNAft2q0bzUzLwfbI80qi9O7osLZVCDP6exsyr5COiDoOuUZ D1PvoBcKo8Zbj6QBnhkLM7JmnDwB5qtEU9hl9IULzA5PJtPsMUpM9ajQKlskmtAwMedAdU5qQJD F7BVIni7JWgXaCChA4GjrAVOpbT4CsUEjwIQeUVBMGLSSun/PT0SmvVKRD9rFD/me1QunWvOFul bdmFIQRMEQY0wllGz5DNKdUYh5T0z/laVSeZlrccdU9MiMHbZPmzhq5A6q0RdS00dsPdDVDuJIS u X-Received: by 2002:a62:8949:: with SMTP id v70mr10226358pfd.85.1544404533770; Sun, 09 Dec 2018 17:15:33 -0800 (PST) X-Received: by 2002:a62:8949:: with SMTP id v70mr10226316pfd.85.1544404532923; Sun, 09 Dec 2018 17:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544404532; cv=none; d=google.com; s=arc-20160816; b=bgEIegJdzMyF6ksF88AhWCxFXmNRxCGpbjbGRt4je+UZoXgwLvp+EPfeMPTxA25sQQ V3XAQoqUTIfPrUOKG/F6/vOPesLNF57E1KBczo9/k5gbDHg9mewFSL0PzEwFTvfKO3Mg Id1lSAL03QzDwSp7gSYFluSVbhObLNKU8afDDCdZEPCMEwtB7jKdLFZ9WzFBzJnLOhZ4 6/fIEw2PTwXT7cRQHR/CG4xTyZKSDtuAd5RhfCA+yLdAyoRHqHXldJfoO4GzAaTxYk2h 2nffc7yuz3PsexSxAwcV/P15BcsutIr1Xeu0TJRSr8QZY3V87p3l0T9vhNr0H9MVsIXQ vR/g== 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=bDHo2G57TH3bcKVmO7L4FOO4ZhAAEjCAIwPeVa/m8Iw=; b=s6nExRRnTf9rOKW+fS73QzruBmB7OYEO+yXTQs5rBzIRoIsFRHJyI2slevGhuCcJSN u3zm0lLLCRgIHn6PIzovIXnfw8E2rTCdOZ82RJXnpqt1EHgIgC9YpEt+Kz8CJMAhDnoW PGEG9oqz0sVzzj5YJsWse+FQuiJ5vroIIkZ0CKmDLq0bVOVuPyQuKLGx9eXoqZHNtWp4 hQ1Uy1HY7XAbXVWNOwob9WdjL8w6+MtAZJCU5N4iq06eju75oHmnjJh+vaLL1FVqEmH0 apIqQZxS5Sy+0i2zcWJxpqjDQqITSYaPpCr/mtdPPTP4JqFUtdv6Xu5hFMjT628n8Y5y VcGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ZaJ/40Oo"; 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 n12sor14951447pgs.60.2018.12.09.17.15.32 for (Google Transport Security); Sun, 09 Dec 2018 17:15:32 -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="ZaJ/40Oo"; 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=bDHo2G57TH3bcKVmO7L4FOO4ZhAAEjCAIwPeVa/m8Iw=; b=ZaJ/40Oor6/NtvfhwNrl5WvkSL4Td68cN+kyNER2UhZSruPtb/vPDmtN6HLOaN53Mm KIXG+orNtv74XskprxQ9IXcdSJhzQZxByr23Dxyhn28J8FKAfGPD78tGNaaJD+5QUP2+ +AiJGDzaDjklmFSKfV18RUsZP12/wyZAbdo0I= X-Google-Smtp-Source: AFSGD/WiOLiNXT6YfwmG1oS8ywLxJPMqFMoEQpnRb2Y1AqFVl4LuoM2SfrAMmFDhPIekmPqTgXi5iA== X-Received: by 2002:a63:c051:: with SMTP id z17mr9032972pgi.20.1544404532459; Sun, 09 Dec 2018 17:15:32 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id b10sm16516336pfj.183.2018.12.09.17.15.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Dec 2018 17:15:31 -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 , hsinyi@chromium.org, stable@vger.kernel.org Subject: [PATCH v6 3/3] mm: Add /sys/kernel/slab/cache/cache_dma32 Date: Mon, 10 Dec 2018 09:15:04 +0800 Message-Id: <20181210011504.122604-4-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181210011504.122604-1-drinkcat@chromium.org> References: <20181210011504.122604-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. Cc: stable@vger.kernel.org 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. No change since v5. 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");