Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp955122ybm; Wed, 27 May 2020 12:06:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiklI+ghRKSlOd4OoJQCA/MtptytCU/Wpg+tb1Qjf+6EFmptOJc9nbhbyQ1YwTCuPPcSPZ X-Received: by 2002:a17:906:f891:: with SMTP id lg17mr7175547ejb.405.1590606371675; Wed, 27 May 2020 12:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590606371; cv=none; d=google.com; s=arc-20160816; b=KD1d4WwkWVdmn8JrSq90UXUguZAkq4q0UQGzoIUNdP2WoQqsdHxZmr2f500ucRAz2e KXnXBlE3Rbil9NBQeCpYGq3fWf5hWz/LgjHaXfVl68ztgOQqByHSeTi2f1c/OFSmXOBp 68IAP0Br3dGI31J2SFtIkmQmtQ0MeJNO/3y4jB9JafLVLCN16w4HzhHognkzOsKvcgrj rmFq4/fR1GT/hMEWkXPAH1hHPJAbOCOEjHy++dACyeWVjJ4PFItdlxDQr7PomPLF1gZR LQ8ZBTUH5wfigtDQ6hRMUdZOWJYuh07nrQtuZY8NQAc8RpnpVR34Y8C/UNJdaq8j6Pgu pk9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=vzNGy90kUGbTWhRMcE/y2ZMcUrGVuVuFjXx3vNNVFA4=; b=SXyTjFjraFKIud49sNWuy0OXMqWZ4LNjrd8clUkQyI1MGrHvjy3eptW4cVkADeJaH2 lnID/PQ7Yoow1VLnr/v8CCGQCfFrkxTjp50dual151B9TbjKLy0PRrWYnch9DutzsVwl COw/G03Ux+QBVvtZfCdPIxvhHfadXIOejW1TMLw2EwnPMxMq44fwNgC2N2pkznByUTVQ 67U6/xJMAyHCljIkvoZVC+5PaVCHskXdYHjtIivlPyDUXMEGeWgrXLHF8G4piqdpp9US 1WakMbthlO7YutQ2Zj917OZUfmkucxBO9lhbMLqCbT5zy9AoKy+5zjZYlpnYLEpKO0Z8 9COg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w20si2433978ejn.439.2020.05.27.12.05.49; Wed, 27 May 2020 12:06:11 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389058AbgE0QBY (ORCPT + 98 others); Wed, 27 May 2020 12:01:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:44646 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388982AbgE0QBX (ORCPT ); Wed, 27 May 2020 12:01:23 -0400 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.