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