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

Commit 5c2cec14 authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik
Browse files

ehea: fix might sleep problem 



A mutex has to be replaced by spinlocks as it can be called from
a context which does not allow sleeping.
The kzalloc flag GFP_KERNEL has to be replaced by GFP_ATOMIC
for the same reason.

Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 97bff095

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ struct ehea_bcmc_reg_entry { 
struct ehea_bcmc_reg_array {

	struct ehea_bcmc_reg_entry *arr;

	int num_entries;

	struct mutex lock;

	spinlock_t lock;

};



#define EHEA_PORT_UP 1

drivers/net/ehea/ehea_main.c

+11 −11
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void ehea_update_bcmc_registrations(void) 
		}



	if (num_registrations) {

		arr = kzalloc(num_registrations * sizeof(*arr), GFP_KERNEL);

		arr = kzalloc(num_registrations * sizeof(*arr), GFP_ATOMIC);

		if (!arr)

			return;  /* Keep the existing array */

	} else
@@ -301,7 +301,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) 


	memset(stats, 0, sizeof(*stats));



	cb2 = kzalloc(PAGE_SIZE, GFP_KERNEL);

	cb2 = kzalloc(PAGE_SIZE, GFP_ATOMIC);

	if (!cb2) {

		ehea_error("no mem for cb2");

		goto out;
@@ -1763,7 +1763,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) 


	memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len);



	mutex_lock(&ehea_bcmc_regs.lock);

	spin_lock(&ehea_bcmc_regs.lock);



	/* Deregister old MAC in pHYP */

	if (port->state == EHEA_PORT_UP) {
@@ -1785,7 +1785,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) 


out_upregs:

	ehea_update_bcmc_registrations();

	mutex_unlock(&ehea_bcmc_regs.lock);

	spin_unlock(&ehea_bcmc_regs.lock);

out_free:

	kfree(cb0);

out:
@@ -1947,7 +1947,7 @@ static void ehea_set_multicast_list(struct net_device *dev) 
	}

	ehea_promiscuous(dev, 0);



	mutex_lock(&ehea_bcmc_regs.lock);

	spin_lock(&ehea_bcmc_regs.lock);



	if (dev->flags & IFF_ALLMULTI) {

		ehea_allmulti(dev, 1);
@@ -1978,7 +1978,7 @@ static void ehea_set_multicast_list(struct net_device *dev) 
	}

out:

	ehea_update_bcmc_registrations();

	mutex_unlock(&ehea_bcmc_regs.lock);

	spin_unlock(&ehea_bcmc_regs.lock);

	return;

}
@@ -2497,7 +2497,7 @@ static int ehea_up(struct net_device *dev) 
		}

	}



	mutex_lock(&ehea_bcmc_regs.lock);

	spin_lock(&ehea_bcmc_regs.lock);



	ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);

	if (ret) {
@@ -2520,7 +2520,7 @@ static int ehea_up(struct net_device *dev) 
		ehea_info("Failed starting %s. ret=%i", dev->name, ret);



	ehea_update_bcmc_registrations();

	mutex_unlock(&ehea_bcmc_regs.lock);

	spin_unlock(&ehea_bcmc_regs.lock);



	ehea_update_firmware_handles();

	mutex_unlock(&ehea_fw_handles.lock);
@@ -2575,7 +2575,7 @@ static int ehea_down(struct net_device *dev) 


	mutex_lock(&ehea_fw_handles.lock);



	mutex_lock(&ehea_bcmc_regs.lock);

	spin_lock(&ehea_bcmc_regs.lock);

	ehea_drop_multicast_list(dev);

	ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
@@ -2584,7 +2584,7 @@ static int ehea_down(struct net_device *dev) 
	port->state = EHEA_PORT_DOWN;



	ehea_update_bcmc_registrations();

	mutex_unlock(&ehea_bcmc_regs.lock);

	spin_unlock(&ehea_bcmc_regs.lock);



	ret = ehea_clean_all_portres(port);

	if (ret)
@@ -3590,7 +3590,7 @@ int __init ehea_module_init(void) 
	memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs));



	mutex_init(&ehea_fw_handles.lock);

	mutex_init(&ehea_bcmc_regs.lock);

	spin_lock_init(&ehea_bcmc_regs.lock);



	ret = check_module_parm();

	if (ret)