Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 28 Jun 2023 14:11:53 +0100
From:   Giovanni Cabiddu <giovanni.cabiddu@intel.com>
To:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
CC:     You Kangren <youkangren@vivo.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>,
        "Tom Zanussi" <tom.zanussi@linux.intel.com>,
        Damian Muszynski <damian.muszynski@intel.com>,
        Srinivas Kerekare <srinivas.kerekare@intel.com>,
        "open list:QAT DRIVER" <qat-linux@intel.com>,
        "open list:CRYPTO API" <linux-crypto@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        <opensource.kernel@vivo.com>
Subject: [PATCH] crypto: qat - use min() in fw loader
Message-ID: <ZJwxmUGPsIlTv+TG@gcabiddu-mobl1.ger.corp.intel.com>
References: <20230627071726.20578-1-youkangren@vivo.com>
 <ZJwPlLC7/sJP8U7u@smile.fi.intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <ZJwPlLC7/sJP8U7u@smile.fi.intel.com>
Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 -
 Collinstown Industrial Park, Leixlip, County Kildare - Ireland
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N9E3D9FNUw+RKhEPx1LHXrMlcLFuXd/9vyxa2bXOOYznLaXjBbnaiRcUr9Vs?=
 =?us-ascii?Q?rMvGEsKA0IwMnijsNAPonj3xU4jChHety5QotKi7lHbF/IUElfvcgQVEBsm5?=
 =?us-ascii?Q?/5kG7mF3XmO8zNZmT/cOL3rEuL1LFvYU2HyHptmJtY2rr1cTkx1naHysUl+i?=
 =?us-ascii?Q?ol5X7sFqC2AFxpATqD2qOvQubcvBVqm+/tTwSLASahLIwMYIadLRaTX4+17C?=
 =?us-ascii?Q?7OYU0OKNL+1DeoMH2aF6afUO5Tz6vN9eqtOG5tqSvAa++XO/4onRvvm0nc1p?=
 =?us-ascii?Q?TcT/A9KK5xrmCJz74A/XLuUbMSQAHA2Zl+PE/cQiYny9guVwtHbichqGAVJD?=
 =?us-ascii?Q?bLDByiTQCVMxR49UUZLOEIoWXUr0pJoRSGhPRpE1x9tHt6bjpp4sOTxg47fc?=
 =?us-ascii?Q?O3NwgBSaUGE03wVhfgTEMqYHcOrLFv5o9RdeGgvGBAVkP5hilXRja5adLSh/?=
 =?us-ascii?Q?ynGS2ohLhIsNxePISLF6qngm3HSdibFCPa08yN/6qhAEzFp82vdv1kH52ecL?=
 =?us-ascii?Q?FvUjvxOan69hqj40AEKgjfL7B7K/oTzE1PHEF9B6Shh0VHUDTlY4194mnW/q?=
 =?us-ascii?Q?e2x68ALn3u6+hxHegycfvKZqagmlkTWvqqBwqfldXq3O2VqQNI06yrw/deP5?=
 =?us-ascii?Q?4mJXDHgZ32zwMAVH5lXeLKbfFMB+XXli6P8LlfSVMdhokLPar9QL13OQho9g?=
 =?us-ascii?Q?eRrP3Io9HEvbu/eu9jBklfr9BWa5+TrZa8WEfRmBsqbn7zUbQBFRTI8UAV4G?=
 =?us-ascii?Q?VilbWnpzJM7oD9MDs/qn1n9x4JXE9TaxtsX8XJOcRwle18AHFoTiSDkmJLii?=
 =?us-ascii?Q?MlwSBYzsWgZewPSM78/vmdM9zn58g2xCOSrJeEmmz2BRJ5LeuKbGk5zOV4su?=
 =?us-ascii?Q?G7OrxadiXZiFsOPRN2HnR+6xhpqCO5eNjBFYveMg1VFlP7QyN5x+fHrMP1HX?=
 =?us-ascii?Q?LbMyZcqetla76Z/S1SkTX1zNWoMe3uPFiMc7psm86epgyd8kykZ+0g1+S1Gl?=
 =?us-ascii?Q?knbdTkmC/RVtZaAwS3F0G1CIxLfftnpvmIasyibfThQqzJnEsjGjDT21NM2R?=
 =?us-ascii?Q?s1kSwH2CnQuuR8ZHrTAFWJ1MWFHbFfdtLeBkh8KGRNVL8Zd5o3NtBJZ9t94E?=
 =?us-ascii?Q?0wts2en+/60bLj/hZ17WK++r89hnfSz60HdjjFk8tcVxFO4KDbi/+9NTpkT9?=
 =?us-ascii?Q?QZIXEfX9T/IcgunAMSjMWwx5xHeKGitIPfcNsVRjHr1nfX0F3dR5U8tYayae?=
 =?us-ascii?Q?QHxIdMnVJVfS47grMIIQZbw50JwNuUl4WX0ch2vhVPW0i4wkCfjSertXFByO?=
 =?us-ascii?Q?N5+u6/1Y8WcI+gD/gK6mKsaZIeCtvf6wB2f/q4oGuZpFWp1IseMGinw/C7gK?=
 =?us-ascii?Q?wbgyoBnLB6Vl8M6QjkkfsRvpCZnmF0ScqIkaMJeBeUorteWN15AMfWmYFrv8?=
 =?us-ascii?Q?fIn9OJNTVx65XKrqSSaXClpO3zoSizpvtoTPOjDRZtaIA6Flb63ZL2erdX9X?=
 =?us-ascii?Q?jV25WevQXhdONv37Su2Ywupji1lSNdyqWTUuS8w3Zg0UEf+mqZ4/TmfuFUhf?=
 =?us-ascii?Q?QY+GPAqsS9JmhBVFVeWsHi/5ZUB88LQWU+Cq2Yqqu6FJq4Dmmao1Xu3KVX74?=
 =?us-ascii?Q?ig=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 21cad47e-b77f-4eed-8120-08db77d94ef0
