Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5951C433E7 for ; Wed, 14 Oct 2020 21:00:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53B852224E for ; Wed, 14 Oct 2020 21:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602709210; bh=kNMavRxu4nxIiZfPRWK/QAzY3biPPPRUvJ8urWThmrU=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=lppKKLlu0QjV2yb5xk9QiC2EvtErGP0Cdke9HxUwa1vwLUV6iPD3RvDz8G/uCih4F k7kn9zuxfDDhu6M1S6LFR2R3CMeuBDM5D7vrnd/9rrRPrj0jOeq78mH/Asc9YdwjbB bH5Diny3Dd/RWlumM9Zta8pagPEzA12DimfkShic= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726279AbgJNVAK (ORCPT ); Wed, 14 Oct 2020 17:00:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:50506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725923AbgJNVAJ (ORCPT ); Wed, 14 Oct 2020 17:00:09 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8F2A72068E; Wed, 14 Oct 2020 21:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602709207; bh=kNMavRxu4nxIiZfPRWK/QAzY3biPPPRUvJ8urWThmrU=; h=Date:From:To:Subject:From; b=s3HRDt36CSmdyzw3zdBvZWnpq3bA8qdhvkN3si/qx23wTDZBt1W3LMW1dlTPzv+Gv zhB3ogbJ7x9CDNT2kFWx9HqvFXbIvLWnbSXSfmjSRoNwDDPZsqf81CxaVlHS8ACTo2 BljVpsRiQltF9u4ipnBBGcuGW3pY/C8spOcnz8vM= Date: Wed, 14 Oct 2020 14:00:07 -0700 From: akpm@linux-foundation.org To: guro@fb.com, hannes@cmpxchg.org, mm-commits@vger.kernel.org, shakeelb@google.com, vbabka@suse.cz Subject: [merged] =?US-ASCII?Q?mm-memcg-slab-fix-racy-access-to-page-mem=5Fcgroup-in-m?= =?US-ASCII?Q?em=5Fcgroup=5Ffrom=5Fobj.patch?= removed from -mm tree Message-ID: <20201014210007.6sSAJBLlW%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: memcg/slab: fix racy access to page->mem_cgroup in mem_cgroup_from_obj() has been removed from the -mm tree. Its filename was mm-memcg-slab-fix-racy-access-to-page-mem_cgroup-in-mem_cgroup_from_obj.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Roman Gushchin Subject: mm: memcg/slab: fix racy access to page->mem_cgroup in mem_cgroup_from_obj() mem_cgroup_from_obj() checks the lowest bit of the page->mem_cgroup pointer to determine if the page has an attached obj_cgroup vector instead of a regular memcg pointer. If it's not set, it simple returns the page->mem_cgroup value as a struct mem_cgroup pointer. The commit 10befea91b61 ("mm: memcg/slab: use a single set of kmem_caches for all allocations") changed the moment when this bit is set: if previously it was set on the allocation of the slab page, now it can be set well after, when the first accounted object is allocated on this page. It opened a race: if page->mem_cgroup is set concurrently after the first page_has_obj_cgroups(page) check, a pointer to the obj_cgroups array can be returned as a memory cgroup pointer. A simple check for page->mem_cgroup pointer for NULL before the page_has_obj_cgroups() check fixes the race. Indeed, if the pointer is not NULL, it's either a simple mem_cgroup pointer or a pointer to obj_cgroup vector. The pointer can be asynchronously changed from NULL to (obj_cgroup_vec | 0x1UL), but can't be changed from a valid memcg pointer to objcg vector or back. If the object passed to mem_cgroup_from_obj() is a slab object and page->mem_cgroup is NULL, it means that the object is not accounted, so the function must return NULL. I've discovered the race looking at the code, so far I haven't seen it in the wild. Link: https://lkml.kernel.org/r/20200910022435.2773735-1-guro@fb.com Fixes: 10befea91b61 ("mm: memcg/slab: use a single set of kmem_caches for all allocations") Signed-off-by: Roman Gushchin Reviewed-by: Shakeel Butt Cc: Johannes Weiner Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/memcontrol.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/mm/memcontrol.c~mm-memcg-slab-fix-racy-access-to-page-mem_cgroup-in-mem_cgroup_from_obj +++ a/mm/memcontrol.c @@ -2888,6 +2888,17 @@ struct mem_cgroup *mem_cgroup_from_obj(v page = virt_to_head_page(p); /* + * If page->mem_cgroup is set, it's either a simple mem_cgroup pointer + * or a pointer to obj_cgroup vector. In the latter case the lowest + * bit of the pointer is set. + * The page->mem_cgroup pointer can be asynchronously changed + * from NULL to (obj_cgroup_vec | 0x1UL), but can't be changed + * from a valid memcg pointer to objcg vector or back. + */ + if (!page->mem_cgroup) + return NULL; + + /* * Slab objects are accounted individually, not per-page. * Memcg membership data for each individual object is saved in * the page->obj_cgroups. _ Patches currently in -mm which might be from guro@fb.com are mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch mm-rework-remote-memcg-charging-api-to-support-nesting.patch mm-kmem-move-memcg_kmem_bypass-calls-to-get_mem-obj_cgroup_from_current.patch mm-kmem-remove-redundant-checks-from-get_obj_cgroup_from_current.patch mm-kmem-prepare-remote-memcg-charging-infra-for-interrupt-contexts.patch mm-kmem-enable-kernel-memcg-accounting-from-interrupt-contexts.patch