From nobody Mon Nov 25 11:31:42 2024 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=quarantine dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1716210116; cv=none; d=zohomail.com; s=zohoarc; b=AqE+dNJK8iyo1Vsy7OQ7ZnRN53UthnYHWLd1Bfzj7gc+0pZQ4T7GDY0yehchyaFpkQXaIibwBHDDdLy/phU8Tnx6/TvIXJK9z7TjN7bQltPhurmGsBt4UM2rGZE/gWMrCTHVFsYkSLqyNOFWvb0UHSEOo44UH3sTCfoPL6ym+eQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716210116; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uZmWbODzMl7rkotI4E8oqlDfQFUwuxdRub4HNKppZ0A=; b=ZAmhiw7S3rG/1QADFKI5vd8MPH1CGVfQlYrVnQgyDtGnOgjN74FvwJI6qStZ0CgO5FKVXe4Qa24MaQCyVulMr/ox3eiM5wGYsUCMHhsYlZBPUQKn2Sk/6j1SgU41dfVS7Zqby4SBfXrqmvgC87Ci1IQvAi+I0aXPuez2bRCR+dQ= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716210116123296.9300722947477; Mon, 20 May 2024 06:01:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s92dj-0000KG-Ho; Mon, 20 May 2024 09:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s92dh-0000IN-G5; Mon, 20 May 2024 09:01:17 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s92de-0006EX-AF; Mon, 20 May 2024 09:01:17 -0400 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44KCemBg022542; Mon, 20 May 2024 13:01:02 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6k8d2jb8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 13:01:01 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44KCeaft005024; Mon, 20 May 2024 13:01:01 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3y6js6bs2r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 13:01:01 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 44KD0qPd028778; Mon, 20 May 2024 13:01:00 GMT Received: from jonah-ol8.us.oracle.com (dhcp-10-65-165-95.vpn.oracle.com [10.65.165.95]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3y6js6brp8-4; Mon, 20 May 2024 13:01:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-11-20; bh=uZmWbODzMl7rkotI4E8oqlDfQFUwuxdRub4HNKppZ0A=; b=FQjYPJgGy1D/geafNMQLKkNqu8H2uTNdLgmQemv65PIOMKWiXSuiydRCke4ipcFGna5g IUctO5xMRWOhixbaN1mrMc5Qs8W640D7T8ZrRaPlvio9eiddMJq6vRpN4ivbUtn3sHLY wi2sP4ltlndUuND6UXF/rhU2nbc6uS4mWrZdbtgaF1ZnHgTK1vWVUizbnX7vmLsYTgh1 KJj+wA61osPcpC7t+HATtnuOKbevzidVEgHhKLJG9acXT1Su/72nrymDwweYKTwBEeDS 6TH00tGcmKGdExbljdl7SY1zFMKKMXrwpBsDjBish5suoXuiivg5HJ1yprfidLzMSHFh PQ== From: Jonah Palmer To: qemu-devel@nongnu.org Cc: mst@redhat.com, raphael@enfabrica.net, kwolf@redhat.com, hreitz@redhat.com, jasowang@redhat.com, pbonzini@redhat.com, fam@euphon.net, eperezma@redhat.com, stefanha@redhat.com, qemu-block@nongnu.org, schalla@marvell.com, leiyang@redhat.com, virtio-fs@lists.linux.dev, si-wei.liu@oracle.com, boris.ostrovsky@oracle.com, jonah.palmer@oracle.com Subject: [PATCH v2 3/6] virtio: virtqueue_ordered_fill - VIRTIO_F_IN_ORDER support Date: Mon, 20 May 2024 09:00:45 -0400 Message-Id: <20240520130048.1483177-4-jonah.palmer@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240520130048.1483177-1-jonah.palmer@oracle.com> References: <20240520130048.1483177-1-jonah.palmer@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_05,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405200108 X-Proofpoint-GUID: Osur1_rTqDi76lII32o60TL246mpBbN2 X-Proofpoint-ORIG-GUID: Osur1_rTqDi76lII32o60TL246mpBbN2 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=lists.gnu.org; Received-SPF: pass client-ip=205.220.165.32; envelope-from=jonah.palmer@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=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: 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 @oracle.com) X-ZM-MESSAGEID: 1716210117556100009 Content-Type: text/plain; charset="utf-8" Add VIRTIO_F_IN_ORDER feature support for the virtqueue_fill operation. The goal of the virtqueue_ordered_fill operation when the VIRTIO_F_IN_ORDER feature has been negotiated is to search for this now-used element, set its length, and mark the element as filled in the VirtQueue's used_elems array. By marking the element as filled, it will indicate that this element has been processed and is ready to be flushed, so long as the element is in-order. Signed-off-by: Jonah Palmer Reviewed-by: Eugenio P=C3=A9rez --- hw/virtio/virtio.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 7456d61bc8..01b6b32460 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -873,6 +873,38 @@ static void virtqueue_packed_fill(VirtQueue *vq, const= VirtQueueElement *elem, vq->used_elems[idx].ndescs =3D elem->ndescs; } =20 +static void virtqueue_ordered_fill(VirtQueue *vq, const VirtQueueElement *= elem, + unsigned int len) +{ + unsigned int i, steps, max_steps; + + i =3D vq->used_idx; + steps =3D 0; + /* + * We shouldn't need to increase 'i' by more than the distance + * between used_idx and last_avail_idx. + */ + max_steps =3D (vq->last_avail_idx + vq->vring.num - vq->used_idx) + % vq->vring.num; + + /* Search for element in vq->used_elems */ + while (steps <=3D max_steps) { + /* Found element, set length and mark as filled */ + if (vq->used_elems[i].index =3D=3D elem->index) { + vq->used_elems[i].len =3D len; + vq->used_elems[i].in_order_filled =3D true; + break; + } + + i +=3D vq->used_elems[i].ndescs; + steps +=3D vq->used_elems[i].ndescs; + + if (i >=3D vq->vring.num) { + i -=3D vq->vring.num; + } + } +} + static void virtqueue_packed_fill_desc(VirtQueue *vq, const VirtQueueElement *elem, unsigned int idx, @@ -923,7 +955,9 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueEleme= nt *elem, return; } =20 - if (virtio_vdev_has_feature(vq->vdev, VIRTIO_F_RING_PACKED)) { + if (virtio_vdev_has_feature(vq->vdev, VIRTIO_F_IN_ORDER)) { + virtqueue_ordered_fill(vq, elem, len); + } else if (virtio_vdev_has_feature(vq->vdev, VIRTIO_F_RING_PACKED)) { virtqueue_packed_fill(vq, elem, len, idx); } else { virtqueue_split_fill(vq, elem, len, idx); --=20 2.39.3