From patchwork Fri Sep 16 06:41:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12978187 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 A7B88ECAAD8 for ; Fri, 16 Sep 2022 06:41:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38D988D0005; Fri, 16 Sep 2022 02:41:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3167B8D0001; Fri, 16 Sep 2022 02:41:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E0008D0005; Fri, 16 Sep 2022 02:41:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 090178D0001 for ; Fri, 16 Sep 2022 02:41:36 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D6DAD1A02E5 for ; Fri, 16 Sep 2022 06:41:35 +0000 (UTC) X-FDA: 79917002550.08.FAC1788 Received: from out30-54.freemail.mail.aliyun.com (out30-54.freemail.mail.aliyun.com [115.124.30.54]) by imf11.hostedemail.com (Postfix) with ESMTP id E8C074009B for ; Fri, 16 Sep 2022 06:41:34 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VPw-i6g_1663310489; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0VPw-i6g_1663310489) by smtp.aliyun-inc.com; Fri, 16 Sep 2022 14:41:30 +0800 From: Xin Hao To: mike.kravetz@oracle.com Cc: songmuchun@bytedance.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, xhao@linux.alibaba.com Subject: [PATCH V2] mm/hugetlb: add is_resv_equal_free() func Date: Fri, 16 Sep 2022 14:41:27 +0800 Message-Id: <20220916064127.1904-1-xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.54 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663310495; a=rsa-sha256; cv=none; b=496TrS2UfmXu8oFUDHniASM20SZx8PhGGrw2JuJIba2z/EpVZDsqfnCe1ShNOjwqXMNgUF VN8IXqS4aJDDRnlZvDxlDK75F+OAQwEt2zLphEaikx2AvORYmYTdP7R+fDqaq9zk6EeT1E JO+yi/a0zRiK01I5CqKQHtKqdOtWSAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663310495; 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:references; bh=6ys/52TMELaUDba43GN2RxE3SKBGv06Yhpeg8L+nh3E=; b=4oTQIvzHVWN8VxjHrT96PCc1SRINGOavoGj65+U6KA3WOWV/ymx1oFzVZjgg9WVmWGg0K4 kNzT0SH7xF3hYGqhlCM+cAoD3Zi4e5MVZF3fQvH/NCXQUBdFwEogqGul0I6WJXz3OfTopp Z9pgJ9gistiiBv+60RN3ca6HwSFNPvQ= X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: E8C074009B Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.54 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-Stat-Signature: tbj6db7dh69pzi3jmnnyhphw35btsbs1 X-HE-Tag: 1663310494-144177 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: In hugetlb.c file, there are several places to compare the values of 'h->free_huge_pages' and 'h->resv_huge_pages', it looks a bit messy, so there add a new is_resv_equal_free() func to do these. Signed-off-by: Xin Hao --- mm/hugetlb.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 2.31.0 diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 66496fc424f4..db6f63fb083f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1191,6 +1191,11 @@ static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, return NULL; } +static inline bool is_resv_equal_free(struct hstate *h) +{ + return (h->free_huge_pages - h->resv_huge_pages == 0) ? true : false; +} + static struct page *dequeue_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, unsigned long address, int avoid_reserve, @@ -1207,12 +1212,11 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, * have no page reserves. This check ensures that reservations are * not "stolen". The child may still get SIGKILLed */ - if (!vma_has_reserves(vma, chg) && - h->free_huge_pages - h->resv_huge_pages == 0) + if (!vma_has_reserves(vma, chg) && is_resv_equal_free(h)) goto err; /* If reserves cannot be used, ensure enough pages are in the pool */ - if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) + if (avoid_reserve && is_resv_equal_free(h)) goto err; gfp_mask = htlb_alloc_mask(h); @@ -2105,7 +2109,7 @@ int dissolve_free_huge_page(struct page *page) if (!page_count(page)) { struct page *head = compound_head(page); struct hstate *h = page_hstate(head); - if (h->free_huge_pages - h->resv_huge_pages == 0) + if (is_resv_equal_free(h)) goto out; /* @@ -2315,7 +2319,7 @@ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid, nodemask_t *nmask, gfp_t gfp_mask) { spin_lock_irq(&hugetlb_lock); - if (h->free_huge_pages - h->resv_huge_pages > 0) { + if (!is_resv_equal_free(h)) { struct page *page; page = dequeue_huge_page_nodemask(h, gfp_mask, preferred_nid, nmask);