{"id":2218905,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218905/?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-12-kshk@linux.ibm.com>","date":"2026-04-02T02:29:17","name":"[11/15] s390x/pci: Move pal from S390PCIIOMMU to S390PCIBusDevice","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d9e7dc2e75ef976d58e352568b25c7e302521810","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-12-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/2218905/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=GbYaDdUk;\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 4fmQqP6Dy8z1yGH\n\tfor ; Thu, 02 Apr 2026 13:32:17 +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 1w87pa-0004pb-A1; Wed, 01 Apr 2026 22:30:50 -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 1w87ot-0004EN-Rb; Wed, 01 Apr 2026 22:30:09 -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 1w87os-0001xd-0D; Wed, 01 Apr 2026 22:30:07 -0400","from pps.filterd (m0360072.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 631DqupJ346198; Thu, 2 Apr 2026 02:30:01 GMT","from ppma11.dal12v.mail.ibm.com\n (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d66msa3tp-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:30:01 +0000 (GMT)","from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1])\n by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 6321P5Mh008732;\n Thu, 2 Apr 2026 02:30:00 GMT","from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74])\n by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6v11r446-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 02:30:00 +0000","from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com\n [10.39.53.233])\n by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 6322Twk824249034\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 2 Apr 2026 02:29:59 GMT","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id CC8FF580F4;\n Thu, 2 Apr 2026 02:29:58 +0000 (GMT)","from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 44A6E580F6;\n Thu, 2 Apr 2026 02:29:58 +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:58 +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=NrGCf/8bYetSxN9UU\n Picau0uFbfmC6ccfpRPRtmpOxo=; b=GbYaDdUkBYoN5XagJz7cIPrnuFgI67r0f\n s+cTwxkHQ6VjgNwtkNE+hK5vVPvx/WHWDzpiuTqshaKbUAP4Os13jgK6ouuOFqq5\n d//Z78/jqrIjUdXu8V/eCH9cZJ1ta+rJAYEG7AkGFgNRcn6lC5SNr5nhg1J9cEMA\n wwBgIoH1iOGL56q5mnFdcX9CGQqdigxg2goLwQivCtZozKquZ7Ib2flzdTv9z0gE\n ZVLPuaQ1QMhs332gnGtWGkJkASQlRqcUPbzwbumiOoY1IhQmBbVGf/NjGh5X7ijI\n uoYHKkJl1UARb/JIs5KmRDOtCyYHkrxk9O82KI0LAsDuK1sj4VE1Q==","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 11/15] s390x/pci: Move pal from S390PCIIOMMU to\n S390PCIBusDevice","Date":"Wed, 1 Apr 2026 21:29:17 -0500","Message-Id":"<20260402022921.298818-12-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=J6enLQnS c=1 sm=1 tr=0 ts=69cdd4a9 cx=c_pps\n a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=WfwOUNX5pORHP_P-vIkA:9","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDAxOSBTYWx0ZWRfX5kkaFzfftqwR\n 3BFjAi7Dl2J3sF3GvaMNbjaKa/0D4pRaW7pF4KlP6mkNLhjy5n8oIkKO6Fs+C5Qas/PBAVot0bH\n AOK2Q6Ns0L2lb0i5uDMrFGBHI3V/k8bgPyqfxRLQM2Zkl32vdax1CnJwjrWot3EARLkYP72YdcQ\n i6l+a/srYJpr7Utwydy7yD6Gyx5ATLqgGyb7oF0mKsVmycLiFdJv8NiJwhz+RTMWb5h/caEPYM2\n wDa7xTFg1yfTId1kBnljIaWfj3oGAF7TroHqyOfmc20RwlBnf18E2wpL+X7jF+d+FHwfq2lJfGM\n hOC9ReEtrgq0KVGnDtr8/ywMxkEY9tcsT7xzOfdG/FeG6loqUOCvlvSFFaRnCUVMLJMlkGlZTYD\n kTX1uUGEhasWz5cvU0y2+JdLKEMfQkshMP3/P1dIh/xvSHFBlmE4TrZ4Exj2xE5RlcVVCjLI2si\n rjsvS985HYpLL7Cl1XA==","X-Proofpoint-GUID":"eEYGYQTVNurchBqlWVGeVDz2upqiNn1x","X-Proofpoint-ORIG-GUID":"eEYGYQTVNurchBqlWVGeVDz2upqiNn1x","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 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 bulkscore=0\n phishscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 impostorscore=0\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2603050001 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\nThis also allows to save/restore this field during migration.\n\nSigned-off-by: Konstantin Shkolnyy \n---\n hw/s390x/s390-pci-bus.c | 8 +++-----\n hw/s390x/s390-pci-inst.c | 12 ++++--------\n include/hw/s390x/s390-pci-bus.h | 2 +-\n 3 files changed, 8 insertions(+), 14 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex 734af3a307..f339a0fd94 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -539,7 +539,6 @@ static IOMMUTLBEntry s390_translate_iommu(IOMMUMemoryRegion *mr, hwaddr addr,\n IOMMUAccessFlags flag, int iommu_idx)\n {\n S390PCIBusDevice *pbdev = container_of(mr, S390PCIBusDevice, iommu_mr);\n- S390PCIIOMMU *iommu = pbdev->iommu;\n S390IOTLBEntry *entry;\n uint64_t iova = addr & TARGET_PAGE_MASK;\n uint16_t error = 0;\n@@ -564,7 +563,7 @@ static IOMMUTLBEntry s390_translate_iommu(IOMMUMemoryRegion *mr, hwaddr addr,\n \n trace_s390_pci_iommu_xlate(addr);\n \n- if (addr < pbdev->pba || addr > iommu->pal) {\n+ if (addr < pbdev->pba || addr > pbdev->pal) {\n error = ERR_EVENT_OORANGE;\n goto err;\n }\n@@ -599,10 +598,9 @@ static void s390_pci_ioat_replay(S390PCIBusDevice *pbdev)\n uint16_t error = 0;\n uint32_t dma_avail;\n hwaddr curr, end;\n- S390PCIIOMMU *iommu = pbdev->iommu;\n \n curr = pbdev->pba;\n- end = iommu->pal;\n+ end = pbdev->pal;\n \n if (pbdev->dm_mr) {\n /* If direct mapping is used, there are no guest tables to replay */\n@@ -770,7 +768,7 @@ void s390_pci_iommu_enable(S390PCIBusDevice *pbdev)\n char *name = g_strdup_printf(\"iommu-s390-%04x\", pbdev->uid);\n memory_region_init_iommu(&pbdev->iommu_mr, sizeof(pbdev->iommu_mr),\n TYPE_S390_IOMMU_MEMORY_REGION, OBJECT(&iommu->mr),\n- name, iommu->pal + 1);\n+ name, pbdev->pal + 1);\n pbdev->iommu_enabled = true;\n memory_region_add_subregion(&iommu->mr, 0, MEMORY_REGION(&pbdev->iommu_mr));\n g_free(name);\ndiff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c\nindex 7680d87080..191f549ba7 100644\n--- a/hw/s390x/s390-pci-inst.c\n+++ b/hw/s390x/s390-pci-inst.c\n@@ -700,7 +700,6 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n uint32_t fh;\n uint16_t error = 0;\n S390PCIBusDevice *pbdev;\n- S390PCIIOMMU *iommu;\n S390IOTLBEntry entry;\n hwaddr start, end, sstart;\n uint32_t dma_avail;\n@@ -742,7 +741,6 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n break;\n }\n \n- iommu = pbdev->iommu;\n if (pbdev->dma_limit) {\n dma_avail = pbdev->dma_limit->avail;\n } else {\n@@ -753,7 +751,7 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)\n goto err;\n }\n \n- if (end < pbdev->pba || start > iommu->pal) {\n+ if (end < pbdev->pba || start > pbdev->pal) {\n error = ERR_EVENT_OORANGE;\n goto err;\n }\n@@ -1001,7 +999,6 @@ bool s390_pci_is_translation_enabled(uint64_t g_iota)\n static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib,\n uintptr_t ra)\n {\n- S390PCIIOMMU *iommu = pbdev->iommu;\n uint64_t pba = ldq_be_p(&fib.pba);\n uint64_t pal = ldq_be_p(&fib.pal);\n uint64_t g_iota = ldq_be_p(&fib.iota);\n@@ -1027,7 +1024,7 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib,\n }\n \n pbdev->pba = pba;\n- iommu->pal = pal;\n+ pbdev->pal = pal;\n pbdev->g_iota = g_iota;\n \n if (t) {\n@@ -1041,10 +1038,9 @@ static int reg_ioat(CPUS390XState *env, S390PCIBusDevice *pbdev, ZpciFib fib,\n \n void pci_dereg_ioat(S390PCIBusDevice *pbdev)\n {\n- S390PCIIOMMU *iommu = pbdev->iommu;\n s390_pci_iommu_disable(pbdev);\n pbdev->pba = 0;\n- iommu->pal = 0;\n+ pbdev->pal = 0;\n pbdev->g_iota = 0;\n }\n \n@@ -1417,7 +1413,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,\n }\n \n stq_be_p(&fib.pba, pbdev->pba);\n- stq_be_p(&fib.pal, pbdev->iommu->pal);\n+ stq_be_p(&fib.pal, pbdev->pal);\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);\ndiff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h\nindex 42f39a5cf0..1f5d8d4bd4 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 pal;\n uint64_t max_dma_limit;\n };\n \n@@ -352,6 +351,7 @@ struct S390PCIBusDevice {\n GHashTable *iotlb;\n uint64_t g_iota;\n uint64_t pba;\n+ uint64_t pal;\n S390PCIDMACount *dma_limit;\n MemoryRegion msix_notify_mr;\n IndAddr *summary_ind;\n","prefixes":["11/15"]}