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:   Wed, 27 May 2020 09:29:56 -0700
From:   Roman Gushchin <guro@fb.com>
To:     Vlastimil Babka <vbabka@suse.cz>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        Christoph Lameter <cl@linux.com>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Michal Hocko <mhocko@kernel.org>,
        Shakeel Butt <shakeelb@google.com>, <linux-mm@kvack.org>,
        <kernel-team@fb.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 12/19] mm: memcg/slab: use a single set of kmem_caches
 for all accounted allocations
Message-ID: <20200527162956.GC396660@carbon.dhcp.thefacebook.com>
References: <20200526214227.989341-1-guro@fb.com>
 <20200526214227.989341-13-guro@fb.com>
 <9a7726c8-ac3c-df5c-7409-16e6be22a923@suse.cz>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <9a7726c8-ac3c-df5c-7409-16e6be22a923@suse.cz>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from carbon.dhcp.thefacebook.com (2620:10d:c090:400::5:bffd) by BYAPR06CA0039.namprd06.prod.outlook.com (2603:10b6:a03:14b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17 via Frontend Transport; Wed, 27 May 2020 16:29:59 +0000
X-Originating-IP: [2620:10d:c090:400::5:bffd]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 1d255478-9273-40b4-6670-08d8025b3354
X-MS-TrafficTypeDiagnostic: BYAPR15MB2999:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR15MB299917472BD2449B258DE7D1BEB10@BYAPR15MB2999.namprd15.prod.outlook.com>
X-FB-Source: Internal
X-MS-Oob-TLC-OOBClassifiers: OLM:1201;
X-Forefront-PRVS: 04163EF38A
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: zAte4guMjEpHOdCilvC/XTrV2nib1uoj1Q30kNJvpvZHtTiJLn4WeB4zTjSkLZmye0ur2+9pAk6FvTLiGjVHcMPTKF/LET7c+0wnKYBG4/FBagktg9goVvABrERdgAPCxOmzpqFnA5AA0FQDptGBahFr1P2GswjqHDxM9pdLcW7hP3qdC0Axdnh4St0EqLtbuCd1XBxghLH4KKDrKcUfeYqmlUkcReGOQb7xGn5Jvwp0Q/O9OyFJtnLX7Nv7y1Ev5ut0eSb/MVWNPl/QIwpxRY1pVyv1QcoCyyr4qcwq1YQXO3NW+ogo+N88rnPsmw2d
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR15MB4136.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39860400002)(136003)(346002)(376002)(366004)(396003)(7696005)(66946007)(6666004)(1076003)(186003)(9686003)(53546011)(16526019)(6506007)(86362001)(316002)(54906003)(4326008)(8936002)(5660300002)(55016002)(52116002)(8676002)(6916009)(66556008)(478600001)(66476007)(33656002)(83380400001)(2906002);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: 8CNdk6W/6cTUgDP78RX94KgDdpRDhzGsfZ0fOtywIORZrLte/Uc3FsIIgpCvNmlBGdPJwYh7HKCDKMh0yzC1ilC63rPKQlBj78WnXpvkZNrT+gbohQHoXwGh+1bFGIdMBwnPiOioXAUqqHak3aEGOn13Uik6Ra7+eW6V9fGZMxWOrP6RMpig+YJRfxqmpnUQEchk6d+Fy9FAAGvYoxfE7BPSwM+b8Jm8KM1iIZFsXOmZ1JaB1fbVMLys4bsHvqUXkF3MO7DWdwKdgyB+23q2V3JDMMyDrp4x4QNk18dviASZBtfTy+gzpNXzHmVoOedwjIJeWpz2IKWiKXMI06sx7Z4XYLuJ2aqcjEGu5pv4AVqqfnH35S7PfB5ZaUf6JA0bp7+dOy8hQIVz8LAgriN1LTIvsosf5qDAzdTO1Daac3CLg3PWqlY/JLp0qs2cX1/EuGtu6pwvsQFCFR54SvJUetmIXs7LqA5PjdgjuhmScdYEpfSX5fJsge4i0EfWWRsOjFy5I0hVGOhHMR+cAKxb3w==
X-MS-Exchange-CrossTenant-Network-Message-Id: 1d255478-9273-40b4-6670-08d8025b3354
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2020 16:30:00.0403
 (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: UMhO3aJ8o3lpT0Xde5WhhisxB7FB0WPgVdbhUDAQ30HcSnKj8yvp9/mFM4Q+Wms+
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2999
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687
 definitions=2020-05-27_03:2020-05-27,2020-05-27 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0
 impostorscore=0 mlxscore=0 priorityscore=1501 mlxlogscore=966
 cotscore=-2147483648 malwarescore=0 spamscore=0 suspectscore=5
 adultscore=0 phishscore=0 bulkscore=0 clxscore=1015 classifier=spam
 adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000
 definitions=main-2005270127
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 Wed, May 27, 2020 at 06:01:20PM +0200, Vlastimil Babka wrote:
> 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.

Ah, indeed, thank you for noticing!
It's fixed by later patches in the patchset, so this is how I missed it.

Let me fix the build, add yours and Johannes's acks and send v5.

Thanks!