Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc:     David Hildenbrand <david@redhat.com>,
        Michal Hocko <mhocko@suse.com>,
        Oscar Salvador <osalvador@suse.de>, Zi Yan <ziy@nvidia.com>,
        Muchun Song <songmuchun@bytedance.com>,
        Naoya Horiguchi <naoya.horiguchi@linux.dev>,
        David Rientjes <rientjes@google.com>,
        "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
        Nghia Le <nghialm78@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH v4 5/5] hugetlb: add hugetlb demote page support
Date:   Thu,  7 Oct 2021 11:19:18 -0700
Message-Id: <20211007181918.136982-6-mike.kravetz@oracle.com>
In-Reply-To: <20211007181918.136982-1-mike.kravetz@oracle.com>
References: <20211007181918.136982-1-mike.kravetz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PIdGzAlDSagakaHvy0fnguLaoOhpp9kLYyAa6Dkk67jRohiZ/aVMYjy83Zam?=
 =?us-ascii?Q?HLPoCJ3jxP8NJkpUeuA2IPCeSK49vNqLev6W113vzyvbBL7Aj33T1TPpQFjv?=
 =?us-ascii?Q?72Y/8QUOUKSiol1Ads9yeUWOjRBQdIQQwlPMyphqGxgl1zUHMv3k+l1RfYGF?=
 =?us-ascii?Q?JwxP7XP6pVjkeRDX06EHiRUShXDcQvJKR+teAdptmm11lkKnUb5h163Fsktn?=
 =?us-ascii?Q?HxfYK7s5olt+21d6vvF8bQnAfQShoaFLVt0nPYSrUQbXEbWuIMGInKaoSihx?=
 =?us-ascii?Q?sjhbxEvUiFCZZKOdwY22VNAabkNw2plEdScCffQ2KgwTuhExLJwbRskCJnNm?=
 =?us-ascii?Q?QjlJ0vgpnLwyywROSHzRmTrRAd3DER23/LrAHE4Lu7gb7k2EVYbuNJ+HZsGu?=
 =?us-ascii?Q?mo3KqQEjf0qN7XyMC3FkY5StlKpekoAklZcRDXrSx9SYV3UxJWjztC/Fdi3D?=
 =?us-ascii?Q?VYuEJKpkN7WUKM6fD1Ns0WH0aKbT/cWrBvAeQk53ru/JPSJrNAUViwhsAHND?=
 =?us-ascii?Q?RaTKoVQ5mPzmIB1VSLEugaDWtnKirco2YdmtQdUUueervjsOBCGbv6bUeM1r?=
 =?us-ascii?Q?FrCnNCVllVWGxlvHGI7f6/TMnxuVZEOMS7qdxzSUcDZXmTFm3j3d7Wlg0fNm?=
 =?us-ascii?Q?QggUWsoGwE3ExzsB4vi8aA+uX8/SPLy3n/UWrzndTg5lmsJ4yNeNh+g4crip?=
 =?us-ascii?Q?OSs+91DAIRJnU7EgHJk3ETJzjkBJFXmKCu8ckKBkzGRbtVgT/45yv9mLdoed?=
 =?us-ascii?Q?hn4kLfAtYcFamfsm5sgoSnwCSGwGuApFVF44MaXAAgzNIMs/EEdn3Vp6MwCc?=
 =?us-ascii?Q?aR2DwL9Fb2J5eblJz3Hm321/QnyBnR2FIZl03vf7d8fpnvQm+W2yg9wM63q9?=
 =?us-ascii?Q?qrDRkN+hu+nX6cQ0mi1g9i7a2Lp88QJe8exnN3fwcbgHSQsInqPxShmuWfnI?=
 =?us-ascii?Q?kI1HubsK9QutoJi682EeXLIBGICleXK62fjZrhQKYp+d8+JMBRXWOIyZgKRu?=
 =?us-ascii?Q?BNMVMnMiMdymfnXUmN8NfMFB7SDaByB8ofeq4mKKacG8IggyundkYPjeLXsx?=
 =?us-ascii?Q?FAAz0FzYotKVL4I9j/3/s6zmIvEEw9PMIGcm03Rgw2OB2+gzC69iSuzgJGpZ?=
 =?us-ascii?Q?cgZFkYgmCQI+T5Adxkw1nSFHTQmAs7uzGucOCK9pZUUAulP4UnnjKddhiwBw?=
 =?us-ascii?Q?YfvOzbqUJPpzCqGRaTs3UacwqzrlFuBTp5QRWv02+fy6QO5rIT13ikHDf993?=
 =?us-ascii?Q?/Nl/kZuD3e73KxcScWmGR7GjU9kndXqYoIUQffBlkgJ1dj53CT5JVM+evQ52?=
 =?us-ascii?Q?q6N8fv459eny0vEvO3z7JT36?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 70f09238-7147-4cd0-812e-08d989bf0965
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 18:19:44.0485
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8rOi98N9NhmFC9RqR05NgojdS0jqk4Hhk1cnDZ4XH3ZXOCHXV2iZMi0Z2iKtCjAiQU+HSf4RwLwigY4qvFK7BA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2552
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10130 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0
 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109230001 definitions=main-2110070118
