114 lines
4.1 KiB
Diff
114 lines
4.1 KiB
Diff
|
From 978835ed87a361a24e0c4424f1a352d13fb7bfac Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Ankur Dwivedi <adwivedi@marvell.com>
|
|||
|
|
Date: Fri, 17 Jun 2022 19:09:29 +0530
|
|||
|
|
Subject: [PATCH] common/cpt: fix build with GCC 12
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
[ upstream commit 3aa16821ab3e0a21052880fbf4dcb76801380c31 ]
|
|||
|
|
|
|||
|
|
The following warning is observed with GCC 12 compilation:
|
|||
|
|
|
|||
|
|
In function ‘fill_sg_comp_from_iov’,
|
|||
|
|
inlined from ‘cpt_zuc_snow3g_enc_prep’ at
|
|||
|
|
../drivers/common/cpt/cpt_ucode.h:1672:9,
|
|||
|
|
inlined from ‘cpt_fc_enc_hmac_prep’ at
|
|||
|
|
../drivers/common/cpt/cpt_ucode.h:2472:3,
|
|||
|
|
inlined from ‘fill_digest_params’ at
|
|||
|
|
../drivers/common/cpt/cpt_ucode.h:3548:14,
|
|||
|
|
inlined from ‘otx_cpt_enq_single_sym’ at
|
|||
|
|
../drivers/crypto/octeontx/otx_cryptodev_ops.c:541:9,
|
|||
|
|
inlined from ‘otx_cpt_enq_single_sym_sessless’ at
|
|||
|
|
../drivers/crypto/octeontx/otx_cryptodev_ops.c:584:8,
|
|||
|
|
inlined from ‘otx_cpt_enq_single’ at
|
|||
|
|
../drivers/crypto/octeontx/otx_cryptodev_ops.c:611:11,
|
|||
|
|
inlined from ‘otx_cpt_pkt_enqueue’ at
|
|||
|
|
../drivers/crypto/octeontx/otx_cryptodev_ops.c:643:9,
|
|||
|
|
inlined from ‘otx_cpt_enqueue_sym’ at
|
|||
|
|
../drivers/crypto/octeontx/otx_cryptodev_ops.c:668:9:
|
|||
|
|
../drivers/common/cpt/cpt_ucode.h:415:36: warning: array subscript 0 is
|
|||
|
|
outside array bounds of ‘buf_ptr_t[0]’ {aka ‘struct buf_ptr[]’}
|
|||
|
|
[-Warray-bounds]
|
|||
|
|
415 | e_dma_addr = bufs[j].dma_addr;
|
|||
|
|
| ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~
|
|||
|
|
../drivers/common/cpt/cpt_ucode.h:416:48: warning: array subscript 0 is
|
|||
|
|
outside array bounds of ‘buf_ptr_t[0]’ {aka ‘struct buf_ptr[]’}
|
|||
|
|
[-Warray-bounds]
|
|||
|
|
416 | e_len = (size > bufs[j].size) ?
|
|||
|
|
| ~~~~~~~^~~~~
|
|||
|
|
|
|||
|
|
This patch resolves the warning.
|
|||
|
|
|
|||
|
|
Bugzilla ID: 861
|
|||
|
|
Fixes: 9be415daf469 ("common/cpt: add common defines for microcode")
|
|||
|
|
Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption")
|
|||
|
|
|
|||
|
|
Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
|
|||
|
|
Reviewed-by: Anoob Joseph <anoobj@marvell.com>
|
|||
|
|
Reviewed-by: Jerin Jacob <jerinj@marvell.com>
|
|||
|
|
Tested-by: David Marchand <david.marchand@redhat.com>
|
|||
|
|
---
|
|||
|
|
drivers/common/cpt/cpt_mcode_defines.h | 2 +-
|
|||
|
|
drivers/common/cpt/cpt_ucode.h | 21 ++++++++++-----------
|
|||
|
|
2 files changed, 11 insertions(+), 12 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h
|
|||
|
|
index f16ee44297..e6dcb7674c 100644
|
|||
|
|
--- a/drivers/common/cpt/cpt_mcode_defines.h
|
|||
|
|
+++ b/drivers/common/cpt/cpt_mcode_defines.h
|
|||
|
|
@@ -387,7 +387,7 @@ typedef struct buf_ptr {
|
|||
|
|
/* IOV Pointer */
|
|||
|
|
typedef struct{
|
|||
|
|
int buf_cnt;
|
|||
|
|
- buf_ptr_t bufs[0];
|
|||
|
|
+ buf_ptr_t bufs[];
|
|||
|
|
} iov_ptr_t;
|
|||
|
|
|
|||
|
|
typedef struct fc_params {
|
|||
|
|
diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
|
|||
|
|
index e1f2f6005d..22aabab6ac 100644
|
|||
|
|
--- a/drivers/common/cpt/cpt_ucode.h
|
|||
|
|
+++ b/drivers/common/cpt/cpt_ucode.h
|
|||
|
|
@@ -394,27 +394,26 @@ 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;
|
|||
|
|
- buf_ptr_t *bufs;
|
|||
|
|
|
|||
|
|
- bufs = from->bufs;
|
|||
|
|
for (j = 0; (j < from->buf_cnt) && size; j++) {
|
|||
|
|
+ phys_addr_t dma_addr = from->bufs[j].dma_addr;
|
|||
|
|
+ uint32_t buf_sz = from->bufs[j].size;
|
|||
|
|
+ sg_comp_t *to = &list[i >> 2];
|
|||
|
|
phys_addr_t e_dma_addr;
|
|||
|
|
uint32_t e_len;
|
|||
|
|
- sg_comp_t *to = &list[i >> 2];
|
|||
|
|
|
|||
|
|
if (unlikely(from_offset)) {
|
|||
|
|
- if (from_offset >= bufs[j].size) {
|
|||
|
|
- from_offset -= bufs[j].size;
|
|||
|
|
+ if (from_offset >= buf_sz) {
|
|||
|
|
+ from_offset -= buf_sz;
|
|||
|
|
continue;
|
|||
|
|
}
|
|||
|
|
- e_dma_addr = bufs[j].dma_addr + from_offset;
|
|||
|
|
- e_len = (size > (bufs[j].size - from_offset)) ?
|
|||
|
|
- (bufs[j].size - from_offset) : size;
|
|||
|
|
+ e_dma_addr = dma_addr + from_offset;
|
|||
|
|
+ e_len = (size > (buf_sz - from_offset)) ?
|
|||
|
|
+ (buf_sz - from_offset) : size;
|
|||
|
|
from_offset = 0;
|
|||
|
|
} else {
|
|||
|
|
- e_dma_addr = bufs[j].dma_addr;
|
|||
|
|
- e_len = (size > bufs[j].size) ?
|
|||
|
|
- bufs[j].size : size;
|
|||
|
|
+ e_dma_addr = dma_addr;
|
|||
|
|
+ e_len = (size > buf_sz) ? buf_sz : size;
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len);
|
|||
|
|
--
|
|||
|
|
2.23.0
|
|||
|
|
|