From patchwork Fri Jun 17 06:14:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 112956 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 27C51A0093; Fri, 17 Jun 2022 08:15:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1779241181; Fri, 17 Jun 2022 08:15:44 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id CCC2E410E7; Fri, 17 Jun 2022 08:15:41 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25H3lNlo024727; Thu, 16 Jun 2022 23:15:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pfpt0220; bh=Kc+LRJGM0xsq6jy95zy+XPHQyTaIYwwMO/nPJQe9E4A=; b=Uhu229N6nRmh2GDawR2QYl6vos6gbuta8SXVctoym6COkzOfImk8M6gro4Jk3xofO0ko XItPX9neNITgeLgTss5uxi97oiFFYGHEjQdeymIXi/f0/0jL5+/7oIxuqblmnrflKzkL oowtCWZTytshLJu6FoGnLOgfXOy1HbTd5pSnJgjy2WmfOCgkkyTUdJTWh0nFY0rHE3oh 8NEfFG73hHY0tVvdgLxCtQi983nwBTGjLB/LrQib0iKFXhwSinhfgPX3zrvmJcWIn7AF NPLLbkNMGbQ1iAJuEY9/RFz19X4eviLmobblWiZgRK3c6m7JwBCX/GNTKTtAGBquicag hA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3grj05rfgq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 16 Jun 2022 23:15:41 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 16 Jun 2022 23:15:38 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 16 Jun 2022 23:15:39 -0700 Received: from hyd1349.t110.caveonetworks.com.com (unknown [10.29.45.13]) by maili.marvell.com (Postfix) with ESMTP id 5C54C3F7086; Thu, 16 Jun 2022 23:15:36 -0700 (PDT) From: Ankur Dwivedi To: CC: , , , , , Ankur Dwivedi , Subject: [PATCH 2/2] crypto/cnxk: fix compilation with GCC 12 Date: Fri, 17 Jun 2022 11:44:32 +0530 Message-ID: <20220617061432.2685-3-adwivedi@marvell.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20220617061432.2685-1-adwivedi@marvell.com> References: <20220617061432.2685-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: WhorZzIo7Riz_9WZp_CZMLl5mR23TgX5 X-Proofpoint-ORIG-GUID: WhorZzIo7Riz_9WZp_CZMLl5mR23TgX5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-17_04,2022-06-16_01,2022-02-23_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Reviewed-by: Anoob Joseph Reviewed-by: Jerin Jacob Kollanukkaran --- 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);