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 EA38FA051C for ; Tue, 11 Feb 2020 12:42:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E32F51C012; Tue, 11 Feb 2020 12:42:46 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by dpdk.org (Postfix) with ESMTP id 4A4931C012 for ; Tue, 11 Feb 2020 12:42:46 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id t3so11968046wru.7 for ; Tue, 11 Feb 2020 03:42:46 -0800 (PST) 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=SYekhwtUHk3Wip4RIdv2c12mK41E0hcvVX6J2VtIP3k=; b=Q9uVy5CvAJuZ/GhF7HrJG+fqko/Aa7ZcdF47fyAL7qFVF31wo/0tPeDqu+oe+IcyrW BC8RHmVeipynfeoHu7mdeOW7zqIGkOjn7m9eaMo6uSq4mpQWSCtC2YPz2zufVx2CYawM hSOLBAmAVwL+8yUodJUFWBb9puGC2KShc2M9Rn41iWQ8vPfQIeNQQy1qN7qWy7TjfK7k gUnXuhbxHiuIRmHQIxPS3lpTUh+mCi4K6u23M8lEouTGeHDXyVH3fidyMEHU6ysCS+3k nuV5qpV9tKwR6jh6clRqKeJUKiX3ytDCkWzNRimDvaYl9qLIzmueA6MOUvUb1DZsZJDI gMQQ== 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=SYekhwtUHk3Wip4RIdv2c12mK41E0hcvVX6J2VtIP3k=; b=P/QNqsuSjuFbo1whvJKeQu8Y7QiaGYxEPXLTC0KhTJew0nA01GlmuMkUiEcQlLayBi L5ZnB1rTuLk7+pLORD2QpADT867f71PQ1DtIGoiXqOv52SEQmD+hBf+H4d4R1U2edYoP zRqLvqCUMb+iZ+Vy1OAEghoGJxGNBYK1CJtVB50lnRF+uqXZIdCkIPlyv9OoWJ/G906L LoQDF4o4FOPqRd1KLvkGM2x3zu4vDDhKlFKIsiIIEmqXow478QV3ChWAGuiErywl4qKS nbNrt95le5L45xn8LEZKsWdGp9HMJArlJhVNKN8eVVN5Ui0cAfU3kqfLvSbKQRWMrctv I29g== X-Gm-Message-State: APjAAAUiWGStlRHTNkqFaUcdjvt5+2A4bbJdpvNu19HIxtdmZDxpSE1U Sf8JdQMRI7YxDtskM/0d18wMY/0bLvg= X-Google-Smtp-Source: APXvYqzIrx0uh/kdIZBzcfvjynJ+JKnPjvEW4/5gUBUObkydp3okFKl6EuMA2fuE97pk4FXUhmnimQ== X-Received: by 2002:adf:f012:: with SMTP id j18mr8172587wro.314.1581421365968; Tue, 11 Feb 2020 03:42:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x6sm3301850wmi.44.2020.02.11.03.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:45 -0800 (PST) From: luca.boccassi@gmail.com To: Archana Muniganti Cc: Anoob Joseph , dpdk stable Date: Tue, 11 Feb 2020 11:22:12 +0000 Message-Id: <20200211112216.3929-186-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/cpt: fix component for empty IOV buffer' has been queued to stable release 19.11.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.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 02/13/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 edf1e8adad106816b35f23dc2abc0968401f72ff Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Wed, 5 Feb 2020 18:46:17 +0530 Subject: [PATCH] common/cpt: fix component for empty IOV buffer [ upstream commit 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 ] fill_sg_comp_from_iov() prepares gather components for i/p IOV buffers and extra buf. This API is failing to create a gather component for extra_buf when IOV buf len is zero. Though there is enough space to accommodate extra_buf, because of pre-decrementing of extra_buf length from aggregate size, this issue is seen. Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption") Signed-off-by: Archana Muniganti Signed-off-by: Anoob Joseph --- drivers/common/cpt/cpt_ucode.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index 979870c754..9dc0fc652a 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -377,7 +377,7 @@ fill_sg_comp_from_iov(sg_comp_t *list, { int32_t j; uint32_t extra_len = extra_buf ? extra_buf->size : 0; - uint32_t size = *psize - extra_len; + uint32_t size = *psize; buf_ptr_t *bufs; bufs = from->bufs; @@ -386,9 +386,6 @@ fill_sg_comp_from_iov(sg_comp_t *list, uint32_t e_len; sg_comp_t *to = &list[i >> 2]; - if (!bufs[j].size) - continue; - if (unlikely(from_offset)) { if (from_offset >= bufs[j].size) { from_offset -= bufs[j].size; @@ -420,18 +417,19 @@ fill_sg_comp_from_iov(sg_comp_t *list, to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len); } + extra_len = RTE_MIN(extra_len, size); /* Insert extra data ptr */ if (extra_len) { i++; to = &list[i >> 2]; to->u.s.len[i % 4] = - rte_cpu_to_be_16(extra_buf->size); + rte_cpu_to_be_16(extra_len); to->ptr[i % 4] = rte_cpu_to_be_64(extra_buf->dma_addr); - - /* size already decremented by extra len */ + size -= extra_len; } + next_len = RTE_MIN(next_len, size); /* insert the rest of the data */ if (next_len) { i++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.975712420 +0000 +++ 0186-common-cpt-fix-component-for-empty-IOV-buffer.patch 2020-02-11 11:17:38.840009574 +0000 @@ -1,8 +1,10 @@ -From 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 Mon Sep 17 00:00:00 2001 +From edf1e8adad106816b35f23dc2abc0968401f72ff Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Wed, 5 Feb 2020 18:46:17 +0530 Subject: [PATCH] common/cpt: fix component for empty IOV buffer +[ upstream commit 0022ae1eb8fc4fb6c0115d6516003f3a9442ff00 ] + fill_sg_comp_from_iov() prepares gather components for i/p IOV buffers and extra buf. This API is failing to create a gather component for extra_buf when IOV buf len is zero. Though there is enough space @@ -10,7 +12,6 @@ length from aggregate size, this issue is seen. Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption") -Cc: stable@dpdk.org Signed-off-by: Archana Muniganti Signed-off-by: Anoob Joseph @@ -19,10 +20,10 @@ 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h -index 081249cd7b..c310ea7cb4 100644 +index 979870c754..9dc0fc652a 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h -@@ -373,7 +373,7 @@ fill_sg_comp_from_iov(sg_comp_t *list, +@@ -377,7 +377,7 @@ fill_sg_comp_from_iov(sg_comp_t *list, { int32_t j; uint32_t extra_len = extra_buf ? extra_buf->size : 0; @@ -31,7 +32,7 @@ buf_ptr_t *bufs; bufs = from->bufs; -@@ -382,9 +382,6 @@ fill_sg_comp_from_iov(sg_comp_t *list, +@@ -386,9 +386,6 @@ fill_sg_comp_from_iov(sg_comp_t *list, uint32_t e_len; sg_comp_t *to = &list[i >> 2]; @@ -41,7 +42,7 @@ if (unlikely(from_offset)) { if (from_offset >= bufs[j].size) { from_offset -= bufs[j].size; -@@ -416,18 +413,19 @@ fill_sg_comp_from_iov(sg_comp_t *list, +@@ -420,18 +417,19 @@ fill_sg_comp_from_iov(sg_comp_t *list, to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len); }