From patchwork Fri Apr 1 23:11:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 605039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qcF5j1brRz9ryQ for ; Sat, 2 Apr 2016 08:34:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755141AbcDAVeZ (ORCPT ); Fri, 1 Apr 2016 17:34:25 -0400 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:53181 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754957AbcDAVeY (ORCPT ); Fri, 1 Apr 2016 17:34:24 -0400 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id m6f5aSySRzRgvm6f5a1hBa; Fri, 01 Apr 2016 14:31:23 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 520) id F40F9190331; Fri, 1 Apr 2016 16:11:54 -0700 (PDT) From: Jake Oshins To: linux-pci@vger.kernel.org, gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, haiyangz@microsoft.com, haddenh@microsoft.com Cc: Jake Oshins Subject: [PATCH v3 5/7] drivers:hv: Track allocations of children of hv_vmbus in private resource tree Date: Fri, 1 Apr 2016 16:11:30 -0700 Message-Id: <1459552292-1297-6-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1459552292-1297-1-git-send-email-jakeo@microsoft.com> References: <1459552292-1297-1-git-send-email-jakeo@microsoft.com> X-CMAE-Envelope: MS4wfGhF0MENFcALz5bPu/QlNr6JUkwG9pPl49ZfKXqj3QX/VodNcikgXaFXjFz9RfC2CVq7DOchbbfjtgHYK4uz7pouf0mWz9w1lz99sfmgUSt1gp1HDedA dXNr5PuXy26m8qJeCR+cYYGbl9011ZVemIXxiqwDagcwsIv46Ve38iljsg9UFoZ7QbK+cPklbL8JxO8PUcd2ebNOa6Q0SaWV4J+pdsWCz5PGaS4K8jxJWykA YZORLm0e9Gfawf+wrBKLVlUYFVSNBJUeO2Ru4ohJFu5mn8txeQRKPQXJi4iTtNwh/SQfTTfic/sWThKUv6kfRvd0BmxbSG/zMO9TxNEaqt5ErizsOfd2hZSd O3U0IID+aiFLsI9fmEdcAxkqQMkYMiubZdFWRWHi4hOe7N1ydD5v8ocNRwfcyl7W0jIPdTCgj7AfY6oNrJ/b/+f9FGYznq14YLc7vrod1wstDLlkR5244GpY Vlly1WtzseuOMOms/H722uah/uu9KW2DttzcpXp2wEvXjbVY9Uylx/lWtUU= Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch changes vmbus_allocate_mmio() and vmbus_free_mmio() so that when child paravirtual devices allocate memory-mapped I/O space, they allocate it privately from a resource tree pointed at by hyperv_mmio and also by the public resource tree iomem_resource. This allows the region to be marked as "busy" in the private tree, but a "bridge window" in the public tree, guaranteeing that no two bridge windows will overlap each other but while also allowing the PCI device children of the bridge windows to overlap that window. One might conclude that this belongs in the pnp layer, rather than in this driver. Rafael Wysocki, the maintainter of the pnp layer, has previously asked that we not modify the pnp layer as it is considered deprecated. This patch is thus essentially a workaround. Signed-off-by: Jake Oshins --- drivers/hv/vmbus_drv.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 1ce47d0..dfc6149 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1128,7 +1128,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, resource_size_t size, resource_size_t align, bool fb_overlap_ok) { - struct resource *iter; + struct resource *iter, *shadow; resource_size_t range_min, range_max, start, local_min, local_max; const char *dev_n = dev_name(&device_obj->device); u32 fb_end = screen_info.lfb_base + (screen_info.lfb_size << 1); @@ -1170,12 +1170,22 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, start = (local_min + align - 1) & ~(align - 1); for (; start + size - 1 <= local_max; start += align) { + shadow = __request_region(iter, start, + size, + NULL, + IORESOURCE_BUSY); + if (!shadow) + continue; + *new = request_mem_region_exclusive(start, size, dev_n); if (*new) { + shadow->name = (char *)*new; retval = 0; goto exit; } + + __release_region(iter, start, size); } } } @@ -1196,7 +1206,17 @@ EXPORT_SYMBOL_GPL(vmbus_allocate_mmio); */ void vmbus_free_mmio(resource_size_t start, resource_size_t size) { + struct resource *iter; + + down(&hyperv_mmio_lock); + for (iter = hyperv_mmio; iter; iter = iter->sibling) { + if ((iter->start >= start + size) || (iter->end <= start)) + continue; + + __release_region(iter, start, size); + } release_mem_region(start, size); + up(&hyperv_mmio_lock); } EXPORT_SYMBOL_GPL(vmbus_free_mmio);