From mboxrd@z Thu Jan 1 00:00:00 1970 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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 1B0DAC433E0 for ; Wed, 27 May 2020 16:02:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DAFA42075F for ; Wed, 27 May 2020 16:02:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DAFA42075F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6ACEA800B7; Wed, 27 May 2020 12:02:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65D9080010; Wed, 27 May 2020 12:02:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54C4B800B7; Wed, 27 May 2020 12:02:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 38EF180010 for ; Wed, 27 May 2020 12:02:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E557F184FA889 for ; Wed, 27 May 2020 16:02:01 +0000 (UTC) X-FDA: 76862965242.16.men00_390b47526d53 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id E824E1041BA7F for ; Wed, 27 May 2020 16:01:23 +0000 (UTC) X-HE-Tag: men00_390b47526d53 X-Filterd-Recvd-Size: 2362 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 May 2020 16:01:23 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3FD0DAFD1; Wed, 27 May 2020 16:01:24 +0000 (UTC) Subject: Re: [PATCH v4 12/19] mm: memcg/slab: use a single set of kmem_caches for all accounted allocations To: Roman Gushchin , Andrew Morton , Christoph Lameter Cc: Johannes Weiner , Michal Hocko , Shakeel Butt , linux-mm@kvack.org, kernel-team@fb.com, linux-kernel@vger.kernel.org References: <20200526214227.989341-1-guro@fb.com> <20200526214227.989341-13-guro@fb.com> From: Vlastimil Babka Message-ID: <9a7726c8-ac3c-df5c-7409-16e6be22a923@suse.cz> Date: Wed, 27 May 2020 18:01:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200526214227.989341-13-guro@fb.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: E824E1041BA7F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: On 5/26/20 11:42 PM, Roman Gushchin wrote: > @@ -549,17 +503,14 @@ static __always_inline int charge_slab_page(struct page *page, > gfp_t gfp, int order, > struct kmem_cache *s) > { > -#ifdef CONFIG_MEMCG_KMEM > if (memcg_kmem_enabled() && !is_root_cache(s)) { > int ret; > > ret = memcg_alloc_page_obj_cgroups(page, s, gfp); > if (ret) > return ret; > - > - percpu_ref_get_many(&s->memcg_params.refcnt, 1 << order); > } > -#endif > + > mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s), > PAGE_SIZE << order); > return 0; > @@ -568,12 +519,9 @@ static __always_inline int charge_slab_page(struct page *page, > static __always_inline void uncharge_slab_page(struct page *page, int order, > struct kmem_cache *s) > { > -#ifdef CONFIG_MEMCG_KMEM > if (memcg_kmem_enabled() && !is_root_cache(s)) { > memcg_free_page_obj_cgroups(page); > - percpu_ref_put_many(&s->memcg_params.refcnt, 1 << order); > - } This now leaves the { bracket unterminated, breaking compilation.