X-Proofpoint-ORIG-GUID: hhoGVzZ_e14Tb0pHbGJ8gUhQ--30tzDK
X-Proofpoint-GUID: hhoGVzZ_e14Tb0pHbGJ8gUhQ--30tzDK
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Demote page functionality will split a huge page into a number of huge
pages of a smaller size.  For example, on x86 a 1GB huge page can be
demoted into 512 2M huge pages.  Demotion is done 'in place' by simply
splitting the huge page.

Added '*_for_demote' wrappers for remove_hugetlb_page,
destroy_compound_gigantic_page and prep_compound_gigantic_page for use
by demote code.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/hugetlb.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 8 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 794e0c4c1b3c..22cb6126be7e 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1270,7 +1270,7 @@ static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed)
 		((node = hstate_next_node_to_free(hs, mask)) || 1);	\
 		nr_nodes--)
 
-#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE
+/* used to demote non-gigantic_huge pages as well */
 static void __destroy_compound_gigantic_page(struct page *page,
 					unsigned int order, bool demote)
 {
@@ -1293,6 +1293,13 @@ static void __destroy_compound_gigantic_page(struct page *page,
 	__ClearPageHead(page);
 }
 
+static void destroy_compound_hugetlb_page_for_demote(struct page *page,
+					unsigned int order)
+{
+	__destroy_compound_gigantic_page(page, order, true);
+}
+
+#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE
 static void destroy_compound_gigantic_page(struct page *page,
 					unsigned int order)
 {
@@ -1438,6 +1445,12 @@ static void remove_hugetlb_page(struct hstate *h, struct page *page,
 	__remove_hugetlb_page(h, page, adjust_surplus, false);
 }
 
+static void remove_hugetlb_page_for_demote(struct hstate *h, struct page *page,
+							bool adjust_surplus)
+{
+	__remove_hugetlb_page(h, page, adjust_surplus, true);
+}
+
 static void add_hugetlb_page(struct hstate *h, struct page *page,
 			     bool adjust_surplus)
 {
@@ -1779,6 +1792,12 @@ static bool prep_compound_gigantic_page(struct page *page, unsigned int order)
 	return __prep_compound_gigantic_page(page, order, false);
 }
 
+static bool prep_compound_gigantic_page_for_demote(struct page *page,
+							unsigned int order)
+{
+	return __prep_compound_gigantic_page(page, order, true);
+}
+
 /*
  * PageHuge() only returns true for hugetlbfs pages, but not for normal or
  * transparent huge pages.  See the PageTransHuge() documentation for more
@@ -3304,9 +3323,54 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid,
 	return 0;
 }
 
+static int demote_free_huge_page(struct hstate *h, struct page *page)
+{
+	int i, nid = page_to_nid(page);
+	struct hstate *target_hstate;
+	int rc = 0;
+
+	target_hstate = size_to_hstate(PAGE_SIZE << h->demote_order);
+
+	remove_hugetlb_page_for_demote(h, page, false);
+	spin_unlock_irq(&hugetlb_lock);
+
+	rc = alloc_huge_page_vmemmap(h, page);
+	if (rc) {
+		/* Allocation of vmemmmap failed, we can not demote page */
+		spin_lock_irq(&hugetlb_lock);
+		set_page_refcounted(page);
+		add_hugetlb_page(h, page, false);
+		return rc;
+	}
+
+	/*
+	 * Use destroy_compound_hugetlb_page_for_demote for all huge page
+	 * sizes as it will not ref count pages.
+	 */
+	destroy_compound_hugetlb_page_for_demote(page, huge_page_order(h));
+
+	for (i = 0; i < pages_per_huge_page(h);
+				i += pages_per_huge_page(target_hstate)) {
+		if (hstate_is_gigantic(target_hstate))
+			prep_compound_gigantic_page_for_demote(page + i,
+							target_hstate->order);
+		else
+			prep_compound_page(page + i, target_hstate->order);
+		set_page_private(page + i, 0);
+		set_page_refcounted(page + i);
+		prep_new_huge_page(target_hstate, page + i, nid);
+		put_page(page + i);
+	}
+
+	spin_lock_irq(&hugetlb_lock);
+	return rc;
+}
+
 static int demote_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed)
 	__must_hold(&hugetlb_lock)
 {
+	int nr_nodes, node;
+	struct page *page;
 	int rc = 0;
 
 	lockdep_assert_held(&hugetlb_lock);
@@ -3317,9 +3381,15 @@ static int demote_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed)
 		return -EINVAL;		/* internal error */
 	}
 
-	/*
-	 * TODO - demote fucntionality will be added in subsequent patch
-	 */
+	for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) {
+		if (!list_empty(&h->hugepage_freelists[node])) {
+			page = list_entry(h->hugepage_freelists[node].next,
+					struct page, lru);
+			rc = demote_free_huge_page(h, page);
+			break;
+		}
+	}
+
 	return rc;
 }
 
@@ -3554,10 +3624,6 @@ static ssize_t demote_store(struct kobject *kobj,
 		/*
 		 * Check for available pages to demote each time thorough the
 		 * loop as demote_pool_huge_page will drop hugetlb_lock.
-		 *
-		 * NOTE: demote_pool_huge_page does not yet drop hugetlb_lock
-		 * but will when full demote functionality is added in a later
-		 * patch.
 		 */
 		if (nid != NUMA_NO_NODE)
 			nr_available = h->free_huge_pages_node[nid];
-- 
2.31.1