From nobody Wed Nov 27 16:50:19 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697740146; cv=none; d=zohomail.com; s=zohoarc; b=hVUxqlIY8kJY4sXlHG3cBNGsGqrnQbdkCwils1IRTx2Uulev6PuZLDEph1XIA+ssddY3YHA7tLI7gXfdeLPkIPcG2cuF4RyZWiIJJ2v/oEM+1Y7TFmxh5UOnmRD1PfsRjJFq6H2GuhBwsRwnLUnSHc/Ao2teW8do+VtYQBMABwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697740146; h=Content-Type: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=dEyHp47zWZMmJ4LBbWEQwLbSqJ+uzpsgbL7RPabK7bU=; b=GO7/pX3oLW1cfRu97ThQRmfTP+leTG1kH2izzp4RliDv1mjRwJQRVk/DWKj8LaNt/xGaC01NjHs/E7um6i+a9qaTLJQpCy9GsnJkcdI/i1EQN3pUqo5Fb/UtCxKZbQDsQeiOgWzF8wm2WXiacoQfXEzfJlcJXP5cm1oXNilcfFI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697740146451675.3616692469777; Thu, 19 Oct 2023 11:29:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtXiJ-0002iJ-RW; Thu, 19 Oct 2023 14:25:43 -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 1qtXgw-0008UX-Er for qemu-devel@nongnu.org; Thu, 19 Oct 2023 14:24:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtXgu-000226-SE for qemu-devel@nongnu.org; Thu, 19 Oct 2023 14:24:18 -0400 Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-yZN_yiSVP5-_YcjlayL3bA-1; Thu, 19 Oct 2023 14:24:14 -0400 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2c52cbb64c9so45317511fa.1 for ; Thu, 19 Oct 2023 11:24:14 -0700 (PDT) Received: from redhat.com ([2a06:c701:73d2:bf00:e379:826:5137:6b23]) by smtp.gmail.com with ESMTPSA id j9-20020a5d4489000000b003176c6e87b1sm4974275wrq.81.2023.10.19.11.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 11:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697739856; 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: in-reply-to:in-reply-to:references:references; bh=dEyHp47zWZMmJ4LBbWEQwLbSqJ+uzpsgbL7RPabK7bU=; b=KT9QBjfS3aFDLVNr4yb830mlaWvbV8rix0bcUJJMjxTbJaLHe/qPss6qfVxFp/5jXZakbZ Jf1IbHI2dIu6Kogp7p4VEkM+sfvQZSdC+WnPqDtck1ZQ87vaUul0DFJJEiHe1Mn3CUtie7 GsenayJE4vtHVDjWfe0jOCGFN9e2q1w= X-MC-Unique: yZN_yiSVP5-_YcjlayL3bA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697739853; x=1698344653; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dEyHp47zWZMmJ4LBbWEQwLbSqJ+uzpsgbL7RPabK7bU=; b=d7whFv7OXBnGlkd6WsYlXks0c03eMNy8p2OkDQEAoV36WV1Xiz3w2xZUFe9cg8l3kA fQ+Mpc5voZvRm97rHfkZBf5YmSdB2YuvOi3PGMg+9Z7sascH/IESYUus2bOWYR+hMXb4 au4lzH51VxfE4gxy+aSznUQ5r8YM5FJ2w8s8tosHiTAh8GMoM9VHJgjXFNSSpeftY8lI imVFwrFCV3jdO79gcoRsbGbSccfOgTsmMewkD9wJX9jONt8rToWnWf8HiTp71MJhOAEx QzA+gR1Q60VTsy5fFj86EziHOns1wFMj5fTaELKsbUm53gBfIZ/aetKkDm3wKoa76HFd 8Mig== X-Gm-Message-State: AOJu0YwCG3woJC2dH2KZYzmtkC+OKmeCgKzY614TMqU/QF31bmPSBgbD 7mD9+84PbK/BJ2dM7ULSUywXawC7/Uy0Kjv1zGCWqHKwHQKGb9OgMMuURYKNhU10Jjk8q2hDcHc Jfvj7xGRcBGTGW8OyXqPN7DczGhzliueXX3fON//JFRLL2Lg7m2K9HnZ28916wZvq9t4k X-Received: by 2002:a19:7707:0:b0:507:a58f:79ac with SMTP id s7-20020a197707000000b00507a58f79acmr2023354lfc.33.1697739852796; Thu, 19 Oct 2023 11:24:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXAonY27n0SDfsYA6P/4ctcBisBQNe5Ri9DgghBWKQWuHCbhUo5y7AZhHxMUMZ8wCz5/8H5A== X-Received: by 2002:a19:7707:0:b0:507:a58f:79ac with SMTP id s7-20020a197707000000b00507a58f79acmr2023339lfc.33.1697739852456; Thu, 19 Oct 2023 11:24:12 -0700 (PDT) Date: Thu, 19 Oct 2023 14:24:10 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Li Feng , Raphael Norwitz , Paolo Bonzini , Fam Zheng Subject: [PULL v2 67/78] vhost-user-common: send get_inflight_fd once Message-ID: <63a5c46a151c0d281d456de0474b7a27e87cd7ce.1697739629.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.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_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 @redhat.com) X-ZM-MESSAGEID: 1697740148169100013 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Li Feng Currently the get_inflight_fd will be sent every time the device is started= , and the backend will allocate shared memory to save the inflight state. If the backend finds that it receives the second get_inflight_fd, it will release = the previous shared memory, which breaks inflight working logic. This patch is a preparation for the following patches. Signed-off-by: Li Feng Reviewed-by: Raphael Norwitz Message-Id: <20231009044735.941655-2-fengli@smartx.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/scsi/vhost-scsi-common.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index a06f01af26..a61cd0e907 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -52,20 +52,28 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc) =20 vsc->dev.acked_features =3D vdev->guest_features; =20 - assert(vsc->inflight =3D=3D NULL); - vsc->inflight =3D g_new0(struct vhost_inflight, 1); - ret =3D vhost_dev_get_inflight(&vsc->dev, - vs->conf.virtqueue_size, - vsc->inflight); + ret =3D vhost_dev_prepare_inflight(&vsc->dev, vdev); if (ret < 0) { - error_report("Error get inflight: %d", -ret); + error_report("Error setting inflight format: %d", -ret); goto err_guest_notifiers; } =20 - ret =3D vhost_dev_set_inflight(&vsc->dev, vsc->inflight); - if (ret < 0) { - error_report("Error set inflight: %d", -ret); - goto err_guest_notifiers; + if (vsc->inflight) { + if (!vsc->inflight->addr) { + ret =3D vhost_dev_get_inflight(&vsc->dev, + vs->conf.virtqueue_size, + vsc->inflight); + if (ret < 0) { + error_report("Error getting inflight: %d", -ret); + goto err_guest_notifiers; + } + } + + ret =3D vhost_dev_set_inflight(&vsc->dev, vsc->inflight); + if (ret < 0) { + error_report("Error setting inflight: %d", -ret); + goto err_guest_notifiers; + } } =20 ret =3D vhost_dev_start(&vsc->dev, vdev, true); @@ -85,9 +93,6 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc) return ret; =20 err_guest_notifiers: - g_free(vsc->inflight); - vsc->inflight =3D NULL; - k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false); err_host_notifiers: vhost_dev_disable_notifiers(&vsc->dev, vdev); @@ -111,12 +116,6 @@ void vhost_scsi_common_stop(VHostSCSICommon *vsc) } assert(ret >=3D 0); =20 - if (vsc->inflight) { - vhost_dev_free_inflight(vsc->inflight); - g_free(vsc->inflight); - vsc->inflight =3D NULL; - } - vhost_dev_disable_notifiers(&vsc->dev, vdev); } =20 --=20 MST