From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751875Ab0CTKWY (ORCPT ); Sat, 20 Mar 2010 06:22:24 -0400 Received: from hera.kernel.org ([140.211.167.34]:35196 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600Ab0CTKWW (ORCPT ); Sat, 20 Mar 2010 06:22:22 -0400 Message-ID: <4BA4A19C.1010607@kernel.org> Date: Sat, 20 Mar 2010 03:21:16 -0700 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100228 SUSE/3.0.3-1.1.1 Thunderbird/3.0.3 MIME-Version: 1.0 To: "Brandeburg, Jesse" , Jesse Barnes , David Woodhouse , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" Subject: [PATCH] intel-iommu: don't call domain_exit if can not attach with iommu References: <4BA42A95.4000301@kernel.org> In-Reply-To: <4BA42A95.4000301@kernel.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org found when a lot of ixgbevf are used with intel iommu, will get crash > > eth304 ip=192.171.178.102 mac=56:95:16:88:4C:C1 pci=0000:0e:18.3 drv=ixgbevf > eth305 ip=192.171.179.102 mac=D6:41:8C:4A:87:B3 pci=0000:0e:18.5 drv=ixgbevf > [ 9534.886519] BUG: unable to handle kernel NULL pointer dereference at > 0000000000000008 > [ 9534.889775] Call Trace: > [ 9534.889775] [] domain_remove_dev_info+0x34/0xcf > [ 9534.889775] [] domain_exit+0x23/0xc4 > [ 9534.889775] [] T.953+0x173/0x342 > [ 9534.889775] [] __intel_map_single+0x63/0x1b3 > [ 9534.889775] [] intel_alloc_coherent+0xc7/0xee > [ 9534.889775] [] ? ixgbevf_setup_tx_resources+0x2f/0x12c > [ 9534.889775] [] ixgbevf_setup_tx_resources+0xe8/0x12c > [ 9534.889775] [] ixgbevf_open+0x7a/0x160 > [ 9534.889775] [] __dev_open+0x8e/0xbc > [ 9534.889775] [] __dev_change_flags+0xad/0x130 > [ 9534.889775] [] dev_change_flags+0x21/0x57 > [ 9534.889775] [] devinet_ioctl+0x29d/0x541 > [ 9534.889775] [] ? trace_hardirqs_off_caller+0x1f/0xa9 > [ 9534.889775] [] inet_ioctl+0x8f/0xa7 > [ 9534.889775] [] sock_do_ioctl+0x29/0x48 > [ 9534.889775] [] sock_ioctl+0x1fe/0x20d > [ 9534.889775] [] vfs_ioctl+0x32/0xa6 > [ 9534.889775] [] do_vfs_ioctl+0x2b0/0x2cb > [ 9534.889775] [] ? sysret_check+0x27/0x62 > [ 9534.889775] [] sys_ioctl+0x47/0x6a > [ 9534.889775] [] system_call_fastpath+0x16/0x1b > [ 9534.889775] Code: cd 7f cc ff 41 54 9d 48 83 c4 20 5b 41 5c 41 5d 41 > 5e c9 c3 55 48 89 e5 e8 11 ff ff ff c9 c3 55 48 89 e5 53 48 89 fb 48 83 > ec 08 <48> 8b 47 08 4c 8b 00 49 39 f8 74 1d 48 89 f9 48 c7 c2 7f e9 18 > [ 9534.889775] RIP [] list_del+0xc/0x8b > [ 9534.889775] RSP > [ 9534.889775] CR2: 0000000000000008 > [ 9534.889775] ---[ end trace 072bd8cdb08a760c ]--- > xifconfig8_2x_vf.sh: line 10: 28555 Killed ifconfig > $DEV $IP > when intel_iommu=off or iommu=pt is used, will work well. root cause: domain is initialized after trying attached it, if it can not be attached, don't call domain_exit yet. it will cause kernel crash in domain_exit() after patch will will get error instead of crash. [ 1781.910241] IOMMU: no free domain ids [ 1781.910244] Allocating domain for 0000:d0:1f.5 failed SIOCSIFFLAGS: Cannot allocate memory Signed-off-by: Yinghai Lu Index: linux-2.6/drivers/pci/intel-iommu.c =================================================================== --- linux-2.6.orig/drivers/pci/intel-iommu.c +++ linux-2.6/drivers/pci/intel-iommu.c @@ -1853,7 +1857,7 @@ static struct dmar_domain *get_domain_fo ret = iommu_attach_domain(domain, iommu); if (ret) { - domain_exit(domain); + free_domain_mem(domain); goto error; }