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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25BFFC433EF for ; Thu, 30 Jun 2022 20:14:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AF748E0002; Thu, 30 Jun 2022 16:14:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 45E5F8E0001; Thu, 30 Jun 2022 16:14:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 326408E0002; Thu, 30 Jun 2022 16:14:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 23AAB8E0001 for ; Thu, 30 Jun 2022 16:14:36 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E964420424 for ; Thu, 30 Jun 2022 20:14:35 +0000 (UTC) X-FDA: 79636004910.08.1D76D68 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf24.hostedemail.com (Postfix) with ESMTP id 3F4E9180049 for ; Thu, 30 Jun 2022 20:14:35 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id a15so426499pfv.13 for ; Thu, 30 Jun 2022 13:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=k1LIpsb9S0gQyTDNkxt7EQKYfYluD3nT7YuRuSg+Q4k=; b=H0nXqrFJrapVFMHWsvsmdn31lNNJxao+dU1utqIg1v4stUgPI64n7s5v7hl1q6Jvu9 +FI81gl6P9GfNGzD2IfLpWCaOCN25K8Auh/rEEM0DIwXLdzdweYHnkDKH0jEgcajlcRq 0cI5BS+34puDzRAdqa4WVQFE1PItxMqkyqusURT7fTDn+HPkZ348VgfpREgRD/WMw7i9 2JSHr5XQktcuB9qpwPPbUA0XEScKXtANbMPtYHYpmi6+IRFMyirOEh1WKzXOX7tShTPj g186hlZtwSc1Uxxmtwj+fKTEcEH3CFIzun2BidFssGdhFs3SqLOjS0Iiek/pWGxxG20x LbSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=k1LIpsb9S0gQyTDNkxt7EQKYfYluD3nT7YuRuSg+Q4k=; b=hkmUg826xLPxawYzNMimwhaCIEZEZA31oC82K0jADijw7NmIL3danafe4MRY9jLCPX NbLyeK+7NuoeXPMz7OpnKj0igZspmH9J11AoFg4RQQF2YVH/oi/cxKZYq4sr+sHbblb8 MtEXm7XvVql9JK7ueoNPTnbX0cWf4pFfLR03+b72urxmKOLCRJ0+YpmhpJJ7o56zRYoU 18TJ6FrK9s9MdCNi7kW8wMxIRZi2jIUdMwxr4+746XGYtay3fj/qqyB1CrgfLxHsvWJf MJqrlnBer5XA3p/rBq7NYYWqMLn+ua43tD5p6Z4W8w6MR56OrMxLvZxYBKIdOwI4yEDL OABg== X-Gm-Message-State: AJIora/ZC9lGmdRlEGzpi+2dnlwDTi6K5HoSDgLdvG6BJwNjAkPtdN6Q 89y+hy/siF7OIPEvHjOxSzOKeA== X-Google-Smtp-Source: AGRyM1svke39pe3IzEjsJVsC4bcgP7DLA7dkBPV8fhj7lp6/AAMyNjo+YW5VLJHYWAiNr3lm9rOyzA== X-Received: by 2002:a05:6a00:170e:b0:525:4cac:fa65 with SMTP id h14-20020a056a00170e00b005254cacfa65mr17236909pfc.40.1656620073886; Thu, 30 Jun 2022 13:14:33 -0700 (PDT) Received: from google.com (55.212.185.35.bc.googleusercontent.com. [35.185.212.55]) by smtp.gmail.com with ESMTPSA id x20-20020aa79574000000b0050dc7628183sm14399177pfq.93.2022.06.30.13.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 13:14:33 -0700 (PDT) Date: Thu, 30 Jun 2022 13:14:30 -0700 From: Zach O'Keefe To: Peter Xu Cc: Alex Shi , David Hildenbrand , David Rientjes , Matthew Wilcox , Michal Hocko , Pasha Tatashin , Rongwei Wang , SeongJae Park , Song Liu , Vlastimil Babka , Yang Shi , Zi Yan , linux-mm@kvack.org, Andrea Arcangeli , Andrew Morton , Arnd Bergmann , Axel Rasmussen , Chris Kennelly , Chris Zankel , Helge Deller , Hugh Dickins , Ivan Kokshaysky , "James E.J. Bottomley" , Jens Axboe , "Kirill A. Shutemov" , Matt Turner , Max Filippov , Miaohe Lin , Minchan Kim , Patrick Xia , Pavel Begunkov , Thomas Bogendoerfer Subject: Re: [PATCH v6 04/15] mm/khugepaged: dedup and simplify hugepage alloc and charging Message-ID: References: <20220604004004.954674-1-zokeefe@google.com> <20220604004004.954674-5-zokeefe@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656620075; a=rsa-sha256; cv=none; b=4WC+T+b1babfv6u8RfrT4LKyRsItH6H6fdfDmi6aCNNrToGH7OYIAKtyocEEhdOOxe7d3U xAJtyaxq/LyTDfhK4Z6dkWTJHC18G1+t0ncWphc/1kccShXOhJGXKyHo2skT7meV9TKqjg kjl8/LFoJxw4V8wKdbsXmhAuhLDteTo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=H0nXqrFJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of zokeefe@google.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zokeefe@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656620075; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=k1LIpsb9S0gQyTDNkxt7EQKYfYluD3nT7YuRuSg+Q4k=; b=lnauKXJxx6Rj1U100oIPIIBxri7XWisB4GksMzgYoXPDsSI9dQjOmidn5o/1c/kNcX3603 vrwCz9FCazcacWBXdmodiNlylgshPefwYwqiWewISL6ahwpgyvjlRy5flUHxoVPL8AzcRP LzFce4HZET/3jzLGWM2zmKMZpqi5NOo= X-Rspamd-Queue-Id: 3F4E9180049 X-Rspam-User: Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=H0nXqrFJ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of zokeefe@google.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zokeefe@google.com X-Rspamd-Server: rspam02 X-Stat-Signature: 5pxwqbo6ou4np5f8xdk5xfwabi3ftiqr X-HE-Tag: 1656620075-536642 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 Jun 29 17:58, Peter Xu wrote: > On Fri, Jun 03, 2022 at 05:39:53PM -0700, Zach O'Keefe wrote: > > The following code is duplicated in collapse_huge_page() and > > collapse_file(): > > > > gfp = alloc_hugepage_khugepaged_gfpmask() | __GFP_THISNODE; > > > > new_page = khugepaged_alloc_page(hpage, gfp, node); > > if (!new_page) { > > result = SCAN_ALLOC_HUGE_PAGE_FAIL; > > goto out; > > } > > > > if (unlikely(mem_cgroup_charge(page_folio(new_page), mm, gfp))) { > > result = SCAN_CGROUP_CHARGE_FAIL; > > goto out; > > } > > count_memcg_page_event(new_page, THP_COLLAPSE_ALLOC); > > > > Also, "node" is passed as an argument to both collapse_huge_page() and > > collapse_file() and obtained the same way, via > > khugepaged_find_target_node(). > > > > Move all this into a new helper, alloc_charge_hpage(), and remove the > > duplicate code from collapse_huge_page() and collapse_file(). Also, > > simplify khugepaged_alloc_page() by returning a bool indicating > > allocation success instead of a copy of the allocated struct page. > > > > Suggested-by: Peter Xu > > > > --- > > [note: please remember to drop this "---" when repost since I think it > could drop your sign-off when apply] > Thanks for catching this, Peter! Fixed locally! Best, Zach > > > > Signed-off-by: Zach O'Keefe > > Reviewed-by: Peter Xu > > Thanks, > > -- > Peter Xu >