From nobody Sun Jul 26 11:51:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1782735252; cv=none; d=zohomail.com; s=zohoarc; b=jwID6Z+JFPfeVp01HMNI+8HstoAXIZO0qlxuya6VgJDv6NDfiYmtC0aA+L0FzJfzmlt4/1OuRA9K4uAIvF/zjNvPaD+MN4B+LldmUgPOJ9NfVVH3qI+zUik3b/aHJ0r/fugpDUdxeql0nR64zjSLoTaSsSggLjBGkW8ADiMu9tA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782735252; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EkJTtkmEV4vc01IaRV9V7AP44PqbMhXkWKQN8F0CzFA=; b=mOxXSun3jARaTjZOqN1pfZjL8ymHJP3Mt1YEQklU/5X+rdIT5dOeEjFKNNxvuMBOHM6EZ9mtwx5ml7Lz1rxWfTa6wyLxn7Fg0tzBGgOjPYgPZpqV//LFC27v3ML6Rx7f2If7lrleI4gUQ9zbWhkrQjuJ2RrU4qA5nyFuA67uL/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178273525252812.217127291973952; Mon, 29 Jun 2026 05:14:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1weAsI-0002Mt-JB; Mon, 29 Jun 2026 08:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1weAs6-00023W-NK for qemu-devel@nongnu.org; Mon, 29 Jun 2026 08:13:56 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1weAs0-0005Kf-E5 for qemu-devel@nongnu.org; Mon, 29 Jun 2026 08:13:51 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATR1l2605192 for ; Mon, 29 Jun 2026 12:13:44 GMT Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3nq88q1w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 12:13:44 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-37c9127e316so2193253a91.1 for ; Mon, 29 Jun 2026 05:13:44 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e1c93272fsm5800179a91.14.2026.06.29.05.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 05:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=EkJTtkmEV4v c01IaRV9V7AP44PqbMhXkWKQN8F0CzFA=; b=eQea9ARU7tLV52Zd1C5HLNOljGO 9MbqRHogK2OzeAH7RRfTr+UlgzJ4teGH9OMInyBeVMiiY94w3MYP6CutE+PNMS+y ZS1nDyQtxGVM9E+qlm+XRjFBAw495wMBk5QfREbzildgj5iaT4TIvTBm/kPxKZlg lULq7mKOfKZrN2+V+PLRopBPUFpWlvoSs44Pt0TuIkKgM9n8PPDhk05HMxwIh952 be+zLOfFgwjUOMWoIhE5v+ldubRqOpL7FxLqWKl9F1bWysvrPBsLtPwX8aysklZH S/NLKSmQjD9+0CgLoCZX386t2jphP7PZZOBE+qcEDpEIkuFpSiC0W5kjV3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782735224; x=1783340024; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EkJTtkmEV4vc01IaRV9V7AP44PqbMhXkWKQN8F0CzFA=; b=IkFW27JsAi5rslHqIvLf9iH86eRLdBF69wPjZyeBmFZmtoGpUC5vmlrkJ5jFDZne/g lTNzdSYWeXEL5c34pLEq469zLJyaZRem8a4zUBROh2xN+SKYbyhfi6c4pP0/fgwpcp2F G4YNRuIJSZAb+ylNyAicplLBKuNptfF2m9V8qbtOVcXYCm1+ZcFHco07UTvGk7RLF32W UknpXyBDH3SDRSlmhMSyD9sklu9480QLjgJ5nOMcylRDW93mXjeS3e1H8mXeqJxTcKNX j8Y5i04kSs98KOSy6irVfWbvtYBhyso1ZdRUxaJdzE0g710vD2bsSGYn/ulXCXU+jHLG Y1Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782735224; x=1783340024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EkJTtkmEV4vc01IaRV9V7AP44PqbMhXkWKQN8F0CzFA=; b=StJ2X2Q3EuzXNWeOI/68AO+XjGRDPE8ruy6UuvL9mkDnDrgSAZk4RJkjrSa0PjS1RN cBO3sckCFYZFo4OweOufpydhliTQAMNs96d38mUIZ3pAaeAs761OYU/e8K2/xoDKhHuo POIp5ZjhzH/zW1LC7mQeHUww16SB4OGHn2gbTHUknCyOq4gh1HjclRPCW2svDpcDZiQX BZB+ceDhVIQ7mJ7uifxO7QISbGF6jXs8f7mXrS0/TE49h5i1JuvUfGpayMZPigye2tl7 iXBuL+LR98/N7vgK6ixTIjUnPOUVPgTDRMzwiZ3Sfvs9pzzt7VYTRephf4sRwbtfD+nz RRKQ== X-Gm-Message-State: AOJu0Yx0e5sMbFvyqcOci2PcsOF/ENQVq6iIE4uwxCHZZWV2TvtW6rQ9 A/w5Ew84URNTSeR0MBuDIAlNaqb4Fz07n4qc8df1tocJYb/v39fFzfcMfWLkPHxT/xsypXP0ZjJ v3W18YVaYeDdZOUSgxQFVGa+EthoIkMqqi2QMB5sM8RnDiVS9BIySfEPRiHwQZZNC1w== X-Gm-Gg: AfdE7cn2LsZfcQvSmQX63r9M+IJi/VLhwGGIGEeSNqON/LCeY9kAGuQ17W1ErDvGbjV uvTxB3N9C3wGSfErpqKy2U5OL3XYC/JABr+LH0yc4FGfj97klSwzFsev9q8ZoZ2vPy5NUYcZDja QDzXqcxgetKeE7i/ujvVRq7N04Kko/eZQ6KRshDAQbLt9y6Wsa/G+Nl1u1ATnkDAiwwzORTLF61 Y+mG2/SV8jYsDWd4MuPSY/Q7EZxcAUxX2a44xC3Fdm2ZmrHZWNsVjCFQy/jxwLrbu9BHKpsetXL o7GCeVF7EtFTjVDNnat0prCJkF2P/NiTVeunqNa9t8jAtCDskypZ2bjiJmDpfb3epvivhNuPhXq 4huYyMTWOHSNFpRg5xxJnYaAM7HKfKTgAvTupLOn2ide/VA== X-Received: by 2002:a17:90b:52c7:b0:37f:eda5:5169 with SMTP id 98e67ed59e1d1-37feda55454mr4418566a91.13.1782735223897; Mon, 29 Jun 2026 05:13:43 -0700 (PDT) X-Received: by 2002:a17:90b:52c7:b0:37f:eda5:5169 with SMTP id 98e67ed59e1d1-37feda55454mr4418547a91.13.1782735223484; Mon, 29 Jun 2026 05:13:43 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, andrew.jones@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 1/2] hw/riscv/riscv-iommu.c: check for reserved PTE bits Date: Mon, 29 Jun 2026 09:13:33 -0300 Message-ID: <20260629121334.567587-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260629121334.567587-1-daniel.barboza@oss.qualcomm.com> References: <20260629121334.567587-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: XW2aczuHPN_opQKjes7pm1Lb8A9lP7sg X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDEwMCBTYWx0ZWRfX1oBnv5z0eaZY GdGMZEG89T2ePs7IItOjza1x5CtI8kFcRK63UyD+R2za2Sdyj/bl6YCGCsdi454cwxaoZPGfuKW 7ik5oXnN9PsLEXWUkzFCmFAHL/PoLUo= X-Proofpoint-ORIG-GUID: XW2aczuHPN_opQKjes7pm1Lb8A9lP7sg X-Authority-Analysis: v=2.4 cv=PqSjqQM3 c=1 sm=1 tr=0 ts=6a426178 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=p0WdMEafAAAA:8 a=EUspDBNiAAAA:8 a=qwidNiq27HggKHQKDkEA:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDEwMCBTYWx0ZWRfX3EwRtCty1Qit OXaLTKiKqOhXw/0qyhtxWZK/OHsyuo/wUoRJYFutJpYTYFPmmBfAgzCxsPuLT7c84xZiNWPmQSt 9Wm4sw0TzPVY+CtXOlVVAxx492XVwNMDbXvl+hd1wgM1j35KzoiDhciukBvVHHDVSnLs3dZbk4C nqtrkWzkejAxDcbyGDxQ14cYhI1QN29t7XW0dY2kuaJAgF+BFPw+OY2Feh44F2lylmQxG+QO5Ko 9cMKx9hSwF//yP1JFPxFp4AwNFhmPxogbTIBSHbqh5J/GDXPkRdX115Co0jGVjXf+qDbrSJeeND UlNwElMnGmcYTuVnYt/sreZncznrjfE0KcSkK/+ZtRljKp5urgMyn4VbuC5MrTLaa/nKrkZH5lo 8+k6jNx7NbIAoSEzOPTY/qEYWkbH8QwviaF6VWi0hVg6Y53psEbxhT/SjZVP+F0+DZbx+XE7/TN xBroc7ZjBAoz9tkQ1uA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782735252841158500 Content-Type: text/plain; charset="utf-8" We need to fault if reserved PTE bits (60:54) are set. Fixes: 0c54acb8243d ("hw/riscv: add RISC-V IOMMU base emulation") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3554 Signed-off-by: Daniel Henrique Barboza Reviewed-by: Chao Liu Reviewed-by: Nutty Liu --- hw/riscv/riscv-iommu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index c9687e01a8..453601d7a5 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -468,6 +468,8 @@ static int riscv_iommu_spa_fetch(RISCVIOMMUState *s, RI= SCVIOMMUContext *ctx, =20 if (!(pte & PTE_V)) { break; /* Invalid PTE */ + } else if (pte & PTE_RESERVED(false)) { + break; /* Reserved PTE bits set */ } else if (!(pte & (PTE_R | PTE_W | PTE_X))) { base =3D PPN_PHYS(ppn); /* Inner PTE, continue walking */ } else if ((pte & (PTE_R | PTE_W | PTE_X)) =3D=3D PTE_W) { --=20 2.43.0 From nobody Sun Jul 26 11:51:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1782735305; cv=none; d=zohomail.com; s=zohoarc; b=QaNUxl/6AKm0DJ0vqBNX/J7jTWHPeRfKJq4541Kmobx4Zqm1dakmsWkMomGrXNqcM9MSRi+3JFBazF6wK8TdBomANsSDcmlqjpToOYz8wFw7ZBMJmsu6SWjyT92na8WMt98nDeIcwPcNHpQLAbQ1oILj+yLm5R15+cMH5WreblE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782735305; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MbGjSXSe/SEJVeLI2ltqryQwXs/ej1Lojop1PHAWL2I=; b=nMtV3lwVmNSTEyyJkNBW2epyFS3Yi7BKZQIwuNsUq784DnK1r2rMWG+nl4ImtEPLeIq/jmUWRI+HN3DkvPCDCrwnKOXNOXXer3Ie1rTCJZW6J3kpGmj5TzoHLoHsw9yvKXmyX2bKJkKcLEaW1zIOW6YL0amNz4Q2XVWgd1VtKpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782735304992585.7133963862839; Mon, 29 Jun 2026 05:15:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1weAsN-0002ld-Gx; Mon, 29 Jun 2026 08:14:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1weAs8-00024F-Nj for qemu-devel@nongnu.org; Mon, 29 Jun 2026 08:13:58 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1weAs6-0005Mo-8A for qemu-devel@nongnu.org; Mon, 29 Jun 2026 08:13:56 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TASxQH2641491 for ; Mon, 29 Jun 2026 12:13:48 GMT Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3nperqd0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 12:13:48 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38010ab3c0bso773834a91.0 for ; Mon, 29 Jun 2026 05:13:48 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e1c93272fsm5800179a91.14.2026.06.29.05.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 05:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=MbGjSXSe/SE JVeLI2ltqryQwXs/ej1Lojop1PHAWL2I=; b=KDcxxJuWjELmdLl3Jn6CZ7/CmtW 1aJjoD1kxP1YKz3T78zrvhmxpg067mz9Cx/R54PZ1XmD46OgJRviiSmhpDAw/nYh XdUHzVVJ9be79PsPN3Wc4nSr05lr1qw3SNyp3ltv1ZRE/qNgYyZ63oOOQnIm3M72 gtkbaFRk7CCK1aJhH4mEVyqV4d0KMYLoi1NBzKkUXG+XG+Lr+mPZlB1jwRlnapbl 3c1VpLhfgdNmMvZG937NctPNluhrgdExyI8izawhELfS7A9GpBdJwSqMr6j2A0bY ZshJRuy/m66QniCldBeeoKP4sdTHnMDNQogOdrn0UuMotwHNWKt3IAU5BvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782735228; x=1783340028; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MbGjSXSe/SEJVeLI2ltqryQwXs/ej1Lojop1PHAWL2I=; b=DqiSBzoGSMWaDx7wY1fT25BVRU0mIJcOC3zsExpmmzJFwxgseRp2z5IB3sGFoSVwyn yWFdAYtmA7yYoQsTkszv+/TGrzzXWwMNuV3tJSPI5f+CGq0i8weSKlf7CjWPXtTemsuV qwDoCquIMMu+U5UvrVV89wsesuInbeiqdDaBFNt1oMjTKr5ZTbMhn3OriM0N99KF9uCw cJCFzfCPyJCsfQjOBhBtJQwCxpCbJiSc0FcUfnR4jvXqnxuFBa5DbwiM8IHjeHIcV0Qh Qne59Zx3nDxnxcLkvUoaDnF2FP2IxU517UgQ8772vqzUFXlxXtuaS9WVlZvkHl5NVQiq 2wFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782735228; x=1783340028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MbGjSXSe/SEJVeLI2ltqryQwXs/ej1Lojop1PHAWL2I=; b=X7J1NUBPRoHTZRJPxPxleqeplMQdjAFlygsVbTJyQtIIEAGeYym69HRJnSNOtyE+3P QlB0A6J/Eu1TN7Eq6b02Si3x6ozsW3JwRcXMAdd15kUyCNFEjKtfSf0raSDLlZNG2Sf4 rTXAY9zGd8IFQBkSgrdj/UxJiEY5J0rILO51eVXYbmsmdM/ZJjHspC82MrNsSVd0948p 9j/tj4hDhC2GDxCwqYYXzpF7B3aKwi5pKZLY8xZ5X4KLfbgWKkvjMWsPGU1KjHz9hy92 eMafbXohnSawOtlBBYIQNXV53RyzsEVK9HebY/AZ4xlmQijKs3QhB2lm2Q9AJntQjvNy JQgQ== X-Gm-Message-State: AOJu0Yzy+e+r9i5XTu27DwmhdNPKJkdEk4JLH7+uIvus5nk5lGYnBe0+ 97AyHzkVaoa5gfulTzg7ezdNxTfcxM7dQ/V5cfK9rOmGnQgJ2S27G2buR3zu20Saal7vFZ0BFtl nnqZm1bzBMbdux64qpQJhi7i7bsdNUDRi7xDQcMQI74GGiaPPW6H38WSVkA1S8Q7M6g== X-Gm-Gg: AfdE7ck8ar5LMOAC3hzFzI08j66ULWyv6JVLpQx6vy1splJLXmt14uQ/yVBXE/qNN+M QcFVDxAiu5Q+mpMbsngUdKjsPT0BuG8F89CIW3i23sMaNkDP/vDe4raiaAA4P+ocEinD7Q+hkRI ybYQ3q88jCA/SJ9p7KqGurmII90wcfx97nWnRx+Etzm/UjUNmhdKdwADwzzxy0EYc9u927lBCnM kV5LzodFmy4dix/Lwb/Tr13+F6vq/uEtYS6VBGR+lJT3B7PzgMjJOrcoJQqHmkWlTR7izM8ZMxv rW+cq1VL5GHWWwbwkceS2ZJ4idtJ8y87NI6FbCB5+ins6IuAFv7sX5TZEKTwV1HgoyZnhEyIP5A xuJR121B2hqHvlgmQb6tcB3T0ZHAnZBogLLgdYPXu3zJFDQ== X-Received: by 2002:a17:90b:5826:b0:36b:b4a1:2939 with SMTP id 98e67ed59e1d1-37dfa251534mr14654144a91.15.1782735227936; Mon, 29 Jun 2026 05:13:47 -0700 (PDT) X-Received: by 2002:a17:90b:5826:b0:36b:b4a1:2939 with SMTP id 98e67ed59e1d1-37dfa251534mr14654110a91.15.1782735227518; Mon, 29 Jun 2026 05:13:47 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, andrew.jones@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt , Tao Tang , Fabiano Rosas , Laurent Vivier , Paolo Bonzini Subject: [PATCH 2/2] hw/riscv/riscv-iommu.c: fault when !PTE_U and no priv access Date: Mon, 29 Jun 2026 09:13:34 -0300 Message-ID: <20260629121334.567587-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260629121334.567587-1-daniel.barboza@oss.qualcomm.com> References: <20260629121334.567587-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDEwMCBTYWx0ZWRfX10Tq0cE2pkmd yx84/mvPi4LafSUQMrr1GHc/SLoODeIQv3FcdwGevoguQKBBv/KltboHEt3znBiULPoVfF18waI 5Xeq2HBXuvtTMmsx19AUlFKs0IO9S0wcXM4+io+oM8KUuZLYt41DA8N0cxbBNh7jRy1/hVJtbRj b53mTpI+a5Go7WKN2cweHVntRr61LlJZH3i49N0OO+R0gK3561nNEScL2s6GVXqgtlMOxidBEbR ypPAMM7W6aCFmwIrS8sQOtalZJCWplVI0VVCB9cOf2Q74xIew2ATiPjlq3gko3rxsapQ/h47FL+ o7YekKnGGhDAkuZHhl+KW+Vxwf0RPaG/Z6Z7UlVUq9XtnTylm6d6aJDTrpseKE+exZrR2KrBj29 EdXJabIpGN5UTdRK57x27dC5gpcOCSpjxh75HffhJfMzfJmjxaCf1qvsOvLDZTvoYPHr7ZN1tr4 TQ+ymctt7ULfxb+cSpg== X-Proofpoint-ORIG-GUID: Vurem6YrSIiZ4LPd2k7so-FVN7UIxWaL X-Authority-Analysis: v=2.4 cv=T6q8ifKQ c=1 sm=1 tr=0 ts=6a42617c cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=p0WdMEafAAAA:8 a=EUspDBNiAAAA:8 a=mpH3L83ql8VJAxoKzUcA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDEwMCBTYWx0ZWRfX9hNWCo2U2hAP C7em9JrfRu8BTHDunDtcflDjUwz2ZKA/F4QMGujREJseSccw+wiZx+XHl7kL3rzoSGhjDU77vzg s5KoDr7Y7nx2raDyk2FSpOor8TbwPpg= X-Proofpoint-GUID: Vurem6YrSIiZ4LPd2k7so-FVN7UIxWaL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782735308331158500 Content-Type: text/plain; charset="utf-8" All IOMMU accesses are assumed to be user mode unless told otherwise, i.e. we have a process_id. In case we have a non-user mode leaf PTE (PTE_U isn't set) and we are running in user mode, we need to throw a fault. This also reflects on qos-riscv-iommu tests: the tests always run in user mode so our PTEs must have PTE_U (bit 0x10) set. Fixes: 0c54acb8243d ("hw/riscv: add RISC-V IOMMU base emulation") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3553 Signed-off-by: Daniel Henrique Barboza Reviewed-by: Chao Liu Reviewed-by: Nutty Liu --- hw/riscv/riscv-iommu.c | 8 ++++++++ tests/qtest/libqos/qos-riscv-iommu.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index 453601d7a5..e6d2ca94bc 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -297,6 +297,7 @@ static int riscv_iommu_spa_fetch(RISCVIOMMUState *s, RI= SCVIOMMUContext *ctx, G_STAGE =3D 1, } pass; MemTxResult ret; + bool pv =3D !!ctx->process_id; =20 satp =3D get_field(ctx->satp, RISCV_IOMMU_ATP_MODE_FIELD); gatp =3D get_field(ctx->gatp, RISCV_IOMMU_ATP_MODE_FIELD); @@ -470,6 +471,13 @@ static int riscv_iommu_spa_fetch(RISCVIOMMUState *s, R= ISCVIOMMUContext *ctx, break; /* Invalid PTE */ } else if (pte & PTE_RESERVED(false)) { break; /* Reserved PTE bits set */ + } else if (!(pte & PTE_U) && !pv) { + /* + * All accesses are assumed to be User mode unless + * process_id is valid (pv). In case we have a + * non-user mode PTE and !pv we need to fault. + */ + break; } else if (!(pte & (PTE_R | PTE_W | PTE_X))) { base =3D PPN_PHYS(ppn); /* Inner PTE, continue walking */ } else if ((pte & (PTE_R | PTE_W | PTE_X)) =3D=3D PTE_W) { diff --git a/tests/qtest/libqos/qos-riscv-iommu.h b/tests/qtest/libqos/qos-= riscv-iommu.h index 90e69a5d73..c218e9d66d 100644 --- a/tests/qtest/libqos/qos-riscv-iommu.h +++ b/tests/qtest/libqos/qos-riscv-iommu.h @@ -54,8 +54,8 @@ * PTE masks for RISC-V IOMMU page tables. * Values match PTE_V, PTE_R, PTE_W, PTE_A, PTE_D in target/riscv/cpu_bits= .h */ -#define QRIOMMU_NON_LEAF_PTE_MASK 0x001 /* PTE_V */ -#define QRIOMMU_LEAF_PTE_RW_MASK 0x0c7 /* V|R|W|A|D */ +#define QRIOMMU_NON_LEAF_PTE_MASK 0x011 /* PTE_V | PTE_U */ +#define QRIOMMU_LEAF_PTE_RW_MASK 0x0d7 /* V | R | W | A | D | PTE_U */ #define QRIOMMU_PTE_PPN_MASK 0x003ffffffffffc00ull =20 /* Address-space base offset for test tables */ --=20 2.43.0