{"id":2218904,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218904/?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-9-kshk@linux.ibm.com>","date":"2026-04-02T02:29:14","name":"[08/15] s390x/pci: Move dma_limit from S390PCIIOMMU to S390PCIBusDevice","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0372b8ef14d4451ac1ba4edefda6f3a725a761ef","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-9-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/2218904/checks/","tags":{},"headers":{"Return-Path":"","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=Wei/QR5g;\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 4fmQqL1JBpz1yGH\n\tfor ; Thu, 02 Apr 2026 13:32:14 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w87pP-0004g8-Sd; Wed, 01 Apr 2026 22:30:39 -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 )\n id 1w87or-0004Dt-Hm; 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 )\n id 1w87op-0001mL-JE; 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 631Ik9883661500; Thu, 2 Apr 2026 02:29:59 GMT","from ppma13.dal12v.mail.ibm.com\n (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d65dcj6d1-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 (ppma13.dal12v.mail.ibm.com [127.0.0.1])\n by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 6321i8Gf031007;\n Thu, 2 Apr 2026 02:29:58 GMT","from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72])\n by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6uhk05hx-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:29:58 +0000","from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com\n [10.39.53.233])\n by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 6322TuWc17367744\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 E21E3580F4;\n Thu, 2 Apr 2026 02:29:56 +0000 (GMT)","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 59C5A580F6;\n Thu, 2 Apr 2026 02:29:56 +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=Gt8DeEfDIwQ0aIYf9\n Nv06cYAJNcblIALhEev2YCEqVo=; b=Wei/QR5gv2qlzxGH2P+GLGPQzvfK48wuk\n 3FJm0rCqh3oyEyqHq4BikoN4bzu+vIOwvt4K7wx/Xok3XVAIaiK/zmxeZMCZn8sj\n kdyNx43F/R+FThxkq2DatJr7U/NAIkmwKbjTWkRzLBEWBE42heVJdKGIS435dbFP\n Yk6z0OCHlaY3nVhed8JmCEsh03n15bMR94ZK3sWt5i8KZ9TxGmNcUqOOGuXcIvUY\n fRhcbkw3lBb6FyTdPW3WIfeIbgMOnMuO6lL013WEjPG+maxNLSFEz2xF39Y/XKGW\n YYtIBMuSnlZavHXEorX1AI6tiBKoHeeq+AJ6uh01PeCp2kULAa5Fg==","From":"Konstantin Shkolnyy ","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 ","Subject":"[PATCH 08/15] s390x/pci: Move dma_limit from S390PCIIOMMU to\n S390PCIBusDevice","Date":"Wed, 1 Apr 2026 21:29:14 -0500","Message-Id":"<20260402022921.298818-9-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=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=NXusJeJlOfVlo0NZOjUA:9","X-Proofpoint-GUID":"Cgg99t6P9cVcbu1MPGNq3SrU7o2ph2FN","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDAxOSBTYWx0ZWRfXz+DFBguv8VhU\n wCE3/OcIfkB7YsHfKDnBnLGsAOBd+2H5UvOTf3J2S2OsO/rFGvOf7eN9IalES5/fZrsUH1lsCcm\n 7C/1FATtBHiL3DxrogxHfKoagMCgsmq4yIo7uwBiy3Ntgei8fc8gcZxUDN5DZu4lzt3xvBc7Q+8\n Nl8vUk+BG5qCJf9c6lW5pTie+ziOXlB8IvvQ6KfCsDOXX9UCrgvjZPPDqr7WHwvnr4SXigTfKve\n CyVqdGS2htw7zrggTdGzWWj5VutHBV0KGozY6jY0LxuSZrP/hCqE5tlvWgsXKkUAi44lCKLTIlu\n +xUirYiomqb2muQTRlgBtuvD4yms3SUGe+N+SHPZYB4K2pLrNykdk6SCD55x6WYKJcbtLo3+OXV\n 448/li9ha0jmo590pGVeId7jo/oNY1GH6S+K9ldU1MZ5w/de4Wv88UAFR7JNxfxy24Ee6G5hCwd\n WmSAkBM2ayOQg06k/Cg==","X-Proofpoint-ORIG-GUID":"Cgg99t6P9cVcbu1MPGNq3SrU7o2ph2FN","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 ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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\nSigned-off-by: Konstantin Shkolnyy \n---\n hw/s390x/s390-pci-bus.c | 10 +++++-----\n hw/s390x/s390-pci-inst.c | 23 +++++++++++------------\n include/hw/s390x/s390-pci-bus.h | 2 +-\n 3 files changed, 17 insertions(+), 18 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex 27ba3c801c..4a0b31b98b 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -609,8 +609,8 @@ static void s390_pci_ioat_replay(S390PCIBusDevice *pbdev)\n return;\n }\n \n- if (iommu->dma_limit) {\n- dma_avail = iommu->dma_limit->avail;\n+ if (pbdev->dma_limit) {\n+ dma_avail = pbdev->dma_limit->avail;\n } else {\n dma_avail = 1;\n }\n@@ -1210,7 +1210,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,\n pbdev->forwarding_assist = false;\n }\n }\n- pbdev->iommu->dma_limit = s390_pci_start_dma_count(s, pbdev);\n+ pbdev->dma_limit = s390_pci_start_dma_count(s, pbdev);\n /* Fill in CLP information passed via the vfio region */\n s390_pci_get_clp_info(pbdev);\n if (!pbdev->interp) {\n@@ -1288,8 +1288,8 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,\n pbdev->fid = 0;\n QTAILQ_REMOVE(&s->zpci_devs, pbdev, link);\n g_hash_table_remove(s->zpci_table, &pbdev->idx);\n- if (pbdev->iommu && pbdev->iommu->dma_limit) {\n- s390_pci_end_dma_count(s, pbdev->iommu->dma_limit);\n+ if (pbdev->dma_limit) {\n+ s390_pci_end_dma_count(s, pbdev->dma_limit);\n }\n g_hash_table_destroy(pbdev->iotlb);\n qdev_unrealize(dev);\ndiff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c\nindex 4458eae681..ac4e7f412d 100644\n--- a/hw/s390x/s390-pci-inst.c\n+++ b/hw/s390x/s390-pci-inst.c\n@@ -28,17 +28,17 @@\n \n #include \"trace.h\"\n \n-static inline void inc_dma_avail(S390PCIIOMMU *iommu)\n+static inline void inc_dma_avail(S390PCIBusDevice *pbdev)\n {\n- if (iommu->dma_limit) {\n- iommu->dma_limit->avail++;\n+ if (pbdev->dma_limit) {\n+ pbdev->dma_limit->avail++;\n }\n }\n \n-static inline void dec_dma_avail(S390PCIIOMMU *iommu)\n+static inline void dec_dma_avail(S390PCIBusDevice *pbdev)\n {\n- if (iommu->dma_limit) {\n- iommu->dma_limit->avail--;\n+ if (pbdev->dma_limit) {\n+ pbdev->dma_limit->avail--;\n }\n }\n \n@@ -616,7 +616,6 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n uint32_t s390_pci_update_iotlb(S390PCIBusDevice *pbdev,\n S390IOTLBEntry *entry)\n {\n- S390PCIIOMMU *iommu = pbdev->iommu;\n S390IOTLBEntry *cache = g_hash_table_lookup(pbdev->iotlb, &entry->iova);\n IOMMUTLBEvent event = {\n .type = entry->perm ? IOMMU_NOTIFIER_MAP : IOMMU_NOTIFIER_UNMAP,\n@@ -634,7 +633,7 @@ uint32_t s390_pci_update_iotlb(S390PCIBusDevice *pbdev,\n goto out;\n }\n g_hash_table_remove(pbdev->iotlb, &entry->iova);\n- inc_dma_avail(iommu);\n+ inc_dma_avail(pbdev);\n /* Don't notify the iommu yet, maybe we can bundle contiguous unmaps */\n goto out;\n } else {\n@@ -657,7 +656,7 @@ uint32_t s390_pci_update_iotlb(S390PCIBusDevice *pbdev,\n cache->len = TARGET_PAGE_SIZE;\n cache->perm = entry->perm;\n g_hash_table_replace(pbdev->iotlb, &cache->iova, cache);\n- dec_dma_avail(iommu);\n+ dec_dma_avail(pbdev);\n }\n \n /*\n@@ -667,7 +666,7 @@ uint32_t s390_pci_update_iotlb(S390PCIBusDevice *pbdev,\n memory_region_notify_iommu(&pbdev->iommu_mr, 0, event);\n \n out:\n- return iommu->dma_limit ? iommu->dma_limit->avail : 1;\n+ return pbdev->dma_limit ? pbdev->dma_limit->avail : 1;\n }\n \n static void s390_pci_batch_unmap(S390PCIBusDevice *pbdev, uint64_t iova,\n@@ -744,8 +743,8 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n }\n \n iommu = pbdev->iommu;\n- if (iommu->dma_limit) {\n- dma_avail = iommu->dma_limit->avail;\n+ if (pbdev->dma_limit) {\n+ dma_avail = pbdev->dma_limit->avail;\n } else {\n dma_avail = 1;\n }\ndiff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h\nindex 24f6e60786..126a50c98b 100644\n--- a/include/hw/s390x/s390-pci-bus.h\n+++ b/include/hw/s390x/s390-pci-bus.h\n@@ -279,7 +279,6 @@ struct S390PCIIOMMU {\n uint64_t pba;\n uint64_t pal;\n uint64_t max_dma_limit;\n- S390PCIDMACount *dma_limit;\n };\n \n typedef struct S390PCIIOMMUTable {\n@@ -353,6 +352,7 @@ struct S390PCIBusDevice {\n IOMMUMemoryRegion iommu_mr;\n MemoryRegion *dm_mr;\n GHashTable *iotlb;\n+ S390PCIDMACount *dma_limit;\n MemoryRegion msix_notify_mr;\n IndAddr *summary_ind;\n IndAddr *indicator;\n","prefixes":["08/15"]}