Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1649944

[PATCH-v2 2/5] Hyper-V vPCI: Use page allocation for hbus structure

Show all headers | View raw

From: Jork Loeser <jloeser@microsoft.com>

The hv_pcibus_device structure contains an in-memory hypercall argument
that must not cross a page boundary. Allocate the structure as a page
to ensure that.

Signed-off-by: Jork Loeser <jloeser@microsoft.com>
---
 drivers/pci/host/pci-hyperv.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index 7bebdc6..6e4b026 100644
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -382,7 +382,10 @@ struct hv_pcibus_device {
 	struct msi_domain_info msi_info;
 	struct msi_controller msi_chip;
 	struct irq_domain *irq_domain;
+
+	/* hypercall arg, must not cross page boundary */
 	struct retarget_msi_interrupt retarget_msi_interrupt_params;
+
 	spinlock_t retarget_msi_interrupt_lock;
 };
 
@@ -2204,7 +2207,13 @@ static int hv_pci_probe(struct hv_device *hdev,
 	struct hv_pcibus_device *hbus;
 	int ret;
 
-	hbus = kzalloc(sizeof(*hbus), GFP_KERNEL);
+	/*
+	 * hv_pcibus_device contains the hypercall arguments for retargeting in
+	 * hv_irq_unmask(). Those must not cross a page boundary.
+	 */
+	BUILD_BUG_ON(sizeof(*hbus) > PAGE_SIZE);
+
+	hbus = (struct hv_pcibus_device *)get_zeroed_page(GFP_KERNEL);
 	if (!hbus)
 		return -ENOMEM;
 	hbus->state = hv_pcibus_init;
@@ -2308,7 +2317,7 @@ static int hv_pci_probe(struct hv_device *hdev,
 close:
 	vmbus_close(hdev->channel);
 free_bus:
-	kfree(hbus);
+	free_page((unsigned long)hbus);
 	return ret;
 }
 
@@ -2386,7 +2395,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 	irq_domain_free_fwnode(hbus->sysdata.fwnode);
 	put_hvpcibus(hbus);
 	wait_for_completion(&hbus->remove_event);
-	kfree(hbus);
+	free_page((unsigned long)hbus);
 	return 0;
 }
 
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH-v2 0/5] Hyper-V vPCI: use vPCI protocol version 1.2 Jork Loeser <jloeser@linuxonhyperv.com> - 2017-05-24 22:50 +0200
  [PATCH-v2 1/5] Hyper-V vPCI: Minor format and semantic fix Jork Loeser <jloeser@linuxonhyperv.com> - 2017-05-24 22:50 +0200
  [PATCH-v2 2/5] Hyper-V vPCI: Use page allocation for hbus structure Jork Loeser <jloeser@linuxonhyperv.com> - 2017-05-24 22:50 +0200
  [PATCH-v2 3/5] PCI-HyperV vPCI: Temporary own CPU-number-to-vCPU-number infra Jork Loeser <jloeser@linuxonhyperv.com> - 2017-05-24 22:50 +0200
  Re: [PATCH-v2 0/5] Hyper-V vPCI: use vPCI protocol version 1.2 Bjorn Helgaas <helgaas@kernel.org> - 2017-05-30 21:50 +0200
    RE: [PATCH-v2 0/5] Hyper-V vPCI: use vPCI protocol version 1.2 KY Srinivasan <kys@microsoft.com> - 2017-05-31 00:20 +0200
  Re: [PATCH-v2 0/5] Hyper-V vPCI: use vPCI protocol version 1.2 Bjorn Helgaas <helgaas@kernel.org> - 2017-05-31 00:40 +0200

csiph-web