From patchwork Wed Mar 1 10:41:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanhan Liu X-Patchwork-Id: 20984 X-Patchwork-Delegate: yuanhan.liu@linux.intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C7302F610; Wed, 1 Mar 2017 11:43:23 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C29046CB4; Wed, 1 Mar 2017 11:43:18 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2017 02:43:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.35,225,1484035200"; d="scan'208"; a="1103530196" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga001.jf.intel.com with ESMTP; 01 Mar 2017 02:43:17 -0800 From: Yuanhan Liu To: dev@dpdk.org Cc: Maxime Coquelin , Yuanhan Liu , stable@dpdk.org Date: Wed, 1 Mar 2017 18:41:59 +0800 Message-Id: <1488364919-22897-2-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1488364919-22897-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1487839550-21800-1-git-send-email-yuanhan.liu@linux.intel.com> <1488364919-22897-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-dev] [PATCH v2 2/2] vhost: fix max queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 0x8000 is the max virito-net queue pairs the virtio 1.0 spec claims to support. While for vhost-user, it's a different story: the max vring index could be passed by the vhost-user spec is 0xff, masked by the VHOST_USER_VRING_IDX_MASK. That said, the max queue pairs could vhost-user could supported is 0x80. If user are asking more, I think the vhost-user need be extended. Fixes: b09b198bfb5c ("vhost-user: announce queue number in message") Cc: stable@dpdk.org Signed-off-by: Yuanhan Liu --- lib/librte_vhost/vhost.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 4391e62..d97df1d 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -110,24 +110,15 @@ struct vhost_virtqueue { uint16_t shadow_used_idx; } __rte_cache_aligned; -/* Old kernels have no such macro defined */ +/* Old kernels have no such macros defined */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE #define VIRTIO_NET_F_GUEST_ANNOUNCE 21 #endif - -/* - * Make an extra wrapper for VIRTIO_NET_F_MQ and - * VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX as they are - * introduced since kernel v3.8. This makes our - * code buildable for older kernel. - */ -#ifdef VIRTIO_NET_F_MQ - #define VHOST_MAX_QUEUE_PAIRS VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX -#else +#ifndef VIRTIO_NET_F_MQ #define VIRTIO_NET_F_MQ 22 - #define VHOST_MAX_QUEUE_PAIRS 0x8000 #endif +#define VHOST_MAX_QUEUE_PAIRS 0x80 /* * Define virtio 1.0 for older kernels