From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 00D45A0096 for ; Wed, 8 May 2019 12:16:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED2C52862; Wed, 8 May 2019 12:16:12 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4AD2E2862 for ; Wed, 8 May 2019 12:16:11 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFA9181F1B; Wed, 8 May 2019 10:16:10 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id C10F51A267; Wed, 8 May 2019 10:16:06 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Konstantin Ananyev , Maxime Coquelin , dpdk stable Date: Wed, 8 May 2019 11:14:55 +0100 Message-Id: <20190508101534.8984-13-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 08 May 2019 10:16:10 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/virtio: fix IV offset' has been queued to LTS release 18.11.2 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 LTS release 18.11.2 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/13/19. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e514982217091e1a2f1d03631a33b648ba4e6e48 Thanks. Kevin Traynor --- >From e514982217091e1a2f1d03631a33b648ba4e6e48 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 5 Apr 2019 17:04:24 +0100 Subject: [PATCH] crypto/virtio: fix IV offset [ upstream commit fd4fa52cbf733164176269b5cce809403d2ef227 ] This patch fixes the incorrect iv offset calculation. Fixes: b063e843fa03 ("crypto/virtio: fix IV physical address") Signed-off-by: Fan Zhang Acked-by: Konstantin Ananyev Reviewed-by: Maxime Coquelin --- drivers/crypto/virtio/virtio_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index e32a1ecd6..e9a63cb5a 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -204,6 +204,6 @@ virtqueue_crypto_sym_enqueue_xmit( uint32_t indirect_vring_addr_offset = req_data_len + sizeof(struct virtio_crypto_inhdr); - uint32_t indirect_iv_addr_offset = indirect_vring_addr_offset + - sizeof(struct vring_desc) * NUM_ENTRY_VIRTIO_CRYPTO_OP; + uint32_t indirect_iv_addr_offset = + offsetof(struct virtio_crypto_op_cookie, iv); struct rte_crypto_sym_op *sym_op = cop->sym; struct virtio_crypto_session *session = -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.522257777 +0100 +++ 0013-crypto-virtio-fix-IV-offset.patch 2019-05-08 11:05:05.788933619 +0100 @@ -1 +1 @@ -From fd4fa52cbf733164176269b5cce809403d2ef227 Mon Sep 17 00:00:00 2001 +From e514982217091e1a2f1d03631a33b648ba4e6e48 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fd4fa52cbf733164176269b5cce809403d2ef227 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org