X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6366.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 13:12:22.8831
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Lhckro4+GlJNriUOmhkHkGRCSyYeozTvlTo6oEi2E3atA3/cRJfcM1tIceNkXh8klmcKhIv2+NG2Z6dRJbywhUINsHCwgTriWukEkcBk7XA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR11MB8430
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On Wed, Jun 28, 2023 at 01:46:44PM +0300, Andy Shevchenko wrote:
> On Tue, Jun 27, 2023 at 03:17:24PM +0800, You Kangren wrote:
> > Replace the if statement with min_t() to simplify the code
> 
> ...
> 
> > -		if (words_num < UWORD_CPYBUF_SIZE)
> > -			cpylen = words_num;
> > -		else
> > -			cpylen = UWORD_CPYBUF_SIZE;
> > +		cpylen = min_t(unsigned int, words_num, UWORD_CPYBUF_SIZE);
> 
> min_t() can be dangerous some times.
> 
> To make it robust I would suggest to use min() and mark UWORD_CPYBUF_SIZE
> with U suffix to make the type the same.
Thanks. I reworked it, added a missing include and ordered the includes
in the file.

----8<----
From: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Date: Wed, 28 Jun 2023 13:32:09 +0100
Subject: [PATCH] crypto: qat - use min() in fw loader
Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland

Use min() macro in firmware loaded instead of if statement.

While at it, reorder the includes on this file in alphabetical order.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
---
 drivers/crypto/intel/qat/qat_common/qat_uclo.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index ce837bcc1cab..6a52a853e2b1 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -1,17 +1,19 @@
 // SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
 /* Copyright(c) 2014 - 2020 Intel Corporation */
-#include <linux/slab.h>
 #include <linux/ctype.h>
-#include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/minmax.h>
 #include <linux/pci_ids.h>
+#include <linux/slab.h>
+
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
-#include "icp_qat_uclo.h"
-#include "icp_qat_hal.h"
 #include "icp_qat_fw_loader_handle.h"
+#include "icp_qat_hal.h"
+#include "icp_qat_uclo.h"
 
-#define UWORD_CPYBUF_SIZE 1024
+#define UWORD_CPYBUF_SIZE 1024U
 #define INVLD_UWORD 0xffffffffffull
 #define PID_MINOR_REV 0xf
 #define PID_MAJOR_REV (0xf << 4)
@@ -1986,10 +1988,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
 	uw_relative_addr = 0;
 	words_num = encap_page->micro_words_num;
 	while (words_num) {
-		if (words_num < UWORD_CPYBUF_SIZE)
-			cpylen = words_num;
-		else
-			cpylen = UWORD_CPYBUF_SIZE;
+		cpylen = min(words_num, UWORD_CPYBUF_SIZE);
 
 		/* load the buffer */
 		for (i = 0; i < cpylen; i++)
-- 
2.40.1