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 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 5E20CCCF9E3 for ; Mon, 10 Nov 2025 16:07:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vIUPu-0004nk-OX; Mon, 10 Nov 2025 11:06:54 -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 1vIUPs-0004ly-It for qemu-devel@nongnu.org; Mon, 10 Nov 2025 11:06:52 -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 1vIUPp-00048h-V8 for qemu-devel@nongnu.org; Mon, 10 Nov 2025 11:06:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762790809; 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=u0yFbVe8S8I2cR37VMafoNrc7fo48PZixS/lIG+IL74=; b=MkNRbsAt3j9h3rlI6D0TkgSB+rElIGoagfbYEbsVyv7luQ5qU6D6I/JjmQNd5NdJaO/zaP pxF4ySP6/W8JSNrJ6O7C1rPspHThTZdmctSi92vtjWIqrDXGNataqIoTn/BaKs8kzAfA+M HCxPTClMK51CVwjaUgFofcHVXy3FB6Y= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-5fEc5b73PECNtBK7Iu_LVw-1; Mon, 10 Nov 2025 11:06:47 -0500 X-MC-Unique: 5fEc5b73PECNtBK7Iu_LVw-1 X-Mimecast-MFC-AGG-ID: 5fEc5b73PECNtBK7Iu_LVw_1762790806 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-429cbed2b8fso1541293f8f.1 for ; Mon, 10 Nov 2025 08:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1762790806; x=1763395606; darn=nongnu.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=u0yFbVe8S8I2cR37VMafoNrc7fo48PZixS/lIG+IL74=; b=fp4/Wj3kQACVN4UfBkSpkp73zXmJIi2Yv2+R9CyIc1NJd8QXh6kVY9oLepf8djzn2T nNdgalO87zP31+KffR6Z3Uh+rz4J3JS9XMTItt1PdEbimkhMnLuMCFmq0FSJXJeYtaOF eTfAHCmY3OdlKYnjujN7YvnTUTqw1RTpRwO/Njp/gmeR+AGDfC6mZkI5LI34JrQQXDmA rNolZamRh7zHmq1y1vHMXf7w4fHqI0Wh7Dk6VIqJUhZ0gTbhfC1Us5HoviZB8kGeH6kf jD5ATW1kZBc93XsTxOqNkIQ2MLeR6lK8tWcihbXp9MGYMled+PV4Nvl9EdIZ3EjPHqeV b0HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762790806; x=1763395606; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u0yFbVe8S8I2cR37VMafoNrc7fo48PZixS/lIG+IL74=; b=VBXQoIY5eug38tgsLqIU6RgPed435hEDu1WYelT8/L018RANvF6BT0e5mxjHr+ly9+ iqofjEbOvIcsB5mwGs51/aqMr7GR/cMTY1MWiBpKGOl5NsK6M29HcV228X48Vhw3qdZO xjbnc4rukdQ1R+vCZCUiLZPmpnB6DarI0Az6KkRD108ZKz08zrX8VfvaFD69K11evMF4 2T/ExVDMFo49OwRNXji9ulOWKKXqaU7sigdPZG4OKI0Gcg9p6/u+WFoqx7SBW1CijFEL +0TED7i/jjiNJ/ScAaiJpmSIqQUkSqLtBE7yXEhorJwdq7GkGS7MIshLlTQ1BJzGORD3 rt0g== X-Gm-Message-State: AOJu0YxdqxsNnpmeC10hwv9mt3blZu/qGgFmRHZEu/HZ6Mnki2n3EHIW NEBcAdh3YbRUZDCJvyMa+nCNj1MVer+RE1TyMoQv5EV1c9eGUJN8k8vhx44OLwADfXPBVMGTATJ /iovxWKygIZ7I9w4RpdR7QA5iRY6VWKS/LW8mFaUNWzciiFH3N8X1cOUU X-Gm-Gg: ASbGnctHb5+g2gmOwIQQfHZ9rg06LhY24qcrJwN2SmyVaSFz9KJRnIGefPB3yq0u1xc +wxsehwSYtNNcLzBbrWoOXmxxW9F6KsOVDvroXDojrYclQuUte/05BoBQ/ewiXh3BO/JTBA+bzJ /VTmEfEokVWXiUb8jY7lHhEReIGdnsqJ9uVRsZ6Lv2DuMWLGSYay7CuSg1T2Y0gSJW1vJCBiD5w zH2GJaWVT66UQqtKE7/cOU+JrRe0dcWUv1w47w5206KEseSvMZTN+Ym5QGhRwlOJfNw5+PHJg3y v9+o+mwACKU3BGNkDS5qWJ9jpu8XNJ8Zvx/56cX9MWJG1BqVgtOe848bRyrB9rTaIYE= X-Received: by 2002:a05:6000:2a88:b0:429:edd0:29c with SMTP id ffacd0b85a97d-42b2dbf4f0bmr6640753f8f.19.1762790806164; Mon, 10 Nov 2025 08:06:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IF/GEKtR+570/BIDeJVR59mx4O67AvflFGv6oFKq1H6GIlpX5IWjLm1liKOYcOU/AqOk+jTOA== X-Received: by 2002:a05:6000:2a88:b0:429:edd0:29c with SMTP id ffacd0b85a97d-42b2dbf4f0bmr6640722f8f.19.1762790805502; Mon, 10 Nov 2025 08:06:45 -0800 (PST) Received: from redhat.com ([2a0d:6fc0:1536:2700:9203:49b4:a0d:b580]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b321a80c0sm12348791f8f.1.2025.11.10.08.06.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 08:06:45 -0800 (PST) Date: Mon, 10 Nov 2025 11:06:42 -0500 From: "Michael S. Tsirkin" To: Albert Esteve Cc: qemu-devel@nongnu.org, Peter Maydell , qemu-stable@nongnu.org, Stefano Garzarella Subject: Re: [PULL 04/14] vhost-user: fix shared object lookup handler logic Message-ID: <20251110110546-mutt-send-email-mst@kernel.org> References: <20251110104059-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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 On Mon, Nov 10, 2025 at 04:57:51PM +0100, Albert Esteve wrote: > On Mon, Nov 10, 2025 at 4:42 PM Michael S. Tsirkin wrote: > > > > On Mon, Nov 10, 2025 at 10:23:25AM +0100, Albert Esteve wrote: > > > On Sun, Nov 9, 2025 at 3:35 PM Michael S. Tsirkin wrote: > > > > > > > > From: Albert Esteve > > > > > > > > Refactor backend_read() function and add a reply_ack variable > > > > to have the option for handlers to force tweak whether they should > > > > send a reply or not without depending on VHOST_USER_NEED_REPLY_MASK > > > > flag. > > > > > > > > This fixes an issue with > > > > vhost_user_backend_handle_shared_object_lookup() logic, as the > > > > error path was not closing the backend channel correctly. So, > > > > we can remove the reply call from within the handler, make > > > > sure it returns early on errors as other handlers do and > > > > set the reply_ack variable on backend_read() to true to ensure > > > > that it will send a response, thus keeping the original intent. > > > > > > Hey Michal, > > > > > > This patch was > > > Based-on: <20251016143827.1850397-1-aesteve@redhat.com> > > > … for main. > > > > That's the SHMEM thing right? Yes but I rebased it dropping > > the SHMEM dependency. > > > > At least, I think I did it correctly. > > Yes, removing the dependency is correctly applied. But that was only > required for the backport to stable. > > If we merge this patch to main without the one it is based on, then > I'd need to send a new version of the SHMEM patch with the block that > you have dropped. I can do it, but I was trying to prioritize the > other one, as it was a lot harder to get approved. That is why I based > this patch on top of the SHMEM one and not the other way around. > > Sorry if that was not clear from the message. Right but I can't apply SHMEM patch in freeze so yes, it has to go on top. Sorry it's like this. > > > > > As this was the first time I did this based-on thingy, I am just > > > making sure that the other patch was not missed. > > > If this PULL is only targeting stable, then it's ok as is. > > > > It is targeting 10.2 which is in freeze. So equivalently same. > > > > > > > BR, > > > Albert > > > > > > > > > > > Fixes: 1609476662 ("vhost-user: add shared_object msg") > > > > Cc: qemu-stable@nongnu.org > > > > Signed-off-by: Albert Esteve > > > > Reviewed-by: Stefano Garzarella > > > > Reviewed-by: Michael S. Tsirkin > > > > Signed-off-by: Michael S. Tsirkin > > > > Message-Id: <20251017072011.1874874-2-aesteve@redhat.com> > > > > --- > > > > hw/virtio/vhost-user.c | 40 +++++++++++++--------------------------- > > > > 1 file changed, 13 insertions(+), 27 deletions(-) > > > > > > > > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > > > > index aac98f898a..4b0fae12ae 100644 > > > > --- a/hw/virtio/vhost-user.c > > > > +++ b/hw/virtio/vhost-user.c > > > > @@ -1668,14 +1668,6 @@ static bool vhost_user_send_resp(QIOChannel *ioc, VhostUserHeader *hdr, > > > > return !qio_channel_writev_all(ioc, iov, ARRAY_SIZE(iov), errp); > > > > } > > > > > > > > -static bool > > > > -vhost_user_backend_send_dmabuf_fd(QIOChannel *ioc, VhostUserHeader *hdr, > > > > - VhostUserPayload *payload, Error **errp) > > > > -{ > > > > - hdr->size = sizeof(payload->u64); > > > > - return vhost_user_send_resp(ioc, hdr, payload, errp); > > > > -} > > > > - > > > > int vhost_user_get_shared_object(struct vhost_dev *dev, unsigned char *uuid, > > > > int *dmabuf_fd) > > > > { > > > > @@ -1716,19 +1708,15 @@ int vhost_user_get_shared_object(struct vhost_dev *dev, unsigned char *uuid, > > > > > > > > static int > > > > vhost_user_backend_handle_shared_object_lookup(struct vhost_user *u, > > > > - QIOChannel *ioc, > > > > - VhostUserHeader *hdr, > > > > - VhostUserPayload *payload) > > > > + VhostUserShared *object) > > > > { > > > > QemuUUID uuid; > > > > CharFrontend *chr = u->user->chr; > > > > - Error *local_err = NULL; > > > > int dmabuf_fd = -1; > > > > int fd_num = 0; > > > > > > > > - memcpy(uuid.data, payload->object.uuid, sizeof(payload->object.uuid)); > > > > + memcpy(uuid.data, object->uuid, sizeof(object->uuid)); > > > > > > > > - payload->u64 = 0; > > > > switch (virtio_object_type(&uuid)) { > > > > case TYPE_DMABUF: > > > > dmabuf_fd = virtio_lookup_dmabuf(&uuid); > > > > @@ -1737,18 +1725,16 @@ vhost_user_backend_handle_shared_object_lookup(struct vhost_user *u, > > > > { > > > > struct vhost_dev *dev = virtio_lookup_vhost_device(&uuid); > > > > if (dev == NULL) { > > > > - payload->u64 = -EINVAL; > > > > - break; > > > > + return -EINVAL; > > > > } > > > > int ret = vhost_user_get_shared_object(dev, uuid.data, &dmabuf_fd); > > > > if (ret < 0) { > > > > - payload->u64 = ret; > > > > + return ret; > > > > } > > > > break; > > > > } > > > > case TYPE_INVALID: > > > > - payload->u64 = -EINVAL; > > > > - break; > > > > + return -EINVAL; > > > > } > > > > > > > > if (dmabuf_fd != -1) { > > > > @@ -1757,11 +1743,6 @@ vhost_user_backend_handle_shared_object_lookup(struct vhost_user *u, > > > > > > > > if (qemu_chr_fe_set_msgfds(chr, &dmabuf_fd, fd_num) < 0) { > > > > error_report("Failed to set msg fds."); > > > > - payload->u64 = -EINVAL; > > > > - } > > > > - > > > > - if (!vhost_user_backend_send_dmabuf_fd(ioc, hdr, payload, &local_err)) { > > > > - error_report_err(local_err); > > > > return -EINVAL; > > > > } > > > > > > > > @@ -1790,6 +1771,7 @@ static gboolean backend_read(QIOChannel *ioc, GIOCondition condition, > > > > struct iovec iov; > > > > g_autofree int *fd = NULL; > > > > size_t fdsize = 0; > > > > + bool reply_ack; > > > > int i; > > > > > > > > /* Read header */ > > > > @@ -1808,6 +1790,8 @@ static gboolean backend_read(QIOChannel *ioc, GIOCondition condition, > > > > goto err; > > > > } > > > > > > > > + reply_ack = hdr.flags & VHOST_USER_NEED_REPLY_MASK; > > > > + > > > > /* Read payload */ > > > > if (qio_channel_read_all(ioc, (char *) &payload, hdr.size, &local_err)) { > > > > error_report_err(local_err); > > > > @@ -1833,8 +1817,10 @@ static gboolean backend_read(QIOChannel *ioc, GIOCondition condition, > > > > &payload.object); > > > > break; > > > > case VHOST_USER_BACKEND_SHARED_OBJECT_LOOKUP: > > > > - ret = vhost_user_backend_handle_shared_object_lookup(dev->opaque, ioc, > > > > - &hdr, &payload); > > > > + /* The backend always expects a response */ > > > > + reply_ack = true; > > > > + ret = vhost_user_backend_handle_shared_object_lookup(dev->opaque, > > > > + &payload.object); > > > > break; > > > > default: > > > > error_report("Received unexpected msg type: %d.", hdr.request); > > > > @@ -1845,7 +1831,7 @@ static gboolean backend_read(QIOChannel *ioc, GIOCondition condition, > > > > * REPLY_ACK feature handling. Other reply types has to be managed > > > > * directly in their request handlers. > > > > */ > > > > - if (hdr.flags & VHOST_USER_NEED_REPLY_MASK) { > > > > + if (reply_ack) { > > > > payload.u64 = !!ret; > > > > hdr.size = sizeof(payload.u64); > > > > > > > > -- > > > > MST > > > > > >