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 625BEC43334 for ; Wed, 29 Jun 2022 21:59:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7511E6B0071; Wed, 29 Jun 2022 17:59:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7014A6B0072; Wed, 29 Jun 2022 17:59:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A1B58E0001; Wed, 29 Jun 2022 17:59:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 47ED16B0071 for ; Wed, 29 Jun 2022 17:59:07 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 2202E60A8C for ; Wed, 29 Jun 2022 21:59:07 +0000 (UTC) X-FDA: 79632639534.11.63BFFDF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 7200920028 for ; Wed, 29 Jun 2022 21:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656539945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rCaOrzAVAD1sqmPU4gDH9qN6myqcH/suZ2a+6qyeagY=; b=TOzYd3DmaJ01b6w7s/p0CyP90Si3r+7HCXKt2t3iCRbeazMDl0En++T/UweNsZNJN+Mpdk Ea8vduCG2U7nFVskPszT0DzqfG6m+DD32qlhtaLgp76FJGfJKyoXGLrp1jIXnn3HJ9ZNd6 B6c80YE3xN0hGrB181C/bu6BGkATVrk= Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-527-LeWumyM9Ox-RRDOgqVCqvQ-1; Wed, 29 Jun 2022 17:59:02 -0400 X-MC-Unique: LeWumyM9Ox-RRDOgqVCqvQ-1 Received: by mail-io1-f69.google.com with SMTP id y22-20020a056602215600b00673b11a9cd5so9183293ioy.7 for ; Wed, 29 Jun 2022 14:59:02 -0700 (PDT) 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=rCaOrzAVAD1sqmPU4gDH9qN6myqcH/suZ2a+6qyeagY=; b=Cqrpd6BYsZCea7DpWCsFhzrpfkm8XLhuBOa2fhmYHF0Kr4AkfdCNwBuEoG7BfXbtBl 8v4a9e5pGlpj7C2a68zjHoqZy5WRh7NpCiv/fWnoO3gJ76FYQBSZjNKDw3mHsCJOi9Ny 70x0aPP90mVlxSMVBrO97Hr6cDQWSrYiosDPDwZbi3+lyXqRk97hmsvxH9uF1igXBl+H ASzyt3t2+Mkf/pL6/Bx7PDxVeb99+KBwIh8cvafstJWTHTF1AGO0tU37HfxIZ2rQwgSn jb/i7UwfWneU9wAVYF0dF6qUg1lm+lTelKypgm5j6ILimvqggo9qlMtOTabzsPsz8hOB 8eXA== X-Gm-Message-State: AJIora8tKWsVh+sPaf2XkxST/YA1uajtINBxw6gUvl0kRzYMdL6Xv7YN 0WiPIrMFwM5M7xd2YwLRU8jwTRnROdFR01vHgKEvTMw7Y8tLIBTsnl6+hoFnqeeR2jHV1Ri7vij 7N7KrYNDC1+Y= X-Received: by 2002:a05:6e02:194b:b0:2da:8568:99da with SMTP id x11-20020a056e02194b00b002da856899damr3183768ilu.80.1656539942047; Wed, 29 Jun 2022 14:59:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vr5JbV+6RUDp1c7QnkcVBfwLegF2mIap5bdghxd3Mw87wxKPTrvKuOU+5Fsch4g9SUEuWPSQ== X-Received: by 2002:a05:6e02:194b:b0:2da:8568:99da with SMTP id x11-20020a056e02194b00b002da856899damr3183724ilu.80.1656539941710; Wed, 29 Jun 2022 14:59:01 -0700 (PDT) Received: from xz-m1.local (cpec09435e3e0ee-cmc09435e3e0ec.cpe.net.cable.rogers.com. [99.241.198.116]) by smtp.gmail.com with ESMTPSA id x42-20020a0294ad000000b00330c5581c03sm7721872jah.1.2022.06.29.14.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 14:59:00 -0700 (PDT) Date: Wed, 29 Jun 2022 17:58:57 -0400 From: Peter Xu To: Zach O'Keefe 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 In-Reply-To: <20220604004004.954674-5-zokeefe@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656539946; 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=rCaOrzAVAD1sqmPU4gDH9qN6myqcH/suZ2a+6qyeagY=; b=qTtcikaLkSfYaPedOSamSykNTTiR10ywvWYvIjkofAPERhbg8nGHF8dcbz0xgvtDobUdYc QqPXQiIKCKh/BJxxLIMigbK9dGDM9ItmQyMGDDw7oHN00OvEEqbpZKv/HbXxOQvpu6Vv+I 9gEfLJLpIeqFHaCZXkm2UWhiQ+OcmBA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TOzYd3Dm; spf=none (imf03.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656539946; a=rsa-sha256; cv=none; b=ikjNcNPHpz+jU85mtOMAtuxuzGVUFkGEChSmCzgBJqHyZPE+EKUjIaIaXNg+p/KYGJPZ4O l2/2VbFn2MewTQFwsprOkdPr1g94MLnR0HnzNKEUQ2xw1WnCIqf/qK0kyODquUIZWqFA1X jQBc+fQx/l5mzqf0WZ6TnYd5gUlLTL4= Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TOzYd3Dm; spf=none (imf03.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: iooygdjccaui1d5oi84nkjdzo1obbx8c X-Rspamd-Queue-Id: 7200920028 X-HE-Tag: 1656539946-735243 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 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] > > Signed-off-by: Zach O'Keefe Reviewed-by: Peter Xu Thanks, -- Peter Xu