From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C0888A0524 for ; Thu, 3 Dec 2020 17:50:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9647C954; Thu, 3 Dec 2020 17:50:34 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 4656BC954 for ; Thu, 3 Dec 2020 17:50:32 +0100 (CET) IronPort-SDR: fxcWY3WB3yDdtuWm5yTlEeOrK/Pab4OJKfm2pXalqT5HoTHe5mXIBvADi/H87WgzOJZ9JCisJR qQH4Kkr/4QIg== X-IronPort-AV: E=McAfee;i="6000,8403,9824"; a="152479263" X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="152479263" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2020 08:50:23 -0800 IronPort-SDR: W8/lXeRrqs23n6fQaDie35/p9v7DSDzYJgZ81sQmbIXvH/IsJaxegder3V6Vmji4crgtmb6cGS 348y9FC+VBZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="550552956" Received: from silpixa00400885.ir.intel.com ([10.243.22.207]) by orsmga005.jf.intel.com with ESMTP; 03 Dec 2020 08:50:22 -0800 From: Fan Zhang To: stable@dpdk.org Cc: maxime.coquelin@redhat.com, ktraynor@redhat.com, Fan Zhang Date: Thu, 3 Dec 2020 16:50:20 +0000 Message-Id: <20201203165020.1396969-1-roy.fan.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11] vhost/crypto: fix feature negotiation 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit ea1b835a0e74d80915e2e717f20418e2c9f948a2 ] This patch fixes the incorrect vhost crypto device feature flags. Fixes: 939066d96563 ("vhost/crypto: add public function implementation") Cc: roy.fan.zhang@intel.com Signed-off-by: Fan Zhang --- lib/librte_vhost/vhost_crypto.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index dfbac66f05..849cfa0889 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -35,13 +35,12 @@ #define VC_LOG_DBG(fmt, args...) #endif -#define VIRTIO_CRYPTO_FEATURES ((1 << VIRTIO_F_NOTIFY_ON_EMPTY) | \ - (1 << VIRTIO_RING_F_INDIRECT_DESC) | \ - (1 << VIRTIO_RING_F_EVENT_IDX) | \ - (1 << VIRTIO_CRYPTO_SERVICE_CIPHER) | \ - (1 << VIRTIO_CRYPTO_SERVICE_MAC) | \ - (1 << VIRTIO_NET_F_CTRL_VQ) | \ - (1 << VHOST_USER_PROTOCOL_F_CONFIG)) +#define VIRTIO_CRYPTO_FEATURES ((1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \ + (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \ + (1ULL << VIRTIO_RING_F_EVENT_IDX) | \ + (1ULL << VIRTIO_NET_F_CTRL_VQ) | \ + (1ULL << VIRTIO_F_VERSION_1) | \ + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) #define IOVA_TO_VVA(t, r, a, l, p) \ ((t)(uintptr_t)vhost_iova_to_vva(r->dev, r->vq, a, l, p)) -- 2.25.1