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 A50C1C433F5 for ; Fri, 13 May 2022 18:27:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 362DE6B0073; Fri, 13 May 2022 14:27:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 312766B0075; Fri, 13 May 2022 14:27:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DA486B0078; Fri, 13 May 2022 14:27:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0F76D6B0073 for ; Fri, 13 May 2022 14:27:38 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id E050780658 for ; Fri, 13 May 2022 18:27:37 +0000 (UTC) X-FDA: 79461552954.06.92777BD Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf08.hostedemail.com (Postfix) with ESMTP id 1D4221600A6 for ; Fri, 13 May 2022 18:27:21 +0000 (UTC) Received: by mail-lf1-f52.google.com with SMTP id d15so15929369lfk.5 for ; Fri, 13 May 2022 11:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xT9sq9uXW97mrcRTh4n8dfrU6IpLd8+Vt93RnDSIHjU=; b=YaqQWqWmxkWfOyvo3Kdk+pO6Z+NT58gDbkMMCKoOtpq4yHr+MZbIRQtdAyBmfDqjFf aqNyOrulZHkNj6Sk5f0qUm4Z/QG0CMejUfN6IkhJPEe3n9dkeXY7/ElfFiUMKpVGW3tB yCDbjRqfqs+GaBDWlCHMVDvFxpgbCePriULK4mB0XDrYPtfazSBz9ms+ZbxYyA/jHQji H5LcTTy1OOIqb4ckaogg5Sj6L/dAUtW3k/FXfLPpbZ5py0Vo9xXn3dKvtJTKtQRDegeq vX73Al3ZXy77JUQ8PbbSuvEOKMlOglzIVdDUbITaeGWLh130RWDNlXLm/yMziPg19R7S /+wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xT9sq9uXW97mrcRTh4n8dfrU6IpLd8+Vt93RnDSIHjU=; b=s6VbeZJ3TXK72hj7SiDVTD3zMCdBH6bmDWp/N31lRfTItt28jedsNpXM2rhtNC3EZs 8Z42OTGkxV1ls+uRQR0nfP+9SmNv7XIKROFDKpjb3fn3FLbKNyY12kE0tD5l7TkQoW3P Dd4BE0iVegHeSdehILOHV+/Cs1Y1bWAzujdkrMv1GHney+jiD5DELex20k/PyIvIEcSL Tkq8eUThIizcX93QG2D5F8bVKqPTeZ4xfWy0A7/2Gwzt79ZCu1K2/WyJX6ZrxogmTdEy MwH39wA7fAPzOwWiEyy0+ZtlJRMSVgHQV2RSEp2NnduRu9EFlNGzpcQDxu1so+Uc/Var qEtA== X-Gm-Message-State: AOAM533mpDxCjwbPB4WeBDhPnrQjic6DZEp24U6QDX5bMCA7QkmBpamW p53hgTn1dkWNuvDDC33bxInuYrpRUd4MIAcyHUNVTw== X-Google-Smtp-Source: ABdhPJyuJQe0gZBvDcDzRSv4KpUwQAFEGYnp6Gb6Pn34KfLeVuAzkIisz5ZXNljqSYAXqzmvZPsxCJaFs1Y7FEt2gUU= X-Received: by 2002:a05:6512:110d:b0:473:d519:5764 with SMTP id l13-20020a056512110d00b00473d5195764mr4459647lfg.128.1652466455137; Fri, 13 May 2022 11:27:35 -0700 (PDT) MIME-Version: 1.0 References: <20220504214437.2850685-1-zokeefe@google.com> <20220504214437.2850685-4-zokeefe@google.com> In-Reply-To: From: "Zach O'Keefe" Date: Fri, 13 May 2022 11:26:58 -0700 Message-ID: Subject: Re: [PATCH v5 03/13] mm/khugepaged: dedup and simplify hugepage alloc and charging To: David Rientjes Cc: Alex Shi , David Hildenbrand , Matthew Wilcox , Michal Hocko , Pasha Tatashin , Peter Xu , 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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1D4221600A6 X-Stat-Signature: m5m7qabdbtmsarxy8g5f97zbuhojojaw X-Rspam-User: Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=YaqQWqWm; spf=pass (imf08.hostedemail.com: domain of zokeefe@google.com designates 209.85.167.52 as permitted sender) smtp.mailfrom=zokeefe@google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1652466441-359323 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 Thu, May 12, 2022 at 1:02 PM David Rientjes wrote: > > On Wed, 4 May 2022, Zach O'Keefe wrote: > > > @@ -1069,10 +1067,34 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, > > return true; > > } > > > > -static void collapse_huge_page(struct mm_struct *mm, > > - unsigned long address, > > - struct page **hpage, > > - int node, int referenced, int unmapped) > > +static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm, > > + struct collapse_control *cc) > > +{ > > +#ifdef CONFIG_NUMA > > + const struct cpumask *cpumask; > > +#endif > > + gfp_t gfp = alloc_hugepage_khugepaged_gfpmask() | __GFP_THISNODE; > > + int node = khugepaged_find_target_node(cc); > > + > > +#ifdef CONFIG_NUMA > > + /* sched to specified node before huge page memory copy */ > > + if (task_node(current) != node) { > > + cpumask = cpumask_of_node(node); > > + if (!cpumask_empty(cpumask)) > > + set_cpus_allowed_ptr(current, cpumask); > > + } > > +#endif > > + if (!khugepaged_alloc_page(hpage, gfp, node)) > > + return SCAN_ALLOC_HUGE_PAGE_FAIL; > > + if (unlikely(mem_cgroup_charge(page_folio(*hpage), mm, gfp))) > > + return SCAN_CGROUP_CHARGE_FAIL; > > + count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC); > > + return SCAN_SUCCEED; > > +} > > Lots of ifdefs here, I wonder if we can define a helper function that is a > no-op when CONFIG_NUMA is disabled that we can call into here instead. > Thanks for the review, David! So, it seems like the patch that forced some of the #ifdefs, 'mm/khugepaged: sched to numa node when collapse huge page', has been dropped until some of the kinks have been worked out[1]. When I rebase on linux-next again for v6, this will be cleaned up. [1] https://lore.kernel.org/linux-mm/20220317065024.2635069-1-maobibo@loongson.cn/ Thanks! Zach > Otherwise this looks like a nice unification. After this is cleaned up > feel free to add > > Acked-by: David Rientjes