From nobody Sun May 19 00:17:19 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575889805; cv=none; d=zohomail.com; s=zohoarc; b=BotJ+/oqL2ZegCepBw8iBGt3D9GUfXeiFpb2rrxqGdt5bUM9ovy8fKFESTADiYbFop94wk0nMSpPE3jzL+y02iPbtcPt3c0BiQveOA9Wh2et+TFv0LFSpWg+HXbD32koNIttza9CxFEUh6SwYzQXY8FC+DFHIl35DCy1BGEva9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575889805; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=RPrMiZ0v1PSesIhe9HmFaiZvHLOIGv64ZoBzOchACrU=; b=jXk6erl5gQgNExT8Nlti0hgKxD0fA+Ew7SyKW5sZElY7EGZ9dGYUAcSwCnFP1rQ7qiNYaneJarSS3UVC0XPkM1GurJi1WB1jDXVafL9kEUqUG7vjU7932PQhhq5hlNYROG1srF+5OqUjjUpuAixjQWWUnqnbI2f6c9LHOxL45lE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575889805841961.404808160137; Mon, 9 Dec 2019 03:10:05 -0800 (PST) Received: from localhost ([::1]:38578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieGvU-0007pu-LC for importer@patchew.org; Mon, 09 Dec 2019 06:10:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41297) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieGtj-0006dH-G8 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 06:08:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieGti-0005Ru-C6 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 06:08:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:29372 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieGti-0005PF-8N for qemu-devel@nongnu.org; Mon, 09 Dec 2019 06:08:14 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-K4elXz4EMqeLhOrhnKhp0Q-1; Mon, 09 Dec 2019 06:08:12 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2401018B9FD7 for ; Mon, 9 Dec 2019 11:08:11 +0000 (UTC) Received: from localhost (ovpn-117-247.ams2.redhat.com [10.36.117.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 077EB100EBA4; Mon, 9 Dec 2019 11:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575889693; 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; bh=RPrMiZ0v1PSesIhe9HmFaiZvHLOIGv64ZoBzOchACrU=; b=CRUhrhqXnbhvOwhi5/Y25CZi5N2npo1yqmI1B2foGIdQFlbsijpbvzFiLMv73yD6q3Hpbb tXrt4FWDbM1ZrE5jI0nbMydv6/cVGIt+atyjdAtV1Eq/n2bLpE8lY7cDggqKIU3gQek66Q EYRdlpItvXnykFN7xE8gjQxEpUz2ZH4= From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] virtio-fs: fix MSI-X nvectors calculation Date: Mon, 9 Dec 2019 11:07:59 +0000 Message-Id: <20191209110759.35227-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: K4elXz4EMqeLhOrhnKhp0Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vivek Goyal , "Dr. David Alan Gilbert" , Stefan Hajnoczi , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The following MSI-X vectors are required: * VIRTIO Configuration Change * hiprio virtqueue * requests virtqueues Fix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector. This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet. Reported-by: Vivek Goyal Signed-off-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin --- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 933a3f265b..e3a649d4a6 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpc= i_dev, Error **errp) DeviceState *vdev =3D DEVICE(&dev->vdev); =20 if (vpci_dev->nvectors =3D=3D DEV_NVECTORS_UNSPECIFIED) { - vpci_dev->nvectors =3D dev->vdev.conf.num_request_queues + 1; + /* Also reserve config change and hiprio queue vectors */ + vpci_dev->nvectors =3D dev->vdev.conf.num_request_queues + 2; } =20 qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); --=20 2.23.0