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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20DABFCC9CC for ; Tue, 10 Mar 2026 06:28:19 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fVP8K6mfxz3bjb; Tue, 10 Mar 2026 17:28:17 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1773124097; cv=none; b=m5XfUWTbkBzqjfniUNQ46+Q6uHfshRWBQSPS1Y5bHov4+2Halbj4IdhsbYALApZchhRF80r8XGI6eH60pLaLiTo+8tllnsGpbUjpjD4Qn27HBDj7sIWHaERUQrSdlMGGqoZPFVqtZRSuf1xJrtakEFXhNBa/V+LWOX59nIHX1vRe9Z9L1TnVa69ywcO/to62n9odtZZDkyycG6dlYVDp4SwZ6/QVHsFE/ifY4gE8rUenpgS5gm5cN7W7BHNEHGmN0Lr0eclvCuyVSjk5IO1cj0vketJ9n1+x+MaI+fvkXFbqhMUt7Phwib2hm6maCggPDjMFNYw3JDtoQzTbqtveMg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1773124097; c=relaxed/relaxed; bh=11zp6Xlu9HtM8NgFiRuGpK0JWZedKvnXV7uxGUZO7MI=; h=Content-Type:Mime-Version:Subject:From:In-Reply-To:Date:Cc: Message-Id:References:To; b=JlhZp/wDDVsdgeK4ct0XdzDuzjVki+CRb64gGu4ImABbvLf+e7nuSbvIY8XZIUBJZukvpilUtp3hcoi5qcH0yvNx04HkVTns+VaYCGCKyQP+pobSkZMb3JJaOY1u7txRiWZ/PuTl1hr28zF9QqoFUybetPX6uZfZK4xqr8Tm0CN9OYvBgipuwkurZh8Vs66Gw4X+UGE4WMfOLFhgzoAjk0wHmAWz9aEja3jbOGnSRSXWykE/OHL0oCas4hhreo4CLoIRdF4wv/FMhFLDSfEYCJV9a8W4Q+31X7l99rD2kkiaC3p7O7YVdecKzijTWplo9jYT8tOax2p+tXVMzZQL2g== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=swuCtPFk; dkim-atps=neutral; spf=pass (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=venkat88@linux.ibm.com; receiver=lists.ozlabs.org) smtp.mailfrom=linux.ibm.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=swuCtPFk; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=venkat88@linux.ibm.com; receiver=lists.ozlabs.org) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4fVP8J5mGXz2yFY for ; Tue, 10 Mar 2026 17:28:16 +1100 (AEDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62A5OGHR512979; Tue, 10 Mar 2026 06:27:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=11zp6X lu9HtM8NgFiRuGpK0JWZedKvnXV7uxGUZO7MI=; b=swuCtPFktVoEWAhDPvQATG 6SLj/C369oEPuaO1oaPXI0DhluFzkddCKx8M5LS3+6TDj0qT3JVhhoa4gavTzPhS 1Y6dOs7pcx5SEYD3rrWYhmDw1LHrpZG1aGSW2SQ2CDA3y6nCxz2pqFtyc9BNzai7 8Zif7aXwsPx8JTQPO5x3hahR0m1xNkrA28GVtlroU32K134ZzOG3SKJY7+VFpb3z BxFa+24z3lYRE6e/xfu9TtqgiV7Ggi94wCSvnqVXABYzZQyZ5NPL48UoCSppPUN0 Zxh86vb2tdUmbvUTwyFD7pIFbhdX8J8W/GXoFgTNapNb/RPVW5flon7F5zx5YBlg == Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4crd1mhbu5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Mar 2026 06:27:57 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62A1qrKr024660; Tue, 10 Mar 2026 06:27:57 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4cs0jjysgj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Mar 2026 06:27:57 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62A6RuaC7734126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2026 06:27:56 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F34EC5805A; Tue, 10 Mar 2026 06:27:55 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6B9E58051; Tue, 10 Mar 2026 06:27:53 +0000 (GMT) Received: from smtpclient.apple (unknown [9.98.109.174]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTPS; Tue, 10 Mar 2026 06:27:53 +0000 (GMT) Content-Type: text/plain; charset=utf-8 X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: [PATCH v2 1/2] drivers/vfio_pci_core: Change PXD_ORDER check from switch case to if/else block From: Venkat In-Reply-To: Date: Tue, 10 Mar 2026 11:57:41 +0530 Cc: linuxppc-dev@lists.ozlabs.org, Madhavan Srinivasan , Christophe Leroy , linux-mm@kvack.org, kvm@vger.kernel.org, Alex Williamson , Peter Xu Content-Transfer-Encoding: quoted-printable Message-Id: References: To: "Ritesh Harjani (IBM)" X-Mailer: Apple Mail (2.3864.300.41.1.7) X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=ds3Wylg4 c=1 sm=1 tr=0 ts=69afb9ee cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=VnNF1IyMAAAA:8 a=TkzObPc7TtdjdkxZWH0A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEwMDA0OCBTYWx0ZWRfX8Pbw1pZPSi2w 8OEl2HmIth+EiBcYA5T11NX1NjHkkp6oRIuiq5ZYirgBIrxSd6K1LFFjFsJb0JLtjcHARShhdVi damULwfsnb1cVpzYQ7MX0TGoFDGT/pVZYHYG0JNx8zRj4DdvDj+Fh/5y2OP8E2S1Qrb7VGgsAbH oMETb8vmDg29Z2CcRX0XTkQhUUPDB3Muv/+W/Le1o1369QECfF/5BYEoLUj/nCijrY8Doc7a4nk Hvvrs8wJKR607HcyVbYNFuSh1hDS5iQHhnsmFJLgZ4oD5gxoI8wYoXiJtkw0p4ZfumyYVm+Slx9 YB6HQZrRZixAfwjXWKP7Mnyzj3qF3v7QWzQgm6yyKqWXkBG1f/t+kzvqPaJChwkWyDjhxFFAPRS 3iAGI6D4O+Xak4mL/f1iEc+Sa1DtEd8ueeotcjh7uew5ETjIDoxUd6/mJi1voZm6aYoZm2xoHu7 0MzqoETFVvPLNqfOBBg== X-Proofpoint-GUID: rUIBbepxIgIMAZgVxnhSla9Np10kf9Vh X-Proofpoint-ORIG-GUID: Yn-QkYj-UwAT8YKWAgDDbqyS4eMFwDC4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-10_01,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 clxscore=1011 impostorscore=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603100048 > On 9 Mar 2026, at 6:08=E2=80=AFPM, Ritesh Harjani (IBM) = wrote: >=20 > Architectures like PowerPC uses runtime defined values for > PMD_ORDER/PUD_ORDER. This is because it can use either RADIX or HASH = MMU > at runtime using kernel cmdline. So the pXd_index_size is not known at > compile time. Without this fix, when we add huge pfn support on = powerpc > in the next patch, vfio_pci_core driver compilation can fail with the > following errors. >=20 > CC [M] drivers/vfio/vfio_main.o > CC [M] drivers/vfio/group.o > CC [M] drivers/vfio/container.o > CC [M] drivers/vfio/virqfd.o > CC [M] drivers/vfio/vfio_iommu_spapr_tce.o > CC [M] drivers/vfio/pci/vfio_pci_core.o > CC [M] drivers/vfio/pci/vfio_pci_intrs.o > CC [M] drivers/vfio/pci/vfio_pci_rdwr.o > CC [M] drivers/vfio/pci/vfio_pci_config.o > CC [M] drivers/vfio/pci/vfio_pci.o > AR kernel/built-in.a > ../drivers/vfio/pci/vfio_pci_core.c: In function = =E2=80=98vfio_pci_vmf_insert_pfn=E2=80=99: > ../drivers/vfio/pci/vfio_pci_core.c:1678:9: error: case label does not = reduce to an integer constant > 1678 | case PMD_ORDER: > | ^~~~ > ../drivers/vfio/pci/vfio_pci_core.c:1682:9: error: case label does not = reduce to an integer constant > 1682 | case PUD_ORDER: > | ^~~~ > make[6]: *** [../scripts/Makefile.build:289: = drivers/vfio/pci/vfio_pci_core.o] Error 1 > make[6]: *** Waiting for unfinished jobs.... > make[5]: *** [../scripts/Makefile.build:546: drivers/vfio/pci] Error 2 > make[5]: *** Waiting for unfinished jobs.... > make[4]: *** [../scripts/Makefile.build:546: drivers/vfio] Error 2 > make[3]: *** [../scripts/Makefile.build:546: drivers] Error 2 >=20 > Fixes: f9e54c3a2f5b7 ("vfio/pci: implement huge_fault support") > Signed-off-by: Ritesh Harjani (IBM) > --- Tested-by: Venkat Rao Bagalkote Tested this patch, and with this, build is successful and reported issue = is fixed. WithOut this patch: drivers/vfio/pci/vfio_pci_core.c: In function = =E2=80=98vfio_pci_vmf_insert_pfn=E2=80=99: drivers/vfio/pci/vfio_pci_core.c:1677:9: error: case label does not = reduce to an integer constant 1677 | case PMD_ORDER: | ^~~~ drivers/vfio/pci/vfio_pci_core.c:1681:9: error: case label does not = reduce to an integer constant 1681 | case PUD_ORDER: | ^~~~ Regards, Venkat. > v1 -> v2: > 1. addressed review comments from Christophe [1] > [1]: = https://lore.kernel.org/linuxppc-dev/0b8fce7a61561640634317a5e287cdb479471= 5fd.1772170860.git.ritesh.list@gmail.com/ >=20 > drivers/vfio/pci/vfio_pci_core.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) >=20 > diff --git a/drivers/vfio/pci/vfio_pci_core.c = b/drivers/vfio/pci/vfio_pci_core.c > index d43745fe4c84..0967307235b8 100644 > --- a/drivers/vfio/pci/vfio_pci_core.c > +++ b/drivers/vfio/pci/vfio_pci_core.c > @@ -1670,21 +1670,16 @@ vm_fault_t vfio_pci_vmf_insert_pfn(struct = vfio_pci_core_device *vdev, > if (vdev->pm_runtime_engaged || !__vfio_pci_memory_enabled(vdev)) > return VM_FAULT_SIGBUS; >=20 > - switch (order) { > - case 0: > + if (!order) > return vmf_insert_pfn(vmf->vma, vmf->address, pfn); > -#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP > - case PMD_ORDER: > + > + if (IS_ENABLED(CONFIG_ARCH_SUPPORTS_PMD_PFNMAP) && order =3D=3D = PMD_ORDER) > return vmf_insert_pfn_pmd(vmf, pfn, false); > -#endif > -#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP > - case PUD_ORDER: > + > + if (IS_ENABLED(CONFIG_ARCH_SUPPORTS_PUD_PFNMAP) && order =3D=3D = PUD_ORDER) > return vmf_insert_pfn_pud(vmf, pfn, false); > - break; > -#endif > - default: > - return VM_FAULT_FALLBACK; > - } > + > + return VM_FAULT_FALLBACK; > } > EXPORT_SYMBOL_GPL(vfio_pci_vmf_insert_pfn); >=20 > -- > 2.39.5 >=20 >=20