From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965752AbcHBNGb (ORCPT ); Tue, 2 Aug 2016 09:06:31 -0400 Received: from mail-db5eur01on0094.outbound.protection.outlook.com ([104.47.2.94]:59709 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965667AbcHBNAl (ORCPT ); Tue, 2 Aug 2016 09:00:41 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=VDavydov@virtuozzo.com; From: Vladimir Davydov To: CC: Johannes Weiner , Michal Hocko , , Subject: [PATCH stable 4.6+] radix-tree: account nodes to memcg only if explicitly requested Date: Tue, 2 Aug 2016 15:45:34 +0300 Message-ID: <1470141934-4568-1-git-send-email-vdavydov@virtuozzo.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: VI1PR0901CA0060.eurprd09.prod.outlook.com (10.167.203.156) To AM5PR0801MB1857.eurprd08.prod.outlook.com (10.168.157.14) X-MS-Office365-Filtering-Correlation-Id: 367c71d5-54af-4855-d131-08d3bad2e7d6 X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1857;2:WD4szYOX3ddt848dCs6VzPFgGhRX/9S16T15WtJe0k50qVQ9ex3vhQQbCl6LfB1QvmH8nfR9oN6cWru8VIXOo82PYToFASOGu8OQHDvyva5JFGHH5c0scHdEXsFxjKewPEFfOIVUmI2LVIvdSwQghZyeaCRatuwtzmcu3gOZ6N6EjJHJmfppWux/b26XZs+8;3:RauivlR0igH/iyaAVHB26PsaemZge5MZravyoIJmn1shzP7d8i1mtuIq4XeZgp5UVJByntjkIbhdeJsGvhVArmXF3EhOZSBIzVlF/NwAtSJpFu6FdJ2ilXlJQ65KrKfx;25:tMVV3fms39m2v8B/XFiAn89/dNDhEyi+msGMkZXhd4dzwAlYdiEzSuqKKJ4Ld9NS16Lx4GO9ODPQ1dkCDSF1xX9gu7vea7iIHx2EBergx3py2vikT4PoOnL40+dun+d6SnsbMCbDAQODVdVmNcj3v66kJkUKIKDCUBGicgnnesH1+mUpm5a9I/6yUfZ18EHP6QPJJ+ySCJyEpbDwMtscs0Xk5227c6VP526KmPz8Sii+SuZDnB7AAGGxfoeALhPvdCDvloL9yiTqtxu4jUyTR45X/7UJV6x9EQF2PU6hSXrkDkpYsVcvJ3tvr80Rjb0KU1RA8xLrnNssOeC0QfWzrL89DT2GcktY+uUgrdYMR2G3HwSQOPhZPmVzqDL1vEKbR1twV/2GJE0DyuFIojBC0vgVIhlKcAl3rFXrlVmdjo4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1857; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1857;31:FxOJe+ETcr6OhcHN2IHRtJ46/+6Bd63FEuY81H4MIulBFolDRJXWiqO6X4MzpaZ+iCB+HEaUHEqrmxeZ3zlUDZXzspLecYCdGis6j5yxDpfsUVajkDM8vLFQZ6afkDEUvSon2Cb4B+PyORJoPM1fWLDBidUAsdlKl1I1kfZiGfPu1EU77wStYwtncUDS6YcqNSUyKHHCk83VW+PFB02DTrVBCYh2yF4sOdF6Vy3aMsY=;4:1zdwiqH7FFF7FlFPXbTU1oNsoLAvjwmi/eXtvT7QmEr8rcS5cB34xSPMFCDdHOqQqCtfg8O0R88L+K6boweheMj3mDtXBerZIYNeso1i37A+iUEbmrOdN0McGq+pJrHI3WWF9nmkKip/bI2hXKe4IbOfwnsWbMBRbJBQW/da6/BiMqxnMGSNBFVApH0j8nBO4MFlTzFUxD4Pf+/wMlpk1vkzEVakBJt1qrKvWysLbfVTpgACx5cx3ChCuY+ujnjWAQGC3cPLuJdNn0l9l4ijDWoV31Eay1/tugTuaZiaQxoLZ9NC1ovRhORUZcmQbdva5EuPU2F+HogZ07LmitxR3YvyCxsr55N/5BRxvbaI8cMSdhp9YtM2VTsBqY6Mk6jPh3uZ9jiIGaFEiqgAbc3y0XlBIDMPaiICqs8LoijL212OffhSSrtkotZF9vzJgf1GK9YK1c3XHlx1L6qPcUixrA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041072)(6043046);SRVR:AM5PR0801MB1857;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1857; X-Forefront-PRVS: 0022134A87 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(86362001)(189998001)(81166006)(47776003)(101416001)(106356001)(66066001)(42186005)(15650500001)(81156014)(80792005)(105586002)(50986999)(36756003)(5003940100001)(8676002)(50226002)(77096005)(33646002)(2351001)(7846002)(110136002)(7736002)(19580395003)(305945005)(68736007)(229853001)(48376002)(50466002)(69596002)(3846002)(586003)(97736004)(2906002)(92566002)(21086003)(19580405001)(4326007)(6116002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0801MB1857;H:virtuozzo.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0801MB1857;23:/grc7f0pz070WSvd4g1FySBlpHX/Kr7afNaKUQH?= =?us-ascii?Q?P84a+2dCq5BBHmfBv/y+Mdx0RYfcJG4kJkUZWSuBN8PMEFg7hE7T2LXR2Se5?= =?us-ascii?Q?ba8ybRLCWfon73T35ndbowF0oYmaNyuvgNQLW1wQqgUuKkj5SzlNPu6d1T6b?= =?us-ascii?Q?vDMikzgo+DZ97G74yod49pSCSmHgdcJch4xsPMZBJibSBy91PiYK4anK00Dr?= =?us-ascii?Q?u+MEgDpMk2o7ZHz8aPpkrGcNYSjbJABVnCA/4Ewk7ZuvJZaL8JFJ1QlBL0F7?= =?us-ascii?Q?e1EHgHMSCHSLi89tT4XYh0efu7k66d5o0ncjxQzJ3NVl2curg2xpXV4zAbl8?= =?us-ascii?Q?suRyr4rcf6bcflrg9/khGxQFAx2629PNNdmFF2OYyZgCpnJ6XinrHJLBy652?= =?us-ascii?Q?Uz92Zjyq34TUbSdWdUt6V2DAJ1DXBHTGYeXjTJRptBOUZHS2uOBFfoERwmfp?= =?us-ascii?Q?Q4oqdx2ibCGkzYsIuwbbeHDWd4pYW/Lxf3AY0tdbO0apWhwPWWCDnLwDxmov?= =?us-ascii?Q?Dr9zhnOejUkw0TH3HR37xzcA7i5e7NMvmllMPPZagiLCSpLyWEU8jLj8WGID?= =?us-ascii?Q?c9d6mYBaIjFkftePwmP2GXgiBrfY8E+YPC0IBGE5KKD8JP1NU0G4cE7M81KM?= =?us-ascii?Q?8ciaLIHanx7rNNZd5IbZKhOxpS8/Sx6cxuSZbPAIEZdwv0ncD2GIc6OxLdcC?= =?us-ascii?Q?VExId915HrHe0XSc6kEesBakUDIWWbNr6gzieD59IAcNBXvVfFUzeik0w2lW?= =?us-ascii?Q?o5Z/mOSztV9MAraj/S9hQ4Tu/v+lRNPjmtPOa897OcJfuyNoUCDqdbuTc61B?= =?us-ascii?Q?dJlnWb0GITQcxddK3h8uGiMFyR4YqVR4C3j5yAyUzOo/IhXPD78hDsPT47uP?= =?us-ascii?Q?X+NGGoUVaOFwIqGocRXHBmjJHz9vrVUZaG+1t1kxKiMfB/75iU7qaHVAhxQw?= =?us-ascii?Q?2qPMHS6RAlKpQv4O4gKSyjp+LKl3ToCQ/jY5UoHP+Kh38ZlffZYlizqQ8gxj?= =?us-ascii?Q?SSf2RVB+JU0tU8ZnT3lHeyiqCPFke/9kB/HBtlGFlqnOw2QcFPg5+txNQgxf?= =?us-ascii?Q?jALU4B7Ec/Ilk6RDN3uNnhARdtFI5DimE+buZ7R+zlDnCuT/WBFb2XDm6NIN?= =?us-ascii?Q?wunLNaGmEY08=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1857;6:ODmK9NUVhANECeu648/6NvC5tkixP3lwFiHVyHTUrGxukqF+9Cvm4IqCf7bKNGIXFA2VncsnAT75U31o889Ik5FcaVWP1/jSZPe4As+ZeVRYo2r5Ba3mSFCm3yphDIZ22xhzxBn701qL+bsktZ2uH5Lz7yPsG26lQBTfFamiUvnvYMRTYxhN0zmehh+JHje7SgN9Mv481dIiYfZv83yGrNZAwdKclOsyXzdjcV7MnEKTehQ0kM1Wi9GS/DyXmq9MNN/9W59OKLMdi08ObMAeKrhMIK1BeqFE/eTT1kSahR5yCticOiRG6vRBp1ZT4HKb;5:B7irKMFH47YneqGV0IW4aDy9+kFXG9Z4vhsBwlnDXydwMFpA3MA/1iUJHOXyRmrmSpd1NimkmO6MSXVbEBefJmgN6dU/6RcH5M68dHx88UrVWTDAPrYwXgX31lVNof2hcV6mIrHxOcbBCeq3OgnsLQ==;24:Idd9MOwko5/mTXqQo5frGJ3GPXOY+/VfHzQXL/iVar+5GI+rJetoxGTNii+E3US6E8vKTq86N7OSaXTYV2PB1LE2dM62SMlvxwyijFFCqk4=;7:t2xAPwpeGBVKbWCQ7yBVs/Sfm/zbQFtHeHhcNlfrXZKQqpNtHvS7LD7oWsAYCYM2OFyiLmsriw7pcpX3BtS2M0rSuBNKMBuyK8PA6uq2lNjQJUqv+I8P4sF4ZCI4gYLIdqEMxWp7MOG9EO8yZp3YlcZQ/pJW2LINU3NI6kOKkEFH3zeyKxUgWwmZH9+LYzoOsr0B4Fj5mz06JKfRv1umUcHsSM90X2GXrzpzla7AiJkVL4tER2fjT356uIwHhrBJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1857;20:cmYUlSD4TjAPcusuynsWqbpMrTQERIYxn0Nw95IGIRzh9bF6dG18TAgx+JJkGrOQi4iK5JRO5bzWeJYH5uOQu//ld5rCwqgt7zT0Iuv4G0Dg0ntRH6rfg3DltwCLi2vwZcxEuo1gp51lR4m+/VnGyklPDHcsthhYpZ8Gy7QzTVQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2016 12:45:37.7459 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1857 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Radix trees may be used not only for storing page cache pages, so unconditionally accounting radix tree nodes to the current memory cgroup is bad: if a radix tree node is used for storing data shared among different cgroups we risk pinning dead memory cgroups forever. So let's only account radix tree nodes if it was explicitly requested by passing __GFP_ACCOUNT to INIT_RADIX_TREE. Currently, we only want to account page cache entries, so mark mapping->page_tree so. Signed-off-by: Vladimir Davydov Acked-by: Johannes Weiner Acked-by: Michal Hocko Cc: [4.6+] --- fs/inode.c | 2 +- lib/radix-tree.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 69b8b526c194..b4ff82f3a57d 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -344,7 +344,7 @@ EXPORT_SYMBOL(inc_nlink); void address_space_init_once(struct address_space *mapping) { memset(mapping, 0, sizeof(*mapping)); - INIT_RADIX_TREE(&mapping->page_tree, GFP_ATOMIC); + INIT_RADIX_TREE(&mapping->page_tree, GFP_ATOMIC | __GFP_ACCOUNT); spin_lock_init(&mapping->tree_lock); init_rwsem(&mapping->i_mmap_rwsem); INIT_LIST_HEAD(&mapping->private_list); diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 1624c4117961..9b9be3ffa1f6 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -228,10 +228,11 @@ radix_tree_node_alloc(struct radix_tree_root *root) /* * Even if the caller has preloaded, try to allocate from the - * cache first for the new node to get accounted. + * cache first for the new node to get accounted to the memory + * cgroup. */ ret = kmem_cache_alloc(radix_tree_node_cachep, - gfp_mask | __GFP_ACCOUNT | __GFP_NOWARN); + gfp_mask | __GFP_NOWARN); if (ret) goto out; @@ -254,8 +255,7 @@ radix_tree_node_alloc(struct radix_tree_root *root) kmemleak_update_trace(ret); goto out; } - ret = kmem_cache_alloc(radix_tree_node_cachep, - gfp_mask | __GFP_ACCOUNT); + ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); out: BUG_ON(radix_tree_is_indirect_ptr(ret)); return ret; @@ -302,6 +302,12 @@ static int __radix_tree_preload(gfp_t gfp_mask) struct radix_tree_node *node; int ret = -ENOMEM; + /* + * Nodes preloaded by one cgroup can be be used by another cgroup, so + * they should never be accounted to any particular memory cgroup. + */ + gfp_mask &= ~__GFP_ACCOUNT; + preempt_disable(); rtp = this_cpu_ptr(&radix_tree_preloads); while (rtp->nr < RADIX_TREE_PRELOAD_SIZE) { -- 2.1.4