From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 160066CB4; Wed, 1 Mar 2017 11:43:17 +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="1103530193" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga001.jf.intel.com with ESMTP; 01 Mar 2017 02:43:16 -0800 From: Yuanhan Liu To: dev@dpdk.org Cc: Maxime Coquelin , Yuanhan Liu , stable@dpdk.org Date: Wed, 1 Mar 2017 18:41:58 +0800 Message-Id: <1488364919-22897-1-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1487839550-21800-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1487839550-21800-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-stable] [PATCH v2 1/2] vhost: fix multiple queue not being enabled for older kernels 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: Wed, 01 Mar 2017 10:43:18 -0000 Some macros (say VIRTIO_NET_F_MQ) are needed for enabling multiple queue, however they are introduced since kernel v3.8, meaning build error happens if we build DPDK vhost on those platforms. 71dfdbe66a66 ("vhost: fix build with kernel < 3.8") meant to fix it, but in a wrong way: it completely disables the MQ features for those kernels. However, the MQ feature doesn't depend on the kernel at all (except the macros dependency stated above), that we could still enable the MQ feature even the host kernel has no such support. The right fix is to define the macro if it's not defined. Fixes: 71dfdbe66a66 ("vhost: fix build with kernel < 3.8") Cc: stable@dpdk.org Signed-off-by: Yuanhan Liu Reviewed-by: Maxime Coquelin --- - v2: do not remove the VHOST_MAX_QUEUE_PAIRS macro. The value which in turn will be fixed in next patch. --- lib/librte_vhost/vhost.c | 2 +- lib/librte_vhost/vhost.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index e415093..3c3f6a4 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -56,7 +56,7 @@ (1ULL << VIRTIO_NET_F_CTRL_VQ) | \ (1ULL << VIRTIO_NET_F_CTRL_RX) | \ (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \ - (VHOST_SUPPORTS_MQ) | \ + (1ULL << VIRTIO_NET_F_MQ) | \ (1ULL << VIRTIO_F_VERSION_1) | \ (1ULL << VHOST_F_LOG_ALL) | \ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \ diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 22564f1..4391e62 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -123,11 +123,10 @@ struct vhost_virtqueue { * code buildable for older kernel. */ #ifdef VIRTIO_NET_F_MQ - #define VHOST_MAX_QUEUE_PAIRS VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX - #define VHOST_SUPPORTS_MQ (1ULL << VIRTIO_NET_F_MQ) + #define VHOST_MAX_QUEUE_PAIRS VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX #else - #define VHOST_MAX_QUEUE_PAIRS 1 - #define VHOST_SUPPORTS_MQ 0 + #define VIRTIO_NET_F_MQ 22 + #define VHOST_MAX_QUEUE_PAIRS 0x8000 #endif /* -- 1.9.0