From patchwork Tue Jul 21 05:33:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 36454 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6L5XwpG003694 for ; Tue, 21 Jul 2009 05:33:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbZGUFd5 (ORCPT ); Tue, 21 Jul 2009 01:33:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752577AbZGUFd5 (ORCPT ); Tue, 21 Jul 2009 01:33:57 -0400 Received: from mga01.intel.com ([192.55.52.88]:54906 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbZGUFd4 (ORCPT ); Tue, 21 Jul 2009 01:33:56 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 20 Jul 2009 22:33:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.43,239,1246863600"; d="scan'208";a="709579410" Received: from minggr.sh.intel.com (HELO [10.239.13.35]) ([10.239.13.35]) by fmsmga001.fm.intel.com with ESMTP; 20 Jul 2009 22:37:10 -0700 Subject: Re: mmotm 2009-07-16-14-32 - sudden OOPS at boot in ACPI code From: Lin Ming To: Hugh Dickins Cc: Valdis.Kletnieks@vt.edu, Andrew Morton , Bob Moore , Len Brown , linux-kernel@vger.kernel.org, linux-acpi In-Reply-To: References: <200907162134.n6GLY2kt019816@imap1.linux-foundation.org> <9078.1248144738@turing-police.cc.vt.edu> Date: Tue, 21 Jul 2009 13:33:59 +0800 Message-Id: <1248154439.1852.49.camel@minggr.sh.intel.com> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 (2.24.1-2.fc10) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org > From: Hugh Dickins > Date: Tue, Jul 21, 2009 at 11:33 AM > Subject: Re: mmotm 2009-07-16-14-32 - sudden OOPS at boot in ACPI code > To: Valdis.Kletnieks@vt.edu > Cc: Andrew Morton , Bob Moore > , Len Brown , > linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org > > > On Mon, 20 Jul 2009, Valdis.Kletnieks@vt.edu wrote: > > On Thu, 16 Jul 2009 14:34:02 PDT, akpm@linux-foundation.org said: > > > The mm-of-the-moment snapshot 2009-07-16-14-32 has been uploaded to > > > > Dies a horrid death during early boot. Dell Latitude D820, and this graphics: > > > > 01:00.0 VGA compatible controller: nVidia Corporation G72M [Quadro NVS 110M/GeForce Go 7300] (rev a1) > > Oh yes, I was getting just the same with Intel graphics (i915); > but promptly forgot about it once I'd a workaround in place, > and moved on to other things, sorry. > > > > > Traceback (hand-copied from a very crappy cell-phone picture) > > > > strcmp+0x4/0x1f > > acpi_device+probe+0xac/0x13e > > driver_probe_device+0xc9/0x14e > > __driver_attach+0x58/0x7c > > ? __driver_attach+0x58/0x7c > > ? __driver_attach+0x58/0x7c > > bus_for_each_dev+0x54/0x89 > > driver_attach+0x19/0x1b > > bus_add_driver+0xv4/0x1fe > > driver_register+0xb7/0x128 > > ? acpi_video_init+0x0/0x17 > > acpi_bus_register_driver+0x3e/0x42 > > acpi_video_register+0x42/0x6e > > acpi_video_init+0x15/0x17 > > do_one_initcall+0x56/0x130 > > > > Analysis shows it's the following code from (inlined) acpi_device_install_notify_handler > > > > static int acpi_device_install_notify_handler(struct acpi_device *device) > > { > > acpi_status status; > > char *hid; > > > > hid = acpi_device_hid(device); > > if (!strcmp(hid, ACPI_BUTTON_HID_POWERF)) > > > > but we never check if hid is non-trash before feeding it to strcmp. Looks > > like something in this linux-next commit is involved: > > > > commit ed444824932d2a563858d82ec1ea29b0aa775e91 > > Author: Bob Moore > > Date: Mon Jun 29 13:39:29 2009 +0800 > > > > I suspect something in acpi_get_object_info() is going astray, causing > > acpi_device_set_id() to set the ->pnp.hardware_id to NULL in this code: > > > > if (hid) { > > device->pnp.hardware_id = ACPI_ALLOCATE_ZEROED(strlen (hid) + 1); > > if (device->pnp.hardware_id) { > > strcpy(device->pnp.hardware_id, hid); > > device->flags.hardware_id = 1; > > } > > } else > > device->pnp.hardware_id = NULL; > > > > The else clause is new in this commit. > > I think pnp.hardware_id has changed from being a builtin array to > an allocated pointer: so before there was always a zeroed array to Yes, pnp.hardware_id and pnp.unique_id are now allocated pointer. We made the change for acpi_get_object_info interface. > strcmp against, whereas now there's a NULL pointer if you come to > use acpi_device_install_notify_handler() "too early". > > Patch that works for me at the bottom. Yes, your patch can workaround the problem in acpi_device_install_notify_handler. But there are other places call strcmp to compare HID/UID. So we'd better fix acpi_device_hid/_uid as below, --- Thanks, Lin Ming > > > > > Looking at the old code, it *may* be that the ACPI code on my laptop is just > > busticated and/or there's no _HID method for the graphics card, and the old > > code Just Happened To Work in previous kernels because ->pnp.hardware_id > > wouldn't actually get set *at all* in acpi_device_set_id, so we'd get random > > stale data that was bogus, but didn't give strcmp() indigestion... > > > > Any wisdom on debugging this further (including how to tell if the ACPI > > tables have a sane _HID method for the graphics card) would be appreciated... > > > > Or is the correct fix in fact to just add a 'if (!hid) return -EINVAL;' to > > acpi_device_install_notify_handler()? > > [PATCH mmotm] acpi: work around NULL hardware_id > > Work around NULL pnp.hardware_id in acpi_device_install_notify_handler() > when probing video device. > > Signed-off-by: Hugh Dickins > --- > Signoff provided to handle the unlikely event that this hack > is actually the right fix! > > drivers/acpi/scan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > --- mmotm/drivers/acpi/scan.c 2009-07-17 12:53:20.000000000 +0100 > +++ linux/drivers/acpi/scan.c 2009-07-17 21:19:10.000000000 +0100 > @@ -376,12 +376,12 @@ static int acpi_device_install_notify_ha > char *hid; > > hid = acpi_device_hid(device); > - if (!strcmp(hid, ACPI_BUTTON_HID_POWERF)) > + if (hid && !strcmp(hid, ACPI_BUTTON_HID_POWERF)) > status = > acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON, > acpi_device_notify_fixed, > device); > - else if (!strcmp(hid, ACPI_BUTTON_HID_SLEEPF)) > + else if (hid && !strcmp(hid, ACPI_BUTTON_HID_SLEEPF)) > status = > acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON, > acpi_device_notify_fixed, > -- > 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/ -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 6e83a68..6c64366 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -188,8 +188,8 @@ struct acpi_device_pnp { #define acpi_device_bid(d) ((d)->pnp.bus_id) #define acpi_device_adr(d) ((d)->pnp.bus_address) -#define acpi_device_hid(d) ((d)->pnp.hardware_id) -#define acpi_device_uid(d) ((d)->pnp.unique_id) +#define acpi_device_hid(d) ((d)->pnp.hardware_id ? (d)->pnp.hardware_id : "\0") +#define acpi_device_uid(d) ((d)->pnp.unique_id ? (d)->pnp.unique_id : "\0") #define acpi_device_name(d) ((d)->pnp.device_name) #define acpi_device_class(d) ((d)->pnp.device_class)