From patchwork Thu May 18 12:02:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert Esteve X-Patchwork-Id: 13246679 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 8BD6CC77B7A for ; Thu, 18 May 2023 12:04:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzcLv-0000ya-AG; Thu, 18 May 2023 08:03:27 -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 1pzcLl-0000wy-2A for qemu-devel@nongnu.org; Thu, 18 May 2023 08:03:17 -0400 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 1pzcLi-0007EE-VY for qemu-devel@nongnu.org; Thu, 18 May 2023 08:03:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684411393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7R8QAg8IKDEm060evA7zcxha7LgBtJpzHg0ysGwKxCA=; b=GersDHU4fs7KgP38EtHVDfifbk9D+i/9w6qCB/VEwfcscEEQUa+PAAkWZeM7z2e2mimiuS iMHMlaPL0eVyXuOUqsg3B83uiaI+fa5CC9gTkt9HT10BiBJBsCTYNxstCKC606/+7XUxyu PmtwQCxsa/GBzV5XqpeiBwB0zy1vvd0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-kDVNJY2QN22xFhneTNgCWA-1; Thu, 18 May 2023 08:03:10 -0400 X-MC-Unique: kDVNJY2QN22xFhneTNgCWA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F7DB38123B3; Thu, 18 May 2023 12:03:10 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CBD51121315; Thu, 18 May 2023 12:03:08 +0000 (UTC) From: Albert Esteve To: qemu-devel@nongnu.org Cc: marcandre.lureau@gmail.com, "Michael S. Tsirkin" , kraxel@redhat.com, Fam Zheng , Albert Esteve , cohuck@redhat.com Subject: [PATCH v2 4/4] vhost-user: refactor send_resp code Date: Thu, 18 May 2023 14:02:58 +0200 Message-Id: <20230518120258.1394135-5-aesteve@redhat.com> In-Reply-To: <20230518120258.1394135-1-aesteve@redhat.com> References: <20230518120258.1394135-1-aesteve@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=aesteve@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, T_SCC_BODY_TEXT_LINE=-0.01 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 Refactor code to send response message so that all common parts both for the common REPLY_ACK case, and other data responses, can call it and avoid code repetition. Signed-off-by: Albert Esteve --- hw/virtio/vhost-user.c | 52 +++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index d9bcaafebf..c82ba9e59f 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1628,28 +1628,36 @@ static int vhost_user_backend_handle_shared_object(VhostUserShared *object) return 0; } -static bool -vhost_user_backend_send_dmabuf_fd(QIOChannel *ioc, VhostUserHeader *hdr, - VhostUserPayload *payload) +static bool vhost_user_send_resp(QIOChannel *ioc, VhostUserHeader *hdr, + VhostUserPayload *payload) { Error *local_err = NULL; struct iovec iov[2]; - if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) { - hdr->flags &= ~VHOST_USER_NEED_REPLY_MASK; - hdr->flags |= VHOST_USER_REPLY_MASK; + hdr->flags &= ~VHOST_USER_NEED_REPLY_MASK; + hdr->flags |= VHOST_USER_REPLY_MASK; - hdr->size = sizeof(payload->object); + iov[0].iov_base = hdr; + iov[0].iov_len = VHOST_USER_HDR_SIZE; + iov[1].iov_base = payload; + iov[1].iov_len = hdr->size; + + if (qio_channel_writev_all(ioc, iov, ARRAY_SIZE(iov), &local_err)) { + error_report_err(local_err); + return false; + } - iov[0].iov_base = hdr; - iov[0].iov_len = VHOST_USER_HDR_SIZE; - iov[1].iov_base = payload; - iov[1].iov_len = hdr->size; + return true; +} - if (qio_channel_writev_all(ioc, iov, ARRAY_SIZE(iov), &local_err)) { - error_report_err(local_err); - return false; - } +static bool +vhost_user_backend_send_dmabuf_fd(QIOChannel *ioc, VhostUserHeader *hdr, + VhostUserPayload *payload) +{ + if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) { + hdr->size = sizeof(payload->object); + return vhost_user_send_resp(ioc, hdr, payload); } + return true; } @@ -1726,22 +1734,10 @@ static gboolean slave_read(QIOChannel *ioc, GIOCondition condition, * directly in their request handlers. */ if (hdr.flags & VHOST_USER_NEED_REPLY_MASK) { - struct iovec iovec[2]; - - - hdr.flags &= ~VHOST_USER_NEED_REPLY_MASK; - hdr.flags |= VHOST_USER_REPLY_MASK; - payload.u64 = !!ret; hdr.size = sizeof(payload.u64); - iovec[0].iov_base = &hdr; - iovec[0].iov_len = VHOST_USER_HDR_SIZE; - iovec[1].iov_base = &payload; - iovec[1].iov_len = hdr.size; - - if (qio_channel_writev_all(ioc, iovec, ARRAY_SIZE(iovec), &local_err)) { - error_report_err(local_err); + if (!vhost_user_send_resp(ioc, &hdr, &payload)) { goto err; } }