From: "Chen, Tiejun" <tiejun.chen@intel.com>
To: Jan Beulich <JBeulich@suse.com>,
George Dunlap <George.Dunlap@eu.citrix.com>
Cc: George Dunlap <george.dunlap@citrix.com>, xen-devel@lists.xen.org
Subject: Re: [v10][PATCH 06/16] hvmloader/pci: Try to avoid placing BARs in RMRRs
Date: Mon, 20 Jul 2015 22:32:48 +0800 [thread overview]
Message-ID: <55AD0690.9000801@intel.com> (raw)
In-Reply-To: <55AD1EEB0200007800093246@mail.emea.novell.com>
On 2015/7/20 22:16, Jan Beulich wrote:
>>>> On 20.07.15 at 16:10, <george.dunlap@citrix.com> wrote:
>> Hmm... although I suppose that doesn't catch the possibility of a memory
>> range crossing the 4G boundary.
>
> I think we can safely ignore that - both real and virtual hardware have
> special regions right below 4Gb, so neither RAM not RMRRs can be
> reasonably placed there.
>
Okay, I regenerate this patch online. And I just hope its good to be
acked here:
hvmloader/pci: Try to avoid placing BARs in RMRRs
Try to avoid placing PCI BARs over RMRRs:
- If mmio_hole_size is not specified, and the existing MMIO range has
RMRRs in it, and there is space to expand the hole in lowmem without
moving more memory, then make the MMIO hole as large as possible.
- When placing RMRRs, find the next RMRR higher than the current base
in the lowmem mmio hole. If it overlaps, skip ahead of it and find
the next one.
This certainly won't work in all cases, but it should work in a
significant number of cases. Additionally, users should be able to
work around problems by setting mmio_hole_size larger in the guest
config.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
tools/firmware/hvmloader/pci.c | 65
++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c
index 5ff87a7..74fc080 100644
--- a/tools/firmware/hvmloader/pci.c
+++ b/tools/firmware/hvmloader/pci.c
@@ -38,6 +38,46 @@ uint64_t pci_hi_mem_start = 0, pci_hi_mem_end = 0;
enum virtual_vga virtual_vga = VGA_none;
unsigned long igd_opregion_pgbase = 0;
+/* Check if the specified range conflicts with any reserved device
memory. */
+static bool check_overlap_all(uint64_t start, uint64_t size)
+{
+ unsigned int i;
+
+ for ( i = 0; i < memory_map.nr_map; i++ )
+ {
+ if ( memory_map.map[i].type == E820_RESERVED &&
+ check_overlap(start, size,
+ memory_map.map[i].addr,
+ memory_map.map[i].size) )
+ return true;
+ }
+
+ return false;
+}
+
+/* Find the lowest RMRR higher than base. */
+static int find_next_rmrr(uint32_t base)
+{
+ unsigned int i;
+ int next_rmrr = -1;
+ uint64_t end, min_end = (1ull << 32);
+
+ for ( i = 0; i < memory_map.nr_map ; i++ )
+ {
+ end = memory_map.map[i].addr + memory_map.map[i].size;
+
+ if ( memory_map.map[i].type == E820_RESERVED &&
+ end > base &&
+ min_end < min_end )
+ {
+ next_rmrr = i;
+ min_end = end;
+ }
+ }
+
+ return next_rmrr;
+}
+
void pci_setup(void)
{
uint8_t is_64bar, using_64bar, bar64_relocate = 0;
@@ -46,6 +86,7 @@ void pci_setup(void)
uint32_t vga_devfn = 256;
uint16_t class, vendor_id, device_id;
unsigned int bar, pin, link, isa_irq;
+ int next_rmrr;
/* Resources assignable to PCI devices via BARs. */
struct resource {
@@ -299,6 +340,15 @@ void pci_setup(void)
|| (((pci_mem_start << 1) >> PAGE_SHIFT)
>= hvm_info->low_mem_pgend)) )
pci_mem_start <<= 1;
+
+ /*
+ * Try to accomodate RMRRs in our MMIO region on a best-effort
basis.
+ * If we have RMRRs in the range, then make pci_mem_start just
after
+ * hvm_info->low_mem_pgend.
+ */
+ if ( pci_mem_start > (hvm_info->low_mem_pgend << PAGE_SHIFT) &&
+ check_overlap_all(pci_mem_start, pci_mem_end-pci_mem_start) )
+ pci_mem_start = hvm_info->low_mem_pgend << PAGE_SHIFT;
}
if ( mmio_total > (pci_mem_end - pci_mem_start) )
@@ -352,6 +402,8 @@ void pci_setup(void)
io_resource.base = 0xc000;
io_resource.max = 0x10000;
+ next_rmrr = find_next_rmrr(pci_mem_start);
+
/* Assign iomem and ioport resources in descending order of size. */
for ( i = 0; i < nr_bars; i++ )
{
@@ -407,6 +459,19 @@ void pci_setup(void)
}
base = (resource->base + bar_sz - 1) & ~(uint64_t)(bar_sz - 1);
+
+ /* If we're using mem_resource, check for RMRR conflicts. */
+ while ( resource == &mem_resource &&
+ next_rmrr >= 0 &&
+ check_overlap(base, bar_sz,
+ memory_map.map[next_rmrr].addr,
+ memory_map.map[next_rmrr].size) )
+ {
+ base = memory_map.map[next_rmrr].addr +
memory_map.map[next_rmrr].size;
+ base = (base + bar_sz - 1) & ~(bar_sz - 1);
+ next_rmrr = find_next_rmrr(base);
+ }
+
bar_data |= (uint32_t)base;
bar_data_upper = (uint32_t)(base >> 32);
base += bar_sz;
--
1.9.1
Thanks
Tiejun
next prev parent reply other threads:[~2015-07-20 14:32 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 6:16 [v10][PATCH 00/16] Fix RMRR Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 01/16] xen: introduce XENMEM_reserved_device_memory_map Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 02/16] xen/vtd: create RMRR mapping Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 03/16] xen/passthrough: extend hypercall to support rdm reservation policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 04/16] xen: enable XENMEM_memory_map in hvm Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 05/16] hvmloader: get guest memory map into memory_map[] Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 06/16] hvmloader/pci: Try to avoid placing BARs in RMRRs Tiejun Chen
2015-07-20 11:00 ` George Dunlap
2015-07-20 11:30 ` Jan Beulich
2015-07-20 12:52 ` George Dunlap
2015-07-20 14:06 ` Chen, Tiejun
2015-07-20 14:10 ` George Dunlap
2015-07-20 14:16 ` Jan Beulich
2015-07-20 14:32 ` Chen, Tiejun [this message]
2015-07-20 15:00 ` Jan Beulich
2015-07-21 0:53 ` Chen, Tiejun
2015-07-21 6:18 ` Jan Beulich
2015-07-21 9:42 ` George Dunlap
2015-07-20 6:16 ` [v10][PATCH 07/16] hvmloader/e820: construct guest e820 table Tiejun Chen
2015-07-20 11:56 ` Jan Beulich
2015-07-20 14:35 ` Chen, Tiejun
2015-07-20 15:03 ` Jan Beulich
2015-07-20 13:00 ` George Dunlap
2015-07-20 13:23 ` Chen, Tiejun
2015-07-20 13:50 ` George Dunlap
2015-07-20 13:57 ` Chen, Tiejun
2015-07-20 6:16 ` [v10][PATCH 08/16] tools/libxc: Expose new hypercall xc_reserved_device_memory_map Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 09/16] tools: extend xc_assign_device() to support rdm reservation policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 10/16] tools: introduce some new parameters to set rdm policy Tiejun Chen
2015-07-20 6:16 ` [v10][PATCH 11/16] tools/libxl: detect and avoid conflicts with RDM Tiejun Chen
2015-07-20 13:32 ` Ian Jackson
2015-07-20 14:40 ` Chen, Tiejun
2015-07-20 14:53 ` Ian Jackson
2015-07-20 15:08 ` Chen, Tiejun
2015-07-20 15:24 ` Ian Jackson
2015-07-20 15:38 ` Ian Campbell
2015-07-21 6:44 ` Chen, Tiejun
2015-07-21 6:45 ` Chen, Tiejun
2015-07-21 6:38 ` Chen, Tiejun
2015-07-21 10:48 ` Ian Jackson
2015-07-21 11:12 ` Chen, Tiejun
2015-07-21 10:41 ` Ian Jackson
2015-07-21 11:04 ` Chen, Tiejun
2015-07-21 11:11 ` Ian Jackson
2015-07-21 11:23 ` Chen, Tiejun
2015-07-21 11:27 ` Ian Jackson
2015-07-21 11:45 ` Chen, Tiejun
2015-07-21 12:33 ` Ian Jackson
2015-07-21 13:29 ` Chen, Tiejun
2015-07-21 15:09 ` Ian Jackson
2015-07-21 15:42 ` Chen, Tiejun
2015-07-21 15:57 ` Ian Jackson
2015-07-21 15:57 ` Ian Jackson
2015-07-22 0:33 ` Chen, Tiejun
2015-07-22 8:43 ` Ian Campbell
2015-07-22 9:18 ` Chen, Tiejun
2015-07-22 10:28 ` Ian Jackson
2015-07-22 10:51 ` Ian Campbell
2015-07-21 13:41 ` Chen, Tiejun
2015-07-21 15:10 ` Ian Jackson
2015-07-21 15:22 ` Chen, Tiejun
2015-07-21 15:31 ` Ian Jackson
2015-07-21 12:04 ` Chen, Tiejun
2015-07-21 12:34 ` Ian Jackson
2015-07-20 6:16 ` [v10][PATCH 12/16] tools: introduce a new parameter to set a predefined rdm boundary Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 13/16] libxl: construct e820 map with RDM information for HVM guest Tiejun Chen
2015-07-20 13:34 ` Ian Jackson
2015-07-20 6:17 ` [v10][PATCH 14/16] xen/vtd: enable USB device assignment Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 15/16] xen/vtd: prevent from assign the device with shared rmrr Tiejun Chen
2015-07-20 6:17 ` [v10][PATCH 16/16] tools: parse to enable new rdm policy parameters Tiejun Chen
2015-07-20 13:43 ` Ian Jackson
2015-07-20 13:53 ` Chen, Tiejun
2015-07-20 10:37 ` [v10][PATCH 00/16] Fix RMRR George Dunlap
2015-07-20 12:39 ` Chen, Tiejun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55AD0690.9000801@intel.com \
--to=tiejun.chen@intel.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=JBeulich@suse.com \
--cc=george.dunlap@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.