* [PATCH 1/2] common/cpt: fix compilation with GCC 12 [not found] <20220617061432.2685-1-adwivedi@marvell.com> @ 2022-06-17 6:14 ` Ankur Dwivedi 2022-06-17 12:07 ` David Marchand 2022-06-17 6:14 ` [PATCH 2/2] crypto/cnxk: " Ankur Dwivedi [not found] ` <20220617133930.5063-1-adwivedi@marvell.com> 2 siblings, 1 reply; 6+ messages in thread From: Ankur Dwivedi @ 2022-06-17 6:14 UTC (permalink / raw) To: dev Cc: anoobj, gakhil, ktejasree, jerinj, david.marchand, Ankur Dwivedi, stable 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. Fixes: 9be415daf469 ("common/cpt: add common defines for microcode") Fixes: b74652f3a91f ("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 Kollanukkaran <jerinj@marvell.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.28.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] common/cpt: fix compilation with GCC 12 2022-06-17 6:14 ` [PATCH 1/2] common/cpt: fix compilation with GCC 12 Ankur Dwivedi @ 2022-06-17 12:07 ` David Marchand 2022-06-17 12:39 ` [EXT] " Ankur Dwivedi 0 siblings, 1 reply; 6+ messages in thread From: David Marchand @ 2022-06-17 12:07 UTC (permalink / raw) To: Ankur Dwivedi Cc: dev, Anoob Joseph, Akhil Goyal, Tejasree Kondoj, Jerin Jacob Kollanukkaran, dpdk stable On Fri, Jun 17, 2022 at 8:15 AM Ankur Dwivedi <adwivedi@marvell.com> wrote: > > 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") Nit: No need for this blank line. > Cc: stable@dpdk.org > > Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> > Reviewed-by: Anoob Joseph <anoobj@marvell.com> > Reviewed-by: Jerin Jacob Kollanukkaran <jerinj@marvell.com> -- David Marchand ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [EXT] Re: [PATCH 1/2] common/cpt: fix compilation with GCC 12 2022-06-17 12:07 ` David Marchand @ 2022-06-17 12:39 ` Ankur Dwivedi 0 siblings, 0 replies; 6+ messages in thread From: Ankur Dwivedi @ 2022-06-17 12:39 UTC (permalink / raw) To: David Marchand Cc: dev, Anoob Joseph, Akhil Goyal, Tejasree Kondoj, Jerin Jacob Kollanukkaran, dpdk stable Hi David, >-----Original Message----- >From: David Marchand <david.marchand@redhat.com> >Sent: Friday, June 17, 2022 5:38 PM >To: Ankur Dwivedi <adwivedi@marvell.com> >Cc: dev <dev@dpdk.org>; Anoob Joseph <anoobj@marvell.com>; Akhil Goyal ><gakhil@marvell.com>; Tejasree Kondoj <ktejasree@marvell.com>; Jerin >Jacob Kollanukkaran <jerinj@marvell.com>; dpdk stable <stable@dpdk.org> >Subject: [EXT] Re: [PATCH 1/2] common/cpt: fix compilation with GCC 12 > >External Email > >---------------------------------------------------------------------- >On Fri, Jun 17, 2022 at 8:15 AM Ankur Dwivedi <adwivedi@marvell.com> >wrote: >> >> 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") >Nit: No need for this blank line. Thanks for the review. Will send a v2 with the changes. >> Cc: stable@dpdk.org >> >> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> >> Reviewed-by: Anoob Joseph <anoobj@marvell.com> >> Reviewed-by: Jerin Jacob Kollanukkaran <jerinj@marvell.com> > > >-- >David Marchand Regards, Ankur ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] crypto/cnxk: fix compilation with GCC 12 [not found] <20220617061432.2685-1-adwivedi@marvell.com> 2022-06-17 6:14 ` [PATCH 1/2] common/cpt: fix compilation with GCC 12 Ankur Dwivedi @ 2022-06-17 6:14 ` Ankur Dwivedi [not found] ` <20220617133930.5063-1-adwivedi@marvell.com> 2 siblings, 0 replies; 6+ messages in thread From: Ankur Dwivedi @ 2022-06-17 6:14 UTC (permalink / raw) To: dev Cc: anoobj, gakhil, ktejasree, jerinj, david.marchand, Ankur Dwivedi, stable The following warning is observed with GCC 12 compilation: In file included from ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:17: In function ‘fill_sg_comp_from_iov’, inlined from ‘cpt_pdcp_chain_alg_prep’ at ../drivers/crypto/cnxk/cnxk_se.h:1194:8, inlined from ‘cpt_fc_enc_hmac_prep’ at ../drivers/crypto/cnxk/cnxk_se.h:1871:9, inlined from ‘fill_digest_params’ at ../drivers/crypto/cnxk/cnxk_se.h:2829:8, inlined from ‘cpt_sym_inst_fill’ at ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:92:9, inlined from ‘cn10k_cpt_fill_inst.constprop’ at ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:146:10: ../drivers/crypto/cnxk/cnxk_se.h:222:52: warning: array subscript 0 is outside array bounds of ‘struct roc_se_buf_ptr[0]’ [-Warray-bounds] 222 | e_vaddr = (uint64_t)bufs[j].vaddr; | ~~~~~~~^~~~~~ ../drivers/crypto/cnxk/cnxk_se.h:223:48: warning: array subscript 0 is outside array bounds of ‘struct roc_se_buf_ptr[0]’ [-Warray-bounds] 223 | e_len = (size > bufs[j].size) ? bufs[j].size : size; | ~~~~~~~^~~~~ This patch resolves the warning. Fixes: 3de331795f73 ("crypto/cnxk: add flexi cipher encryption") Cc: stable@dpdk.org Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> Reviewed-by: Anoob Joseph <anoobj@marvell.com> Reviewed-by: Jerin Jacob Kollanukkaran <jerinj@marvell.com> --- drivers/crypto/cnxk/cnxk_se.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index a339b80a87..0833167586 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -188,27 +188,27 @@ fill_sg_comp_from_iov(struct roc_se_sglist_comp *list, uint32_t i, int32_t j; uint32_t extra_len = extra_buf ? extra_buf->size : 0; uint32_t size = *psize; - struct roc_se_buf_ptr *bufs; - bufs = from->bufs; for (j = 0; (j < from->buf_cnt) && size; j++) { + struct roc_se_sglist_comp *to = &list[i >> 2]; + uint32_t buf_sz = from->bufs[j].size; + void *vaddr = from->bufs[j].vaddr; uint64_t e_vaddr; uint32_t e_len; - struct roc_se_sglist_comp *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_vaddr = (uint64_t)bufs[j].vaddr + from_offset; - e_len = (size > (bufs[j].size - from_offset)) ? - (bufs[j].size - from_offset) : + e_vaddr = (uint64_t)vaddr + from_offset; + e_len = (size > (buf_sz - from_offset)) ? + (buf_sz - from_offset) : size; from_offset = 0; } else { - e_vaddr = (uint64_t)bufs[j].vaddr; - e_len = (size > bufs[j].size) ? bufs[j].size : size; + e_vaddr = (uint64_t)vaddr; + e_len = (size > buf_sz) ? buf_sz : size; } to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len); -- 2.28.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20220617133930.5063-1-adwivedi@marvell.com>]
* [PATCH v2 1/2] common/cpt: fix compilation with GCC 12 [not found] ` <20220617133930.5063-1-adwivedi@marvell.com> @ 2022-06-17 13:39 ` Ankur Dwivedi 2022-06-17 13:39 ` [PATCH v2 2/2] crypto/cnxk: " Ankur Dwivedi 1 sibling, 0 replies; 6+ messages in thread From: Ankur Dwivedi @ 2022-06-17 13:39 UTC (permalink / raw) To: dev Cc: anoobj, gakhil, ktejasree, jerinj, david.marchand, Ankur Dwivedi, stable 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") Cc: stable@dpdk.org Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> Reviewed-by: Anoob Joseph <anoobj@marvell.com> Reviewed-by: Jerin Jacob Kollanukkaran <jerinj@marvell.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.28.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] crypto/cnxk: fix compilation with GCC 12 [not found] ` <20220617133930.5063-1-adwivedi@marvell.com> 2022-06-17 13:39 ` [PATCH v2 1/2] common/cpt: " Ankur Dwivedi @ 2022-06-17 13:39 ` Ankur Dwivedi 1 sibling, 0 replies; 6+ messages in thread From: Ankur Dwivedi @ 2022-06-17 13:39 UTC (permalink / raw) To: dev Cc: anoobj, gakhil, ktejasree, jerinj, david.marchand, Ankur Dwivedi, stable The following warning is observed with GCC 12 compilation: In file included from ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:17: In function ‘fill_sg_comp_from_iov’, inlined from ‘cpt_pdcp_chain_alg_prep’ at ../drivers/crypto/cnxk/cnxk_se.h:1194:8, inlined from ‘cpt_fc_enc_hmac_prep’ at ../drivers/crypto/cnxk/cnxk_se.h:1871:9, inlined from ‘fill_digest_params’ at ../drivers/crypto/cnxk/cnxk_se.h:2829:8, inlined from ‘cpt_sym_inst_fill’ at ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:92:9, inlined from ‘cn10k_cpt_fill_inst.constprop’ at ../drivers/crypto/cnxk/cn10k_cryptodev_ops.c:146:10: ../drivers/crypto/cnxk/cnxk_se.h:222:52: warning: array subscript 0 is outside array bounds of ‘struct roc_se_buf_ptr[0]’ [-Warray-bounds] 222 | e_vaddr = (uint64_t)bufs[j].vaddr; | ~~~~~~~^~~~~~ ../drivers/crypto/cnxk/cnxk_se.h:223:48: warning: array subscript 0 is outside array bounds of ‘struct roc_se_buf_ptr[0]’ [-Warray-bounds] 223 | e_len = (size > bufs[j].size) ? bufs[j].size : size; | ~~~~~~~^~~~~ This patch resolves the warning. Fixes: 3de331795f73 ("crypto/cnxk: add flexi cipher encryption") Cc: stable@dpdk.org Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com> Reviewed-by: Anoob Joseph <anoobj@marvell.com> Reviewed-by: Jerin Jacob Kollanukkaran <jerinj@marvell.com> --- drivers/crypto/cnxk/cnxk_se.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index a339b80a87..0833167586 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -188,27 +188,27 @@ fill_sg_comp_from_iov(struct roc_se_sglist_comp *list, uint32_t i, int32_t j; uint32_t extra_len = extra_buf ? extra_buf->size : 0; uint32_t size = *psize; - struct roc_se_buf_ptr *bufs; - bufs = from->bufs; for (j = 0; (j < from->buf_cnt) && size; j++) { + struct roc_se_sglist_comp *to = &list[i >> 2]; + uint32_t buf_sz = from->bufs[j].size; + void *vaddr = from->bufs[j].vaddr; uint64_t e_vaddr; uint32_t e_len; - struct roc_se_sglist_comp *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_vaddr = (uint64_t)bufs[j].vaddr + from_offset; - e_len = (size > (bufs[j].size - from_offset)) ? - (bufs[j].size - from_offset) : + e_vaddr = (uint64_t)vaddr + from_offset; + e_len = (size > (buf_sz - from_offset)) ? + (buf_sz - from_offset) : size; from_offset = 0; } else { - e_vaddr = (uint64_t)bufs[j].vaddr; - e_len = (size > bufs[j].size) ? bufs[j].size : size; + e_vaddr = (uint64_t)vaddr; + e_len = (size > buf_sz) ? buf_sz : size; } to->u.s.len[i % 4] = rte_cpu_to_be_16(e_len); -- 2.28.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-17 13:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220617061432.2685-1-adwivedi@marvell.com>
2022-06-17 6:14 ` [PATCH 1/2] common/cpt: fix compilation with GCC 12 Ankur Dwivedi
2022-06-17 12:07 ` David Marchand
2022-06-17 12:39 ` [EXT] " Ankur Dwivedi
2022-06-17 6:14 ` [PATCH 2/2] crypto/cnxk: " Ankur Dwivedi
[not found] ` <20220617133930.5063-1-adwivedi@marvell.com>
2022-06-17 13:39 ` [PATCH v2 1/2] common/cpt: " Ankur Dwivedi
2022-06-17 13:39 ` [PATCH v2 2/2] crypto/cnxk: " Ankur Dwivedi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).