d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common/cpt: fix build with GCC 12

Browse Source 
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: 9be415daf4 ("common/cpt: add common defines for microcode")
Fixes: b74652f3a9 ("common/cpt: add microcode interface for encryption")
Cc: stable@dpdk.org

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>
This commit is contained in:
Ankur Dwivedi 2022-06-17 19:09:29 +05:30 committed by Akhil Goyal
parent 23a95dfe96
commit 3aa16821ab
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/common/cpt/cpt_mcode_defines.h
View File

@ -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 {

21
drivers/common/cpt/cpt_ucode.h
View File

@ -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);