From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70973C61DBD for ; Wed, 26 Aug 2026 14:31:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wzEeu-0005wb-TV; Wed, 26 Aug 2026 10:31:20 -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 1wzEes-0005qt-M9; Wed, 26 Aug 2026 10:31:18 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wzEeq-0003Ec-KN; Wed, 26 Aug 2026 10:31:18 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67QE1flm4099702; Wed, 26 Aug 2026 14:31:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=ciVFSA awMLVFrbouV+KmhBgF/vx/CPazTIYKpZbrJpM=; b=T5AoOgM7Mq0kUCR1ByCQ7m Tb+nqpPjieYvsfxm1bzcy5boDxGXthuFgdwLhcl1Y4GOmbWcf0g8VwyNRsU5oMpH XZ8aYRwY9832CL27oLTgYz7YbmuEh+9ofjMp64dLgshQ9wotgYG6v+7O1Eyf3a8U /xD8FKZuysF+pmOtXIQMJii/vvX2hGaHEDoHe7SIJiM2Lzjw2CLFMyK+4dVDtRUv Q2mLup+ObGNPyaXoPjFSUu9ESNhvAwUGKqAn3eKK5cMSDvJcaYvAIJ+iMLo1v4qL tbtW+xu5XTFaLJMn553Xt45hamLjT7S3ZctopAf12/LvQ1X1BOy8L9NadhZXmJBg == Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4g716hyb9t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:31:14 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67QEQMnO013945; Wed, 26 Aug 2026 14:31:14 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4g7pfwahqf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:31:13 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67QEVCl450069952 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Aug 2026 14:31:12 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 72D6F5805D; Wed, 26 Aug 2026 14:31:12 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37E125805F; Wed, 26 Aug 2026 14:31:11 +0000 (GMT) Received: from [9.12.79.241] (unknown [9.12.79.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 26 Aug 2026 14:31:11 +0000 (GMT) Message-ID: Date: Wed, 26 Aug 2026 10:31:10 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 4/7] pc-bios/s390-ccw: Add support for virtio-net-pci IPL To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org Cc: mst@redhat.com, jrossi@linux.ibm.com, borntraeger@linux.ibm.com, jjherne@linux.ibm.com, cohuck@redhat.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, pasic@linux.ibm.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com References: <20260818205324.580199-1-zycai@linux.ibm.com> <20260818205324.580199-5-zycai@linux.ibm.com> Content-Language: en-US From: Zhuoying Cai In-Reply-To: <20260818205324.580199-5-zycai@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDExNiBTYWx0ZWRfX5ba0SuBCLvXY O+SlFUHP8VJZkkNnCCn/zXskZ39GTEVmbNQRAn85a4c3uhu015zhXpZ4LqgaRdWvJ5jhP7Rf/OG AzGkJAsyi0Puxyswb0LMYxPVNLujYRI= X-Proofpoint-GUID: O6ceRjLAHIC4opAc2y24ZM_2oHHSi2I6 X-Proofpoint-ORIG-GUID: O6ceRjLAHIC4opAc2y24ZM_2oHHSi2I6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDExNiBTYWx0ZWRfX+tlpTumuJmIs +tSU9rHJNrmexkIKsqRzMSI9nJ/2SLh4ZWZFznIXI2ui1nbRiAJ8kvWEU7LD1HCJJ5FikAwPmTh UsKtMCJnN6CDoMuUO8FqrchGNW6XTBMRgtkfrkvj9Gq6YFSENUdUhNsSp1m8/wIbW/jbmZWLQev JW/NMXA8Bc3Oy7+D32+qlXrCxRUKlrCMCgepqKnvgoc+leoJPVNHP0pUYkN058siHkXH1V3HmME 8De/A1FS9ep086hloPs9dWWuzaiZ/fRjKoz9oHSTBXkqdKrlsXAOMwwXpew+OLp7JccI9Hd6Bdv D/HHZjTaZQPdAqIyKOyhMh6ioMkicvPLOb+NoXi8xNGGd/r7evYVn1tvFTLxP8n6t727Sj2QrrW su1gchvWHkiZTBpkhqi2zw/HtxoEwJf/rWV1sLEaCu08KONoII7Ax0yRn6v7HWjcm6+EdPdshIO aYW5lvW5TVA3lxJkk8Q== X-Authority-Analysis: v=2.4 cv=H7brBeYi c=1 sm=1 tr=0 ts=6a8ef8b2 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=ctsVLiZ_AAAA:8 a=GXgPxmL8cXOeriQcYlgA:9 a=QEXdDO2ut3YA:10 a=3VCIHQLkQthbvTRuo98s:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-26_04,2026-08-26_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 bulkscore=0 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608260116 Received-SPF: pass client-ip=148.163.158.5; envelope-from=zycai@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 8/18/26 4:53 PM, Zhuoying Cai wrote: > Enable network booting via virtio-net-pci by implementing PCI transport > support for virtio-net. > > This patch also adds endianness handling for virtio PCI ring operations in > little-endian to ensure correct behavior on s390x. > > Signed-off-by: Zhuoying Cai > --- > pc-bios/s390-ccw/main.c | 1 + > pc-bios/s390-ccw/virtio-net.c | 37 +++++++++++++++++++++++------- > pc-bios/s390-ccw/virtio-pci.c | 43 +++++++++++++++++++++++++++++++++++ > pc-bios/s390-ccw/virtio-pci.h | 2 ++ > 4 files changed, 75 insertions(+), 8 deletions(-) > > diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c > index 8bc6e8eaa3..0eeb53a2bf 100644 > --- a/pc-bios/s390-ccw/main.c > +++ b/pc-bios/s390-ccw/main.c > @@ -328,6 +328,7 @@ static void ipl_pci_device(void) > } > > switch (vdev->dev_type) { > + case VIRTIO_ID_NET: > case VIRTIO_ID_BLOCK: > if (virtio_setup() == 0) { > zipl_load(); /* only return on error */ > diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c > index 3a9ae789cf..209f98a0e3 100644 > --- a/pc-bios/s390-ccw/virtio-net.c > +++ b/pc-bios/s390-ccw/virtio-net.c > @@ -62,7 +62,16 @@ int virtio_net_init(void *mac_addr) > rx_last_idx = 0; > > vdev->guest_features[0] = VIRTIO_NET_F_MAC_BIT; > - virtio_ccw_setup(vdev); > + switch (virtio_get_device()->ipl_type) { > + case S390_IPL_TYPE_CCW: > + virtio_ccw_setup(vdev); > + break; > + case S390_IPL_TYPE_PCI: > + virtio_pci_setup(vdev); > + break; > + default: > + return -1; > + } > > if (!(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT)) { > puts("virtio-net device does not support the MAC address feature"); > @@ -115,22 +124,30 @@ int recv(int fd, void *buf, int maxlen, int flags) > VRing *rxvq = &vdev->vrings[VQ_RX]; > int len, id; > uint8_t *pkt; > + uint16_t rx_used_idx, rx_avail_idx; > + uint32_t rx_used_len, rx_used_id; > + uint64_t rx_desc_addr; > > - if (rx_last_idx == rxvq->used->idx) { > + rx_used_idx = virtio_tswap16(rxvq->used->idx); > + if (rx_last_idx == rx_used_idx) { > return 0; > } > > - len = rxvq->used->ring[rx_last_idx % rxvq->num].len - virtio_net_hdr_size; > + rx_used_len = virtio_tswap32(rxvq->used->ring[rx_last_idx % rxvq->num].len); > + rx_used_id = virtio_tswap32(rxvq->used->ring[rx_last_idx % rxvq->num].id); > + > + len = rx_used_len - virtio_net_hdr_size; > if (len > maxlen) { > puts("virtio-net: Receive buffer too small"); > len = maxlen; > } > - id = rxvq->used->ring[rx_last_idx % rxvq->num].id % rxvq->num; > - pkt = (uint8_t *)(rxvq->desc[id].addr + virtio_net_hdr_size); > + id = rx_used_id % rxvq->num; > + rx_desc_addr = virtio_tswap64(rxvq->desc[id].addr); > + pkt = (uint8_t *)(rx_desc_addr + virtio_net_hdr_size); > > #if DEBUG_VIRTIO_NET /* Dump packet */ > int i; > - printf("\nbuf %p: len=%i\n", (void *)rxvq->desc[id].addr, len); > + printf("\nbuf %p: len=%i\n", (void *)rx_desc_addr, len); > for (i = 0; i < 64; i++) { > printf(" %02x", pkt[i]); > if ((i % 16) == 15) { > @@ -144,8 +161,10 @@ int recv(int fd, void *buf, int maxlen, int flags) > memcpy(buf, pkt, len); > > /* Mark buffer as available to the host again */ > - rxvq->avail->ring[rxvq->avail->idx % rxvq->num] = id; > - rxvq->avail->idx = rxvq->avail->idx + 1; > + rx_avail_idx = virtio_tswap16(rxvq->avail->idx); > + rxvq->avail->ring[rx_avail_idx % rxvq->num] = virtio_tswap16(id); > + rx_avail_idx++; > + rxvq->avail->idx = virtio_tswap16(rx_avail_idx); > vring_notify(rxvq); > > /* Move index to next entry */ > @@ -164,6 +183,8 @@ bool virtio_net_setup(void) > switch (virtio_get_device()->ipl_type) { > case S390_IPL_TYPE_CCW: > return virtio_ccw_net_setup(); > + case S390_IPL_TYPE_PCI: > + return virtio_pci_net_setup(); > default: > return false; > } > diff --git a/pc-bios/s390-ccw/virtio-pci.c b/pc-bios/s390-ccw/virtio-pci.c > index f501252c81..c7d62766b8 100644 > --- a/pc-bios/s390-ccw/virtio-pci.c > +++ b/pc-bios/s390-ccw/virtio-pci.c > @@ -52,6 +52,10 @@ void virtio_pci_id2type(VDev *vdev, uint16_t device_id) > case 0x1001: > vdev->dev_type = VIRTIO_ID_BLOCK; > break; > + case 0x1041: > + case 0x1000: > + vdev->dev_type = VIRTIO_ID_NET; > + break; > default: > vdev->dev_type = 0; > } > @@ -199,6 +203,14 @@ static int virtio_pci_get_blk_config(void) > return rc; > } > > +static int virtio_pci_get_net_config(void) > +{ > + VirtioNetConfig *cfg = &virtio_get_device()->config.net; > + int rc = vpci_read_flex(d_cap.off, d_cap.bar, cfg, sizeof(VirtioNetConfig)); > + > + return rc; > +} > + > static int virtio_pci_negotiate(void) > { > int i, rc; > @@ -330,6 +342,7 @@ bool virtio_pci_is_supported(VDev *vdev) > if (vdev->vendor_id == PCI_VENDOR_VIRTIO) { > switch (vdev->dev_type) { > case VIRTIO_ID_BLOCK: > + case VIRTIO_ID_NET: > return true; > default: > return false; > @@ -384,6 +397,11 @@ int virtio_pci_setup(VDev *vdev) > vdev->cmd_vr_idx = 0; > virtio_pci_get_blk_config(); > break; > + case VIRTIO_ID_NET: > + vdev->nr_vqs = 2; > + vdev->cmd_vr_idx = 0; > + virtio_pci_get_net_config(); > + break; > default: > puts("Unsupported virtio device"); > return -ENODEV; > @@ -458,3 +476,28 @@ int virtio_pci_setup_device(void) > > return 0; > } > + > +static bool find_pci_net_dev(void) > +{ > + if (!virtio_is_supported(virtio_get_device())) { > + return false; > + } > + > + if (virtio_get_device_type() != VIRTIO_ID_NET) { > + return false; > + } > + > + return true; > +} > + > +bool virtio_pci_net_setup(void) > +{ > + bool found = false; > + > + if (have_iplb || store_iplb(&iplb)) { > + IPL_assert(iplb.pbt == S390_IPL_TYPE_PCI, "IPL_TYPE_PCI expected"); > + found = find_pci_net_dev(); > + } > + > + return found; > +} > diff --git a/pc-bios/s390-ccw/virtio-pci.h b/pc-bios/s390-ccw/virtio-pci.h > index 33b683bd92..2c3136fd05 100644 > --- a/pc-bios/s390-ccw/virtio-pci.h > +++ b/pc-bios/s390-ccw/virtio-pci.h > @@ -70,6 +70,8 @@ long virtio_pci_notify(VRing *vr); > bool virtio_pci_is_supported(VDev *vdev); > int virtio_pci_setup(VDev *vdev); > int virtio_pci_setup_device(void); > +bool virtio_pci_is_supported(VDev *vdev); This is a duplicate declaration and will be removed in the next revision. > +bool virtio_pci_net_setup(void); > > int vpci_read_flex(uint64_t offset, uint8_t pcias, void *buf, int len); > int vpci_read_bswap64(uint64_t offset, uint8_t pcias, uint64_t *buf);