Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752411AbZITG0Q (ORCPT ); Sun, 20 Sep 2009 02:26:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752134AbZITG0P (ORCPT ); Sun, 20 Sep 2009 02:26:15 -0400 Received: from smtp.wp.pl ([212.77.101.1]:41245 "EHLO mx1.wp.pl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751669AbZITG0P (ORCPT ); Sun, 20 Sep 2009 02:26:15 -0400 Date: Sun, 20 Sep 2009 08:41:40 +0200 From: Krzysztof Helt To: linux-input@vger.kernel.org Cc: Linux Kernel Mailing List Subject: hid-core: fix lockdep in hid_input_report() v2 Message-Id: <20090920084140.5287559e.krzysztof.h1@wp.pl> X-Mailer: Sylpheed 2.4.3 (GTK+ 2.11.0; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-WP-AV: skaner antywirusowy poczty Wirtualnej Polski S. A. X-WP-SPAM: NO 0000000 [keME] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2755 Lines: 68 From: Krzysztof Helt There is a lockdep warning in the hid_input_report() due to kmalloc(.,GFP_KERNEL) allocation of a temporary buffer. Change hid_input_report() call inside the hid_ctrl() after Jiri Slaby's advice. This converts kmalloc() call into kmalloc(.,GFP_ATOMIC). The lockdep trace is: WARNING: at kernel/lockdep.c:2457 lockdep_trace_alloc+0xca/0xd0() Hardware name: Product Name Modules linked in: usbhid(+) hid uhci_hcd ne2k_pci via_agp 8390 i2c_via Pid: 0, comm: swapper Not tainted 2.6.31 #74 Call Trace: [] ? lockdep_trace_alloc+0xca/0xd0 [] warn_slowpath_common+0x7c/0xa0 [] ? lockdep_trace_alloc+0xca/0xd0 [] warn_slowpath_null+0x15/0x20 [] lockdep_trace_alloc+0xca/0xd0 [] kmem_cache_alloc+0x28/0x100 [] ? hid_input_report+0x6f/0x220 [hid] [] hid_input_report+0x6f/0x220 [hid] [] hid_ctrl+0x7f/0x180 [usbhid] [] usb_hcd_giveback_urb+0x41/0xa0 [] uhci_giveback_urb+0x8c/0x280 [uhci_hcd] [] ? dma_pool_free+0xd3/0x120 [] ? uhci_free_td+0x58/0xa0 [uhci_hcd] [] uhci_scan_schedule+0x301/0x910 [uhci_hcd] [] uhci_irq+0x94/0x940 [uhci_hcd] [] ? __lock_acquire+0x433/0xab0 [] ? mask_and_ack_8259A+0x66/0x100 [] usb_hcd_irq+0x6b/0x90 [] handle_IRQ_event+0x2d/0xc0 [] handle_level_irq+0x65/0xe0 [] handle_irq+0x34/0x60 [] do_IRQ+0x39/0xb0 [] ? trace_hardirqs_on_caller+0x12c/0x180 [] common_interrupt+0x2e/0x40 [] ? default_idle+0x38/0x50 [] apm_cpu_idle+0x10f/0x290 [] cpu_idle+0x21/0x40 [] rest_init+0x4d/0x60 [] start_kernel+0x235/0x280 [] ? unknown_bootoption+0x0/0x210 [] __init_begin+0x3f/0x50 Signed-off-by: Krzysztof Helt --- This lockdep is in the current git tree. diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 1b0e07a..ab2869d 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -455,7 +455,7 @@ static void hid_ctrl(struct urb *urb) if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN) hid_input_report(urb->context, usbhid->ctrl[usbhid->ctrltail].report->type, - urb->transfer_buffer, urb->actual_length, 0); + urb->transfer_buffer, urb->actual_length, 1); break; case -ESHUTDOWN: /* unplug */ unplug = 1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/