From nobody Sun Jul 26 11:03:39 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=1782897791; cv=none; d=zohomail.com; s=zohoarc; b=FRKmg5I98ChVqoj/BPpafsk1A6mJGgmQg6Bv7VQ2FomJ2bw8ET1liS2kgQUBp9WQ8XLXuHfXYgapnzBY5TAzQxH0cipwwiUTu0ysbd3Tq4kSDWXiT6Odw/K9wRiCbAqaNQdt/7z6htIsUKUlbZVbxXjzzC4RXZdiVI7eW7Urk2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782897791; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aP3/6FaYOBbAQXbEok4/lvQIxgKUn33JL3GGE4UZhGU=; b=hcdaRFH2k4CJ0JARGfhQ/bz/Zmx1jJhgyuR4bK6jMMxBIWGHBsBDPZNMvMY+KlNrKwdJUsERAxtb94m6F134ke2RTNEkgAk6cZldeQmfokcPsikphI1H5t/KHOcaBi0NsQsW2pe1hnJocU58D407x/CYhj9rb41xq4ycxof89Qg= 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 1782897791634457.5842821019247; Wed, 1 Jul 2026 02:23:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wer9k-0007Zs-FQ; Wed, 01 Jul 2026 05:22:56 -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 1wer9i-0007ZE-Fv for qemu-devel@nongnu.org; Wed, 01 Jul 2026 05:22:54 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wer9g-0002Wm-CW for qemu-devel@nongnu.org; Wed, 01 Jul 2026 05:22:54 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6618GNIj489417 for ; Wed, 1 Jul 2026 09:22:50 GMT Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f4h0auy6j-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 01 Jul 2026 09:22:50 +0000 (GMT) Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-4412c255fd4so278714fac.3 for ; Wed, 01 Jul 2026 02:22:50 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-44c613c0457sm1222120fac.3.2026.07.01.02.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 02:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=aP3/6FaYOBbAQXbEok4/lvQIxgKUn33JL3G GE4UZhGU=; b=BLOzJ7txiIw29G3Ol8vaj4xniqUBaTIh3uREU3Ba22CvK0q/YeG gqGP2j8aEgzHpCccJS9JFoSyoOkT6mHWGaQ5G+PFMso6snyUoVBTpvoT4ChoaBmr CxZK2VQjciqvtEb3V1eKTRvDz4RurKQIfDp++kfJdxjw/nKbq36TOcpYQ8bMuO+/ u9Bus02z6tN76qY9qufH4gMMjEee1A8zCYau1ClhI/YCZ0CGKV8IBFh6HG33cvqA 09+5I/o0fgYZw9mZ/SxZP4Ah3IRwJqno/UxeZ9PTOIzuMFWTN3+b5TBClhMbWnwk DLDwnaNPEcn9f4uvJIJopgQQuizpRriSuSg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782897770; x=1783502570; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aP3/6FaYOBbAQXbEok4/lvQIxgKUn33JL3GGE4UZhGU=; b=gt+b4slcu9iisuj41oGrIwTRyaYZLwy5PlaUoyy32txPTuGMCRAHjbblPZ4Nk5MbpO xTFk66fwSOKIc9sOlWCSEdNbxes8GV17qv/ilgKsgoz9d2NEd0DhbAdgHYPkSvRKKBJK l8EvGPj6IKPtyHFhyOAx1R61CtI2vwLuibDO8jLWcgMJRnraTF0mR735LaegIVFPVdBe SJntmK9a8S1LP5iZXD0mHNO4wzisk6IXmmjDPHKw4cWqKjWx2HTo4LpxY3FLmbbPrF1+ LnRZJFKP2Fg0ac4+JwKgs8oWiVT3u4SauJHumvJfJHs27gkIMtsR2ggfgy/KrSPTmDAE /MxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782897770; x=1783502570; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aP3/6FaYOBbAQXbEok4/lvQIxgKUn33JL3GGE4UZhGU=; b=lqrKctn5ho8iXRJfIJZMHMWP1/oU6BM4pmkCA3QwVPhhSPCu90vyxRXevrbB/G5yAL vyfQAaPrTRpdZ4jM69THdXUMWBXZEgV3DrdLvaiYxnnMoSA4bUJEvhs0X5353vfE0DJs qkoXw0X7VOAY7xr9QWqwKbXRMNcpQvGVlGrLgDublynyTg6QZ0oQws5AWOCgdQantQdB pQwvScRrEi7g1G2TslCSPyCztH3IJyfNQ7rEN/jxQ02DvK+PHxrJLauNjrCL76p8dexn tNPzDsy7BTIGGRXlL8p2Khd27O6iWnM2Sug78s/sjap1eN9/o+zEZjUSreot+e8pbkR2 PlUA== X-Gm-Message-State: AOJu0YySuYiOk5yIlv1KgGw1J1+ZUdtVUbrG/zzupUmSMKPcGuJdhyWQ P6S+LQYZ+bd7xf00U5y3nNVK3Bj38dmiSXqKKK90yAZRTLUOi4/7GIZjHtIUMAaCFaZdhsitf2m pNqfz0/iZJSjA4DPMBropugwrSluMrKhWhVRExKmCK+sRYLjL5ZYnK8Mn71s2aIb3+g== X-Gm-Gg: AfdE7clBJBG+sFnWaIcWxGq5/nowFSLV8CRywbSNwQLrX9kvPFhra6D9J0p6lXXhB/y Wzo9rgAD1OYGnttUmBjMGO2/kQzaonVatvBbdixjRLTT/PYAw/AWaPCnOmm1GiaVmqTKApLCwDp 9+utMi9ug0Qwn2yyghyOlm77eZRGy71vqZfmb/1V8G/KP+ObgBap+vOM5M66WMglNKoa5LjIn1m ffQdheE8I9YKjC+WslATO1857M7wrxGS11bCksKL7iYEDyhIXupoc22ACW3Q81Y6czBmOrGkEfb kUQIMrb+l/cdpqpcxWsydAt3e06WIwKCQKWfP8cUiRjCEStOINVsIoE4ZwWl5qPR0mAYP7+5UQ5 6RMRVgWvJFpcpmkiYzB7pd2000M6mkpRlrqBQ6U9B6AavZQ== X-Received: by 2002:a05:6870:d40e:b0:448:558c:d8b3 with SMTP id 586e51a60fabf-44cabc2e295mr392058fac.41.1782897769868; Wed, 01 Jul 2026 02:22:49 -0700 (PDT) X-Received: by 2002:a05:6870:d40e:b0:448:558c:d8b3 with SMTP id 586e51a60fabf-44cabc2e295mr392041fac.41.1782897769451; Wed, 01 Jul 2026 02:22:49 -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] hw/riscv/riscv-iommu.c: set ftype and iova in riscv_iommu_ctx() Date: Wed, 1 Jul 2026 06:22:41 -0300 Message-ID: <20260701092241.307801-1-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=OuF/DS/t c=1 sm=1 tr=0 ts=6a44dc6a cx=c_pps a=CWtnpBpaoqyeOyNyJ5EW7Q==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=p0WdMEafAAAA:8 a=EUspDBNiAAAA:8 a=u8ADOvQWIPrcURbT9VIA:9 a=vh23qwtRXIYOdz9xvnmn:22 X-Proofpoint-ORIG-GUID: q6JwZ-gUtHBjVmVN71vn34ZRWjDTNrzT X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAxMDA5NCBTYWx0ZWRfX26LO0gD6RpTx jxQxE3kh815ujxr+jyh8TSXu6+8SOywbSv1T2fxB6vHL+85LKOqqbYw5ROHJ66y7FB0yqjmyWW/ hEgC5Q/IBmyggVtVxIJUKeZ/aeKFPEA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAxMDA5NCBTYWx0ZWRfXzuMGhMeRQcq4 qd9YSH7cL0q3yxolgUg6cgmXuQCJEqGF9EBfOH0EpSDpt5RKZnbSSfZUv0DU5DhpABJMwS7j+rN 9r8yMAh9aQtzyQXWoF+T8wiEL8mhf4nRsLVxe4EDCz/ExyRH83KwEJDYa3ZGQgtMvL2JrdCgMVc 9M1yy6q6MlNV3sl1IrTqVJDwiM4Os61pOWVvXvOJIsNmVEGojT3Md5plU59NujL7yC/os+KUU6F zWNb2rUxMEgd/Hu/aKeyFu2izryHZ8YthWevR0fMGYFde93d7tbJ6zTLgq/ecyvFOzHBhcNKHKg mpwPEluKyMxX5Ztes8CSjGDDnsJaGbZqgzoiGKlGGtbxLME7b09idLe8whFRCugw72EhuzhddZp 53FAp+xW63B2PhNCxF/4DCocuJNtNr+eEVxmfqnWqKt44cuAk6vlp9Q+ZtMMoj0OOvYQIjZBv8R I2CIMA6+tv8h6U+nGUQ== X-Proofpoint-GUID: q6JwZ-gUtHBjVmVN71vn34ZRWjDTNrzT 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-07-01_02,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 clxscore=1015 adultscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607010094 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.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-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=unavailable 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: 1782897793598158500 Content-Type: text/plain; charset="utf-8" We're hardcoding faulting type as READ, where it could very well be a write access, and we're not recording the faulting addr/iova. A note was added in the fault_type logic because I wasn't able to trivially handle a probable code repeitition it in this same patch. Something to do in a later date. Fixes: 0c54acb8243d ("hw/riscv: add RISC-V IOMMU base emulation") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3564 Signed-off-by: Daniel Henrique Barboza Acked-by: Alistair Francis --- hw/riscv/riscv-iommu.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index 70eede3f14..690c21289f 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -1330,6 +1330,7 @@ static void riscv_iommu_ctx_inval(RISCVIOMMUState *s,= GHFunc func, /* Find or allocate translation context for a given {device_id, process_id= } */ static RISCVIOMMUContext *riscv_iommu_ctx(RISCVIOMMUState *s, unsigned devid, unsigned process= _id, + IOMMUAccessFlags perm, uint64_t = iova, void **ref) { GHashTable *ctx_cache; @@ -1339,6 +1340,7 @@ static RISCVIOMMUContext *riscv_iommu_ctx(RISCVIOMMUS= tate *s, .process_id =3D process_id, }; unsigned mode =3D get_field(s->ddtp, RISCV_IOMMU_DDTP_MODE); + uint32_t fault_type; =20 ctx_cache =3D g_hash_table_ref(s->ctx_cache); =20 @@ -1381,8 +1383,21 @@ static RISCVIOMMUContext *riscv_iommu_ctx(RISCVIOMMU= State *s, g_hash_table_unref(ctx_cache); *ref =3D NULL; =20 - riscv_iommu_report_fault(s, ctx, RISCV_IOMMU_FQ_TTYPE_UADDR_RD, - fault, !!process_id, 0, 0); + /* + * TODO: (1) do we need to distinguish other fault types + * for ctx fetching and (2) evaluate putting the 'fault_type' + * logic inside riscv_iommu_report_fault() - there's at + * least one other place (end of riscv_iommu_translate()) + * that does something similar. + */ + if (perm & IOMMU_RO) { + fault_type =3D RISCV_IOMMU_FQ_TTYPE_UADDR_RD; + } else { + fault_type =3D RISCV_IOMMU_FQ_TTYPE_UADDR_WR; + } + + riscv_iommu_report_fault(s, ctx, fault_type, fault, + !!process_id, iova, 0); =20 g_free(ctx); return NULL; @@ -2128,6 +2143,8 @@ static void riscv_iommu_process_dbg(RISCVIOMMUState *= s) uint64_t ctrl =3D riscv_iommu_reg_get64(s, RISCV_IOMMU_REG_TR_REQ_CTL); unsigned devid =3D get_field(ctrl, RISCV_IOMMU_TR_REQ_CTL_DID); unsigned pid =3D get_field(ctrl, RISCV_IOMMU_TR_REQ_CTL_PID); + IOMMUAccessFlags perm =3D ctrl & RISCV_IOMMU_TR_REQ_CTL_NW + ? IOMMU_RO : IOMMU_RW; RISCVIOMMUContext *ctx; void *ref; =20 @@ -2135,7 +2152,7 @@ static void riscv_iommu_process_dbg(RISCVIOMMUState *= s) return; } =20 - ctx =3D riscv_iommu_ctx(s, devid, pid, &ref); + ctx =3D riscv_iommu_ctx(s, devid, pid, perm, iova, &ref); if (ctx =3D=3D NULL) { riscv_iommu_reg_set64(s, RISCV_IOMMU_REG_TR_RESPONSE, RISCV_IOMMU_TR_RESPONSE_FAULT | @@ -2143,7 +2160,7 @@ static void riscv_iommu_process_dbg(RISCVIOMMUState *= s) } else { IOMMUTLBEntry iotlb =3D { .iova =3D iova, - .perm =3D ctrl & RISCV_IOMMU_TR_REQ_CTL_NW ? IOMMU_RO : IOMMU_= RW, + .perm =3D perm, .addr_mask =3D ~0, .target_as =3D NULL, }; @@ -2482,7 +2499,7 @@ static MemTxResult riscv_iommu_trap_write(void *opaqu= e, hwaddr addr, /* FIXME: PCIe bus remapping for attached endpoints. */ devid |=3D s->bus << 8; =20 - ctx =3D riscv_iommu_ctx(s, devid, 0, &ref); + ctx =3D riscv_iommu_ctx(s, devid, 0, IOMMU_RW, addr, &ref); if (ctx =3D=3D NULL) { res =3D MEMTX_ACCESS_ERROR; } else { @@ -2784,7 +2801,7 @@ static IOMMUTLBEntry riscv_iommu_memory_region_transl= ate( }; uint32_t devid =3D riscv_iommu_space_devid(as); =20 - ctx =3D riscv_iommu_ctx(as->iommu, devid, iommu_idx, &ref); + ctx =3D riscv_iommu_ctx(as->iommu, devid, iommu_idx, flag, addr, &ref); if (ctx =3D=3D NULL) { /* Translation disabled or invalid. */ iotlb.addr_mask =3D 0; --=20 2.43.0