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 22C2BA0093 for ; Tue, 19 May 2020 15:09:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 18D7C1D6B6; Tue, 19 May 2020 15:09:26 +0200 (CEST) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id 9DC071D6AF for ; Tue, 19 May 2020 15:09:24 +0200 (CEST) Received: by mail-wr1-f43.google.com with SMTP id h17so15815135wrc.8 for ; Tue, 19 May 2020 06:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SiEB48f+RpiIElUwPxOtovd9XhdpU8UjD/NTfpWCuz0=; b=lEsXgZqQi1Kr+wxQZKZR3oDuXpLr5nz9aqq6YxZ6ZeqXJ4o87mzRDWCsdAVmtet7KU y817Ml4SCIO1AmlF+1v0DAnrZxNX/2nQKVScRmelh0Wa2inI01sPVxtXnQ8g8yEiP05a Q2hUyS0j+IgWNbF8o5ZbTGXnsLUVd22ge+4Z2hAKMImg/a0aC6FFsOdqsO/VX6f32Vbj cbyXZXRH8CwOhy6PKTWwM37I4D1DznyHSnvsxhGYcSTZ+VX0HStTbhFgojvWzkOCiX4Z rQUIizP4HZc7fnbubZVZVqBCa18jQ3rJnToXBYQubwEPfkZQqTAQw0fRHrZpviYX5C39 j6ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SiEB48f+RpiIElUwPxOtovd9XhdpU8UjD/NTfpWCuz0=; b=NfnppihiNgTUCcjAbU+TKejAznjymNvzAfcxTi8uID2WNktB56WTnC8DyHpB4Holcf uNpl99fzMapBkzCUU3y3KfZG/cLjnLWbAaVsDOnSQNH+4GotohygLU+jS8LHSvu5qnmY W14/CeIF6TF/gO73r4aSkXVxT1bc4wHmgGiV07opN9aEcrD3999YFSog4HAImJzwT06g 5qhpWYDJqvjybnF2L00ZiwxDiPtLxIxI6qEXEw8Pe6sQsTM7mjCsH01UjL3wUkGDqbPN WjMbiZF0G1AUxuyuReS8nWgQ4idmatlkH2ZnBWgfBujfJUxNEMYHjOZPG7xcxx3L3FSx byaw== X-Gm-Message-State: AOAM533k5u4HnxsRj7g4WQ+hY1XtGnJCF8iOXCpRWnbyHJzMAZrJHiT9 vLaAkpCvGOUcqowY7XPmSUU= X-Google-Smtp-Source: ABdhPJxelpY2cGPvZNkb+WxBI0v68dnyj2+/atYZ3lvIveGHbWR7zvEdYXqyDKPeWuGDNO6+TDQWag== X-Received: by 2002:a5d:4484:: with SMTP id j4mr21430275wrq.325.1589893764358; Tue, 19 May 2020 06:09:24 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 128sm4254152wme.39.2020.05.19.06.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:23 -0700 (PDT) From: luca.boccassi@gmail.com To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Tue, 19 May 2020 14:03:23 +0100 Message-Id: <20200519130549.112823-68-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost/crypto: add missing user protocol flag' has been queued to stable release 19.11.3 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" Hi, FYI, your patch has been queued to stable release 19.11.3 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/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From e6247616042c0e01bcff7ee8f95a60c1f3dd4743 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:19:37 +0000 Subject: [PATCH] vhost/crypto: add missing user protocol flag [ upstream commit 699a225b3861bd1a02872ed389a317f2d18c8f3a ] This patch fixes the vhost crypto missed "VHOST_USER_PROTOCOL_F_CONFIG" flag problem during initialization. Newer Qemu version requires this feature enabled. Fixes: 939066d96563 ("vhost/crypto: add public function implementation") Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/rte_vhost.h | 5 +++++ lib/librte_vhost/vhost_crypto.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index 7b5dc87c2e..ad6e717026 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -68,6 +68,10 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_PAGEFAULT 8 #endif +#ifndef VHOST_USER_PROTOCOL_F_CONFIG +#define VHOST_USER_PROTOCOL_F_CONFIG 9 +#endif + #ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 #endif @@ -85,6 +89,7 @@ extern "C" { #define VHOST_USER_F_PROTOCOL_FEATURES 30 #endif + /** * Information relating to memory regions including offsets to * addresses in QEMUs memory file. diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index 07a4115482..0f9df4059d 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -40,7 +40,8 @@ (1 << VIRTIO_RING_F_EVENT_IDX) | \ (1 << VIRTIO_CRYPTO_SERVICE_CIPHER) | \ (1 << VIRTIO_CRYPTO_SERVICE_MAC) | \ - (1 << VIRTIO_NET_F_CTRL_VQ)) + (1 << VIRTIO_NET_F_CTRL_VQ) | \ + (1 << VHOST_USER_PROTOCOL_F_CONFIG)) #define IOVA_TO_VVA(t, r, a, l, p) \ ((t)(uintptr_t)vhost_iova_to_vva(r->dev, r->vq, a, l, p)) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.255549334 +0100 +++ 0068-vhost-crypto-add-missing-user-protocol-flag.patch 2020-05-19 14:04:44.228648590 +0100 @@ -1,14 +1,15 @@ -From 699a225b3861bd1a02872ed389a317f2d18c8f3a Mon Sep 17 00:00:00 2001 +From e6247616042c0e01bcff7ee8f95a60c1f3dd4743 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:19:37 +0000 Subject: [PATCH] vhost/crypto: add missing user protocol flag +[ upstream commit 699a225b3861bd1a02872ed389a317f2d18c8f3a ] + This patch fixes the vhost crypto missed "VHOST_USER_PROTOCOL_F_CONFIG" flag problem during initialization. Newer Qemu version requires this feature enabled. Fixes: 939066d96563 ("vhost/crypto: add public function implementation") -Cc: stable@dpdk.org Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin @@ -18,10 +19,10 @@ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h -index c7b619ae0d..5c72fba797 100644 +index 7b5dc87c2e..ad6e717026 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h -@@ -69,6 +69,10 @@ extern "C" { +@@ -68,6 +68,10 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_PAGEFAULT 8 #endif @@ -32,7 +33,7 @@ #ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 #endif -@@ -86,6 +90,7 @@ extern "C" { +@@ -85,6 +89,7 @@ extern "C" { #define VHOST_USER_F_PROTOCOL_FEATURES 30 #endif @@ -41,7 +42,7 @@ * Information relating to memory regions including offsets to * addresses in QEMUs memory file. diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c -index 68911972b6..2e52ecae87 100644 +index 07a4115482..0f9df4059d 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -40,7 +40,8 @@