From mboxrd@z Thu Jan 1 00:00:00 1970 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 82CC9CCA481 for ; Wed, 22 Jun 2022 17:06:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 323408E00D0; Wed, 22 Jun 2022 13:06:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 254F38E00CF; Wed, 22 Jun 2022 13:06:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6B0F6B00CF; Wed, 22 Jun 2022 13:06:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A73F48E00CF for ; Wed, 22 Jun 2022 13:06:52 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 82915120FA5 for ; Wed, 22 Jun 2022 17:06:52 +0000 (UTC) X-FDA: 79606501464.23.62A85F4 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf19.hostedemail.com (Postfix) with ESMTP id E92BC1A00BB for ; Wed, 22 Jun 2022 17:06:51 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LSqW52NY4zkWLh; Thu, 23 Jun 2022 01:04:49 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 23 Jun 2022 01:06:30 +0800 From: Miaohe Lin To: CC: , , , , , Subject: [PATCH 07/16] mm/huge_memory: minor cleanup for split_huge_pages_pid Date: Thu, 23 Jun 2022 01:06:18 +0800 Message-ID: <20220622170627.19786-8-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220622170627.19786-1-linmiaohe@huawei.com> References: <20220622170627.19786-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655917612; a=rsa-sha256; cv=none; b=dKXFFgolwjjB9nnPQVqe6quxTSHIHQ6EnTR3SedHaUHgE6PlV2JY8XbuZoM9Pe46krDOKh GCA+DpyudE7RNwIeMDc7e6dFW3Fxn6EO+da1jSNi4/BOy1V/OKAIKkAPn9VaCpHew80H5W 1gcuRqOD6boN+U9fcfXotIDsuJFKZiE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655917612; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=as46R5QMFDhvQrqbVwO9M/hzoAQUCElMhEjQNdf2tpk=; b=qInZ1r94Hs9FLUTIwFAie32LChRDgoKjdYhP2Hi+Pq/l8hhH7WzH9fJqCfuJv3IUkHp7b1 G7xmJcbLAgpx55TF6Q5+oIw3gmIrQxYY9DcbwgdoY6UT3xfQlbXFYgSGOaT/BwpgUPVk7q mpd+1UZNdyu9iP+kSHAVgjCsVf+Af5A= X-Rspamd-Queue-Id: E92BC1A00BB X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam08 X-Stat-Signature: p15c6eyn761om9nqg7na6zo3b5c9zdb7 X-HE-Tag: 1655917611-684382 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: Use helper function vma_lookup to lookup the needed vma and use help macro IS_ERR_OR_NULL to check the validity of page to simplify the code. Minor readability improvement. Signed-off-by: Miaohe Lin --- mm/huge_memory.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index fb5c484dfa39..7cfa003b1789 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2942,10 +2942,10 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, * table filled with PTE-mapped THPs, each of which is distinct. */ for (addr = vaddr_start; addr < vaddr_end; addr += PAGE_SIZE) { - struct vm_area_struct *vma = find_vma(mm, addr); + struct vm_area_struct *vma = vma_lookup(mm, addr); struct page *page; - if (!vma || addr < vma->vm_start) + if (!vma) break; /* skip special VMA and hugetlb VMA */ @@ -2957,9 +2957,7 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, /* FOLL_DUMP to ignore special (like zero) pages */ page = follow_page(vma, addr, FOLL_GET | FOLL_DUMP | FOLL_LRU); - if (IS_ERR(page)) - continue; - if (!page) + if (IS_ERR_OR_NULL(page)) continue; if (!is_transparent_hugepage(page)) -- 2.23.0