From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 78F1E9187 for ; Thu, 25 May 2017 11:51:22 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 25 May 2017 02:51:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,391,1491289200"; d="scan'208";a="91624341" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga002.jf.intel.com with ESMTP; 25 May 2017 02:51:11 -0700 From: Yuanhan Liu To: Yuanhan Liu Cc: dpdk stable Date: Thu, 25 May 2017 17:48:35 +0800 Message-Id: <1495705809-21416-63-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-stable] patch 'vhost: fix max queues' has been queued to stable release 17.02.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 May 2017 09:51:23 -0000 Hi, FYI, your patch has been queued to stable release 17.02.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/28/17. So please shout if anyone has objections. Thanks. --yliu --- >>From d29d8944d9154a077fb80188e8bd54f5c65d67ef Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Wed, 1 Mar 2017 18:41:59 +0800 Subject: [PATCH] vhost: fix max queues [ upstream commit de8e1fdcecdca1254dbd6a63fd6e0e65fe3e3b05 ] 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") 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 -- 1.9.0