[linux-yocto] [PATCH 06/46] Revert "intel: fcs: avoid allocating memory repeatedly"

[wenlin.k...@windriver.com via lists.yoctoproject.org]

From: Wenlin Kang <wenlin.k...@windriver.com>

Since this issue already fix by upstream commit
dd05e5a3(HSD #14015618796: crypto: intel_fcs:
To support concurrent fcs clients requests)

This reverts commit 9dfe713b6ff10378972c68893ca9d789dc52c663.
---
 drivers/crypto/intel_fcs.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/intel_fcs.c b/drivers/crypto/intel_fcs.c
index 832c05133eb3..ee61668c5094 100644
--- a/drivers/crypto/intel_fcs.c
+++ b/drivers/crypto/intel_fcs.c
@@ -252,11 +252,9 @@ static long fcs_ioctl(struct file *file, unsigned int cmd,
                      unsigned long arg)
 {
        struct intel_fcs_dev_ioctl *data;
-       struct intel_fcs_dev_ioctl data_var;
        struct intel_fcs_priv *priv;
        struct device *dev;
        struct stratix10_svc_client_msg *msg;
-       struct stratix10_svc_client_msg msg_var;
        const struct firmware *fw;
        char filename[FILE_NAME_SIZE];
        size_t tsz, rsz, datasz, ud_sz;
@@ -274,8 +272,14 @@ static long fcs_ioctl(struct file *file, unsigned int cmd,
 
        priv = container_of(file->private_data, struct intel_fcs_priv, miscdev);
        dev = priv->client.dev;
-       data = &data_var;
-       msg = &msg_var;
+
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       msg = devm_kzalloc(dev, sizeof(*msg), GFP_KERNEL);
+       if (!msg)
+               return -ENOMEM;
 
        switch (cmd) {
        case INTEL_FCS_DEV_VALIDATION_REQUEST:
@@ -470,6 +474,7 @@ static long fcs_ioctl(struct file *file, unsigned int cmd,
                        dev_err(dev, "failed to allocate RNG buffer\n");
                        return -ENOMEM;
                }
+
                msg->command = COMMAND_FCS_RANDOM_NUMBER_GEN;
                msg->payload = s_buf;
                msg->payload_length = RANDOM_NUMBER_SIZE;
@@ -2461,7 +2466,6 @@ static int fcs_close(struct inode *inode, struct file 
*file)
 static int fcs_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
 {
        struct stratix10_svc_client_msg *msg;
-       struct stratix10_svc_client_msg msg_var;
        struct intel_fcs_priv *priv;
        struct device *dev;
        void *s_buf;
@@ -2480,7 +2484,12 @@ static int fcs_rng_read(struct hwrng *rng, void *buf, 
size_t max, bool wait)
 
        priv = (struct intel_fcs_priv *)rng->priv;
        dev = priv->client.dev;
-       msg = &msg_var;
+
+       msg = devm_kzalloc(dev, sizeof(*msg), GFP_KERNEL);
+       if (!msg) {
+               dev_err(dev, "failed to allocate msg buffer\n");
+               return -ENOMEM;
+       }
 
        s_buf = stratix10_svc_allocate_memory(priv->chan,
                                              RANDOM_NUMBER_SIZE);
@@ -2488,6 +2497,7 @@ static int fcs_rng_read(struct hwrng *rng, void *buf, 
size_t max, bool wait)
                dev_err(dev, "failed to allocate random number buffer\n");
                return -ENOMEM;
        }
+
        msg->command = COMMAND_FCS_RANDOM_NUMBER_GEN;
        msg->payload = s_buf;
        msg->payload_length = RANDOM_NUMBER_SIZE;
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12508): 
https://lists.yoctoproject.org/g/linux-yocto/message/12508
Mute This Topic: https://lists.yoctoproject.org/mt/98898742/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-