From patchwork Fri Jan 12 16:45:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 124372 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2270503qgn; Fri, 12 Jan 2018 08:48:37 -0800 (PST) X-Google-Smtp-Source: ACJfBotFxlhCxkZZ9KHx6vEqeYJsKXtiswtgPG6+9IT8RqjH+ngP0B/LY3A/NVtSJLasUZyOYIj1 X-Received: by 10.101.65.136 with SMTP id a8mr20769887pgq.363.1515775717862; Fri, 12 Jan 2018 08:48:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515775717; cv=none; d=google.com; s=arc-20160816; b=bKar6M1AgTcMFj9TT51tiZxrAK+9Bxbi+CMsHSBT5p7bzmOjN8wTOu2zkJb+QSVm22 7DF0fu6Y4oqCVCl+Ul6TpihTHDeg/grl/Jb2KdR9Rwdfxt5hidp6aj5CllLXw41PHA22 Qr21LpmNkfNiUmrVwRm1cbqu62MfZEQQcBK1PXL8nmof6pl9m3LbVUMm6ZnQ0TVpTAym SAdFfjPvzKbZmkrwZJ1L22I6RdDVnyfH4sPM7H/4H/RVX0YzBxYF/qFd6p8q0gSp0LvK dgx7QhLV+qDFMwC4sYamEGq135KG7RWZ5TzHZXmxJz1wB7rfsrCHoVfShmi2d3QX1Bwd cOAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=WtB1RB2ALQVbHjF8k0DcJitd+jT72JEMFDHKJpnvF8k=; b=LlhIrdOyEj/1+fSAoULy0IgQOuffF8zDGz8NlOBCZLKteBvR45lVZRwwk/K2L+TJt9 4UymIbKGpwTla604I9LDNjq2u2q8HbMTBXmz8jMwx4AUxSprcMnyr7l43tQ8gY2Owvli LbvHOLED8aVmKiZgs+xdMvAw7phUzF0hI4xtRoVBJx8AjWYaeUdEu4CqKlP7fs4Nn1I9 oeG62o8JUTniKsikGhNvqtmD/v9lQ7za4wIOAZ9AKg9I0a7YpoXvEN3kD5dqTAO/CmNj 9M3hkujA9p0NaMhoFs0rAXiPCNLagStasxPwFAuNw2ospDXshpHziPqdrNJgwKKXk6f3 Bt5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 26si15558860pfo.269.2018.01.12.08.48.37; Fri, 12 Jan 2018 08:48:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964977AbeALQsf (ORCPT + 28 others); Fri, 12 Jan 2018 11:48:35 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:57092 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S964828AbeALQsc (ORCPT ); Fri, 12 Jan 2018 11:48:32 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 28E0B6778BD91; Sat, 13 Jan 2018 00:48:27 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.361.1; Sat, 13 Jan 2018 00:48:20 +0800 From: Shameer Kolothum To: , , CC: , , , , , Shameer Kolothum Subject: [RFC v2 5/5] vfio/type1: remove duplicate retrieval of reserved regions. Date: Fri, 12 Jan 2018 16:45:31 +0000 Message-ID: <20180112164531.93712-6-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20180112164531.93712-1-shameerali.kolothum.thodi@huawei.com> References: <20180112164531.93712-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we now already have the reserved regions list, just pass that into vfio_iommu_has_sw_msi() fn. Signed-off-by: Shameer Kolothum --- drivers/vfio/vfio_iommu_type1.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 1.9.1 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index dc6ed85..b5cf21d 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -1193,15 +1193,13 @@ static struct vfio_group *find_iommu_group(struct vfio_domain *domain, return NULL; } -static bool vfio_iommu_has_sw_msi(struct iommu_group *group, phys_addr_t *base) +static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions, + phys_addr_t *base) { - struct list_head group_resv_regions; - struct iommu_resv_region *region, *next; + struct iommu_resv_region *region; bool ret = false; - INIT_LIST_HEAD(&group_resv_regions); - iommu_get_group_resv_regions(group, &group_resv_regions); - list_for_each_entry(region, &group_resv_regions, list) { + list_for_each_entry(region, group_resv_regions, list) { /* * The presence of any 'real' MSI regions should take * precedence over the software-managed one if the @@ -1217,8 +1215,7 @@ static bool vfio_iommu_has_sw_msi(struct iommu_group *group, phys_addr_t *base) ret = true; } } - list_for_each_entry_safe(region, next, &group_resv_regions, list) - kfree(region); + return ret; } @@ -1514,7 +1511,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, if (ret) goto out_detach; - resv_msi = vfio_iommu_has_sw_msi(iommu_group, &resv_msi_base); + resv_msi = vfio_iommu_has_sw_msi(&group_resv_regions, &resv_msi_base); INIT_LIST_HEAD(&domain->group_list); list_add(&group->next, &domain->group_list);