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");