From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCE02C2D0C0 for ; Wed, 1 Jan 2020 04:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B37C8206CC for ; Wed, 1 Jan 2020 04:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727105AbgAAEGi (ORCPT ); Tue, 31 Dec 2019 23:06:38 -0500 Received: from mga07.intel.com ([134.134.136.100]:62808 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbgAAEGi (ORCPT ); Tue, 31 Dec 2019 23:06:38 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 20:06:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,381,1571727600"; d="scan'208";a="244309244" Received: from allen-box.sh.intel.com (HELO [10.239.159.136]) ([10.239.159.136]) by fmsmga004.fm.intel.com with ESMTP; 31 Dec 2019 20:06:36 -0800 Cc: baolu.lu@linux.intel.com, Bjorn Helgaas , Lorenzo Pieralisi , Keith Busch , Joerg Roedel , Christoph Hellwig , David Woodhouse Subject: Re: [RFC 2/5] iommu/vt-d: Unlink device if failed to add to group To: Jon Derrick , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org References: <1577823863-3303-1-git-send-email-jonathan.derrick@intel.com> <1577823863-3303-3-git-send-email-jonathan.derrick@intel.com> From: Lu Baolu Message-ID: Date: Wed, 1 Jan 2020 12:05:29 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <1577823863-3303-3-git-send-email-jonathan.derrick@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On 1/1/20 4:24 AM, Jon Derrick wrote: > If the device fails to be added to the group, make sure to unlink the > reference before returning. > > Signed-off-by: Jon Derrick This fix looks reasonable to me. Acked-by: Lu Baolu Best regards, baolu > --- > drivers/iommu/intel-iommu.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index b2526a4..978d502 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -5625,8 +5625,10 @@ static int intel_iommu_add_device(struct device *dev) > > group = iommu_group_get_for_dev(dev); > > - if (IS_ERR(group)) > - return PTR_ERR(group); > + if (IS_ERR(group)) { > + ret = PTR_ERR(group); > + goto unlink; > + } > > iommu_group_put(group); > > @@ -5652,7 +5654,8 @@ static int intel_iommu_add_device(struct device *dev) > if (!get_private_domain_for_dev(dev)) { > dev_warn(dev, > "Failed to get a private domain.\n"); > - return -ENOMEM; > + ret = -ENOMEM; > + goto unlink; > } > > dev_info(dev, > @@ -5667,6 +5670,10 @@ static int intel_iommu_add_device(struct device *dev) > } > > return 0; > + > +unlink: > + iommu_device_unlink(&iommu->iommu, dev); > + return ret; > } > > static void intel_iommu_remove_device(struct device *dev) > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB000C2D0C0 for ; Wed, 1 Jan 2020 04:06:41 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 895BC206CC for ; Wed, 1 Jan 2020 04:06:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 895BC206CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5F43084C20; Wed, 1 Jan 2020 04:06:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hHex--KIDTjT; Wed, 1 Jan 2020 04:06:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id C13E7846AD; Wed, 1 Jan 2020 04:06:40 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B4431C18DC; Wed, 1 Jan 2020 04:06:40 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3781FC077D for ; Wed, 1 Jan 2020 04:06:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 20B1F84F2E for ; Wed, 1 Jan 2020 04:06:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8jzcZ_SQLWcL for ; Wed, 1 Jan 2020 04:06:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6165584E60 for ; Wed, 1 Jan 2020 04:06:38 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 20:06:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,381,1571727600"; d="scan'208";a="244309244" Received: from allen-box.sh.intel.com (HELO [10.239.159.136]) ([10.239.159.136]) by fmsmga004.fm.intel.com with ESMTP; 31 Dec 2019 20:06:36 -0800 Subject: Re: [RFC 2/5] iommu/vt-d: Unlink device if failed to add to group To: Jon Derrick , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org References: <1577823863-3303-1-git-send-email-jonathan.derrick@intel.com> <1577823863-3303-3-git-send-email-jonathan.derrick@intel.com> From: Lu Baolu Message-ID: Date: Wed, 1 Jan 2020 12:05:29 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <1577823863-3303-3-git-send-email-jonathan.derrick@intel.com> Content-Language: en-US Cc: Bjorn Helgaas , Keith Busch , David Woodhouse , Christoph Hellwig X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 1/1/20 4:24 AM, Jon Derrick wrote: > If the device fails to be added to the group, make sure to unlink the > reference before returning. > > Signed-off-by: Jon Derrick This fix looks reasonable to me. Acked-by: Lu Baolu Best regards, baolu > --- > drivers/iommu/intel-iommu.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index b2526a4..978d502 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -5625,8 +5625,10 @@ static int intel_iommu_add_device(struct device *dev) > > group = iommu_group_get_for_dev(dev); > > - if (IS_ERR(group)) > - return PTR_ERR(group); > + if (IS_ERR(group)) { > + ret = PTR_ERR(group); > + goto unlink; > + } > > iommu_group_put(group); > > @@ -5652,7 +5654,8 @@ static int intel_iommu_add_device(struct device *dev) > if (!get_private_domain_for_dev(dev)) { > dev_warn(dev, > "Failed to get a private domain.\n"); > - return -ENOMEM; > + ret = -ENOMEM; > + goto unlink; > } > > dev_info(dev, > @@ -5667,6 +5670,10 @@ static int intel_iommu_add_device(struct device *dev) > } > > return 0; > + > +unlink: > + iommu_device_unlink(&iommu->iommu, dev); > + return ret; > } > > static void intel_iommu_remove_device(struct device *dev) > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu