From patchwork Wed Apr 18 11:40:45 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: 133614 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp5776249ljb; Wed, 18 Apr 2018 04:44:14 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+cVEE2gHhVePtnKCrWdXAZjmNhO+Uml1nyhwY+UynER5bOmuVvfcCSXC8jL1UD0doLp3z0 X-Received: by 10.99.95.210 with SMTP id t201mr1505900pgb.315.1524051854134; Wed, 18 Apr 2018 04:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524051854; cv=none; d=google.com; s=arc-20160816; b=P4zra1XlWZ/E0AYVulQ4aHTcitJ+1SiHAsY6x3d0AaYlCfz9HaIT1CIdUqLlVCMINH TNdJrFUe/rWOQ/DQhvGT1PTUXmpDYPMJ0vBGHV+lFGOx0Qj/J4wLTHzw7RQkoEM5A+MY lJH2jdYgRuUd48WO01c9bnaWds4TMxgHBZ/kbdgC6nz8r5l5DX9eSn06DwdY3RWMUkB7 2NK/+de7SFFYrNLjtAjZi2HBX7qw35hwOPHvmn+N8p1DlsTp46P4xcZoZJgsCAytojMc s+IY/NJlK8ussKruViy9O+htJisTtYMlw4mEdONGos9BWVObXxRhVpjRjer6Va3Pg+Sh /bhA== 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=0nNGlb+6cBOrRH02UmRQ/EYDC54UAiNj6weVrcAeIfw=; b=GjMsZIC8wHpoYde7KNQmLH3TgxNDoiVIIItcieaSUk/lHB79xB0Q1PftOtwx9z9WXY kZgOtjsl88b330ImkR25gRZPzcKslV6B2wpRug8MOaz0dfjY/NV9h6Hwe/ag6nh71sPr 0vo/EBiyFGsNomcnRsQFV+CCFZh6N6sUl5HA/BkuRX2uGT/rKzDf697KF1WJ93Lk1uSq W3IXN7JTRbs/t+nF4TfIkZ8aHfWiaAZlX7SbMNttChakteg8vjCx1KMmoOx7EeB8A/dm wgp11sUNDIgCg3pmcxH+GiKIzDcRO3wKJ/pBggDypT9+rJ7h10bOJVze5NMMiTbmgRgs P2UQ== 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 v31-v6si1118845plg.157.2018.04.18.04.44.13; Wed, 18 Apr 2018 04:44:14 -0700 (PDT) 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 S1754082AbeDRLoK (ORCPT + 29 others); Wed, 18 Apr 2018 07:44:10 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:42340 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753566AbeDRLoF (ORCPT ); Wed, 18 Apr 2018 07:44:05 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 5F95137BB648A; Wed, 18 Apr 2018 19:44:01 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Wed, 18 Apr 2018 19:43:55 +0800 From: Shameer Kolothum To: , , CC: , , , , , , Shameer Kolothum Subject: [PATCH v6 7/7] vfio/type1: remove duplicate retrieval of reserved regions Date: Wed, 18 Apr 2018 12:40:45 +0100 Message-ID: <20180418114045.7968-8-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20180418114045.7968-1-shameerali.kolothum.thodi@huawei.com> References: <20180418114045.7968-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(-) -- 2.7.4 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 44d0f13d..13c631a 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -1313,15 +1313,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 @@ -1337,8 +1335,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; } @@ -1673,7 +1670,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);