From patchwork Wed Jun 15 17:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12882805 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 9BCDFC433EF for ; Wed, 15 Jun 2022 17:29:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8009F6B007E; Wed, 15 Jun 2022 13:29:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74EA16B0081; Wed, 15 Jun 2022 13:29:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F86C6B0080; Wed, 15 Jun 2022 13:29:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F04A26B0080 for ; Wed, 15 Jun 2022 13:29:45 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id C0714602F9 for ; Wed, 15 Jun 2022 17:29:45 +0000 (UTC) X-FDA: 79581157530.29.F41A685 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf12.hostedemail.com (Postfix) with ESMTP id 3D977400A7 for ; Wed, 15 Jun 2022 17:29:43 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id k12-20020a17090a404c00b001eaabc1fe5dso2783464pjg.1 for ; Wed, 15 Jun 2022 10:29:43 -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=BxodM/enWfpl7ZA6N5naFXFtK7edc51Vh1QDre/mU/Q=; b=mkhCdkIJNqb0v6VU4lByixweHMSmazQOcfv8y2ewFiVeKtD8M+w7to2fu1BHM9jFdW FnkzXfY6+FrSC06EzCmia1Hfqwj1UVUHQBir/i6VaPcvgTdyxFi/D0bk0ChP45wRaEP7 i0x+6MMSNGr6PWLhRBI/MFVrSihpDL13tYcEA5WFGBI73Ue+rR1ygElAlQtRw2JOk8mv lrCeuu2Rhb9PYkgS4A0u3VW2Sok5anSb27z8+p8NuL0bW/OEUtFQkKXGTRPY9nAjsuWR BU1bLwPC0owvKLfTqg4S7y1AcndfGkSb6Q6aDEtdQYxtLn1MEzxy/KNL8S+tIYR50lXG VKcw== 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=BxodM/enWfpl7ZA6N5naFXFtK7edc51Vh1QDre/mU/Q=; b=MLLDDp2/AKijOB0eV90rntTSkYouM+TClIo1aNAADmO5cbNWcuoFMqDCasVoUwHb35 k5GcLE4C5yNxRkSxo/Y6iFhuw3EtCboz+dUnMc+usVgNKghNwRijNa98RHjTAx/sV19Z VH+vB6e3P3qPUOSQnfRDrQmer0dzca3fTFajoWWfHhBH94fz7HBD04m6FEMJYZ9uqFrb sjbetqUkinqGbS3rxhIfWc2TvexL0D2sFRmwYuqUMWZ84IZspAKmMOBQjHQOzkXZ1L8f gFVXm7MfXExKG2LFrnY3/ldmjlZEVk49vnXuk6786ykl4CzktTL7GkODD/cnnmUfENIV CODA== X-Gm-Message-State: AJIora+NGATHrcZp5qTlUXywSIW71q4NULgB+ok3Bb6tJWrSrqdxcVk+ BbLfGEogO9bJlixAN0B7jFA= X-Google-Smtp-Source: AGRyM1txU2kmgua+NX3rp4duO3aRrjlN4ZOjkSUAr8RCRc2/lLC+ogmCrebuBsavl/ElraFx4uynEA== X-Received: by 2002:a17:903:186:b0:167:6d8c:68c4 with SMTP id z6-20020a170903018600b001676d8c68c4mr789311plg.91.1655314182347; Wed, 15 Jun 2022 10:29:42 -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 w14-20020a1709029a8e00b001676f87473fsm9552244plp.302.2022.06.15.10.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 10:29:41 -0700 (PDT) From: Yang Shi To: vbabka@suse.cz, kirill.shutemov@linux.intel.com, willy@infradead.org, zokeefe@google.com, linmiaohe@huawei.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [v4 PATCH 6/7] mm: khugepaged: reorg some khugepaged helpers Date: Wed, 15 Jun 2022 10:29:25 -0700 Message-Id: <20220615172926.546974-7-shy828301@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20220615172926.546974-1-shy828301@gmail.com> References: <20220615172926.546974-1-shy828301@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655314183; a=rsa-sha256; cv=none; b=x+NRKEolarby8B7Q/ppUp1nZ/mZ8ifia2kI74ofAt3Dv2giU1TpiZ4zdt1BGD2qz7Yk0bq zS2RR0MKJZpeZho5fWCdlmNyFJ3FssAPLLPfuSyUkOdpLOVAztMCuI+SD2StvzHhoRE0ai ZBDJuPx32PIMJagwhPw6zaHRIoz8lys= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mkhCdkIJ; spf=pass (imf12.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655314183; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BxodM/enWfpl7ZA6N5naFXFtK7edc51Vh1QDre/mU/Q=; b=enrG70/379jXc2BEpUVGc0yFZWquFakTD0pSyFp/XJDoVcVOg8eN67HjEuD2IF1LXuv+Wo ULI3lHTRCrA5t+tc9sJb2j9QZ8cFXdQxkxxGFsOP1MOI4Wjdj0VS1acVhtSt2nDuEtAnPp LskdKCPtASBjM9W8G0Q/EJqxggmrMc0= X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3D977400A7 X-Stat-Signature: mtm5i6rhdg4muq53iwc4micwfpk7txrm Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mkhCdkIJ; spf=pass (imf12.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1655314183-832505 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 Reviewed-by: Zach O'Keefe --- include/linux/huge_mm.h | 8 ++++++++ include/linux/khugepaged.h | 14 -------------- mm/huge_memory.c | 4 ++-- mm/khugepaged.c | 18 +++++++++++------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 9d97d7ee6234..4cf546af7d97 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)) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d0c37d99917b..0f2cce2d7041 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -117,11 +117,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 2a676f37c921..d8ebb60aae36 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, 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<