From patchwork Mon Dec 5 17:04:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 13064821 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 lists.gnu.org (lists.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 2F3B1C4321E for ; Mon, 5 Dec 2022 17:06:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2Euk-0000l6-Bj; Mon, 05 Dec 2022 12:06:05 -0500 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 1p2Ety-0000Vb-7B for qemu-devel@nongnu.org; Mon, 05 Dec 2022 12:05:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2Etv-0002qt-Mk for qemu-devel@nongnu.org; Mon, 05 Dec 2022 12:05:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670259907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2RFw7L+2BXaLuOkr7eQfNV4/dHHQbEBLPykQdO9g9zg=; b=f3/A1rSb6o7BLdKpeYxHRO8qWYTuMWRqPNY2ByP5/YgelbWlH7bpzx8QQl7F5O5ghTgmyi Eer0/pbg6z3svZyf74ZXfwaGgVLW6Gbje19nZcSJZybiDPezOh0VvQeKEIfH8eb3/zrMlq FSwOf4orF7ODnLfqb8b1XvlscxLLe1M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-444-16wV_l61OiKReFzbYO32FA-1; Mon, 05 Dec 2022 12:05:02 -0500 X-MC-Unique: 16wV_l61OiKReFzbYO32FA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8080D894E89; Mon, 5 Dec 2022 17:05:01 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD0DAC15BA8; Mon, 5 Dec 2022 17:04:58 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Liuxiangdong , Stefan Hajnoczi , Jason Wang , Harpreet Singh Anand , Gautam Dawar , Zhu Lingshan , Cindy Lu , Si-Wei Liu , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Laurent Vivier , Eli Cohen , Stefano Garzarella , Juan Quintela , Parav Pandit Subject: [RFC PATCH for 8.0 06/13] virtio: refactor qemu_get_virtqueue_element Date: Mon, 5 Dec 2022 18:04:29 +0100 Message-Id: <20221205170436.2977336-7-eperezma@redhat.com> In-Reply-To: <20221205170436.2977336-1-eperezma@redhat.com> References: <20221205170436.2977336-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.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_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The core of the function is useful to transform from VirtQueueElementOld to VirtQueueElement. Extract from qemu_get_virtqueue_element, and leave there the handling of QEMUFile. No functional change intended. Signed-off-by: Eugenio Pérez --- hw/virtio/virtio.c | 68 ++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 6efff3d441..b0245ce4e8 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2297,50 +2297,66 @@ typedef struct VirtQueueElementOld { struct iovec out_sg[VIRTQUEUE_MAX_SIZE]; } VirtQueueElementOld; -void *qemu_get_virtqueue_element(VirtIODevice *vdev, QEMUFile *f, size_t sz) +/* Convert VirtQueueElementOld to VirtQueueElement */ +static void *qemu_get_virtqueue_element_from_old(VirtIODevice *vdev, + const VirtQueueElementOld *data, + size_t sz) { - VirtQueueElement *elem; - VirtQueueElementOld data; - int i; - - qemu_get_buffer(f, (uint8_t *)&data, sizeof(VirtQueueElementOld)); - - /* TODO: teach all callers that this can fail, and return failure instead - * of asserting here. - * This is just one thing (there are probably more) that must be - * fixed before we can allow NDEBUG compilation. - */ - assert(ARRAY_SIZE(data.in_addr) >= data.in_num); - assert(ARRAY_SIZE(data.out_addr) >= data.out_num); - - elem = virtqueue_alloc_element(sz, data.out_num, data.in_num); - elem->index = data.index; + VirtQueueElement *elem = virtqueue_alloc_element(sz, data->out_num, + data->in_num); + elem->index = data->index; - for (i = 0; i < elem->in_num; i++) { - elem->in_addr[i] = data.in_addr[i]; + for (uint16_t i = 0; i < elem->in_num; i++) { + elem->in_addr[i] = data->in_addr[i]; } - for (i = 0; i < elem->out_num; i++) { - elem->out_addr[i] = data.out_addr[i]; + for (uint16_t i = 0; i < elem->out_num; i++) { + elem->out_addr[i] = data->out_addr[i]; } - for (i = 0; i < elem->in_num; i++) { + for (uint16_t i = 0; i < elem->in_num; i++) { /* Base is overwritten by virtqueue_map. */ elem->in_sg[i].iov_base = 0; - elem->in_sg[i].iov_len = data.in_sg[i].iov_len; + elem->in_sg[i].iov_len = data->in_sg[i].iov_len; } - for (i = 0; i < elem->out_num; i++) { + for (uint16_t i = 0; i < elem->out_num; i++) { /* Base is overwritten by virtqueue_map. */ elem->out_sg[i].iov_base = 0; - elem->out_sg[i].iov_len = data.out_sg[i].iov_len; + elem->out_sg[i].iov_len = data->out_sg[i].iov_len; } + virtqueue_map(vdev, elem); + return elem; +} + +static bool vq_element_in_range(void *opaque, int version_id) +{ + VirtQueueElementOld *data = opaque; + + return ARRAY_SIZE(data->in_addr) >= data->in_num && + ARRAY_SIZE(data->out_addr) >= data->out_num; +} + +void *qemu_get_virtqueue_element(VirtIODevice *vdev, QEMUFile *f, size_t sz) +{ + VirtQueueElement *elem; + VirtQueueElementOld data; + + qemu_get_buffer(f, (uint8_t *)&data, sizeof(VirtQueueElementOld)); + + /* TODO: teach all callers that this can fail, and return failure instead + * of asserting here. + * This is just one thing (there are probably more) that must be + * fixed before we can allow NDEBUG compilation. + */ + assert(vq_element_in_range(&data, 0)); + + elem = qemu_get_virtqueue_element_from_old(vdev, &data, sz); if (virtio_host_has_feature(vdev, VIRTIO_F_RING_PACKED)) { qemu_get_be32s(f, &elem->ndescs); } - virtqueue_map(vdev, elem); return elem; }