From nobody Mon Nov 25 04:27:30 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=1717528220; cv=none; d=zohomail.com; s=zohoarc; b=KKmRIS/SWydxT4lMKtWzY0AMmOAi6WAG00WGoS+rg6mm7kPq7p1mSgtulMDywy/UqNtkDoeNBsXQOOFkFnuuRQAKhwpSvCqPinxpkAl6K8KbFlGkMk9WYqJUGn+vnzyR8dhTCi5BJJk8dly9/PMNOePK3GIhxuWLc/mTBME/qBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717528220; 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=X5ZK85DrY7E/kWQuvTt0uyTur3Js4Sbrs2c23IwHRBA=; b=L+Fw/OUWciAnoHPZlDZ9uRRGUT5tuKnaJ5MQqsF7LOiwMjVmFPzxf/CLl5qeEeRcLbz2wXh5ovN10fZQo9OOYItKUEx2jwPe+pjNo+k4C+1q8gZF9XNt1gIAg8WLjk8zCHdyhh13Zxi5e6+gkI366CMz5j9CDhmrzhmsCvZDc4I= 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 1717528220759989.2526367123639; Tue, 4 Jun 2024 12:10:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEZWg-0001qT-W9; Tue, 04 Jun 2024 15:08:55 -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 1sEZWf-0001de-3L for qemu-devel@nongnu.org; Tue, 04 Jun 2024 15:08:53 -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 1sEZWc-00014K-8O for qemu-devel@nongnu.org; Tue, 04 Jun 2024 15:08:52 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-LU11aHEcPCKS8s3NJdhBRw-1; Tue, 04 Jun 2024 15:08:47 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-35e83bf3294so109550f8f.1 for ; Tue, 04 Jun 2024 12:08:47 -0700 (PDT) Received: from redhat.com ([2a0d:6fc7:552:cf5c:2b13:215c:b9df:f231]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd066ff17sm12305649f8f.116.2024.06.04.12.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 12:08:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717528129; 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=X5ZK85DrY7E/kWQuvTt0uyTur3Js4Sbrs2c23IwHRBA=; b=iCzcqWCelyrR5AZdECSQK06SnfXiUD3hC32Vz0jJE+PbwtrL7T+ci8v64ggQOUoNJijZNj U3pdTWX0l8aRQmvAk3Wqhcyc0Za/HMU5yezBhTzYD3C9yfZkXgLCzHLDJIeVM7STBsDcjD c8nkd8CEf6CWHcUiW7wwozhhc0q8Gyw= X-MC-Unique: LU11aHEcPCKS8s3NJdhBRw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717528126; x=1718132926; 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=X5ZK85DrY7E/kWQuvTt0uyTur3Js4Sbrs2c23IwHRBA=; b=EG+vIWrT+dukY6JnAi7BpksXfCmtLqoAYNsFieuOg/TcoY0O2UPz3aZWhC38dAHRII E/yRbIYJNqKIK3sLjAA2fzOjY0v9Bjxic988zYMlKHI0sNd+vIA2f90IvCxW5CxVc3Pr rQ7R+PoZtvtB7zsXyDl5kWZMs+w9g5h97AAX9LsqEg6BQ2nGbHt4iTUs7MxDCnOPTMEl PKWcJpN/yBJjvaykQupAl34D7l9nocrhpF3zTlHoF8CxuccxfMO0xnbyt0xGCZALOHoR anRMweHbiGyX12e4Yp08swBIO0/zL167hWv2ZqA26EYKwExDHkXeucvmEE5YUuUlhQU6 nkKw== X-Gm-Message-State: AOJu0YzMUKMZD7ddZOD9oxlBy0gJ7v7BXq82gMtrzYW4JOnXR6uwfVR5 x/T2R0gkWrhOiuk6Py3BFQzpeAvlRF29eFH9MChNGoaYXFG3Z2HkZ2LxyrNm9pYpLnDxeVLbpzo cSN94n2wgrpKbYDol7+cqqThp0w4i7WN2esXhHs7jJv/NY7ldaJS/cLAJIXrln6gqtnexAZnwXs ZHOTfsML61LGWKrYOzTV5LAcQ4lPnAVA== X-Received: by 2002:a05:6000:ac1:b0:357:ac48:9676 with SMTP id ffacd0b85a97d-35e8ef8fe7bmr215576f8f.51.1717528125703; Tue, 04 Jun 2024 12:08:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZ2Bws9bhvSZVUDSxK2VewV7oWsb2mOYqXEIHq30jnoguOWmRVGsHetSQ/kV8PCk8v1uUogA== X-Received: by 2002:a05:6000:ac1:b0:357:ac48:9676 with SMTP id ffacd0b85a97d-35e8ef8fe7bmr215557f8f.51.1717528125261; Tue, 04 Jun 2024 12:08:45 -0700 (PDT) Date: Tue, 4 Jun 2024 15:08:42 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Cindy Lu , qemu-stable@nongnu.org Subject: [PULL 45/46] virtio-pci: Fix the failure process in kvm_virtio_pci_vector_use_one() Message-ID: 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.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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: 1717528222641100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Cindy Lu In function kvm_virtio_pci_vector_use_one(), the function will only use the irqfd/vector for itself. Therefore, in the undo label, the failing process is incorrect. To fix this, we can just remove this label. Fixes: f9a09ca3ea ("vhost: add support for configure interrupt") Cc: qemu-stable@nongnu.org Signed-off-by: Cindy Lu Message-Id: <20240528084840.194538-1-lulu@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-pci.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index b6757ffce2..349619f57a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -898,7 +898,7 @@ static int kvm_virtio_pci_vector_use_one(VirtIOPCIProxy= *proxy, int queue_no) } ret =3D kvm_virtio_pci_vq_vector_use(proxy, vector); if (ret < 0) { - goto undo; + return ret; } /* * If guest supports masking, set up irqfd now. @@ -908,25 +908,11 @@ static int kvm_virtio_pci_vector_use_one(VirtIOPCIPro= xy *proxy, int queue_no) ret =3D kvm_virtio_pci_irqfd_use(proxy, n, vector); if (ret < 0) { kvm_virtio_pci_vq_vector_release(proxy, vector); - goto undo; + return ret; } } =20 return 0; -undo: - - vector =3D virtio_queue_vector(vdev, queue_no); - if (vector >=3D msix_nr_vectors_allocated(dev)) { - return ret; - } - if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { - ret =3D virtio_pci_get_notifier(proxy, queue_no, &n, &vector); - if (ret < 0) { - return ret; - } - kvm_virtio_pci_irqfd_release(proxy, n, vector); - } - return ret; } static int kvm_virtio_pci_vector_vq_use(VirtIOPCIProxy *proxy, int nvqs) { --=20 MST