Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f6e3aad authored by Dan Streetman's avatar Dan Streetman Committed by Herbert Xu
Browse files

crypto: nx - move kzalloc() out of spinlock 



Move the kzalloc() calls in nx842_probe() and nx842_OF_upd() to the top
of the functions, before taking the devdata spinlock.

Since kzalloc() without GFP_ATOMIC can sleep, it can't be called while
holding a spinlock.  Move the calls to before taking the lock.

Signed-off-by: default avatarDan Streetman <ddstreet@ieee.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 90fd73f9

drivers/crypto/nx/nx-842-pseries.c

+16 −22
Original line number Diff line number Diff line
@@ -724,6 +724,10 @@ static int nx842_OF_upd(struct property *new_prop) 
	int ret = 0;

	unsigned long flags;



	new_devdata = kzalloc(sizeof(*new_devdata), GFP_NOFS);

	if (!new_devdata)

		return -ENOMEM;



	spin_lock_irqsave(&devdata_mutex, flags);

	old_devdata = rcu_dereference_check(devdata,

			lockdep_is_held(&devdata_mutex));
@@ -733,16 +737,10 @@ static int nx842_OF_upd(struct property *new_prop) 
	if (!old_devdata || !of_node) {

		pr_err("%s: device is not available\n", __func__);

		spin_unlock_irqrestore(&devdata_mutex, flags);

		kfree(new_devdata);

		return -ENODEV;

	}



	new_devdata = kzalloc(sizeof(*new_devdata), GFP_NOFS);

	if (!new_devdata) {

		dev_err(old_devdata->dev, "%s: Could not allocate memory for device data\n", __func__);

		ret = -ENOMEM;

		goto error_out;

	}



	memcpy(new_devdata, old_devdata, sizeof(*old_devdata));

	new_devdata->counters = old_devdata->counters;
@@ -966,6 +964,17 @@ static int nx842_probe(struct vio_dev *viodev, 
	unsigned long flags;

	int ret = 0;



	new_devdata = kzalloc(sizeof(*new_devdata), GFP_NOFS);

	if (!new_devdata)

		return -ENOMEM;



	new_devdata->counters = kzalloc(sizeof(*new_devdata->counters),

			GFP_NOFS);

	if (!new_devdata->counters) {

		kfree(new_devdata);

		return -ENOMEM;

	}



	spin_lock_irqsave(&devdata_mutex, flags);

	old_devdata = rcu_dereference_check(devdata,

			lockdep_is_held(&devdata_mutex));
@@ -978,21 +987,6 @@ static int nx842_probe(struct vio_dev *viodev, 


	dev_set_drvdata(&viodev->dev, NULL);



	new_devdata = kzalloc(sizeof(*new_devdata), GFP_NOFS);

	if (!new_devdata) {

		dev_err(&viodev->dev, "%s: Could not allocate memory for device data\n", __func__);

		ret = -ENOMEM;

		goto error_unlock;

	}



	new_devdata->counters = kzalloc(sizeof(*new_devdata->counters),

			GFP_NOFS);

	if (!new_devdata->counters) {

		dev_err(&viodev->dev, "%s: Could not allocate memory for performance counters\n", __func__);

		ret = -ENOMEM;

		goto error_unlock;

	}



	new_devdata->vdev = viodev;

	new_devdata->dev = &viodev->dev;

	nx842_OF_set_defaults(new_devdata);