From patchwork Fri May 20 21:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12857455 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 4AD94C433EF for ; Fri, 20 May 2022 21:16:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF9A66B007E; Fri, 20 May 2022 17:16:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAAF06B0080; Fri, 20 May 2022 17:16:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A60896B0081; Fri, 20 May 2022 17:16:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 958F16B007E for ; Fri, 20 May 2022 17:16:25 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7E1F431D75 for ; Fri, 20 May 2022 21:16:25 +0000 (UTC) X-FDA: 79487379930.05.61F06BE Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf12.hostedemail.com (Postfix) with ESMTP id AC3114000B for ; Fri, 20 May 2022 21:15:53 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id c2so8347429plh.2 for ; Fri, 20 May 2022 14:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j4XmJAWPYD2D8xrDs4B9doFxdeAqtS3ydjsiwVqFNQE=; b=Ptl/vJ+4tr0wo8YH9eqwLAvaSJxi7Oycnq92HxfoZk+QdfTfA9ENKktv7+IZjg4dQA Tnji/iUJmJpcFvSWDbCv4VN85SuKnLwbT0huZV6bIyCoRD/7bhs0irQMtF8Lnc7ZY5Q7 wOe9j+hlD+5P7UxV/dOtjIyR381ynQL1SqKIiUsdjoTXtM7kP+Wyw+cZdIglDsx1pDeK 9+HigMz9haP+HCDkKNneVDaB0D2N0tyMbU+HA5dEbgRdmoCqplw1qxf0V8I6+wunGFDl 5lfbF7srBIkNk8zjstYMnHqPez+C1RfCdxiUC3Izu8Owg3I4cjReT4lCRDb/or6V4+zu +/Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j4XmJAWPYD2D8xrDs4B9doFxdeAqtS3ydjsiwVqFNQE=; b=553TZpnWgm+1Y1W6aIXs/pl5+oANvwlhc7wi79AYSrvIxka8ZkeuyLrfYyqWZGc+a9 JnG20eml7nSZYueTF2ZuPPikxNTSgkVxykyE4CAGDXZ2l+4QS9PivG7M5qtt2wn+5LRn SI1CCeiXGbLmBOA94e0hrRMkAyboqYL9Ve8JIzdBtNEy14nMfJ/k82XM4OB4//1SYkt6 Ehs6uEEp32LJ8S2JdtkPTcUFeR7tiqxfESuiGVE/ZCAAtxS6Pq8dO4VMbUUgZpT7iEvv IhD3ySKvjkIHNqkkrGMI6zINuPIU6nMmnhp26n7fmfrILxT2WRYT9xrrZagpLRqPBv6F iqqw== X-Gm-Message-State: AOAM532BrOcgmuLmgcDnN4n+y7OyXmB9deYbKoZUur4lwqib72+jrj2V Gz5C1yXWROV4Lg9gcYgmjaIHy4AmPfs= X-Google-Smtp-Source: ABdhPJy9LubXKnw2CwDr67vvJdDrVydqGO6/z63N55tXZRS8KRReOt/HeiFZIFFyfXfdOhEcnhSYdQ== X-Received: by 2002:a17:902:f551:b0:15e:999a:2425 with SMTP id h17-20020a170902f55100b0015e999a2425mr11172213plf.3.1653081383403; Fri, 20 May 2022 14:16:23 -0700 (PDT) Received: from localhost.localdomain (c-67-174-241-145.hsd1.ca.comcast.net. [67.174.241.145]) by smtp.gmail.com with ESMTPSA id h1-20020a170902748100b0015e8d4eb2c2sm167620pll.268.2022.05.20.14.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 14:16:22 -0700 (PDT) From: Yang Shi To: vbabka@suse.cz, kirill.shutemov@linux.intel.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] mm: khugepaged: reorg some khugepaged helpers Date: Fri, 20 May 2022 14:16:05 -0700 Message-Id: <20220520211605.51473-8-shy828301@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20220520211605.51473-1-shy828301@gmail.com> References: <20220520211605.51473-1-shy828301@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: AC3114000B X-Stat-Signature: dipczihus1zypae99guibwi86gp11d9x Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Ptl/vJ+4"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of shy828301@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Rspamd-Server: rspam04 X-HE-Tag: 1653081353-756672 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: The khugepaged_{enabled|always|req_madv} are not khugepaged only anymore, move them to huge_mm.h and rename to hugepage_flags_xxx, and remove khugepaged_req_madv due to no users. Also move khugepaged_defrag to khugepaged.c since its only caller is in that file, it doesn't have to be in a header file. Signed-off-by: Yang Shi --- include/linux/huge_mm.h | 8 ++++++++ include/linux/khugepaged.h | 17 +---------------- mm/huge_memory.c | 4 ++-- mm/khugepaged.c | 18 +++++++++++------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 67c913e66e60..e6f89d8ad5f8 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -116,6 +116,14 @@ extern struct kobj_attribute shmem_enabled_attr; extern unsigned long transparent_hugepage_flags; +#define hugepage_flags_enabled() \ + (transparent_hugepage_flags & \ + ((1<flags)) @@ -53,8 +39,7 @@ static inline void khugepaged_exit(struct mm_struct *mm) static inline void khugepaged_enter(struct vm_area_struct *vma, unsigned long vm_flags) { - if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - khugepaged_enabled()) { + if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags)) { if (hugepage_vma_check(vma, vm_flags, false)) __khugepaged_enter(vma->vm_mm); } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b4cab3aa2534..f4d7b6378b83 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -102,11 +102,11 @@ bool hugepage_vma_check(struct vm_area_struct *vma, if (!in_pf && shmem_file(vma->vm_file)) return shmem_huge_enabled(vma); - if (!khugepaged_enabled()) + if (!hugepage_flags_enabled()) return false; /* THP settings require madvise. */ - if (!(vm_flags & VM_HUGEPAGE) && !khugepaged_always()) + if (!(vm_flags & VM_HUGEPAGE) && !hugepage_flags_always()) return false; /* Only regular file is valid */ diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 292ed9c0db1e..37ea5a5396cd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -472,7 +472,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, unsigned long vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - khugepaged_enabled()) { + hugepage_flags_enabled()) { if (hugepage_vma_check(vma, vm_flags, false)) __khugepaged_enter(vma->vm_mm); } @@ -763,6 +763,10 @@ static bool khugepaged_scan_abort(int nid) return false; } +#define khugepaged_defrag() \ + (transparent_hugepage_flags & \ + (1<