From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbdJCLS5 (ORCPT ); Tue, 3 Oct 2017 07:18:57 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:63257 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbdJCLSx (ORCPT ); Tue, 3 Oct 2017 07:18:53 -0400 X-AuditID: b6c32a37-c75ff70000001076-bb-59d3721a6c45 From: Bartlomiej Zolnierkiewicz To: "David S. Miller" Cc: Guenter Roeck , Lorenzo Pieralisi , Bjorn Helgaas , Richard Henderson , Ivan Kokshaysky , Matt Turner , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ide: add missing hwif->portdev freeing on hwif_init() failure Date: Tue, 03 Oct 2017 13:18:47 +0200 Message-id: <1640481.zjlggixLin@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset="us-ascii" X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42LZdlhTX1eq6HKkwdsfghZLmjIs5pxvYbH4 d2ojs8WxHY+YLC7vmsNm8WThGSaLN79fsFt8un2Q2WLaqTusDpwea+atYfTYsvImk8fOWXfZ PRZsKvX4fzbKY+f3BnaPvukfmD0+b5IL4IjisklJzcksSy3St0vgyvh7u5ml4LdkxZs5PYwN jO/Euhg5OSQETCTm7HjL3MXIxSEksINR4vn1a6wQzndGiaNTP7HBVG1vO8MGkdjAKPF00i0m kISQwFdGiV33nUBsNgEriYntqxhBbBEBbYl1B3rAJjELrGOSOLD/N1hCWCBYYtHjl2DNLAKq Env7p4Jt4BXQlNg0oZ8dxBYV8JLYsq+dCSIuKPFj8j0WEJtZQF5i3/6prBC2jsTZY+sYQRZI CJxgk2hYeIkF4lQXif+N91ghbGGJV8e3AA3lALKlJS4dtYUIT2eU2P5bAqJ3M6PEqt0T2CES 1hKHj1+EWsAn8e4ryAcgvbwSHW1CECUeEmtm9kGVO0rMOTwRbLyQQKzExtNuExhlZiG5ehaS q2chuXoBI/MqRrHUguLc9NRiwwJjveLE3OLSvHS95PzcTYzgtKFlvoNxwzmfQ4wCHIxKPLwJ bpcihVgTy4orcw8xSnAwK4nwuhRcjhTiTUmsrEotyo8vKs1JLT7EKM3BoiTOK7b+WoSQQHpi SWp2ampBahFMlomDU6qBkUnc7cy/glPO+VZbqn5G6er+2eLIkKVn9+ZpKqt0lfUi+3npczxY Jv29V9xgm3jFqlpkyrq1fr6tzzf/X3r1k3dH8PLFy1k7u6OXndxp2igYeSXWVudkYabGqm+1 5SztjRmS6iaNmVINn41P9nlWGCU8zfD+x3tZtYU1bdqPPVMCLvVY7+tVYinOSDTUYi4qTgQA YBI3zRcDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t9jQV3JosuRBlsei1ksacqwmHO+hcXi 36mNzBbHdjxisri8aw6bxZOFZ5gs3vx+wW7x6fZBZotpp+6wOnB6rJm3htFjy8qbTB47Z91l 91iwqdTj/9koj53fG9g9+qZ/YPb4vEkugCOKyyYlNSezLLVI3y6BK+Pv7WaWgt+SFW/m9DA2 ML4T62Lk5JAQMJHY3naGrYuRi0NIYB2jRMeKXywQzldGiau9B9lAqtgErCQmtq9iBLFFBLQl 1h3oYQUpYhZYxySxfVo7K0hCWCBYYtHjl0wgNouAqsTe/qlgzbwCmhKbJvSzg9iiAl4SW/a1 M0HEBSV+TL7HAmIzC8hL7Ns/lRXC1pJYv/M40wRG3llIymYhKZuFpGwBI/MqRsnUguLc9Nxi owLDvNRyveLE3OLSvHS95PzcTYzAoN52WKtvB+P9JfGHGAU4GJV4eHd4XIoUYk0sK67MPcQo wcGsJMLrUnA5Uog3JbGyKrUoP76oNCe1+BCjNAeLkjjv7bxjkUIC6YklqdmpqQWpRTBZJg5O qQZGF9naLTmtK7yt+fdcV3HTZ7jX+O1V1fyWtPhzLYreb4p2rImXZ2x/5iY2U63678Sm+Sv/ CS+o1M35/E9eZ+rNdYxzrbbcfuu0qWOX7YlbnoeiEhLOX49UZMl6t9Cz+02UG49BfElvoHHN D5ZFZ0OiLpZN21TzKohx4sU7re55ISsj3TvzHacqsRRnJBpqMRcVJwIAORW4LGYCAAA= X-CMS-MailID: 20171003111849epcas1p3335e2bc56e5aafdeadc340301284b2b8 X-Msg-Generator: CA X-Sender-IP: 182.195.42.142 X-Local-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRvsgrzshLHsoITsnpAbU2VuaW9yIFNvZnR3YXJlIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBF?= =?UTF-8?B?bmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 101P X-CMS-RootMailID: 20171003111849epcas1p3335e2bc56e5aafdeadc340301284b2b8 X-RootMTR: 20171003111849epcas1p3335e2bc56e5aafdeadc340301284b2b8 References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recent pci_assign_irq() changes uncovered a problem with missing freeing of ide_port class instance on hwif_init() failure in ide_host_register(): ide0: disabled, no IRQ ide0: failed to initialize IDE interface ide0: disabling port cmd64x 0000:00:02.0: IDE controller (0x1095:0x0646 rev 0x07) CMD64x_IDE 0000:00:02.0: BAR 0: can't reserve [io 0x8050-0x8057] cmd64x 0000:00:02.0: can't reserve resources CMD64x_IDE: probe of 0000:00:02.0 failed with error -16 ide_generic: please use "probe_mask=0x3f" module parameter for probing all legacy ISA IDE ports ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x94/0xd0 sysfs: cannot create duplicate filename '/class/ide_port/ide0' ... Trace: [] __warn+0x160/0x190 [] sysfs_warn_dup+0x94/0xd0 [] warn_slowpath_fmt+0x58/0x70 [] sysfs_warn_dup+0x94/0xd0 [] kernfs_path_from_node+0x30/0x60 [] kernfs_put+0x16c/0x2c0 [] kernfs_put+0x16c/0x2c0 [] sysfs_do_create_link_sd.isra.2+0x100/0x120 [] device_add+0x2a4/0x7c0 [] device_create_groups_vargs+0x14c/0x170 [] device_create_groups_vargs+0x98/0x170 [] device_create+0x50/0x70 [] ide_host_register+0x48c/0xa00 [] ide_host_register+0x450/0xa00 [] device_register+0x20/0x50 [] ide_host_register+0x450/0xa00 [] ide_host_add+0x64/0xe0 [] kobject_uevent_env+0x16c/0x710 [] do_one_initcall+0x68/0x260 [] kernel_init+0x1c/0x1a0 [] kernel_init+0x0/0x1a0 [] ret_from_kernel_thread+0x18/0x20 [] kernel_init+0x0/0x1a0 ---[ end trace 24a70433c3e4d374 ]--- ide0: disabling port Fix the problem by adding missing code to ide_host_register(). Link: http://lkml.kernel.org/r/32ec730f-c1b0-5584-cd35-f8a809122b96@roeck-us.net Reported-by: Guenter Roeck Cc: Bjorn Helgaas Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Guenter Roeck Cc: Matt Turner Signed-off-by: Bartlomiej Zolnierkiewicz --- This should fix sysfs warning and probing of ide_generic driver driven ports in case of hwif_init() failure (i.e. no IRQ issue when pci_assign_irq() fix is not present). v2: - Fixed typo in the patch description: pci_assing_irq() -> pci_assign_irq(). drivers/ide/ide-probe.c | 1 + 1 file changed, 1 insertion(+) Index: b/drivers/ide/ide-probe.c =================================================================== --- a/drivers/ide/ide-probe.c 2017-10-02 15:08:16.658662459 +0200 +++ b/drivers/ide/ide-probe.c 2017-10-03 11:59:36.867189557 +0200 @@ -1451,6 +1451,7 @@ int ide_host_register(struct ide_host *h if (hwif_init(hwif) == 0) { printk(KERN_INFO "%s: failed to initialize IDE " "interface\n", hwif->name); + device_unregister(hwif->portdev); device_unregister(&hwif->gendev); ide_disable_port(hwif); continue;