From mboxrd@z Thu Jan 1 00:00:00 1970 From: elena.ufimtseva@oracle.com Subject: [PATCH v10 2/5] iommu VT-d: separate rmrr addition function Date: Mon, 13 Jul 2015 14:17:59 -0400 Message-ID: <1436811482-16113-3-git-send-email-elena.ufimtseva@oracle.com> References: <1436811482-16113-1-git-send-email-elena.ufimtseva@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436811482-16113-1-git-send-email-elena.ufimtseva@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Elena Ufimtseva , kevin.tian@intel.com, tim@xen.org, jbeulich@suse.com, yang.z.zhang@intel.com, boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org From: Elena Ufimtseva In preparation for auxiliary RMRR data provided on Xen command line, make RMRR adding a separate function. Also free memory for rmrr device scope in error path. Signed-off-by: Elena Ufimtseva Reviewed-by: Konrad Rzeszutek Wilk --- xen/drivers/passthrough/vtd/dmar.c | 126 +++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 8ed1e24..93f10fd 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -583,6 +583,68 @@ out: return ret; } +static int register_one_rmrr(struct acpi_rmrr_unit *rmrru) +{ + bool_t ignore = 0; + unsigned int i = 0; + int ret = 0; + + /* Skip checking if segment is not accessible yet. */ + if ( !pci_known_segment(rmrru->segment) ) + i = UINT_MAX; + + for ( ; i < rmrru->scope.devices_cnt; i++ ) + { + u8 b = PCI_BUS(rmrru->scope.devices[i]); + u8 d = PCI_SLOT(rmrru->scope.devices[i]); + u8 f = PCI_FUNC(rmrru->scope.devices[i]); + + if ( pci_device_detect(rmrru->segment, b, d, f) == 0 ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Non-existent device (%04x:%02x:%02x.%u) is reported" + " in RMRR (%"PRIx64", %"PRIx64")'s scope!\n", + rmrru->segment, b, d, f, + rmrru->base_address, rmrru->end_address); + ignore = 1; + } + else + { + ignore = 0; + break; + } + } + + if ( ignore ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Ignore the RMRR (%"PRIx64", %"PRIx64") due to " + "devices under its scope are not PCI discoverable!\n", + rmrru->base_address, rmrru->end_address); + scope_devices_free(&rmrru->scope); + xfree(rmrru); + } + else if ( rmrru->base_address > rmrru->end_address ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " The RMRR (%"PRIx64", %"PRIx64") is incorrect!\n", + rmrru->base_address, rmrru->end_address); + scope_devices_free(&rmrru->scope); + xfree(rmrru); + ret = -EFAULT; + } + else + { + if ( iommu_verbose ) + dprintk(VTDPREFIX, + " RMRR region: base_addr %"PRIx64" end_address %"PRIx64"\n", + rmrru->base_address, rmrru->end_address); + acpi_register_rmrr_unit(rmrru); + } + + return ret; +} + static int __init acpi_parse_one_rmrr(struct acpi_dmar_header *header) { @@ -633,68 +695,10 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end, &rmrru->scope, RMRR_TYPE, rmrr->segment); - if ( ret || (rmrru->scope.devices_cnt == 0) ) - xfree(rmrru); + if ( !ret && (rmrru->scope.devices_cnt != 0) ) + register_one_rmrr(rmrru); else - { - u8 b, d, f; - bool_t ignore = 0; - unsigned int i = 0; - - /* Skip checking if segment is not accessible yet. */ - if ( !pci_known_segment(rmrr->segment) ) - i = UINT_MAX; - - for ( ; i < rmrru->scope.devices_cnt; i++ ) - { - b = PCI_BUS(rmrru->scope.devices[i]); - d = PCI_SLOT(rmrru->scope.devices[i]); - f = PCI_FUNC(rmrru->scope.devices[i]); - - if ( !pci_device_detect(rmrr->segment, b, d, f) ) - { - dprintk(XENLOG_WARNING VTDPREFIX, - " Non-existent device (%04x:%02x:%02x.%u) is reported" - " in RMRR (%"PRIx64", %"PRIx64")'s scope!\n", - rmrr->segment, b, d, f, - rmrru->base_address, rmrru->end_address); - ignore = 1; - } - else - { - ignore = 0; - break; - } - } - - if ( ignore ) - { - dprintk(XENLOG_WARNING VTDPREFIX, - " Ignore the RMRR (%"PRIx64", %"PRIx64") due to " - "devices under its scope are not PCI discoverable!\n", - rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); - } - else if ( base_addr > end_addr ) - { - dprintk(XENLOG_WARNING VTDPREFIX, - " The RMRR (%"PRIx64", %"PRIx64") is incorrect!\n", - rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); - ret = -EFAULT; - } - else - { - if ( iommu_verbose ) - dprintk(VTDPREFIX, - " RMRR region: base_addr %"PRIx64 - " end_address %"PRIx64"\n", - rmrru->base_address, rmrru->end_address); - acpi_register_rmrr_unit(rmrru); - } - } + xfree(rmrru); return ret; } -- 2.1.3