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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 A2345C433E0 for ; Tue, 23 Feb 2021 16:40:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E77064E61 for ; Tue, 23 Feb 2021 16:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233583AbhBWQks (ORCPT ); Tue, 23 Feb 2021 11:40:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232733AbhBWQko (ORCPT ); Tue, 23 Feb 2021 11:40:44 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9869C06178A for ; Tue, 23 Feb 2021 08:40:03 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id q23so3864576lji.8 for ; Tue, 23 Feb 2021 08:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+E3RqKwI3DqPgCvOyDy4gIUAe0bpQ6Te+CARgN71T3Q=; b=GhVta4M2dkEUmj17lyRCCl5KAtHb5qECT6ll8PfiYJYL+xyd5EIkxm+jnsnp4LgOlZ fo0vMcBFEttAdGXi8HlTG0RiPUE2KVzD3kQ/R0Y0t+f/2kyPTKNfUpht4YXxP3mmLuKy 71bYLKPMzAfBzcWRj0zEPNBOUnXUVY0DyC0qH7w1QuqUW74NYEi/hGzwvMpkFbucKUz6 /J17k3uojknHtxBXUR2HNiGXiie9Vt2mVTlXH6s/WHxnajKgtLpdaUSx0A5jgWxdCIi/ 8WP2Bjo888QxYCbTCr7wPv6aQNB+FmewUo+AzmfOZbj0S2VvnJCfSzfRJhizLlOe2u72 0UDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+E3RqKwI3DqPgCvOyDy4gIUAe0bpQ6Te+CARgN71T3Q=; b=EyGRWK+Ng5ElfoPh7mXprn6OQQm+TCX9mdgQoAb4XHzdE4KM2v2S2sYotfIWiDYR03 Z3bQEwEDNKETKhgIJ7l0JuaQjg7sSZEHV7CJpZzoPid6PZcSeA0hpORGg6uVCDoP+btw fw4T+ghLPqivN7jOYmZqEpKtv9GjGeCLjp4m4pOumutjYLuPidZw8/GK/rhw0SvUFIKW kLn93GHKN8t+UmlUfrFQtahEAavDvPK6aggRCBwzaQRZdbfF4xfyzmJ6ZglwatcXf0U7 a1NN1J6oCTq+cmKWyip0QbyLqHOQhtF/DrB+tXtKp9nzgK4XyZnt01jP/lQXHFBpUXC/ nm3w== X-Gm-Message-State: AOAM530xcK14MgztATbOOFkoAY3r1FmFDBHQk1Wo5ipkIir7Mm8lS9+J Pt0b+yqCAX7jMqQ6IyQLC3vUu++KOb5tnlVGLUaG4Q== X-Google-Smtp-Source: ABdhPJxDmAkEYhL3kIjIJ8vXDU1llWl2if3R+WoY60Q0/4E8qQ50rSwMtF1b6ZutD0HAV9BY/3awG/i911SNczxHoWI= X-Received: by 2002:a2e:b4e8:: with SMTP id s8mr17985871ljm.34.1614098401989; Tue, 23 Feb 2021 08:40:01 -0800 (PST) MIME-Version: 1.0 References: <20210223055505.2594953-1-shakeelb@google.com> In-Reply-To: <20210223055505.2594953-1-shakeelb@google.com> From: Shakeel Butt Date: Tue, 23 Feb 2021 08:39:51 -0800 Message-ID: Subject: Re: [PATCH v2] memcg: charge before adding to swapcache on swapin To: Hugh Dickins , Johannes Weiner Cc: Roman Gushchin , Michal Hocko , Andrew Morton , Cgroups , Linux MM , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 22, 2021 at 9:55 PM Shakeel Butt wrote: [snip] > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -596,6 +596,9 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) > } > > int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask); > +int mem_cgroup_charge_swapin_page(struct page *page, struct mm_struct *mm, > + gfp_t gfp, swp_entry_t entry); > +void mem_cgroup_finish_swapin_page(struct page *page, swp_entry_t entry); > > void mem_cgroup_uncharge(struct page *page); > void mem_cgroup_uncharge_list(struct list_head *page_list); > @@ -1141,6 +1144,17 @@ static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm, > return 0; > } > > +static inline int mem_cgroup_charge_swapin_page(struct page *page, > + struct mm_struct *mm, gfp_t gfp, swp_entry_t entry); I didn't build-test the !CONFIG_MEMCG config and missed this semicolon. Andrew, let me know if you want me to send a new version. > +{ > + return 0; > +} > +