Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 26 May 2020 11:04:56 -0700
From:   Roman Gushchin <guro@fb.com>
To:     Vlastimil Babka <vbabka@suse.cz>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Michal Hocko <mhocko@kernel.org>, <linux-mm@kvack.org>,
        <kernel-team@fb.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 09/19] mm: memcg/slab: charge individual slab objects
 instead of pages
Message-ID: <20200526180456.GC377498@carbon.DHCP.thefacebook.com>
References: <20200422204708.2176080-1-guro@fb.com>
 <20200422204708.2176080-10-guro@fb.com>
 <75328f78-117b-5042-f42e-5ef01dd93086@suse.cz>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <75328f78-117b-5042-f42e-5ef01dd93086@suse.cz>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from carbon.DHCP.thefacebook.com (2620:10d:c090:400::5:d421) by BYAPR05CA0006.namprd05.prod.outlook.com (2603:10b6:a03:c0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.9 via Frontend Transport; Tue, 26 May 2020 18:04:59 +0000
X-Originating-IP: [2620:10d:c090:400::5:d421]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: ee809332-7895-4f1f-fff6-08d8019f4e58
X-MS-TrafficTypeDiagnostic: SN6PR1501MB1982:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <SN6PR1501MB19828FD1F26E55B925043376BEB00@SN6PR1501MB1982.namprd15.prod.outlook.com>
X-FB-Source: Internal
X-MS-Oob-TLC-OOBClassifiers: OLM:2449;
X-Forefront-PRVS: 041517DFAB
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: uy1bVPVekA8NuuZ9sj6sN/aix8jtE69KY5xC3DrAjM3dKJNShUoFcktbk5xW2DvvSjv5NiLTrXfP4jnHYJ4uAoNOUHM2WWTLwkyypLQFHDT9cRa5EaeMqPomk9vuBqJNt9nl8hODZKeiS6mkupsbMFbTGpZNiDGaxIwegfLggjwywqMpQd0bRYVyhGC7I1TWXL1nZNXvBNE2SnizeKbu54EJsXHkSPPz2o01lUZuw2KhOs9JJbD/JqUDFHBy2ucw+FyGG+Ryni6jQzXfXvvMN1wN90mm6M0p5Zn/w81usnrMuYMxNr6cyh3cGR4lSOrY
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR1501MB4141.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(376002)(366004)(39860400002)(396003)(346002)(54906003)(8936002)(33656002)(8676002)(1076003)(316002)(4326008)(478600001)(2906002)(86362001)(66946007)(9686003)(6916009)(6666004)(66556008)(66476007)(55016002)(7696005)(52116002)(5660300002)(186003)(16526019)(53546011)(6506007);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: dScEuifzDtQwHI/IfcaJNCcuizXyJ3eCaEZ4ZP7gEZLgPrMF1RqIGaeBxFGAwII3MLSgScgBkAVAOf3YXf4KPUGLOCE3mCEOMinJnqHd82lMsC3n4kxEQboa+BgtEjfFi60uxxj1eSxFr0EhOzvggVISp5BUd18QSC3DqZDyunekabxe5q0ubwTbU9IrW8bWwOdOQdlw9k9jVwR7sN7clkHVAhBaduNg4EJBZdk/dHrj/ehA6qASmFxW3K+z324Z6g1GOX/6eSqSb/rZfXWTsGwwHKpozWnk3oYGQiAfGO574QWWqkbxIBsypX0hoPBMzGGWtIOSseuEIvrZge9I15CCQ744s+ZO9weI85w09WTgI4YiGFphyfPPvAHu2Ewj4cwP8LVwRT9iZV/RAJeqqaG+q2D9TxIpfbsXeJtYzCvJ+WH3aTYSficls4IrnVHd0SbbT3quLmpgQNmy5+DJj5t5khD8s4lwkVaP4aBlmhhgqNofcsuzXmBwQSjFtwYvKR5xpwZoH29+flhz3A70ZA==
X-MS-Exchange-CrossTenant-Network-Message-Id: ee809332-7895-4f1f-fff6-08d8019f4e58
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 18:04:59.9828
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ffYAyLVQeC04C/D+BB4ETi66rtelWA0Z06SY3ascOhKP4xZuRX5OP0kwywX5OKzf
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR1501MB1982
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687
 definitions=2020-05-26_02:2020-05-26,2020-05-26 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501
 clxscore=1015 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0
 phishscore=0 suspectscore=5 impostorscore=0 cotscore=-2147483648
 bulkscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2004280000
 definitions=main-2005260140
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, May 25, 2020 at 06:10:55PM +0200, Vlastimil Babka wrote:
> On 4/22/20 10:46 PM, Roman Gushchin wrote:
> > Switch to per-object accounting of non-root slab objects.
> > 
> > Charging is performed using obj_cgroup API in the pre_alloc hook.
> > Obj_cgroup is charged with the size of the object and the size
> > of metadata: as now it's the size of an obj_cgroup pointer.
> > If the amount of memory has been charged successfully, the actual
> > allocation code is executed. Otherwise, -ENOMEM is returned.
> > 
> > In the post_alloc hook if the actual allocation succeeded,
> > corresponding vmstats are bumped and the obj_cgroup pointer is saved.
> > Otherwise, the charge is canceled.
> > 
> > On the free path obj_cgroup pointer is obtained and used to uncharge
> > the size of the releasing object.
> > 
> > Memcg and lruvec counters are now representing only memory used
> > by active slab objects and do not include the free space. The free
> > space is shared and doesn't belong to any specific cgroup.
> > 
> > Global per-node slab vmstats are still modified from (un)charge_slab_page()
> > functions. The idea is to keep all slab pages accounted as slab pages
> > on system level.
> > 
> > Signed-off-by: Roman Gushchin <guro@fb.com>
> 
> Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
> 
> Suggestion below:
> 
> > @@ -568,32 +548,33 @@ static __always_inline int charge_slab_page(struct page *page,
> >  					    gfp_t gfp, int order,
> >  					    struct kmem_cache *s)
> >  {
> > -	int ret;
> > -
> > -	if (is_root_cache(s)) {
> > -		mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
> > -				    PAGE_SIZE << order);
> > -		return 0;
> > -	}
> > +#ifdef CONFIG_MEMCG_KMEM
> > +	if (!is_root_cache(s)) {
> 
> This could also benefit from memcg_kmem_enabled() static key test AFAICS. Maybe
> even have a wrapper for both tests together?

Added.

> 
> > +		int ret;
> >  
> > -	ret = memcg_alloc_page_obj_cgroups(page, gfp, objs_per_slab(s));
> > -	if (ret)
> > -		return ret;
> > +		ret = memcg_alloc_page_obj_cgroups(page, gfp, objs_per_slab(s));
> 
> You created memcg_alloc_page_obj_cgroups() empty variant for !CONFIG_MEMCG_KMEM
> but now the only caller is under CONFIG_MEMCG_KMEM.

Good catch, thanks!

> 
> > +		if (ret)
> > +			return ret;
> >  
> > -	return memcg_charge_slab(page, gfp, order, s);
> > +		percpu_ref_get_many(&s->memcg_params.refcnt, 1 << order);
> 
> Perhaps moving this refcount into memcg_alloc_page_obj_cgroups() (maybe the name
> should be different then) will allow you to not add #ifdef CONFIG_MEMCG_KMEM in
> this function.

The reference counter bumping is not related to obj_cgroups,
we just bump a counter for each slab page belonging to the kmem_cache.
And it will go away later in the patchset with the rest of slab caches
refcounting.

> 
> Maybe this is all moot after patch 12/19, will find out :)
> 
> > +	}
> > +#endif
> > +	mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
> > +			    PAGE_SIZE << order);
> > +	return 0;
> >  }
> >  
> >  static __always_inline void uncharge_slab_page(struct page *page, int order,
> >  					       struct kmem_cache *s)
> >  {
> > -	if (is_root_cache(s)) {
> > -		mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
> > -				    -(PAGE_SIZE << order));
> > -		return;
> > +#ifdef CONFIG_MEMCG_KMEM
> > +	if (!is_root_cache(s)) {
> 
> Everything from above also applies here.

Done.
Thanks!

> 
> > +		memcg_free_page_obj_cgroups(page);
> > +		percpu_ref_put_many(&s->memcg_params.refcnt, 1 << order);
> >  	}
> > -
> > -	memcg_free_page_obj_cgroups(page);
> > -	memcg_uncharge_slab(page, order, s);
> > +#endif
> > +	mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
> > +			    -(PAGE_SIZE << order));
> >  }
> >  
> >  static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
> 
>