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=ham 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 CD158C433E0 for ; Tue, 23 Feb 2021 16:40:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 325A164D99 for ; Tue, 23 Feb 2021 16:40:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 325A164D99 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id ABF0D6B0005; Tue, 23 Feb 2021 11:40:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A700A6B0006; Tue, 23 Feb 2021 11:40:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 987C56B006E; Tue, 23 Feb 2021 11:40:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id 82F676B0005 for ; Tue, 23 Feb 2021 11:40:10 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 40EC31E1E for ; Tue, 23 Feb 2021 16:40:10 +0000 (UTC) X-FDA: 77850094980.20.9FDEC5B Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 4577B13A for ; Tue, 23 Feb 2021 16:40:04 +0000 (UTC) Received: by mail-lj1-f172.google.com with SMTP id y7so61695738lji.7 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=M1EjF+/U8GKZFpYDfrbLSCMczmiW6zlb1wnUInLDFDpb/EenNLychpsof1DjBJy3A0 iiX0wCPSMKVWgE6aIG1ZLmCn3qQPchvivLZsvk3oJCfoT1RKrgnDhwPScC1iFPrj6CjT enaN/k49tXRrQjfdTrf3JvQbZvixjmeGEC6hTdfcjwy1EnGKN2+RpF7MqRTRDe0m1g16 1gId0AHrflcHprLa0I2pOI3FpjBIMYTyL4kKN6qcnoimDy561IwOXDK/VlXvIe1UOsMK M0MZXIX43UDU77/hGAaJ/gOCFREpGnQtOdM+GL/jEfMxNX6aH+jn9GfpP5bGnVT0Be0x 099w== X-Gm-Message-State: AOAM531lH8NFsBx9dXuffISYP0kRZh17IowRhfjzqZwBt+43C/UnmawA dwxvRMPsLxhikypsKJ5x3/AF9kJxPS2aDCbkCT0BYw== 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" X-Stat-Signature: od5ga445dyj6m37kbfs4hbe1xxq9tsw1 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4577B13A Received-SPF: none (google.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail-lj1-f172.google.com; client-ip=209.85.208.172 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614098404-78027 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 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; > +} > +