From patchwork Fri Oct 1 17:52:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12531285 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E669C433EF for ; Fri, 1 Oct 2021 17:53:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0AA1F61ABB for ; Fri, 1 Oct 2021 17:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0AA1F61ABB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A11A2940124; Fri, 1 Oct 2021 13:53:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 99A4F940121; Fri, 1 Oct 2021 13:53:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7ECE5940124; Fri, 1 Oct 2021 13:53:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0247.hostedemail.com [216.40.44.247]) by kanga.kvack.org (Postfix) with ESMTP id 67812940121 for ; Fri, 1 Oct 2021 13:53:42 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 1E96618043660 for ; Fri, 1 Oct 2021 17:53:42 +0000 (UTC) X-FDA: 78648616284.36.070CC61 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf26.hostedemail.com (Postfix) with ESMTP id 8A14E200173A for ; Fri, 1 Oct 2021 17:52:41 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 191GxaHM011106; Fri, 1 Oct 2021 17:52:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=oN/4ATE+WL0d9Mqp+VtfP/b0NQsDUEDHkS39qUTI6lE=; b=AnsYkF1PetuIMf7XXmjOnbqtt1mAjXvRqrrKh4Y/SmkVUM4/BWHbh50ka95a6/clKFP6 1luj50pDOy9SkqYB8+mAaLyoqPrLGNyL8nRQqIt4UwSGzpPYkbuD0QsDad6TL6GijYs3 EOASldxn9piGhdkOMYhTzRoXJXAz9tp/X+I93avMQrXguJgUk1bqgRY7p+d4P5y6EX9f wcezeshaEULoSbrsyJMUjrRvbNFOHeyp7vJYyo0NIL8c1L2FeAFjsaMe5MYQ5wJkGE7m qsASnG36VHqna5txkkZzGF+UM8AVe+ykSDBPJcuFijTf0x6nqNx1+mV6rq9DQtDMQEMj wQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3bde3chgyh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:36 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 191Hjwqb194733; Fri, 1 Oct 2021 17:52:35 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2170.outbound.protection.outlook.com [104.47.73.170]) by aserp3020.oracle.com with ESMTP id 3bceu8y918-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOOzY67mtRxYKm4o3FUmE1fK1K7sAo1o2D7/uilDOUA914MSeKmNP3DHnILuPPb7RYwifQtIJ065SGvAbQnYZHWHTPn83cLUsucF884aSXLjrVTHxeoWAQGjWoKg699Kok9dvQF2g01V/IE0oRROVFI+worUDcWAS4uw5GIZeNohD/KhJrihrH01omZqgVG2ZnJbYEuFTBeOT6p2oit/k+1XTulqJ5YTyh3qBmYtwuFw7LmbqNLKwDvvrRayLlXVapE/9cOXrS6oENRi9taHA0cgTpafyEUHa9cZovmZ64zFUb+//w9HwBXqNMNrXzuWANct4TUdm2RoWrf4wA83Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oN/4ATE+WL0d9Mqp+VtfP/b0NQsDUEDHkS39qUTI6lE=; b=Pdzsrru+xw6sCqBP0m1o/VKwCi7lyTkBKRTVstFWRrE1qHu7JCjihYX8a+uKBxJXvlSMRYwSLLFFBNQEi5tRIaYmxfXAXTCnIv5hc3VAuEBwrSTtgCfo9vZTAnop/BcARlSb4IwNkAmfYG2OxXDTI9190lrFVOzq3FSVduXOAx+oZFpIGDzYU3r8q8bi8LYV7e8iREob44XY9lZYnT6/i7b7i8dc4aiOVCj9zAQxaX5xV9BCbipzwzCcochNNc1OzZ1wEDuijhlcEvxPv9yqZ0ESENKEV8B5GcR3Y2m2+RxLs+gHQI59CWqkJOTICoHiziHEpGNHB4a67hCWv2uFGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oN/4ATE+WL0d9Mqp+VtfP/b0NQsDUEDHkS39qUTI6lE=; b=GKYxu+o8g8MvMSJ5+rWv/RtsypEllqsEuANhGFr29l2r6uUyepZAkb6MyqFMv0Gg+PHnWhIUb8UDOpaDwxBQdbnznTW4/1AC4GT7ItqUslMFGId6Rj7ZFHXtBGehekeiPKc0db4JhD8rVgz/4VWVOaqv7xH+K7b9WaFeZvHF/Bw= Received: from CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) by CH0PR10MB4924.namprd10.prod.outlook.com (2603:10b6:610:ca::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Fri, 1 Oct 2021 17:52:32 +0000 Received: from CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73]) by CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73%9]) with mapi id 15.20.4544.025; Fri, 1 Oct 2021 17:52:32 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Michal Hocko , Oscar Salvador , Zi Yan , Muchun Song , Naoya Horiguchi , David Rientjes , "Aneesh Kumar K . V" , Andrew Morton , Mike Kravetz Subject: [PATCH v3 1/5] hugetlb: add demote hugetlb page sysfs interfaces Date: Fri, 1 Oct 2021 10:52:06 -0700 Message-Id: <20211001175210.45968-2-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001175210.45968-1-mike.kravetz@oracle.com> References: <20211001175210.45968-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) To CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) MIME-Version: 1.0 Received: from monkey.oracle.com (50.38.35.18) by MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 17:52:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56b26c8c-616a-4363-9dcf-08d985043ea7 X-MS-TrafficTypeDiagnostic: CH0PR10MB4924: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vFfR3BSIpoojvfpnx56EZazHpYHdgWfkr1AimCSPoj3tYzOQaOOrvRfvyC/p87CPlj63CgjF4OitxZEYK6nKsuhSx5coLLg31v7QSZsefM9tMZXt3uAXVJ4CP0IembM8/OmHItTEE2ZW79eMgmxfA3GWlOlldTTZB1GxK6Z7Z5ranDSwvXVRyzdeHpzqGv/rDGezzTlWRwucT4EeQ+hX+9R5UX2CKp4ViW9bESbDLdKiypdGk/LFxQQ3pFLwfOERKeO/Gb43EtFf2WceUyXMmd+rhbAlVQd/MAH+CorxIeab14zF5MiK5Wb/N7VxdlR6qL2MtZ6dwpn97cIm4bqRP/b7lzxmfxDGZplu3FIPv0Ex0R5L77p6Vl6Vat6UiVftWKAc0t6RzYQMvQyIc/V3rP665m3Ri4hRP5X12DVWCyUGF5NJ03vteRQ2O3ED67w7ku28XWQd6DVlosnCNPGw6XogF85Hp4MqvlWEnpo+gGqtJ/FhDo3h8G6U3rCnx4WOE6OC5xpVTbNrTGosDVpOLh+3MTzXVrQ2nKGFfIMautx9WdwCIrEvdv4Q+dPVylAlXtv/ZFuDYC3KHWlaQ+pBq2UlTNFUqsDShrYb+GWkn67fvnOyua6beZo+zrpmV+lulf3EqyuSWhGQN4E8YLJ/H7sWEUYNKRoa8uBpU0RbamdpjQgHOFDy+QhVvjepmQBd7prNdatJO9pRR1KErZGJEw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4200.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66946007)(8676002)(8936002)(52116002)(508600001)(5660300002)(6666004)(316002)(66476007)(7696005)(54906003)(83380400001)(107886003)(44832011)(36756003)(4326008)(66556008)(7416002)(2616005)(956004)(2906002)(38100700002)(1076003)(38350700002)(26005)(186003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DiOn311C2qOdSBb3gzSKuKX9DKjBMZo+9Fen0ubFgcwByp/oS9a9WYNrumdrEam2DGtJsAHkJqtgsywQfSTlXV3uzMoZDL0iTZfsMrQDFVlSA17wl+SAR2Iv+TW23/McX0YJ5JMfu2E1SrEQ/j9FBf62c809+B8Wa1P7+aGf42Meamj3nf4A2c2ytmdjGQJRS1h/dQmGeuKYjTnXcp3xW2kx2TOeVjcVQao1qUQv4GZlfWgRLUQN1N3FkdAhyxL0E400Je2dKQT8uZhqtvBDHxUo2C8PXX0hmEn4VHlf3b/1tAJGGdV7cT8bjCIhN42I8FNXwQ1RXscPd+Ka/krZWnWW7dhPqX/gB6wS8Z4Zm0AImI6hspW5SHtyAuLa5Xt1Uucz1WREb5kF2XqQVyf5ypZAwkdw9u/RctUAuioELb6eJScL2/4fTSNYqmDn2qkNVUHWUWXcv9xebrhBb8HxreOkI3o7mTkNVck/FC9QHTjOZUhVc3FRgGpv4/+Twmi+DhZazkQZoYLRLBSG6cjQG01hungPfZtdh9JXPCE5LVm0jt8lgj+q9TU6HC8bNH3FNEwav4mnCa9kxAd1LMtQjSZGZIqRcsysUJ0KX82nUyZZu92MrO+RiivvQBMiLM5tguDtjc8xxMC53zcprwxr/Bo0m7oKxZ5KlGUDu/vdHuVniSIGimMmdoNpSixLIGVJcwF7v06+16lAvHd6Gc+X/UI5AhAhG0iMJtUWS5JM9ynugmWRVpuhtFPaYzW2EERt71y2efm8yyaBx37qpzKAZxKuDgEjFznUy0vTNYjxjTpzOTib9B9P6LzU+A1PXtkO+4n+WnIDxFjhLsj08I/C/gM5g1mTiV5KxKQi92QL3PpkNV4ytrEIE4ChVTxkRn8rEYQbFNbPiQNeMIyUE7Z/QY/wvVHMe0Z6xJbYejFMy0ThEqYoxQD+I+0nDNDftJ029ss5qzViEy/ivKUz6VxRkHvCXAeIdNgleBiMxS2h6aygrSuwYmGl++NF6DLuJ0yftqt4GZchwWCzxEyB/j7KnsXnOaS9kzV/j+rZezYKLf3j4YITpZaeBoDZzhWiSRyvbEbPu7nJckz8XE8eA/782PCIgZukUQbcoj/yngc1nGN2zsADU7tFHUSTVoHLprrK3oDKKN8FYer2LVxRPMHdi0v8yWqvZGO3zVtDgDn8a9o7q3EHF7wsPknu9oQ/dE4AvhvADtF3dBdbFqpzFTNPVfmPIjZ1AGb8Wx885HTQohW7QSNHU3CKehKNPptqOH/uwgJOeTdfcwBQ5cApKLgzetM2SC4GWh70kzjEacrgS+v39ygCJoYELa7JDWlDaO0t X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56b26c8c-616a-4363-9dcf-08d985043ea7 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4200.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 17:52:32.8679 (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: +ORK0X/SGKq3Ss6dCu2Lso6gT7G1mCCoOWGHCqLwV5XlK995Q964+8UGM3V7TVffmffVPNbK08vz9MutIroLAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4924 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10124 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110010127 X-Proofpoint-GUID: XU8OG_qETKqFpFCF6uMpn_yc5rxaXP3h X-Proofpoint-ORIG-GUID: XU8OG_qETKqFpFCF6uMpn_yc5rxaXP3h X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8A14E200173A X-Stat-Signature: zwzsozdejw9rb9wjw6g9exaqcdayqs4i Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=AnsYkF1P; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=GKYxu+o8; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf26.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=mike.kravetz@oracle.com X-HE-Tag: 1633110761-152348 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: Two new sysfs files are added to demote hugtlb pages. These files are both per-hugetlb page size and per node. Files are: demote_size - The size in Kb that pages are demoted to. (read-write) demote - The number of huge pages to demote. (write-only) By default, demote_size is the next smallest huge page size. Valid huge page sizes less than huge page size may be written to this file. When huge pages are demoted, they are demoted to this size. Writing a value to demote will result in an attempt to demote that number of hugetlb pages to an appropriate number of demote_size pages. NOTE: Demote interfaces are only provided for huge page sizes if there is a smaller target demote huge page size. For example, on x86 1GB huge pages will have demote interfaces. 2MB huge pages will not have demote interfaces. This patch does not provide full demote functionality. It only provides the sysfs interfaces. It also provides documentation for the new interfaces. Signed-off-by: Mike Kravetz --- Documentation/admin-guide/mm/hugetlbpage.rst | 30 +++- include/linux/hugetlb.h | 1 + mm/hugetlb.c | 155 ++++++++++++++++++- 3 files changed, 183 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/mm/hugetlbpage.rst b/Documentation/admin-guide/mm/hugetlbpage.rst index 8abaeb144e44..0e123a347e1e 100644 --- a/Documentation/admin-guide/mm/hugetlbpage.rst +++ b/Documentation/admin-guide/mm/hugetlbpage.rst @@ -234,8 +234,12 @@ will exist, of the form:: hugepages-${size}kB -Inside each of these directories, the same set of files will exist:: +Inside each of these directories, the set of files contained in ``/proc`` +will exist. In addition, two additional interfaces for demoting huge +pages may exist:: + demote + demote_size nr_hugepages nr_hugepages_mempolicy nr_overcommit_hugepages @@ -243,7 +247,29 @@ Inside each of these directories, the same set of files will exist:: resv_hugepages surplus_hugepages -which function as described above for the default huge page-sized case. +The demote interfaces provide the ability to split a huge page into +smaller huge pages. For example, the x86 architecture supports both +1GB and 2MB huge pages sizes. A 1GB huge page can be split into 512 +2MB huge pages. Demote interfaces are not available for the smallest +huge page size. The demote interfaces are: + +demote_size + is the size of demoted pages. When a page is demoted a corresponding + number of huge pages of demote_size will be created. By default, + demote_size is set to the next smaller huge page size. If there are + multiple smaller huge page sizes, demote_size can be set to any of + these smaller sizes. Only huge page sizes less then the current huge + pages size are allowed. + +demote + is used to demote a number of huge pages. A user with root privileges + can write to this file. It may not be possible to demote the + requested number of huge pages. To determine how many pages were + actually demoted, compare the value of nr_hugepages before and after + writing to the demote interface. demote is a write only interface. + +The interfaces which are the same as in ``/proc`` (all except demote and +demote_size) function as described above for the default huge page-sized case. .. _mem_policy_and_hp_alloc: diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 1faebe1cd0ed..f2c3979efd69 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -596,6 +596,7 @@ struct hstate { int next_nid_to_alloc; int next_nid_to_free; unsigned int order; + unsigned int demote_order; unsigned long mask; unsigned long max_huge_pages; unsigned long nr_huge_pages; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 95dc7b83381f..f4dad1ab12d8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2986,7 +2986,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) static void __init hugetlb_init_hstates(void) { - struct hstate *h; + struct hstate *h, *h2; for_each_hstate(h) { if (minimum_order > huge_page_order(h)) @@ -2995,6 +2995,23 @@ static void __init hugetlb_init_hstates(void) /* oversize hugepages were init'ed in early boot */ if (!hstate_is_gigantic(h)) hugetlb_hstate_alloc_pages(h); + + /* + * Set demote order for each hstate. Note that + * h->demote_order is initially 0. + * - We can not demote gigantic pages if runtime freeing + * is not supported. + */ + if (!hstate_is_gigantic(h) || + gigantic_page_runtime_supported()) { + for_each_hstate(h2) { + if (h2 == h) + continue; + if (h2->order < h->order && + h2->order > h->demote_order) + h->demote_order = h2->order; + } + } } VM_BUG_ON(minimum_order == UINT_MAX); } @@ -3235,9 +3252,29 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, return 0; } +static int demote_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed) + __must_hold(&hugetlb_lock) +{ + int rc = 0; + + lockdep_assert_held(&hugetlb_lock); + + /* We should never get here if no demote order */ + if (!h->demote_order) + return rc; + + /* + * TODO - demote fucntionality will be added in subsequent patch + */ + return rc; +} + #define HSTATE_ATTR_RO(_name) \ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) +#define HSTATE_ATTR_WO(_name) \ + static struct kobj_attribute _name##_attr = __ATTR_WO(_name) + #define HSTATE_ATTR(_name) \ static struct kobj_attribute _name##_attr = \ __ATTR(_name, 0644, _name##_show, _name##_store) @@ -3433,6 +3470,106 @@ static ssize_t surplus_hugepages_show(struct kobject *kobj, } HSTATE_ATTR_RO(surplus_hugepages); +static ssize_t demote_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, size_t len) +{ + unsigned long nr_demote; + unsigned long nr_available; + nodemask_t nodes_allowed, *n_mask; + struct hstate *h; + int err; + int nid; + + err = kstrtoul(buf, 10, &nr_demote); + if (err) + return err; + h = kobj_to_hstate(kobj, &nid); + + /* Synchronize with other sysfs operations modifying huge pages */ + mutex_lock(&h->resize_lock); + + spin_lock_irq(&hugetlb_lock); + if (nid != NUMA_NO_NODE) { + init_nodemask_of_node(&nodes_allowed, nid); + n_mask = &nodes_allowed; + } else { + n_mask = &node_states[N_MEMORY]; + } + + while (nr_demote) { + /* + * 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]; + else + nr_available = h->free_huge_pages; + nr_available -= h->resv_huge_pages; + if (!nr_available) + break; + + if (!demote_pool_huge_page(h, n_mask)) + break; + + nr_demote--; + } + + spin_unlock_irq(&hugetlb_lock); + mutex_unlock(&h->resize_lock); + + return len; +} +HSTATE_ATTR_WO(demote); + +static ssize_t demote_size_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct hstate *h; + unsigned long demote_size; + int nid; + + h = kobj_to_hstate(kobj, &nid); + demote_size = h->demote_order; + + return sysfs_emit(buf, "%lukB\n", + (unsigned long)(PAGE_SIZE << h->demote_order) / SZ_1K); +} + +static ssize_t demote_size_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + struct hstate *h, *t_hstate; + unsigned long demote_size; + unsigned int demote_order; + int nid; + + demote_size = (unsigned long)memparse(buf, NULL); + + t_hstate = size_to_hstate(demote_size); + if (!t_hstate) + return -EINVAL; + demote_order = t_hstate->order; + + /* demote order must be smaller hstate order */ + h = kobj_to_hstate(kobj, &nid); + if (demote_order >= h->order) + return -EINVAL; + + /* resize_lock synchronizes access to demote size and writes */ + mutex_lock(&h->resize_lock); + h->demote_order = demote_order; + mutex_unlock(&h->resize_lock); + + return count; +} +HSTATE_ATTR(demote_size); + static struct attribute *hstate_attrs[] = { &nr_hugepages_attr.attr, &nr_overcommit_hugepages_attr.attr, @@ -3449,6 +3586,16 @@ static const struct attribute_group hstate_attr_group = { .attrs = hstate_attrs, }; +static struct attribute *hstate_demote_attrs[] = { + &demote_size_attr.attr, + &demote_attr.attr, + NULL, +}; + +static const struct attribute_group hstate_demote_attr_group = { + .attrs = hstate_demote_attrs, +}; + static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, struct kobject **hstate_kobjs, const struct attribute_group *hstate_attr_group) @@ -3466,6 +3613,12 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, hstate_kobjs[hi] = NULL; } + if (h->demote_order) { + if (sysfs_create_group(hstate_kobjs[hi], + &hstate_demote_attr_group)) + pr_warn("HugeTLB unable to create demote interfaces for %s\n", h->name); + } + return retval; } From patchwork Fri Oct 1 17:52:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12531279 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548F9C433F5 for ; Fri, 1 Oct 2021 17:52:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E9D6861A10 for ; Fri, 1 Oct 2021 17:52:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E9D6861A10 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id E5AE59400E4; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE13F940121; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C32449400E4; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id AC4F2940121 for ; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 61FFE8249980 for ; Fri, 1 Oct 2021 17:52:44 +0000 (UTC) X-FDA: 78648613848.28.33D9D53 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf11.hostedemail.com (Postfix) with ESMTP id DD0FEF00020F for ; Fri, 1 Oct 2021 17:52:43 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 191Gx6GC011126; Fri, 1 Oct 2021 17:52:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=+yqbwHdGWttKhN7nmszckzQMd5R0+R6b0HBaQLIonpA=; b=cWU2rLf5CyAWZcR2WTJZS/MKE2JgEaMdGTZI0Tkd8ICLIpuiI1oyOS0iom5IBw9xFA5C rpGBo5pNWT55L/mJFNZSLOCFcnjB1Bk3KREpSlqBsai0bkKr24pJP6mhDMmTmL1a0gUK QI2Yf4qbpBT3bkeHV0n2/sIFyOmp6DcYlxspluZx/RFNdogbveUdtXbUJNOU/NjbcpRN C+UQgp5ljKFqBlHqAeiTG2BYibkt84JuJNwW3NYxQp4UEvCQaq+QyBlzRkNGo5tL8lHN NiRPPNSNew6u3R+NC1k80cV0q6PIb5/M7Ln1MnSfw/Jhs1cfUDkEHz3ulL7ty0QqyG7c 5g== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bde3chgyp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:38 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 191HkNvs109128; Fri, 1 Oct 2021 17:52:37 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2171.outbound.protection.outlook.com [104.47.73.171]) by userp3020.oracle.com with ESMTP id 3bc3chupan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fk4dw+hUC+8HDVv3zNWY3hks9HbsyfIYeyjBmca6vYSHpiIq2v+x32DHKD9WFZRtV4f4giBcygReK2xVArkuQ2OIMQi2AstrcX8ua4nFAEkBXSUC2cdbxHVzZwJFjjdjgl2OqKFwrBCxNFdHi/kzFj/RdujmIXa2RU67qBb2tIT/TS16b13RWgaleA7Na59W1lijf6iTBp4cIEzBtxPaAP3Dy0ZJ2avHp6LzLg0RIeZ5p4YZ6qOJxdwmvdVGqiwSelqPpX06gHXThltIZs8jwaQQd2gpIkljMLgfIO8a+C64WGGj6H7AdxTZFbP/4kXo33t5u8P+JcBR5CX+W2dzlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+yqbwHdGWttKhN7nmszckzQMd5R0+R6b0HBaQLIonpA=; b=fNskxlnUe0z6bpFvd872lZAYv4m9c+twWuFGTE9IzINIxPvsAN2o+eE4lGUEdVLnqjpZ8vLi+fyONVhCoW0x224aj60ckq1QKxQSENAgj81VnrH/HhI3c760NPHuLHbdH4NDyDzVFckILSv25/o93iPcWN99j4vMk/TJsRL/ZmIK4N8EYiov1xESYt3Y3GVoSMw7M4EvWEyu12oYZotfT5mogU5VuFnUK8z6BldEbtNNe3RgTeUfxh5iQffAaYFM0K1fnTORq5qRkqjaIcbLkjeNTef8ZuIN49WJp+rq5IgRgsSQ7hGIayHJyfMzxpHWGGppwLolZHtbp+F9ecFzwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+yqbwHdGWttKhN7nmszckzQMd5R0+R6b0HBaQLIonpA=; b=d9gI687hLopzuFAM8k6wNbKaePdOcLqax7AyvsKObGrJVQnUn5E9JF8ZPrBaKZ+u6IzsMuLAJ1eu/3jFlfK/Vxvmley6f9QTA8n4ZcSI8NKfVwhuHAg9AG7bLuxpCIwhswPuq9x7FvIt1YB0oXJWgXt38Mv6sWazV/iHdkHzk8Q= Received: from CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) by CH0PR10MB4924.namprd10.prod.outlook.com (2603:10b6:610:ca::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Fri, 1 Oct 2021 17:52:35 +0000 Received: from CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73]) by CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73%9]) with mapi id 15.20.4544.025; Fri, 1 Oct 2021 17:52:35 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Michal Hocko , Oscar Salvador , Zi Yan , Muchun Song , Naoya Horiguchi , David Rientjes , "Aneesh Kumar K . V" , Andrew Morton , Mike Kravetz Subject: [PATCH v3 2/5] mm/cma: add cma_pages_valid to determine if pages are in CMA Date: Fri, 1 Oct 2021 10:52:07 -0700 Message-Id: <20211001175210.45968-3-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001175210.45968-1-mike.kravetz@oracle.com> References: <20211001175210.45968-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) To CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) MIME-Version: 1.0 Received: from monkey.oracle.com (50.38.35.18) by MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 17:52:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07ea421b-1d8a-46e6-ced9-08d985043fec X-MS-TrafficTypeDiagnostic: CH0PR10MB4924: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sY6IDhkNoxrRFQxv4tFsW7n8m0/L+xMk+OJTwulrg8vf/YeBevsuPLtzaBVH8iuEhevS8023D8koBKagdUS1LTHZ/kHF0Nt1Nb31E3rt9Dlzo374xZctLo/CTk5T1fcTEc0FYdgwfguNKhkF3hMEbE9QhqACeWoCb1+0miGpIZ3ylY37FhY2orlHlcjS1Ez5xofSA7uaFMCbix9YPdjTkV3nasVfFFP4Cg9/VsLYW+FY9zOZSMrSj6p4hlnGhWWy12lvz+Tta6DKvtiasQgRfW5Hv0H1VzT7EZ9qwpO8eHTQsVbYKkxq7su90NbuhZKd5Zrjh8J7oGOIz4F+bgRRw8E+jlxEmQtr0DRMJJY0yQSU+xeAFMU7zpT2SEl1y4nSqjHShGrX5rJYqKw/4wyaQVtXxJiMCLgpT4jKEVd7lLLPDGeFZWr1ZqbJ+Fa7WDsCYhmZOtLcOTsfCMXNxyXw/Yq2G9fSMpmPoBmBc56LjA/5VtZ84q0buVRr2keetgdxSZIWYjHCB5MDoav38//AC9zjx2SFySsc52+GEkfMoW2usDbBqntDbA5QvHGF/SYUWvn3HrPnqCH8elw7VSodnRhhdx2FflUeetOhwcT/p1AHIS0XN0jIDLuutDwlgsxukdv1Bs4E47qT2njYIh4NnmuLwomAJCxBHZVDcD5Rqg6k7YCvkN//1cZTzxh0eL9jXfUgXO3sYo6INx8DYOpLng== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4200.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66946007)(8676002)(8936002)(52116002)(508600001)(5660300002)(6666004)(316002)(66476007)(7696005)(54906003)(83380400001)(107886003)(44832011)(36756003)(4326008)(66556008)(7416002)(2616005)(956004)(2906002)(38100700002)(1076003)(38350700002)(26005)(186003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZCPat+gf5ttt57RgJGK+CcKXL3Fi0AI2VW+KkP7ZNpUC7sYOltlDY6L4AR7yTLaPXgyJn1nM4aliKPoLrbhUyl/SvZJOb38klqoMULrLXI0Y9/13pHBThOJxhD11+/Degvfi5Fjc8FFVlgCjsWfVRfWa2rZnMLdf59eSJPDJBJryjWgYYBw/8zI3bPtujcGqGbMHnczZVKNRD3L0YwKSo/4mOu4x9309GI8p+srKqCkwYfcAsSE9CNN8ecuRkPZdSlWTDLc0kEUev3Hz6xXtd5VMfGuYZYczMmBpb5mLN7j63w50lQ1gUTvIDRZTaOdewUQAavwYydJg/BlnJMaKyFDDAsof9Boc/w/MUXwejio3mwpFcRRTfIg9eM8qw+IDbqGeisLFPsGwoOaQPn4KLGO206DkmNMVpKOO6zVdjJA4NKeainDnPMbdB7sk7dOb7s6Affb4jHhewwbaQqK4bOteX52+EOHzhFOQqlHgAdUnF8p7LVpiPfu9l0fJLhLYNcafmkDC5OlQJP/+if4/2Rzfgz5nRm6op5evJvZqzDUuMny0YYxZFmPxQSmibiB5fbQtX+HGS2hJ/YpBAb7qN9uC6D4imZ+EURi5DqKZu6QH+9HtgNK7NURNtZ5BCR+H4GRjeZ/cW0Qo5y8OfvARfbFiLSqHkkVqNfqSsqNzVqpEMGge+F9VbgcEy3PfUH262I7w7tcChhcq2MMOoDYQpheLfmWOhfVZLbgsngMo5izpQ52cOyHMvhNsab5cNxskpwL7dodHRm1HaKs3+DxHPDY2CrATDY6RUbRQLs28yTlZg+s9OnUE+xkJqj+NJh5zuDk5FvgNNDgxudyiQELmEfqtrP4j/k+/ZOFCwRrMjjmSCmSFiGfGgofWtNoC4bEmg7vzI/7TLC/IxSj3HY/9gU6AAREFewTMcYTCgx+Lmw06kYt+yu1A/3KquZ2w1kKRvP0K96VfXu/tsO+sU2fs5yQYkmlPP0DwFm31VRg5kSJefujc0EVUO43noZilFaPloAK2OQYQeLa3ex0oQT20ggHE/BUn9pMejstjUIr8pOGgpUmQWVn4HtOgUyIKEaF6J0JyheYJSYEn6mbnJMuFVfo15m/zm+CLiQzxoIy65WpVlSH45nEHOEk2IdZHXYZLFBawfof4IooDIH7Lrpao0Ikz1hlzoZiqYNK/QkGLmp3ydEvYgBewwf2JDqWnHqO9uWbYtAmsLne0C3OGbSw1WsnvHYn0YvEyfYgSUk0jKEVF+PyRHuHNtOCJ2vh1X6bklvfsOndR3oLEo3qSBfSJFrp9D+egkg2g3wXidn0TQdQ13U99i3gH2UNaqbiDicCh X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07ea421b-1d8a-46e6-ced9-08d985043fec X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4200.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 17:52:34.9608 (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: Jzxu0dwBF2OeyGzg1pmtNe7awYT5UzDcRUZQl7Ynz7ZSHLomeR/9V27R+bCvVMyvAfapaVK+Nx8/TNYjs44ZFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4924 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10124 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110010127 X-Proofpoint-GUID: ZYjnydTQcoqQVV6Huq2RBk1XYA-nhW72 X-Proofpoint-ORIG-GUID: ZYjnydTQcoqQVV6Huq2RBk1XYA-nhW72 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: DD0FEF00020F X-Stat-Signature: o6nq4nrz5r9h14ujpr4mua38nzdmdepf Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=cWU2rLf5; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=d9gI687h; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf11.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=mike.kravetz@oracle.com X-HE-Tag: 1633110763-301870 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: Add new interface cma_pages_valid() which indicates if the specified pages are part of a CMA region. This interface will be used in a subsequent patch by hugetlb code. Signed-off-by: Mike Kravetz Acked-by: David Hildenbrand --- include/linux/cma.h | 1 + mm/cma.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/linux/cma.h b/include/linux/cma.h index 53fd8c3cdbd0..bd801023504b 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -46,6 +46,7 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, struct cma **res_cma); extern struct page *cma_alloc(struct cma *cma, unsigned long count, unsigned int align, bool no_warn); +extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned long count); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count); extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data); diff --git a/mm/cma.c b/mm/cma.c index 995e15480937..960994b88c7f 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -524,6 +524,22 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, return page; } +bool cma_pages_valid(struct cma *cma, const struct page *pages, + unsigned long count) +{ + unsigned long pfn; + + if (!cma || !pages) + return false; + + pfn = page_to_pfn(pages); + + if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count) + return false; + + return true; +} + /** * cma_release() - release allocated pages * @cma: Contiguous memory region for which the allocation is performed. @@ -539,16 +555,13 @@ bool cma_release(struct cma *cma, const struct page *pages, { unsigned long pfn; - if (!cma || !pages) + if (!cma_pages_valid(cma, pages, count)) return false; pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count); pfn = page_to_pfn(pages); - if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count) - return false; - VM_BUG_ON(pfn + count > cma->base_pfn + cma->count); free_contig_range(pfn, count); From patchwork Fri Oct 1 17:52:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12531277 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 721ADC433EF for ; Fri, 1 Oct 2021 17:52:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EFE0F6115A for ; Fri, 1 Oct 2021 17:52:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EFE0F6115A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 88CAB940120; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8142B9400E4; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 666DF940120; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id 51B959400E4 for ; Fri, 1 Oct 2021 13:52:44 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EC66F18260C96 for ; Fri, 1 Oct 2021 17:52:43 +0000 (UTC) X-FDA: 78648613806.13.B0384D1 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf14.hostedemail.com (Postfix) with ESMTP id 7EE4160022C5 for ; Fri, 1 Oct 2021 17:52:43 +0000 (UTC) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 191GlTMq005267; Fri, 1 Oct 2021 17:52:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=7dalMIrGbHq7VXgagd4qH08OoOiTNy3EBK6658fLPVs=; b=ZKzm2udg054M04/WBtJhwaflGRDxfk8EwguyFou0h0QJqDJ8LUREvrBu3VvoUOd2nmgs 6NNXt+TA8+aPtvyjQXikj9UJ9eIYG0xlPOHU3SXmV08M5xji8h/dwdHsE9IxbnbK1ha/ Zwwy6OhzcxyJU3JRFCXnXRWYAii8zcAaIhqQ/NLMLD6JR5V0LICw4RVjS0CmQhNFOWUj 5WU0jGO1H+5NrT+p19ZDIuLI67ZV6metIcTEYhbpXP0169Fz1MdryInQTCi/ibEUzYCn 4wJ9psRHyVDAI76igKY8iI3ItiYyHjRsx0MT9BbZbBxvM6M0SBmm70XhPx7kyK9oC4cW DQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bddu91jjb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:40 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 191HkMKF109010; Fri, 1 Oct 2021 17:52:39 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by userp3020.oracle.com with ESMTP id 3bc3chupbg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SC4n4Dkrnd8L4M7Sc34haDQyoNmU4jPi6QUsPWRPMkZXwOGR83W6hVkNcDz+bguPr6sw35Hri2tJ3jvePWJt9+n7plVXuaT6lb6KLFBwUCoizc45oTzyzDoZFkOsm2hYd7D2yZE/NkwC0lgqjc04CQhpzXpWePLIj6s0qThsGIE7vGP+nL4pMNd4S/F584KPcQgKncvVwZBLJX7JkLN8NPh9PzqdHzJbsk95nY7GF1vO/IWdpNQ76tFhYcS3cbLgWE5oX2xcfMfQ9qIPboRahXw13MZ8Tf1tmFIw2zCrupycGEshmz6GFLql5kE8W/a5pr5g5N9XRD2gdDKSXEzxGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7dalMIrGbHq7VXgagd4qH08OoOiTNy3EBK6658fLPVs=; b=Kf/6GnlllAHcpEY8tBtYlP000MeXZTzyt/ughJLo+L/abdoC7xo65Q7MhPRpARUiuMCRKEYnwJx/+6qo8+Ih7MwxRLnhfTAaBoleUh9rKCxiDfIsB+faH4YHGP9orY1TgOA77K6TSRo2WVt//1iWO7BntNOUGevpvLgTCoiAAVUlw/4ZEeorsfHz+74XBMHCwbMnmLSPj/8L3Gd7arw+GdNT1Pz6s2oat0vr7FPgEJd1Nhm2Wx0zwkTObd17HYPc31+6kIZsKSkiq7HaG3ovX3icQmHlqjO/W2Ab/Unx9srloj4tBpn6FS0fxnekZ+7txqmS3r8ex32WABXoMxApTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7dalMIrGbHq7VXgagd4qH08OoOiTNy3EBK6658fLPVs=; b=HqQq8JtbWuwlo/YnZSoeQ9VapONAswUR8dIBm5XM/W6mDGtOYEUf8tmWU11a3OoyjLUlVIRcbd3a2iGSZGkTUeR58NFWJ7ipgRAogsKdR4B1rQE1ZIAsRzV57/y5+5O/43QYBlY/fmvXvt/vx5vBN1sIMwHQmNqNRGguQFTUjxc= Received: from CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) by CH0PR10MB4924.namprd10.prod.outlook.com (2603:10b6:610:ca::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Fri, 1 Oct 2021 17:52:37 +0000 Received: from CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73]) by CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73%9]) with mapi id 15.20.4544.025; Fri, 1 Oct 2021 17:52:37 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Michal Hocko , Oscar Salvador , Zi Yan , Muchun Song , Naoya Horiguchi , David Rientjes , "Aneesh Kumar K . V" , Andrew Morton , Mike Kravetz Subject: [PATCH v3 3/5] hugetlb: be sure to free demoted CMA pages to CMA Date: Fri, 1 Oct 2021 10:52:08 -0700 Message-Id: <20211001175210.45968-4-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001175210.45968-1-mike.kravetz@oracle.com> References: <20211001175210.45968-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) To CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) MIME-Version: 1.0 Received: from monkey.oracle.com (50.38.35.18) by MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 17:52:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a29e1f88-216a-4822-36d2-08d98504412d X-MS-TrafficTypeDiagnostic: CH0PR10MB4924: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: niYF+GsLFxCPgS57khWQODrCiuNKhvJ6kYV4x5EpXHv+xOPmrUaX1Rsin1McUp4XGRlPOVgmaKuhsYH/wP9FaCFqOuyAeM9LaJLNvtvQqik86aWhVTX2XFXnTPVXolVvtYm9mAllc8MA05fLbE0w/v7TlBibBudbiC4Xpz2/KZAiIoyfNkeNqGayZnZnkg4G6azdzlzJpJ1nQEJI9kLM0Bhx0yCun4KDwT2Uao0h/Nzfk+WexSojEdEpPFwz+EgyFbkRlH1F9S7l11eG8S5nUWMKF/XRHRFlATvoL5mMpvtNLdy/i/XUF/Zeccrj6h/klizwhTX49rxFuIOwpmY6m60B9YDkGbWLkTKFK7TyLmQiR+yUkG9X8NUewfBF6bkzaMMqCWajn/a2r9BuzH0zGcnYvcasQbtvdYHKyza5rxHmaQy86xn6eV7nKf/2uvxHsCC+s2Bk+PuTwwtlHD6VI8k2BTfTLPIf3EI+35jGIgvEDXvB1o/4NPpU/SZILpHaSiKEXAEiOOscghO8j1F1iQDVIxPPGOtwDp7S8GxmxMePjMtyxreHrzHTNerm8/CJHDxlaCJtWrQfku3EHqoUp63VRotXXl76DDfpvjUewnChRqIkmrt111D8TTxSbOxglhc+cOQ3PjiLASw6HcySyRuxHQNnhIM6nPYqywf1MxtYMjMU6rNaJ0D1hC3p63EzNTyxXyizhDch+MArVaymIg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4200.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66946007)(8676002)(8936002)(52116002)(508600001)(5660300002)(6666004)(316002)(66476007)(7696005)(54906003)(83380400001)(107886003)(44832011)(36756003)(4326008)(66556008)(7416002)(2616005)(956004)(2906002)(38100700002)(1076003)(38350700002)(26005)(186003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XnWQqhLOI5sKlyfp+RBN/8YlHYEE4Pa6vy1FDHvDpLTkvFZaQAhEFPDeD6h6QgJQ5p7tZgr2BN3fpzqSefdS+oJ2HKPSWWARZiZ8S13ZuL58PuLV00vr60pM3INwmgwC36bVkk6KHhLpMyHd7HxmnG2aeiluTq56Bdw5mjM3p5jKzY0tkn5CS7AN1NDOQhw5rY8aOpqG26k1pHaGcTioPGEr4248QwPebdajpJnr7Rh4GXk9qXv/cxJLuNY/z013YhfwnCwM7O8/Oqusz0POUif6YmALYk1VWlYmoRVMjHappCOX2BY/+V61utIIUCbzCPz9iJv8vwdMFeksPAt8RnG9GIn0IaNK8bO67nxZZRviI7ppWOHLMEr+hkUy5dc1wB5FHoOVsSnF1knFSpUcicBz7AoTDrA9Qhju6KDcW2ED0IVqT8u2LmsGUmnnaAJ3oYZRG1FjA8Xbgr8vTYtdHVMzurXdR4lD5fbY0YSYjAlC0CSVkqh+2FyZ32CF+VamrtC3mxI18Y5kwlniN+h73q3RCQwiS2S0dbdh5gUxNEQsPKXRuLR5fTGGBYI2FbYv/j+EfJaIae528ZH5zZDq/OYRVp/D040n1+gdissXP5PP3YgFNbh179Q+x1+Jns+znfHQaJrw6miu4PB69YBLIg/YnxmK3oTVH/kLTY2fhNYuSJT1Xx7no7N8cSguD3ODVaxi76r0LscVc1nWe8XL7aU2ThKfsz7Jf6Aynf7jGbEJLT9aOU+fyKSCUUNi9SQUL9jORJd8sdyoq2QD7CvLnBwSiY2ECz0+IGsD1BsiRpxUwq+RBrWEXPaDl3gvgmqvUdLndqIp41rbSW+2sWX0o9tOLYFHQidIaoJCxlidX8EIfL3vyUH/NzUAw0kFLuFlneGPzRCNgdrfZgod2jfNWBSaA8I3yQG1WDZiYLX7y9h7sP9Flcg11o1rbezr5hrX98rHQum9zR8N3zPdB20FzT8uJwECys4kPcnrU5Yu5sca7LckfO1RlYQZH6lfkVftwwOfOfGYOJk41juqDoProj2olDXQyqzr/7CkF+5YZ2U+xAlaYW+19Dm4rejbqWmwVUCyLLY5njDYP1M7uGUxvnQmLmceyJ/4zdZt6NV1MUSEwP06Fk5wmTNi7vHHuAsFxRij25yEuk+tcikZLzSkThQIF0f/GqkMKBgZFIMXc0q4z9zTypbjZ8Xo4AdMgEftRQrGNFGv9rYHgz01k6HrukpA9Pdprp2UCTmzsPXbJRr7arD8LBft3h/plldlOikWhXrf6ZbwM2tY7ATVSojQeCztf9S9ckaANAvaQqEGlps5WPoZdgxh6+znxBG+Z9jS X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a29e1f88-216a-4822-36d2-08d98504412d X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4200.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 17:52:37.1681 (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: 1X75UyMKlc4Ey8qsoEcDaqRi5/H9WhdgKxNBYSNhOVBZjQUFx6/eFe1H8IONubbS/3aLagih+d3cz3t2yuaCnQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4924 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10124 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110010127 X-Proofpoint-GUID: PbUjBTRAdqpm8D8WN4RBfTGjXgZLW2mS X-Proofpoint-ORIG-GUID: PbUjBTRAdqpm8D8WN4RBfTGjXgZLW2mS X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 7EE4160022C5 X-Stat-Signature: m177e1w7hmqwbkkqj6khz88ju315fkjw Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=ZKzm2udg; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=HqQq8Jtb; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf14.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=mike.kravetz@oracle.com X-HE-Tag: 1633110763-57863 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: When huge page demotion is fully implemented, gigantic pages can be demoted to a smaller huge page size. For example, on x86 a 1G page can be demoted to 512 2M pages. However, gigantic pages can potentially be allocated from CMA. If a gigantic page which was allocated from CMA is demoted, the corresponding demoted pages needs to be returned to CMA. Use the new interface cma_pages_valid() to determine if a non-gigantic hugetlb page should be freed to CMA. Also, clear mapping field of these pages as expected by cma_release. This also requires a change to CMA reservations for gigantic pages. Currently, the 'order_per_bit' is set to the gigantic page size. However, if gigantic pages can be demoted this needs to be set to the order of the smallest huge page. At CMA reservation time we do not know the size of the smallest huge page size, so use HUGETLB_PAGE_ORDER. Also, prohibit demotion to huge page sizes smaller than HUGETLB_PAGE_ORDER. Signed-off-by: Mike Kravetz --- mm/hugetlb.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f4dad1ab12d8..a15f6763e8f4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -50,6 +50,16 @@ struct hstate hstates[HUGE_MAX_HSTATE]; #ifdef CONFIG_CMA static struct cma *hugetlb_cma[MAX_NUMNODES]; +static bool hugetlb_cma_page(struct page *page, unsigned int order) +{ + return cma_pages_valid(hugetlb_cma[page_to_nid(page)], page, + 1 << order); +} +#else +static bool hugetlb_cma_page(struct page *page, unsigned int order) +{ + return false; +} #endif static unsigned long hugetlb_cma_size __initdata; @@ -1272,6 +1282,7 @@ static void destroy_compound_gigantic_page(struct page *page, atomic_set(compound_pincount_ptr(page), 0); for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) { + p->mapping = NULL; clear_compound_head(p); set_page_refcounted(p); } @@ -1476,7 +1487,13 @@ static void __update_and_free_page(struct hstate *h, struct page *page) 1 << PG_active | 1 << PG_private | 1 << PG_writeback); } - if (hstate_is_gigantic(h)) { + + /* + * Non-gigantic pages demoted from CMA allocated gigantic pages + * need to be given back to CMA in free_gigantic_page. + */ + if (hstate_is_gigantic(h) || + hugetlb_cma_page(page, huge_page_order(h))) { destroy_compound_gigantic_page(page, huge_page_order(h)); free_gigantic_page(page, huge_page_order(h)); } else { @@ -3003,7 +3020,8 @@ static void __init hugetlb_init_hstates(void) * is not supported. */ if (!hstate_is_gigantic(h) || - gigantic_page_runtime_supported()) { + gigantic_page_runtime_supported() || + !hugetlb_cma_size || !(h->order <= HUGETLB_PAGE_ORDER)) { for_each_hstate(h2) { if (h2 == h) continue; @@ -3555,6 +3573,8 @@ static ssize_t demote_size_store(struct kobject *kobj, if (!t_hstate) return -EINVAL; demote_order = t_hstate->order; + if (demote_order < HUGETLB_PAGE_ORDER) + return -EINVAL; /* demote order must be smaller hstate order */ h = kobj_to_hstate(kobj, &nid); @@ -6563,7 +6583,13 @@ void __init hugetlb_cma_reserve(int order) size = round_up(size, PAGE_SIZE << order); snprintf(name, sizeof(name), "hugetlb%d", nid); - res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order, + /* + * Note that 'order per bit' is based on smallest size that + * may be returned to CMA allocator in the case of + * huge page demotion. + */ + res = cma_declare_contiguous_nid(0, size, 0, + PAGE_SIZE << HUGETLB_PAGE_ORDER, 0, false, name, &hugetlb_cma[nid], nid); if (res) { From patchwork Fri Oct 1 17:52:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12531281 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E694C433F5 for ; Fri, 1 Oct 2021 17:52:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E92461A10 for ; Fri, 1 Oct 2021 17:52:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1E92461A10 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id BC532940122; Fri, 1 Oct 2021 13:52:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B244B940121; Fri, 1 Oct 2021 13:52:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 901FA940122; Fri, 1 Oct 2021 13:52:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id 78E1F940121 for ; Fri, 1 Oct 2021 13:52:48 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2C2A53A8D6 for ; Fri, 1 Oct 2021 17:52:48 +0000 (UTC) X-FDA: 78648614016.32.03F27A0 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf05.hostedemail.com (Postfix) with ESMTP id A5C9E506C726 for ; Fri, 1 Oct 2021 17:52:47 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 191Gwn7s011112; Fri, 1 Oct 2021 17:52:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=kFzMwKxnbfSGwrvHo+Y//iX48aKR56ZuyLEE1Iabk3w=; b=eIC+oLRAzB241hONeu0vbTkhceLLwuk30cUORIGxeIg36pJ/xAyRdVgvxnVkiTaHSssc BL784BU2u6mEFgSDrPfydAXJqG1gs8JbaUaquULmjQgfrMV64tmxejnHhGct/jvbywD4 yJFviv40P0NBM0C+DRdzLRx4sQo8iAkfnzEFlPgRvILJetp2osHvdFNUeE9g1rJHpJ8F yAkAHK9lP3ZDhrQekzYe1rQ6mH/6cr6xsEswAgBkOBZT0LTL864Le6TUsUsdU+j04tku /65kPdsbmtbK3D30XhyBIzY34dEKmplAp3n4bfMWt7/koL6j9aSTT9KvNjJ4gkLqCxYK 0A== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3bde3chgyv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:42 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 191HjJHW123520; Fri, 1 Oct 2021 17:52:41 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2108.outbound.protection.outlook.com [104.47.55.108]) by aserp3030.oracle.com with ESMTP id 3bd5wd0epp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ecOlRrjqV+zlP7P2BQ0IOssC4L0ASAlrFeJk2NWKMfQwv96ShIaVXRrZUSg6QTavDxFj3xDVokH+UAQguerdyp8OAF3puV+AYP7vKyytlvJCnkg7Fgng+XgnRaAiJZXeHqmA49WcLuCbjYu0yv4ydwvSeJKhNbVRSeNQF+CzxRwSgc4QzN+CMuA2UyXitxbVRYH2w5TqVt/RBlOGV1Q9TkH31tSbuxZtmmMxfLvDKvawHJq1esLWgXqPYOBHHp7GmlUa29zI+pAClYM+DYYTE6XhtZoDOKg5VZJCKxFPGkJslZKcStJsrGFMXT/35QqIMhiYjrb/EuGDHPA2bTaXzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kFzMwKxnbfSGwrvHo+Y//iX48aKR56ZuyLEE1Iabk3w=; b=WDvoqxRPoo8sgcaQwU+YDvVHarF4kuBUtiF8qcH09FQ9nxbB7YtEvCXEeiwp9zTE++JROQuAG2MocgFqpGGnMeMYf7kNV5wxYVSbLhskTksE2jIwurc3+h/gc5yynZGBsYwCkauhtBMmtGTgkLI43gtffWLYTnJHBsT4LRgsgIhAFDTTM40/HLTUHK4MqXfygYK4Dfv5oUlTKlnL26rhGxM0H4GzdxtCh9eVQMmTZrVq/bQs20MQIi8w3gDwy98v8uxKg/LXnbNipTBTEvS6kt8tkT81H6AOEkNOpV/fip5YBxenrQ2z2XUtEz2Llk0aDXe7Q7V11YeNT6Esrg42lQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kFzMwKxnbfSGwrvHo+Y//iX48aKR56ZuyLEE1Iabk3w=; b=LozMtquc7hNeFnjbk/JIZFPOL8Ww/dvMmjsBvF9ZIyo3kJE77Zyn4cHkE4Q1dPNvProTkhdlONDIPssK4eRfF6Sy51L0vkOsRVeCRi7Wli+3as7vSlLZXuW4a4h3gRtjW964h9lfWS7mFL8wSfAip+7fjClLAkpMyBl8dvcPxOU= Received: from CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) by CH0PR10MB4924.namprd10.prod.outlook.com (2603:10b6:610:ca::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Fri, 1 Oct 2021 17:52:39 +0000 Received: from CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73]) by CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73%9]) with mapi id 15.20.4544.025; Fri, 1 Oct 2021 17:52:39 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Michal Hocko , Oscar Salvador , Zi Yan , Muchun Song , Naoya Horiguchi , David Rientjes , "Aneesh Kumar K . V" , Andrew Morton , Mike Kravetz Subject: [PATCH v3 4/5] hugetlb: add demote bool to gigantic page routines Date: Fri, 1 Oct 2021 10:52:09 -0700 Message-Id: <20211001175210.45968-5-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001175210.45968-1-mike.kravetz@oracle.com> References: <20211001175210.45968-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) To CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) MIME-Version: 1.0 Received: from monkey.oracle.com (50.38.35.18) by MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 17:52:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7223aaef-8062-4286-9625-08d985044288 X-MS-TrafficTypeDiagnostic: CH0PR10MB4924: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4x+IJuQ9ibne+f89qQC+0g7Yt+NTeaU6M2xLaCsnlpOhUI2foKqKGnO4/ULFdZu9nwfsyQW7rHPtn0GOQYu4s+45v9Jr7pOt7yo/uK+Masiu587FZJV3M2iDajncsM0VWibYEnMEcusu3/QNOZ7o+iLNt7Elnxi5pHo7vsih9ceFjRf7S0n5rBqXD5Nh4XGPdRr1KZELBJT5PJzDiNVcm3b/eCUaQzXpHgRvz30InNqRbrImvg5smXquEqnYNdFpgZWLVWQjcNxPsn2XTOZ/l1Avk0PomnFiFYFx5pxP43CCHEPWCGqyoI/YsMBpl/7THEAQcXnlLkMZRHiMid7cHNpkbxrSIM9Fbe/t7pS/+FdH0KCoWlRA4kVn+5jZeeAtIk1ghq8lkcePV0HKc9qUA5Ye2OPmcKyRSp+m2i6fq49wIlXBmbal5SV+QBdOOFZNplfdd8/n/yx0BojZTaEucI6mD2QmasHG8do57oGcOJ3mBsUFsYaduUcIig1vDFosd0KUwwTABBH3yfWDbutjoevyjlJZPnu1jEu8CK6tAMKAl0zrdPHy8TigOha7+D6Edk7d07Hhc62kHAkD5w+zlTlSMtpu+NjaEnkPo8kWWUW5usJh9u0P3y7RWa90rzBV7lL3vHO1c/LQFAda2wHXID37vknB5wm+w2aK0VbFCnXtjrzLw20O2KB5WTSVM/5dcrgnQu1YiPeik6mYW/e9Pw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4200.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66946007)(8676002)(8936002)(52116002)(508600001)(5660300002)(6666004)(316002)(66476007)(7696005)(54906003)(83380400001)(107886003)(44832011)(36756003)(4326008)(66556008)(7416002)(2616005)(956004)(2906002)(38100700002)(1076003)(38350700002)(26005)(186003)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QKD1wozh2EvoHAZZ23ejHjGysfFRo33mOJhYnbW89r8PilHtFcsyZ+Wb+1MRm8/jgnPOsEEEHGPMyG15C4oCiJ40WsUYctxrAkl+j2CoGA0DdrF97HM430BYppuDCFu8lkQvlfU9J/gd0AGX0TlZ2/QxA1+ikPDR22nLVkzqP8juFSOGtencnTQ7JvYvSbCXEVD5lFly90uWfU8/yAfA7UiX/WW5UvjQvnzd2DiL9u7phD4VhF0lwaM3/5FkK4keNpmUAzEKhSrz3bnXjyZunKe0fBkGspPQQkwAxmqUx05+X7C2wwpcaYsWTqno69jtAv3oAiJ84FqS9+e5Ek2DAr7xgX5Ywrz/v3BVTY2OXG8Eu55A8SJGVQkhUgjInyp7+ycFYY9ZDBF+XfKT+19TnrZ5Sn6GxkHVoaqLz7lQjly2BCVBPW/ucUWB0NJRszuLwL2icTsDFhkHMe6ythN5EcXreJw/Wqg81USMdYPIlE6eiwkF8zXeFN18H5sUK5F7IjSasjdbYhOxDPtfKBSzMht9PhTSFLzEXrr0bGuzr118BTbqdD5hHc2kgUruBa96Hwak2EHBC0SvalOkvhtvh4AxkpU5zwmBiDdONJkJz/kbM2OSQdvIgEFuLCBfwMPtN1h7/G5oW4uJvTSuHCvBdr6AsAkTLzCnNkhvzrsgMLu8C9ozRmxVusnDug2XgVptj/eyP4oP0rVgZtspuPhgyuXGkS4vygrZeX/PB/4h/JoNvsT7Wk8nR2MKDerkzsYi+NU0sD47OGuCLDyg0Ol/MAz+HLOnk3Gw38gWFgmUF9SWKVwPOmiuGuDhiH4h9NFgfIzYsDoSsKjqsPYQh9PYFXqBA8oWJCYNj2963iQ02mDD4tlS+bRzYW6Ce5XoDjXFHDewmAve2lvhc/uAHXHob0xbVmyeRO9MGu75AacmhibMhefbQ5LBhadClfMtRMf+5SV3XA7oEcEAc0vd12gDtLtZ2g+wVeie3OrVyvnFlFbmTCjs0FZL9d2sYpIFXeHkkp7+zuhrDu7sp7Tr4CNzsWFnTvG5KEYux+/kV9arxa6uhUNZFkzmoaUKvZvH0uiqT9+p93BuWO4TBU9m1Lxm/nKiOCS+vMTr8KhXeQ6slIcqfMy3oVpoYZpfRGXNAyK1pB2iTgoE1VNw8NpEIXtwDnN4/Ekyq7nCy1TySXgY+bMO9oVmo11Qz724nmF82ewFr5zDKGi5pTZSDZXKPcqn8BhACzUWhXUeDGiPQureZU+3A+7uP5IhY8lptmeyvFlUN8xGgNb4z3RDtLoU7zGYPXzo7TJHUz0suEg7jwsiiKlwH/knb8FrFZkTRiaS2fUH X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7223aaef-8062-4286-9625-08d985044288 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4200.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 17:52:39.5577 (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: QE+LPVhnStfAudeB2PTARa4TRQlubN1UmYM0CJJVY6g7/H1RLokpc0Ql3mHpZ9u+LCNgUdcyxueJw8QoPRZwZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4924 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10124 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110010127 X-Proofpoint-GUID: 9zvRoyMiyiuh7WZVX14BSsffpXuv8WG2 X-Proofpoint-ORIG-GUID: 9zvRoyMiyiuh7WZVX14BSsffpXuv8WG2 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A5C9E506C726 X-Stat-Signature: 58mssa8m4rw6pacye6qowu3xxab6xing Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=eIC+oLRA; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=LozMtquc; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf05.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=mike.kravetz@oracle.com X-HE-Tag: 1633110767-166061 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 routines remove_hugetlb_page and destroy_compound_gigantic_page will remove a gigantic page and make the set of base pages ready to be returned to a lower level allocator. In the process of doing this, they make all base pages reference counted. The routine prep_compound_gigantic_page creates a gigantic page from a set of base pages. It assumes that all these base pages are reference counted. During demotion, a gigantic page will be split into huge pages of a smaller size. This logically involves use of the routines, remove_hugetlb_page, and destroy_compound_gigantic_page followed by prep_compound*_page for each smaller huge page. When pages are reference counted (ref count >= 0), additional speculative ref counts could be taken. This could result in errors while demoting a huge page. Quite a bit of code would need to be created to handle all possible issues. Instead of dealing with the possibility of speculative ref counts, avoid the possibility by keeping ref counts at zero during the demote process. Add a boolean 'demote' to the routines remove_hugetlb_page, destroy_compound_gigantic_page and prep_compound_gigantic_page. If the boolean is set, the remove and destroy routines will not reference count pages and the prep routine will not expect reference counted pages. '*_for_demote' wrappers of the routines will be added in a subsequent patch where this functionality is used. Signed-off-by: Mike Kravetz --- mm/hugetlb.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a15f6763e8f4..ccbe323c992b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1271,8 +1271,8 @@ static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed) nr_nodes--) #ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE -static void destroy_compound_gigantic_page(struct page *page, - unsigned int order) +static void __destroy_compound_gigantic_page(struct page *page, + unsigned int order, bool demote) { int i; int nr_pages = 1 << order; @@ -1284,7 +1284,8 @@ static void destroy_compound_gigantic_page(struct page *page, for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) { p->mapping = NULL; clear_compound_head(p); - set_page_refcounted(p); + if (!demote) + set_page_refcounted(p); } set_compound_order(page, 0); @@ -1292,6 +1293,12 @@ static void destroy_compound_gigantic_page(struct page *page, __ClearPageHead(page); } +static void destroy_compound_gigantic_page(struct page *page, + unsigned int order) +{ + __destroy_compound_gigantic_page(page, order, false); +} + static void free_gigantic_page(struct page *page, unsigned int order) { /* @@ -1364,12 +1371,15 @@ static inline void destroy_compound_gigantic_page(struct page *page, /* * Remove hugetlb page from lists, and update dtor so that page appears - * as just a compound page. A reference is held on the page. + * as just a compound page. + * + * A reference is held on the page, except in the case of demote. * * Must be called with hugetlb lock held. */ -static void remove_hugetlb_page(struct hstate *h, struct page *page, - bool adjust_surplus) +static void __remove_hugetlb_page(struct hstate *h, struct page *page, + bool adjust_surplus, + bool demote) { int nid = page_to_nid(page); @@ -1407,8 +1417,12 @@ static void remove_hugetlb_page(struct hstate *h, struct page *page, * * This handles the case where more than one ref is held when and * after update_and_free_page is called. + * + * In the case of demote we do not ref count the page as it will soon + * be turned into a page of smaller size. */ - set_page_refcounted(page); + if (!demote) + set_page_refcounted(page); if (hstate_is_gigantic(h)) set_compound_page_dtor(page, NULL_COMPOUND_DTOR); else @@ -1418,6 +1432,12 @@ static void remove_hugetlb_page(struct hstate *h, struct page *page, h->nr_huge_pages_node[nid]--; } +static void remove_hugetlb_page(struct hstate *h, struct page *page, + bool adjust_surplus) +{ + __remove_hugetlb_page(h, page, adjust_surplus, false); +} + static void add_hugetlb_page(struct hstate *h, struct page *page, bool adjust_surplus) { @@ -1681,7 +1701,8 @@ static void prep_new_huge_page(struct hstate *h, struct page *page, int nid) spin_unlock_irq(&hugetlb_lock); } -static bool prep_compound_gigantic_page(struct page *page, unsigned int order) +static bool __prep_compound_gigantic_page(struct page *page, unsigned int order, + bool demote) { int i, j; int nr_pages = 1 << order; @@ -1719,10 +1740,16 @@ static bool prep_compound_gigantic_page(struct page *page, unsigned int order) * the set of pages can not be converted to a gigantic page. * The caller who allocated the pages should then discard the * pages using the appropriate free interface. + * + * In the case of demote, the ref count will be zero. */ - if (!page_ref_freeze(p, 1)) { - pr_warn("HugeTLB page can not be used due to unexpected inflated ref count\n"); - goto out_error; + if (!demote) { + if (!page_ref_freeze(p, 1)) { + pr_warn("HugeTLB page can not be used due to unexpected inflated ref count\n"); + goto out_error; + } + } else { + VM_BUG_ON_PAGE(page_count(p), p); } set_page_count(p, 0); set_compound_head(p, page); @@ -1747,6 +1774,11 @@ static bool prep_compound_gigantic_page(struct page *page, unsigned int order) return false; } +static bool prep_compound_gigantic_page(struct page *page, unsigned int order) +{ + return __prep_compound_gigantic_page(page, order, false); +} + /* * PageHuge() only returns true for hugetlbfs pages, but not for normal or * transparent huge pages. See the PageTransHuge() documentation for more From patchwork Fri Oct 1 17:52:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Kravetz X-Patchwork-Id: 12531283 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9894AC433EF for ; Fri, 1 Oct 2021 17:52:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 34F6C61A10 for ; Fri, 1 Oct 2021 17:52:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 34F6C61A10 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id CD158940123; Fri, 1 Oct 2021 13:52:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3510940121; Fri, 1 Oct 2021 13:52:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EA7C940123; Fri, 1 Oct 2021 13:52:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0235.hostedemail.com [216.40.44.235]) by kanga.kvack.org (Postfix) with ESMTP id 89BEF940121 for ; Fri, 1 Oct 2021 13:52:50 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4720A2D4AA for ; Fri, 1 Oct 2021 17:52:50 +0000 (UTC) X-FDA: 78648614100.19.ED851D5 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf27.hostedemail.com (Postfix) with ESMTP id C6EB1700196B for ; Fri, 1 Oct 2021 17:52:49 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 191HHgjs012502; Fri, 1 Oct 2021 17:52:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=1iCDNTIR8jU85nLXzn+Ia5d36yp3z4Ajp+MgpSvw5kY=; b=L/Uf5yfDmiswNYVSchq8iJb7NaEzopDHBM32VB2Z6QPIHXx+F3UpQlLflwm3gMHsVKgx dh+k6I+Jyw2AWvTxUddKsP/D9YvulrgaoMZ1ZI6LlVSUYVri9uLatMSsVG8eAJXm11NU OnIp/qusWL9+C+qqEVD4QgS9ZtCwhneuwe8c7TUHeP0JnX2ETYMLGfHoyTRYgexH72Cz EJMyK1YHLPRiFiKEdDCFLfsetZ1zMP9+x/Z4vG6Gt+uMOjN0X9gkLSk59Iv4aQAZ0AFH DKNTIybyEUeWo1LqjYWa9yxEVeCCj7ybsd3HokAvSBDTMSRylaG1fWPvmVxAxWVQ1zyv Aw== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3bdevvg5qt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:44 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 191HjKD2123599; Fri, 1 Oct 2021 17:52:43 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2168.outbound.protection.outlook.com [104.47.73.168]) by aserp3030.oracle.com with ESMTP id 3bd5wd0eqa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Oct 2021 17:52:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D/AoGx+yXyHRoRqbLOUbpLQVB9VTCFRVvQkiJHXEN9vb8kBsU/LEPQdE43RDYd1V+t29CMQn30uGXuD3z0U1BrBJAg2ZdjCLDkIg8tLDAREB8o+FcOlB0wH9wC/M7Co+8qgSwKQ5VN49K/JMmHbugAljrhL5mAuYeXFy1EAjoDzO4vSiaSk5AQj/Yp2BfjMSbXgqmeE/m5b38JzTqculEkLuEFXkRtnCvrjye7ZDML0KM2RQmm3p8Eql1EOLZZ16r+M5GTfAX/5l8am7uwxUtbnEBh5zX1nHUegEkKarW/npIFmg7r4a0nRKrJeqhU5cc3fcC3b3gVYOtN939PSLcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1iCDNTIR8jU85nLXzn+Ia5d36yp3z4Ajp+MgpSvw5kY=; b=BoZVqz7RkYUTsu3ptTU4XSLQ9LCp0prXbQqCBRWubYhWF/ilA5i9NRrU/7znZMLtZjzwgpUTsyWNKoEHoSQs5LPyMo4acmqTztYO0iEUqYilQm6dKkhULs0i3uo9/LEAT/1GZvXCuZI1fkYYxLRUt+C5Vw/TENquk2V6hirRPEjmivQO013SxwL5lemv4us7m+7Mq9txo/zySbMRd4O8iS068e1NpSxUxx0/7LS45VG5s0FyEaxOY8TIQ5YkUmlX8Ky3w5abOq13GQOFtXw/n2NxL8b2KqpLMNOWH4OaAViXbLfVBsGLvdA7SR1uThA6NGRkmS60koIZfosJl26CLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1iCDNTIR8jU85nLXzn+Ia5d36yp3z4Ajp+MgpSvw5kY=; b=Tz+p5JV3LJSlXznQsgfsi4x/k1ytfNnfEHRwY2DuYVFmbJydn4djLQYd0Mfdf1d9mk7MuWAPsSwJJeQhHyMNbt7W15+AOHXcl7ty4um4hR2Vy6C7vHQD4JjcpqReKinoTrqowiwWRum+T9CNaU1+NnG6RiPZwYz3mgdfbpIeSXc= Received: from CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) by CH0PR10MB5228.namprd10.prod.outlook.com (2603:10b6:610:db::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 1 Oct 2021 17:52:41 +0000 Received: from CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73]) by CH2PR10MB4200.namprd10.prod.outlook.com ([fe80::9516:b37d:b134:1e73%9]) with mapi id 15.20.4544.025; Fri, 1 Oct 2021 17:52:41 +0000 From: Mike Kravetz To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Michal Hocko , Oscar Salvador , Zi Yan , Muchun Song , Naoya Horiguchi , David Rientjes , "Aneesh Kumar K . V" , Andrew Morton , Mike Kravetz Subject: [PATCH v3 5/5] hugetlb: add hugetlb demote page support Date: Fri, 1 Oct 2021 10:52:10 -0700 Message-Id: <20211001175210.45968-6-mike.kravetz@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001175210.45968-1-mike.kravetz@oracle.com> References: <20211001175210.45968-1-mike.kravetz@oracle.com> X-ClientProxiedBy: MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) To CH2PR10MB4200.namprd10.prod.outlook.com (2603:10b6:610:a5::9) MIME-Version: 1.0 Received: from monkey.oracle.com (50.38.35.18) by MWHPR22CA0060.namprd22.prod.outlook.com (2603:10b6:300:12a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Fri, 1 Oct 2021 17:52:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a75fcd4-7137-4040-eddc-08d9850443c7 X-MS-TrafficTypeDiagnostic: CH0PR10MB5228: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rYjFci1EB7mmkSt7lzxWh4gRy/alMrwcTxp9G21O1B490MoDGAzkrvVqz5nZ0AdDtRxpd72R+UagP3yucenZNoOl2iXjcCdFIXkB4puC+ToLwqJqDo7qftDKK35+tgDB49f7r7uBAQmIHQkqK3lKAxEwnAXKlAmphB1byJ/mlXH1JUcQe3ZfTAlcUxglm571izxLjI0sreEdG4NBu3SAHmC9ys+YJsX7DQVI4sHun5GqyjmKZGMIrnp02XXGxx7yYyJyVbIgS5KFTYg8iCjufp5Ue1m5lXAotphOFwx0dJvfw4nxtBgR2M2ZilOh/KGIrTahCbQEWQ96r/M0VcbruurTx+Ci4OxgpdpFH0OnAc03jc+2s1NzM4XsFvxETvgk2mx1QglpvDlyeJ5jT4h6JN3kp3P87nyj5AWkfzuvUA+5lsBwOkhzf16UaFA8HYq5gtgR3nI+NROLH2W0ykw7YCyVGm6UV8MImOcE7Q7Uosn10jQ1hRLwQaMhFxoqLGvm02lxgiSASx6FHEvxjQCIV6aOARFOzzoReJVpmYJUX5tyW46nbBiu3qYF2iw+312DB4FOjxGwiDjzPh9gp+QlhtL6KN3FENwcp97cmqlxEcx8Zkn+cJVOV/hBMYrBPEykCDkxxBE6aJum3YpHk/8FlpSzPJjiCITttvxQImoTZZiaOOmTUimgfB0n4gS30qyitnpCr/MxjEbbPZ+mAY2O0w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4200.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6666004)(508600001)(956004)(2616005)(1076003)(83380400001)(66946007)(66556008)(66476007)(2906002)(26005)(86362001)(8936002)(44832011)(186003)(107886003)(4326008)(54906003)(7416002)(6486002)(38100700002)(38350700002)(52116002)(8676002)(316002)(7696005)(36756003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DVcpYOtz5anrMjTr2UcTy5hVT3NI8UMdJJWB3VWIdd/8uzOti/ZwnGwqiQzn8WmHUe5JZTtBwNblZjQHA9W3lC4AWi35LR6HWu58CLu3Yxl7QsGn0QXO5secV6xlZYKnX5PClLqX1y7pU1PG1DTE6DGX7OpD2E/cwrFmeweA52o9daPjnVwtUY3yZT9D/gzx101H1r6K/qPPjb6fb8dc6/sls3xMwSsoe9A0bAt9hB8l3aPq9HS6g99P+J279cQRMod+gV7SemnfW84xnu8gUsMdWrHsjQ4jcvsa8ZySHigVk04tZw5DdSIdj+N1RsyLwN0MaYfgDToWqAggQkNdEuc+npfQdxbDsbrHDYn05YP73Iu/4LFzSVCpe5VTsai5kfRWJtBF7ttr+5zm2dtUcLQN+brOtLqwyP7YONj1bzBI8FA/8+p5lCn7nN4SZo3b1Nx+QBs51BYprPOiHJ9vICKaIWGG0pbq7LQWMSGpLz1lPEMQRsojnOIs22A7TK9SfkQy34VYpd+bYXTxu1kV5nsvow36Mww2TDvwhytZR95RST9bl1WejiFcEk3VpAX0JSdCHA2RSc3UG+eiMkCVBZmb5TlhUv9JfeqJdK+y+Ky/msdlwV2DYYBtsX7zKarnwOB+IUju/bd02laFtrXtHQjQJgqMbgLc2sZLW/oPUOp8MYy140uOMsdmzpBUib1+5WRjwid+r1IDsCy27o5vbfaVyu0RiasleSfjCf3LNS1132LS1vpsxKwrAiBACRZ9JCAUcQK5ArZeDYq89+VQ6N7d4NM43ogmlctoSgemBj1P7tYHeECVTpDdvccqfqrzkM+A6wKPyJl9ThKK4bmOycx2aA5G+9pYXq0F+jQT7Xr/5F+CuWbvDSKzIYLgDcULeTYU0iMB9e79tRj7KJjUhYNalvs3tmfu9/C/jY+D8YxiViPkNDTd4FJKsIOCEfEzwTr6cZ6xypF2jOf4vtMJJHd9FmWbRtG2cg+EBwvpOV806nlx0DTZyiTo1RPyNBGZmx7/aKHY/YfEASmAM+ZbazcZHTOAL7gX5bTGPRrDWgvKf9Y8+CSOyVaY/7ezzAKJI8v9LTyN4QKUoS0x2c0oaV+F8n6cjGdaehGMo1HSRbbgKrocwQ+t3iXnSN5Gadig+/NOCAeZEhKwKeTXqKR6loHtfHeS6Vx8kgbiouJVTV2ikeLm88gqjxG28ItCiNKvz0Hm0FIGblGHafTGY636DAq7iiF8qPPQq74dtspTdLlpc7Wc0uOd7bwNZgwameW7C7t0xnwsHjc4Ac7AfmM7yY7y1X9ovwwBJSzBw24NYyLlmXb4pjZd03A4xoIMjSuq X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a75fcd4-7137-4040-eddc-08d9850443c7 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4200.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 17:52:41.4330 (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: rYVBGG+xJCbacu04jFo9CJ+8sew0bvdU+UzaSioGWyO4pFmnPU1QuJeppnYfiYaEfz3NIrDsObYc8tzj8G/RvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5228 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10124 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110010127 X-Proofpoint-ORIG-GUID: St_A1tA4ghp0wTFPHsH-OJbtmyb0w3XQ X-Proofpoint-GUID: St_A1tA4ghp0wTFPHsH-OJbtmyb0w3XQ Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b="L/Uf5yfD"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Tz+p5JV3; spf=none (imf27.hostedemail.com: domain of mike.kravetz@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=mike.kravetz@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C6EB1700196B X-Stat-Signature: t4z187aasqqtbpckua7nxgfizeu7tt1r X-HE-Tag: 1633110769-685834 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: 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 --- mm/hugetlb.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ccbe323c992b..aec2e737d0cd 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_gigantic_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 @@ -3302,9 +3321,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_gigantic_page_for_demote for all huge page + * sizes as it will not ref count pages. + */ + destroy_compound_gigantic_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); @@ -3313,9 +3377,15 @@ static int demote_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed) if (!h->demote_order) return rc; - /* - * 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; } @@ -3550,10 +3620,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];