From patchwork Mon Jan 13 15:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Yu X-Patchwork-Id: 11330417 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D60A13A0 for ; Mon, 13 Jan 2020 15:37:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6994E222C3 for ; Mon, 13 Jan 2020 15:37:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="ns5+RP/u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6994E222C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A97588E000E; Mon, 13 Jan 2020 10:37:43 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A47778E0003; Mon, 13 Jan 2020 10:37:43 -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 937348E000E; Mon, 13 Jan 2020 10:37:43 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id 7A78C8E0003 for ; Mon, 13 Jan 2020 10:37:43 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 38E0D8248D51 for ; Mon, 13 Jan 2020 15:37:43 +0000 (UTC) X-FDA: 76373016006.06.glove11_7d78859a5e410 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,qiang.yu@amd.com,::cgroups@vger.kernel.org:dri-devel@lists.freedesktop.org:hannes@cmpxchg.org:mhocko@kernel.org:akpm@linux-foundation.org:tj@kernel.org:christian.koenig@amd.com:ray.huang@amd.com:airlied@linux.ie:daniel@ffwll.ch:kenny.ho@amd.com:qiang.yu@amd.com,RULES_HIT:30054:30064,0,RBL:40.107.223.50:@amd.com:.lbl8.mailshell.net-62.16.0.32 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:28,LUA_SUMMARY:none X-HE-Tag: glove11_7d78859a5e410 X-Filterd-Recvd-Size: 7871 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2050.outbound.protection.outlook.com [40.107.223.50]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Mon, 13 Jan 2020 15:37:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mPfJuw+6t86Bzi1DvvmRS53MY7UWKZD2Fl1TtqJ9LKDLjWR4oS1aj1Gr5j7Ws3PFWuHPb0orFLnLghgiSPEHg5muSLPkj8jclx27MB4gBzwDlh7dj2+g2d5IsrebuzdoO43XzmgUSxbUZSbtCf1zyA5e7kwl7Wzobd+OPXI72quur2rC4USsl4VBluLJmRl8DAu1yHbQTMf2jUOvxYLhkNGcH0rQPTBN9fzhpfhiRAHBptTTUZfYfcK3Zoh2vRgMd6NTbQr3gpFsqOYnDItWW2RVUgrnVXl5WNXlZ2JnKfkgNelCK1027G3jWkfNsc9pPpm/4yTUez6TFVy0J4IE3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DlwxaZntIBVeSDvPKOD4vQ85k2mF4dXbT5Z/W5r0bA=; b=XxzR2AJUyYmekCPq+UeP8964aHwwkrXtUK717bJagr5PcQn7KrDjZBDn0qH5mZ3ZMO84nDV+uOtkdlEMNwTJi3v4fKOuoiqIw3qfeZKzP8hnHaIqnZuxmkOJ7MeCR+82JDiozksmPfFZcuPV4ecxfu4JItg9QVpC0/19hZn+LO1+DbA55Yba4rt7ITEAEKXswyxatcAlq/Q+Vo49a50si0yMSoohiLmaZdpCT48ELRPvQsnqyuwERuKkOslmHufRhxMsFEVn7Bn0juBXv04IqNgC7U8IZuNqf2LU+76Eo4+2iqF9tycFH7qt+AqzHZZC2i7PEY7QENF3mrIrF4qoSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DlwxaZntIBVeSDvPKOD4vQ85k2mF4dXbT5Z/W5r0bA=; b=ns5+RP/uMpMArt9jZ20SH0ISwxA9/Hgtpl3dnrJxiZ+2McgZ6W7lioaMyNrCi32UvMTX3VQc1GAypcglJtHvZujGMXzxkjgMQJ1bcAq8CMJxToz/4qpego9/ZfK6x+3Px5UWQ3Ssg47OQiBPrRgVYA9B5LBrNulyxGeqACwkLTY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Qiang.Yu@amd.com; Received: from SN6PR12MB2702.namprd12.prod.outlook.com (52.135.101.144) by SN6PR12MB2847.namprd12.prod.outlook.com (52.135.106.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9; Mon, 13 Jan 2020 15:37:39 +0000 Received: from SN6PR12MB2702.namprd12.prod.outlook.com ([fe80::d46f:d4ae:d96d:ef70]) by SN6PR12MB2702.namprd12.prod.outlook.com ([fe80::d46f:d4ae:d96d:ef70%5]) with mapi id 15.20.2623.015; Mon, 13 Jan 2020 15:37:39 +0000 From: Qiang Yu To: linux-mm@kvack.org, cgroups@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Johannes Weiner , Michal Hocko , Andrew Morton , Tejun Heo , Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , Kenny Ho , Qiang Yu Subject: [PATCH RFC 2/3] mm: memcontrol: record driver memory statistics Date: Mon, 13 Jan 2020 23:35:42 +0800 Message-Id: <20200113153543.24957-3-qiang.yu@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200113153543.24957-1-qiang.yu@amd.com> References: <20200113153543.24957-1-qiang.yu@amd.com> X-ClientProxiedBy: SG2PR0302CA0024.apcprd03.prod.outlook.com (2603:1096:3:2::34) To SN6PR12MB2702.namprd12.prod.outlook.com (2603:10b6:805:6c::16) MIME-Version: 1.0 Received: from localhost.localdomain (221.239.222.115) by SG2PR0302CA0024.apcprd03.prod.outlook.com (2603:1096:3:2::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.10 via Frontend Transport; Mon, 13 Jan 2020 15:37:34 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [221.239.222.115] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d35fa7ee-415d-4b2c-5505-08d7983e855b X-MS-TrafficTypeDiagnostic: SN6PR12MB2847:|SN6PR12MB2847: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:110; X-Forefront-PRVS: 028166BF91 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(376002)(346002)(136003)(366004)(396003)(199004)(189003)(26005)(6506007)(956004)(44832011)(2906002)(316002)(2616005)(16526019)(69590400006)(186003)(52116002)(6666004)(54906003)(8936002)(8676002)(81166006)(5660300002)(81156014)(478600001)(4326008)(86362001)(1076003)(6486002)(66946007)(66556008)(66476007)(6512007)(36756003)(21314003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR12MB2847;H:SN6PR12MB2702.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZtO30H7pxzqoU3477dOsXPxcsNy98wP42F5oUBhXn37lyhVDMmf/LRaoiHj0/KbJteMkwFIhzSdv+L8Ff+N4cliG4dIq4wMfuv5UO7+IBzJ6acfmwusoIMumN9zBPZnMaOJJ8UQYPYNIahV0ajSqGGzHUGF+SHDScJMf2Ueh7v05g8o+rOl8j0u8t1MPHC+s7SJddEnHP4pwWDnWidA+uOonIGCu3vc/RrYPaMY574tTHsCfVMw2XNGGo3aumQ5KNGEwtqoL4lXJCk3Zi2+Q3iYRhnb72CZW4nN47tp5lhAO9Azq4EN9F3Gvv4FGzTgj3krtB2W//4x4hycOtvbblwsc+UjjfneKo8IDK4j1zAiAWWnkc9VLORQ30izrMTSQg9fzxKIJQ2sTzuEXJUYStm4/xJgf4aWIMuhBV3a2ToeL5jjlBsQ4CYBCJJZ/D4foYhvwnWHCjSypQnf2DJJZBmfx6f8z7pAqH5MO3qrIZcZs/AH6VomjlgRzZoAaYIIDCRcZcQNhPrchgfReGNiLEQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: d35fa7ee-415d-4b2c-5505-08d7983e855b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2020 15:37:39.4011 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ai6k1zpHvT6K8PLg4mKhPv2IpPCcmWoQB4X4CxtMDjD446Qpf8/5baaxa3H5b+31 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2847 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: Signed-off-by: Qiang Yu --- include/linux/memcontrol.h | 1 + mm/memcontrol.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d76977943265..6518b4b5ee07 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -36,6 +36,7 @@ enum memcg_stat_item { MEMCG_SOCK, /* XXX: why are these zone and not node counters? */ MEMCG_KERNEL_STACK_KB, + MEMCG_DRV, MEMCG_NR_STAT, }; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 28595c276e6b..cdd3f3401598 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1413,6 +1413,9 @@ static char *memory_stat_format(struct mem_cgroup *memcg) seq_buf_printf(&s, "sock %llu\n", (u64)memcg_page_state(memcg, MEMCG_SOCK) * PAGE_SIZE); + seq_buf_printf(&s, "driver %llu\n", + (u64)memcg_page_state(memcg, MEMCG_DRV) * + PAGE_SIZE); seq_buf_printf(&s, "shmem %llu\n", (u64)memcg_page_state(memcg, NR_SHMEM) * @@ -6947,6 +6950,9 @@ EXPORT_SYMBOL(mem_cgroup_driver_get_from_current); int mem_cgroup_charge_drvmem(struct mem_cgroup *memcg, gfp_t gfp, unsigned long nr_pages) { + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) + mod_memcg_state(memcg, MEMCG_DRV, nr_pages); + return try_charge(memcg, gfp, nr_pages); } EXPORT_SYMBOL(mem_cgroup_charge_drvmem); @@ -6958,6 +6964,9 @@ EXPORT_SYMBOL(mem_cgroup_charge_drvmem); */ void mem_cgroup_uncharge_drvmem(struct mem_cgroup *memcg, unsigned long nr_pages) { + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) + mod_memcg_state(memcg, MEMCG_DRV, -nr_pages); + refill_stock(memcg, nr_pages); } EXPORT_SYMBOL(mem_cgroup_uncharge_drvmem);