s390/zcrypt: Use kvcalloc() instead of kvmalloc_array()

sparse warns about a large memset() call within
zcrypt_device_status_mask_ext():

drivers/s390/crypto/zcrypt_api.c:1303:15: warning: memset with byte count of 262144

Get rid of this warning by making sure that all callers of this function
allocate memory with __GFP_ZERO, which zeroes memory already at allocation
time, which again allows to remove the memset() call.

Reviewed-by: Harald Freudenberger <[email protected]>
Signed-off-by: Heiko Carstens <[email protected]>

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index eba07f8ef3087190e6a0af4be9d278c4cff0643c..74036886ca87dc2ddc1d0395ce1cbe87619a9c95 100644 (file)
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1300,9 +1300,6 @@ void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus)
        struct zcrypt_device_status_ext *stat;
        int card, queue;
 
-       memset(devstatus, 0, MAX_ZDEV_ENTRIES_EXT
-              * sizeof(struct zcrypt_device_status_ext));
-
        spin_lock(&zcrypt_list_lock);
        for_each_zcrypt_card(zc) {
                for_each_zcrypt_queue(zq, zc) {
@@ -1607,9 +1604,9 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
                size_t total_size = MAX_ZDEV_ENTRIES_EXT
                        * sizeof(struct zcrypt_device_status_ext);
 
-               device_status = kvmalloc_array(MAX_ZDEV_ENTRIES_EXT,
-                                              sizeof(struct zcrypt_device_status_ext),
-                                              GFP_KERNEL);
+               device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
+                                        sizeof(struct zcrypt_device_status_ext),
+                                        GFP_KERNEL);
                if (!device_status)
                        return -ENOMEM;
                zcrypt_device_status_mask_ext(device_status);

diff --git a/drivers/s390/crypto/zcrypt_ccamisc.c b/drivers/s390/crypto/zcrypt_ccamisc.c
index 6087547328ce91271eeab7a13c02059299c0c39a..7bef2cc4e46195629933f1a4cb4f89bca0282efd 100644 (file)
--- a/drivers/s390/crypto/zcrypt_ccamisc.c
+++ b/drivers/s390/crypto/zcrypt_ccamisc.c
@@ -1762,9 +1762,9 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
                return -EINVAL;
 
        /* fetch status of all crypto cards */
-       device_status = kvmalloc_array(MAX_ZDEV_ENTRIES_EXT,
-                                      sizeof(struct zcrypt_device_status_ext),
-                                      GFP_KERNEL);
+       device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
+                                sizeof(struct zcrypt_device_status_ext),
+                                GFP_KERNEL);
        if (!device_status)
                return -ENOMEM;
        zcrypt_device_status_mask_ext(device_status);
@@ -1878,9 +1878,9 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
        struct cca_info ci;
 
        /* fetch status of all crypto cards */
-       device_status = kvmalloc_array(MAX_ZDEV_ENTRIES_EXT,
-                                      sizeof(struct zcrypt_device_status_ext),
-                                      GFP_KERNEL);
+       device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
+                                sizeof(struct zcrypt_device_status_ext),
+                                GFP_KERNEL);
        if (!device_status)
                return -ENOMEM;
        zcrypt_device_status_mask_ext(device_status);

diff --git a/drivers/s390/crypto/zcrypt_ep11misc.c b/drivers/s390/crypto/zcrypt_ep11misc.c
index 9bcf8fc69ebe428bff07458406f70be0407d0b39..b43db17a4e0e6a95d3b1f44778f6b1ee857f5f35 100644 (file)
--- a/drivers/s390/crypto/zcrypt_ep11misc.c
+++ b/drivers/s390/crypto/zcrypt_ep11misc.c
@@ -1588,9 +1588,9 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
        struct ep11_card_info eci;
 
        /* fetch status of all crypto cards */
-       device_status = kvmalloc_array(MAX_ZDEV_ENTRIES_EXT,
-                                      sizeof(struct zcrypt_device_status_ext),
-                                      GFP_KERNEL);
+       device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
+                                sizeof(struct zcrypt_device_status_ext),
+                                GFP_KERNEL);
        if (!device_status)
                return -ENOMEM;
        zcrypt_device_status_mask_ext(device_status);