From: Jork Loeser <jloeser@linuxonhyperv.com>
To: jloeser@microsoft.com, helgaas@kernel.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
vkuznets@redhat.com, jasowang@redhat.com,
leann.ogasawara@canonical.com, marcelo.cerri@canonical.com,
sthemmin@microsoft.com
Subject: [PATCH-v2 2/5] Hyper-V vPCI: Use page allocation for hbus structure
Date: Wed, 24 May 2017 13:41:25 -0700 [thread overview]
Message-ID: <1495658488-13199-3-git-send-email-jloeser@linuxonhyperv.com> (raw)
In-Reply-To: <1495658488-13199-1-git-send-email-jloeser@linuxonhyperv.com>
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
next prev parent reply other threads:[~2017-05-24 20:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 20:41 [PATCH-v2 0/5] Hyper-V vPCI: use vPCI protocol version 1.2 Jork Loeser
2017-05-24 20:41 ` [PATCH-v2 1/5] Hyper-V vPCI: Minor format and semantic fix Jork Loeser
2017-05-24 20:41 ` Jork Loeser [this message]
2017-05-24 20:41 ` [PATCH-v2 3/5] PCI-HyperV vPCI: Temporary own CPU-number-to-vCPU-number infra Jork Loeser
2017-05-24 20:41 ` [PATCH-v2 4/5] Hyper-V vPCI: Add vPCI version protocol negotiation Jork Loeser
2017-05-24 20:41 ` [PATCH-v2 5/5] Hyper-V vPCI: use vPCI protocol version 1.2 Jork Loeser
2017-05-30 19:45 ` [PATCH-v2 0/5] " Bjorn Helgaas
2017-05-30 22:13 ` KY Srinivasan
2017-05-30 22:34 ` Bjorn Helgaas
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=1495658488-13199-3-git-send-email-jloeser@linuxonhyperv.com \
--to=jloeser@linuxonhyperv.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=helgaas@kernel.org \
--cc=jasowang@redhat.com \
--cc=jloeser@microsoft.com \
--cc=leann.ogasawara@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=marcelo.cerri@canonical.com \
--cc=olaf@aepfle.de \
--cc=sthemmin@microsoft.com \
--cc=vkuznets@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).