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 B64CFC433FE for ; Sat, 7 May 2022 15:07:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE16A6B0071; Sat, 7 May 2022 11:07:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B92A76B0073; Sat, 7 May 2022 11:07:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7FD96B0074; Sat, 7 May 2022 11:07:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 986FF6B0071 for ; Sat, 7 May 2022 11:07:01 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6A53F60A23 for ; Sat, 7 May 2022 15:07:01 +0000 (UTC) X-FDA: 79439274642.04.24E66E3 Received: from mail.nfschina.com (unknown [124.16.136.209]) by imf29.hostedemail.com (Postfix) with ESMTP id 5060C1200A3 for ; Sat, 7 May 2022 15:06:54 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by mail.nfschina.com (Postfix) with ESMTP id 9A28C1E80D89; Sat, 7 May 2022 23:02:03 +0800 (CST) X-Virus-Scanned: amavisd-new at test.com Received: from mail.nfschina.com ([127.0.0.1]) by localhost (mail.nfschina.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I7NvjaRQfYCx; Sat, 7 May 2022 23:02:00 +0800 (CST) Received: from localhost.localdomain (unknown [123.113.181.70]) (Authenticated sender: kunyu@nfschina.com) by mail.nfschina.com (Postfix) with ESMTPA id A6A301E80D6D; Sat, 7 May 2022 23:02:00 +0800 (CST) From: Li kunyu To: dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Li kunyu Subject: [PATCH] mm: Functions may simplify the use of return values Date: Sat, 7 May 2022 23:06:30 +0800 Message-Id: <20220507150630.90399-1-kunyu@nfschina.com> X-Mailer: git-send-email 2.18.2 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5060C1200A3 X-Stat-Signature: ih9b9mdou3ceyfi4hgyxhksmk54tje89 Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=none; spf=none (imf29.hostedemail.com: domain of kunyu@nfschina.com has no SPF policy when checking 124.16.136.209) smtp.mailfrom=kunyu@nfschina.com X-Rspam-User: X-HE-Tag: 1651936014-276395 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: p4d_clear_huge may be optimized for void return type and function usage. vunmap_p4d_range function saves a few steps here. Signed-off-by: Li kunyu --- arch/x86/mm/pgtable.c | 3 +-- include/linux/pgtable.h | 12 +++--------- mm/vmalloc.c | 7 ++----- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 3481b35cb4ec..9222b6832c36 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -676,9 +676,8 @@ int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) * * No 512GB pages yet -- always return 0 */ -int p4d_clear_huge(p4d_t *p4d) +void p4d_clear_huge(p4d_t *p4d) { - return 0; } #endif diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index f4f4077b97aa..5448b5b10241 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1394,16 +1394,13 @@ static inline int pmd_protnone(pmd_t pmd) #ifndef __PAGETABLE_P4D_FOLDED int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot); -int p4d_clear_huge(p4d_t *p4d); +void p4d_clear_huge(p4d_t *p4d); #else static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) { return 0; } -static inline int p4d_clear_huge(p4d_t *p4d) -{ - return 0; -} +static inline void p4d_clear_huge(p4d_t *p4d) { } #endif /* !__PAGETABLE_P4D_FOLDED */ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); @@ -1426,10 +1423,7 @@ static inline int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) { return 0; } -static inline int p4d_clear_huge(p4d_t *p4d) -{ - return 0; -} +static inline void p4d_clear_huge(p4d_t *p4d) { } static inline int pud_clear_huge(pud_t *pud) { return 0; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index cadfbb5155ea..fa915f3cb75e 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -389,18 +389,15 @@ static void vunmap_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end, { p4d_t *p4d; unsigned long next; - int cleared; p4d = p4d_offset(pgd, addr); do { next = p4d_addr_end(addr, end); - cleared = p4d_clear_huge(p4d); - if (cleared || p4d_bad(*p4d)) + p4d_clear_huge(p4d); + if (p4d_bad(*p4d)) *mask |= PGTBL_P4D_MODIFIED; - if (cleared) - continue; if (p4d_none_or_clear_bad(p4d)) continue; vunmap_pud_range(p4d, addr, next, mask); -- 2.18.2