{"id":2218899,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218899/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260402022921.298818-10-kshk@linux.ibm.com>","date":"2026-04-02T02:29:15","name":"[09/15] s390x/pci: Move g_iota from S390PCIIOMMU to S390PCIBusDevice","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5f84e666801266de6739e218cf161383137cbb3c","submitter":{"id":90249,"url":"http://patchwork.ozlabs.org/api/1.0/people/90249/?format=json","name":"Konstantin Shkolnyy","email":"kshk@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260402022921.298818-10-kshk@linux.ibm.com/mbox/","series":[{"id":498419,"url":"http://patchwork.ozlabs.org/api/1.0/series/498419/?format=json","date":"2026-04-02T02:29:08","name":"s390x/pci: Implement migration for emulated devices","version":1,"mbox":"http://patchwork.ozlabs.org/series/498419/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2218899/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=iXmb37Wg;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmQpM3RVsz1yGH\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 13:31:23 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w87pF-0004YB-OV; Wed, 01 Apr 2026 22:30:29 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <kshk@linux.ibm.com>)\n id 1w87or-0004Ds-HJ; Wed, 01 Apr 2026 22:30:06 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <kshk@linux.ibm.com>)\n id 1w87op-0001mg-Q7; Wed, 01 Apr 2026 22:30:05 -0400","from pps.filterd (m0353725.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 631IfKqc3065805; Thu, 2 Apr 2026 02:29:59 GMT","from ppma23.wdc07v.mail.ibm.com\n (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d65dcj6d4-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:29:59 +0000 (GMT)","from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1])\n by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 6321EPoh013922;\n Thu, 2 Apr 2026 02:29:59 GMT","from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73])\n by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4d6ttkr8eb-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:29:59 +0000","from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com\n [10.39.53.233])\n by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 6322TvV256623598\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 2 Apr 2026 02:29:57 GMT","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 88EC5580F4;\n Thu,  2 Apr 2026 02:29:57 +0000 (GMT)","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 01B3A580F6;\n Thu,  2 Apr 2026 02:29:57 +0000 (GMT)","from WIN-DU0DFC9G5VV.ibm.com (unknown [9.61.247.119])\n by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP;\n Thu,  2 Apr 2026 02:29:56 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=9O2dwSdCOQfpP/HIU\n 7CH820qFNISS0WlI/zjHFURx38=; b=iXmb37Wg4K1XvBZUMspqDFyTQo/SZHUUz\n 9jeVTidFCCxYaW4Ye9lWbhL1JfKTJeSMr2enzfH73HGHeA57ayccpU6s7OaBIb+J\n H7DAncXyjZDI4gfZ0oLxH/LXHh/NbGYGuKcFjh320ZCIx2qumEW5Iyfm6rCcFbaT\n VLGMeMgrULxNP4fSNUbMcQncVPTfbWA1mEppoM0c91hDL1xU6m6Es2iYYX65SW7X\n gZVh52ZQcAdkk0Kaj/x+bHhRenHZNHgqNGQZ/U8os/9PJWc2zK53dm2SnzDGh8bp\n YO7hWRruxE6BxuoajlWLSRe29f6B9JRhu9Hx7fKTv7A+wjPPpVRAg==","From":"Konstantin Shkolnyy <kshk@linux.ibm.com>","To":"mjrosato@linux.ibm.com","Cc":"alifm@linux.ibm.com, richard.henderson@linaro.org, iii@linux.ibm.com,\n david@kernel.org, cohuck@redhat.com, pasic@linux.ibm.com,\n borntraeger@linux.ibm.com, qemu-s390x@nongnu.org,\n qemu-devel@nongnu.org, Konstantin Shkolnyy <kshk@linux.ibm.com>","Subject":"[PATCH 09/15] s390x/pci: Move g_iota from S390PCIIOMMU to\n S390PCIBusDevice","Date":"Wed,  1 Apr 2026 21:29:15 -0500","Message-Id":"<20260402022921.298818-10-kshk@linux.ibm.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260402022921.298818-1-kshk@linux.ibm.com>","References":"<20260402022921.298818-1-kshk@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Authority-Analysis":"v=2.4 cv=RsjI7SmK c=1 sm=1 tr=0 ts=69cdd4a7 cx=c_pps\n a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=FDQAEqGjsTQLeQouP1gA:9","X-Proofpoint-GUID":"Lo5hnMoeq4bZtqKhzvWkS5Ll7SYtyEoi","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDAxOSBTYWx0ZWRfX27ZhpbLpY2ql\n uGpZlh/yFmmlNeYBxij7VaRCSV7XZ+3/LeC9B0tCaMycZtTa/ZLWP9Uu58MlL+t0FfMGk1eiCGR\n BnbCUeSzoDztxJN8PdN9Y4mfhU47nX6XsvVpCeCvx3okECXqlykPRKkCa21NJ50fZkhstGT6mND\n 7Q8EX6H7HnkzfIWL6ppSIr79DUAGNyOIUMkxUQmGD3+T8aZKi2ThpcUCYS27OQjacTyu5RZQdnK\n rcizL1QPj123Kb93w3rlOP0x+HWOGZTf6Ajnt84v8nMiXUIL6XmWeTWVzI3hVYxOdF3wgytQyiK\n SAMgfrxLqxvot0MeBAN6S5SCQUGEujJBRv5HRO6UkrGwPP0QPTsJXw1UgYCHA8lD7YnpjFeg8VL\n J2LRG3DngRZsnZbB0CTCL0GY5saH9FlRmE5AnvcopZT8fVapx4MoeSgstbBI/wbB9f/l6qFj/Dh\n Qarsc26jXMxDLsnixDw==","X-Proofpoint-ORIG-GUID":"Lo5hnMoeq4bZtqKhzvWkS5Ll7SYtyEoi","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-01_05,2026-04-01_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n impostorscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0\n suspectscore=0 malwarescore=0 spamscore=0 clxscore=1015 phishscore=0\n adultscore=0 classifier=typeunknown authscore=0 authtc= authcc=\n route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001\n definitions=main-2604020019","Received-SPF":"pass client-ip=148.163.158.5; envelope-from=kshk@linux.ibm.com;\n helo=mx0b-001b2d01.pphosted.com","X-Spam_score_int":"-6","X-Spam_score":"-0.7","X-Spam_bar":"/","X-Spam_report":"(-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\n RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=1, RCVD_IN_VALIDITY_RPBL_BLOCKED=1,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"This field is only used when S390PCIBusDevice exists, so it can be moved\nthere to simplify S390PCIIOMMU which purpose is just to store the \"root\"\nAddressSpace.\n\nThis also allows to save/restore this field during migration.\n\nSigned-off-by: Konstantin Shkolnyy <kshk@linux.ibm.com>\n---\n hw/s390x/s390-pci-bus.c         |  2 +-\n hw/s390x/s390-pci-inst.c        | 10 +++++-----\n include/hw/s390x/s390-pci-bus.h |  2 +-\n 3 files changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex 4a0b31b98b..b784196c9e 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -616,7 +616,7 @@ static void s390_pci_ioat_replay(S390PCIBusDevice *pbdev)\n     }\n \n     while (curr < end) {\n-        error = s390_guest_io_table_walk(iommu->g_iota, curr, &entry);\n+        error = s390_guest_io_table_walk(pbdev->g_iota, curr, &entry);\n         if (error) {\n             error_report(\"Failure to walk table during iommu remap\");\n             return;\ndiff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c\nindex ac4e7f412d..f4ec299614 100644\n--- a/hw/s390x/s390-pci-inst.c\n+++ b/hw/s390x/s390-pci-inst.c\n@@ -748,7 +748,7 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n     } else {\n         dma_avail = 1;\n     }\n-    if (!iommu->g_iota) {\n+    if (!pbdev->g_iota) {\n         error = ERR_EVENT_INVALAS;\n         goto err;\n     }\n@@ -762,7 +762,7 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n     start = sstart;\n     again = false;\n     while (start < end) {\n-        error = s390_guest_io_table_walk(iommu->g_iota, start, &entry);\n+        error = s390_guest_io_table_walk(pbdev->g_iota, start, &entry);\n         if (error) {\n             break;\n         }\n@@ -1028,7 +1028,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib,\n \n     iommu->pba = pba;\n     iommu->pal = pal;\n-    iommu->g_iota = g_iota;\n+    pbdev->g_iota = g_iota;\n \n     if (t) {\n         s390_pci_iommu_enable(pbdev);\n@@ -1045,7 +1045,7 @@ void pci_dereg_ioat(S390PCIBusDevice *pbdev)\n     s390_pci_iommu_disable(pbdev);\n     iommu->pba = 0;\n     iommu->pal = 0;\n-    iommu->g_iota = 0;\n+    pbdev->g_iota = 0;\n }\n \n void fmb_timer_free(S390PCIBusDevice *pbdev)\n@@ -1418,7 +1418,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,\n \n     stq_be_p(&fib.pba, pbdev->iommu->pba);\n     stq_be_p(&fib.pal, pbdev->iommu->pal);\n-    stq_be_p(&fib.iota, pbdev->iommu->g_iota);\n+    stq_be_p(&fib.iota, pbdev->g_iota);\n     stq_be_p(&fib.aibv, pbdev->routes.adapter.ind_addr);\n     stq_be_p(&fib.aisb, pbdev->routes.adapter.summary_addr);\n     stq_be_p(&fib.fmb_addr, pbdev->fmb_addr);\ndiff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h\nindex 126a50c98b..a7d1f1ade2 100644\n--- a/include/hw/s390x/s390-pci-bus.h\n+++ b/include/hw/s390x/s390-pci-bus.h\n@@ -275,7 +275,6 @@ struct S390PCIIOMMU {\n     Object parent_obj;\n     AddressSpace as;\n     MemoryRegion mr;\n-    uint64_t g_iota;\n     uint64_t pba;\n     uint64_t pal;\n     uint64_t max_dma_limit;\n@@ -352,6 +351,7 @@ struct S390PCIBusDevice {\n     IOMMUMemoryRegion iommu_mr;\n     MemoryRegion *dm_mr;\n     GHashTable *iotlb;\n+    uint64_t g_iota;\n     S390PCIDMACount *dma_limit;\n     MemoryRegion msix_notify_mr;\n     IndAddr *summary_ind;\n","prefixes":["09/15"]}