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 5C7AED1A43B for ; Mon, 14 Oct 2024 11:01:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD4CC6B00DE; Mon, 14 Oct 2024 07:01:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5C476B00E0; Mon, 14 Oct 2024 07:01:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD6706B00E1; Mon, 14 Oct 2024 07:01:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8D8E06B00DE for ; Mon, 14 Oct 2024 07:01:56 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 615A7120D7C for ; Mon, 14 Oct 2024 11:01:49 +0000 (UTC) X-FDA: 82671917706.18.966F78A Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf02.hostedemail.com (Postfix) with ESMTP id 2A4A68001B for ; Mon, 14 Oct 2024 11:01:42 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903642; 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:in-reply-to:references:references; bh=1Pv7dW4G5U3czwTGJgTczogiNPWDVKQoCd/L9alqD4s=; b=zIIZEUPu/UghhH5hucKYfyW/ezQ/12o6x2q/AECDEqVTf2hCOCqnF3t/7Rh3FK1K/J2EIS GlAG91W4c/nlSCDfTPJ9xSwjAQsuL87UTUhESBjwFN5oyPgCqASZulQ+JAKrDbkWP7en/F JZT7lBnsc3dtIy0E85Kqkhh8GXK/dQc= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903642; a=rsa-sha256; cv=none; b=ymswIXlRFCAnmomwsao3GNc3asoGh+EsNLvOeQy8fVPyqlETJBEJP/vfWbDmeFAdKzbTri zsZsnnZ8Vh7ToUIomAMQXQ7bkKvN8q63v3I+MjHFoLe4hrfPIgZrlwTRxlhNoyllD3VnBV clqvso+WkBg4PMhZAU6UA++eM4ddHzg= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A0064176C; Mon, 14 Oct 2024 04:02:23 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 62FEC3F51B; Mon, 14 Oct 2024 04:01:51 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Oliver Upton , Will Deacon Cc: Ryan Roberts , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1 48/57] arm64: Convert switch to if for non-const comparison values Date: Mon, 14 Oct 2024 11:58:55 +0100 Message-ID: <20241014105912.3207374-48-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 2A4A68001B X-Stat-Signature: yhdnfw79jb3fbrntgqwyyu1jkwuhc6ff X-HE-Tag: 1728903702-123624 X-HE-Meta: U2FsdGVkX18xomW7F3aCYxHyGdeXRyrl5hhiaAdHDAHikBJMHvvZhCFFZPtljj9yIdrSkKrv/Kj4EuwRZ6m7i3Ci9AkwWhpMYQFhHEU1KraTC5kitLNkyUr66yzHQ94xOCku3JCwia40lsKp/Qz2ALulDpAaYIw3tCnp7cELvHaUnfNZqKNJKj718LMPEPW1LzHAxz7/qMzdTFYFLqTsFZ04XL92/FU3MuaMywga069Ug8ogllRp2sHnNWLErdFI394Q12qAMy1boJLwXJLPKHfbdWCEMZBJVXGLRebVR0p7t4zfELm7llCXJY4Yert3vwm7rv6swkDADydq/qjY1vSzUFBIvujXtXdbVQbv5QGJNyUrjJy239JzayGxHEEajeMCx/E6+pMTcZ34sqPAe0ZvOYU0K9/BYRHt7EHMkOluk/b7Yco4ug7Z3V6XOMeW+R6OvUpKQBwepaJo5TETDrT7IvaCWWLIOLGhWyCMIWMZ4UI8NbNdzm9g5cau0Qd6Ap1yhL8m4gGBGSpk0cUXR/tRTiWrWMt0Nizku9agW44zlCqdR/qpFKzmqA1x7eddZIfRdNb8Ah5Xkw96IjwdAnoDmsxtFo+GrjerUf51PC+cmSS8ICz7xGtLdnReJWcloaYjyLyiL5k6hdfkbNMfPV+XaajJ4hYq2TwYsw8yiTOlgZCss+6Pk/k9YTie8qPmA9r/VPvo3H8nqy+W+FBLcfob4zgBtev3XUSUBYrHeCC91VA5X3kRvOqfBzqu6nJPOhfV6kNnG6KlCFVSpKn0rGuqFhuIIMBWZNC/2D3qo/Ry5ZdGaeNP/jCMVaoMeRu1bNj+jIIfMmYZ6FLXAklfjTaI5NFBFsAvz8q3SNIbhjkthfT18xEVWoVaMX7i6sK8fB3pXPFfsTV03TqJTmRRo5Cl0gUlDC/zOgbl2ANbQ9O1uva9/ARJNSl81vlhDw9T17Huh1DuFYeVZq/37Ax x6vm9NOa d+NZop+CWiMTFcnd5wxJQPbG5zDnq9Fd8+FU/GUGBeOVbB1DZuIECwc4RyeUGOkH+eqDB4dxtdqwatIHfwsIDaTpmtam+Y5oLFMlrEGBcuOmfegGmFIhE1UCd2oh7ppWCFJcuL3C0r0jWMKaiHyOUzoaBZCwj9SboE6NodFqXStoAZH/p1MtC2ul01Q== 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: List-Subscribe: List-Unsubscribe: When we enable boot-time page size, some macros are no longer compile-time constants. Where these macros are used as cases in switch statements, the switch statements no longer compile. Let's convert these to if/else blocks, which can handle the runtime values. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ arch/arm64/kvm/mmu.c | 32 +++++++++++++++----------------- arch/arm64/mm/hugetlbpage.c | 34 +++++++++++----------------------- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index a509b63bd4dd5..248a2d7ad6dbb 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1487,29 +1487,27 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, vma_shift = get_vma_page_shift(vma, hva); } - switch (vma_shift) { #ifndef __PAGETABLE_PMD_FOLDED - case PUD_SHIFT: - if (fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE)) - break; - fallthrough; + if (vma_shift == PUD_SHIFT) { + if (!fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE)) + vma_shift = PMD_SHIFT; + } #endif - case CONT_PMD_SHIFT: + if (vma_shift == CONT_PMD_SHIFT) { vma_shift = PMD_SHIFT; - fallthrough; - case PMD_SHIFT: - if (fault_supports_stage2_huge_mapping(memslot, hva, PMD_SIZE)) - break; - fallthrough; - case CONT_PTE_SHIFT: + } + if (vma_shift == PMD_SHIFT) { + if (!fault_supports_stage2_huge_mapping(memslot, hva, PMD_SIZE)) + vma_shift = PAGE_SHIFT; + } + if (vma_shift == CONT_PTE_SHIFT) { vma_shift = PAGE_SHIFT; force_pte = true; - fallthrough; - case PAGE_SHIFT: - break; - default: - WARN_ONCE(1, "Unknown vma_shift %d", vma_shift); } + if (vma_shift != PUD_SHIFT && + vma_shift != PMD_SHIFT && + vma_shift != PAGE_SHIFT) + WARN_ONCE(1, "Unknown vma_shift %d", vma_shift); vma_pagesize = 1UL << vma_shift; diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 5f1e2103888b7..bc98c20655bba 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -51,16 +51,12 @@ void __init arm64_hugetlb_cma_reserve(void) static bool __hugetlb_valid_size(unsigned long size) { - switch (size) { #ifndef __PAGETABLE_PMD_FOLDED - case PUD_SIZE: + if (size == PUD_SIZE) return pud_sect_supported(); #endif - case CONT_PMD_SIZE: - case PMD_SIZE: - case CONT_PTE_SIZE: + if (size == CONT_PMD_SIZE || size == PMD_SIZE || size == CONT_PTE_SIZE) return true; - } return false; } @@ -104,24 +100,20 @@ static inline int num_contig_ptes(unsigned long size, size_t *pgsize) *pgsize = size; - switch (size) { #ifndef __PAGETABLE_PMD_FOLDED - case PUD_SIZE: + if (size == PUD_SIZE) { if (pud_sect_supported()) contig_ptes = 1; - break; + } else #endif - case PMD_SIZE: + if (size == PMD_SIZE) { contig_ptes = 1; - break; - case CONT_PMD_SIZE: + } else if (size == CONT_PMD_SIZE) { *pgsize = PMD_SIZE; contig_ptes = CONT_PMDS; - break; - case CONT_PTE_SIZE: + } else if (size == CONT_PTE_SIZE) { *pgsize = PAGE_SIZE; contig_ptes = CONT_PTES; - break; } return contig_ptes; @@ -339,20 +331,16 @@ unsigned long hugetlb_mask_last_page(struct hstate *h) { unsigned long hp_size = huge_page_size(h); - switch (hp_size) { #ifndef __PAGETABLE_PMD_FOLDED - case PUD_SIZE: + if (hp_size == PUD_SIZE) return PGDIR_SIZE - PUD_SIZE; #endif - case CONT_PMD_SIZE: + if (hp_size == CONT_PMD_SIZE) return PUD_SIZE - CONT_PMD_SIZE; - case PMD_SIZE: + if (hp_size == PMD_SIZE) return PUD_SIZE - PMD_SIZE; - case CONT_PTE_SIZE: + if (hp_size == CONT_PTE_SIZE) return PMD_SIZE - CONT_PTE_SIZE; - default: - break; - } return 0UL; } -- 2.43.0