Skip to contentSkip to conversation

usb: gadget: function: Replace GFP_KERNEL with GFP_ATOMIC

PATCH In review Tapasweni Pathak 2 participants 2 messages Feb 20, 2015 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: function: Replace GFP_KERNEL with GFP_ATOMIC

To avoid deadlock, do not call blocking functions with spinlocks held.

Replace GFP_KERNEL with GFP_ATOMIC, as the latter will fail if the heap doesn't have enough free pages but will not sleep and hence deadlock can be avoided.

Found by Coccinelle.

---
Is there any other way this can be fixed as it is better to avoid GFP_ATOMIC?

 drivers/usb/gadget/function/f_fs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_fs.c +1 -1
index af98b09..8a25d30 100644
@@ -823,7 +823,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
 		}
 
 		if (io_data->aio) {
-			req = usb_ep_alloc_request(ep->ep, GFP_KERNEL);
+			req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC);
 			if (unlikely(!req))
 				goto error_lock;
 

--
1.7.9.5

#1 lore raw
Quoted 11 lines · Tapasweni Pathak

To avoid deadlock, do not call blocking functions with spinlocks held.

Replace GFP_KERNEL with GFP_ATOMIC, as the latter will fail if the heap doesn't have enough free pages but will not sleep and hence deadlock can be avoided.

Found by Coccinelle.

---
Is there any other way this can be fixed as it is better to avoid GFP_ATOMIC?

I think there is. A patchset will follow this reply.

Quoted 16 lines
 drivers/usb/gadget/function/f_fs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_fs.c +1 -1
index af98b09..8a25d30 100644
@@ -823,7 +823,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
 		}
 
 		if (io_data->aio) {
-			req = usb_ep_alloc_request(ep->ep, GFP_KERNEL);
+			req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC);
 			if (unlikely(!req))
 				goto error_lock;
 
Signature · 4 lines
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +--<[email protected]>--<xmpp:[email protected]>--ooO--(_)--Ooo--