From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: <linux-kernel@vger.kernel.org>, <xen-devel@lists.xenproject.org>,
<boris.ostrovsky@oracle.com>, <david.vrabel@citrix.com>,
<stefano.stabellini@eu.citrix.com>, <mukesh.rathor@oracle.com>
Subject: Re: [PATCH v12 12/18] xen/grants: Remove gnttab_max_grant_frames dependency on gnttab_init.
Date: Fri, 3 Jan 2014 16:40:26 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1401031640200.8667@kaball.uk.xensource.com> (raw)
In-Reply-To: <1388550945-25499-13-git-send-email-konrad.wilk@oracle.com>
On Tue, 31 Dec 2013, Konrad Rzeszutek Wilk wrote:
> The function gnttab_max_grant_frames() returns the maximum amount
> of frames (pages) of grants we can have. Unfortunatly it was
> dependent on gnttab_init() having been run before to initialize
> the boot max value (boot_max_nr_grant_frames).
>
> This meant that users of gnttab_max_grant_frames would always
> get a zero value if they called before gnttab_init() - such as
> 'platform_pci_init' (drivers/xen/platform-pci.c).
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> drivers/xen/grant-table.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index aa846a4..99399cb 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -62,7 +62,6 @@
>
> static grant_ref_t **gnttab_list;
> static unsigned int nr_grant_frames;
> -static unsigned int boot_max_nr_grant_frames;
> static int gnttab_free_count;
> static grant_ref_t gnttab_free_head;
> static DEFINE_SPINLOCK(gnttab_list_lock);
> @@ -827,6 +826,11 @@ static unsigned int __max_nr_grant_frames(void)
> unsigned int gnttab_max_grant_frames(void)
> {
> unsigned int xen_max = __max_nr_grant_frames();
> + static unsigned int boot_max_nr_grant_frames;
> +
> + /* First time, initialize it properly. */
> + if (!boot_max_nr_grant_frames)
> + boot_max_nr_grant_frames = __max_nr_grant_frames();
>
> if (xen_max > boot_max_nr_grant_frames)
> return boot_max_nr_grant_frames;
> @@ -1227,13 +1231,12 @@ int gnttab_init(void)
>
> gnttab_request_version();
> nr_grant_frames = 1;
> - boot_max_nr_grant_frames = __max_nr_grant_frames();
>
> /* Determine the maximum number of frames required for the
> * grant reference free list on the current hypervisor.
> */
> BUG_ON(grefs_per_grant_frame == 0);
> - max_nr_glist_frames = (boot_max_nr_grant_frames *
> + max_nr_glist_frames = (gnttab_max_grant_frames() *
> grefs_per_grant_frame / RPP);
>
> gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *),
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2014-01-03 16:41 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-01 4:35 [PATCH v12] Linux Xen PVH support Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 01/18] xen/p2m: Check for auto-xlat when doing mfn_to_local_pfn Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 02/18] xen/pvh/x86: Define what an PVH guest is (v2) Konrad Rzeszutek Wilk
2014-01-02 11:13 ` David Vrabel
2014-01-03 15:33 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 03/18] xen/pvh: Early bootup changes in PV code (v2) Konrad Rzeszutek Wilk
2014-01-02 15:32 ` David Vrabel
2014-01-02 18:32 ` Konrad Rzeszutek Wilk
2014-01-03 1:34 ` Mukesh Rathor
2014-01-03 11:29 ` David Vrabel
2014-01-03 15:37 ` Stefano Stabellini
2014-01-03 17:35 ` Konrad Rzeszutek Wilk
2014-01-04 1:13 ` Mukesh Rathor
2014-01-03 11:25 ` David Vrabel
2014-01-01 4:35 ` [PATCH v12 04/18] xen/pvh: Don't setup P2M tree Konrad Rzeszutek Wilk
2014-01-02 11:17 ` David Vrabel
2014-01-03 15:41 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 05/18] xen/mmu/p2m: Refactor the xen_pagetable_init code Konrad Rzeszutek Wilk
2014-01-02 11:21 ` David Vrabel
2014-01-03 15:47 ` Stefano Stabellini
2014-01-03 16:02 ` Konrad Rzeszutek Wilk
2014-01-03 16:23 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 06/18] xen/pvh: MMU changes for PVH (v2) Konrad Rzeszutek Wilk
2014-01-02 11:24 ` David Vrabel
2014-01-03 1:36 ` Mukesh Rathor
2014-01-03 10:14 ` David Vrabel
2014-01-03 15:50 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 07/18] xen/pvh: Setup up shared_info Konrad Rzeszutek Wilk
2014-01-02 11:27 ` David Vrabel
2014-01-02 18:23 ` Konrad Rzeszutek Wilk
2014-01-03 14:39 ` Konrad Rzeszutek Wilk
2014-01-03 15:18 ` David Vrabel
2014-01-01 4:35 ` [PATCH v12 08/18] xen/pvh: Load GDT/GS in early PV bootup code for BSP Konrad Rzeszutek Wilk
2014-01-02 11:31 ` David Vrabel
2014-01-02 18:24 ` Konrad Rzeszutek Wilk
2014-01-03 11:27 ` David Vrabel
2014-01-01 4:35 ` [PATCH v12 09/18] xen/pvh: Secondary VCPU bringup (non-bootup CPUs) Konrad Rzeszutek Wilk
2014-01-02 16:07 ` David Vrabel
2014-01-01 4:35 ` [PATCH v12 10/18] xen/pvh: Update E820 to work with PVH (v2) Konrad Rzeszutek Wilk
2014-01-02 16:14 ` David Vrabel
2014-01-02 18:41 ` Konrad Rzeszutek Wilk
2014-01-04 1:23 ` Mukesh Rathor
2014-01-04 2:25 ` Konrad Rzeszutek Wilk
2014-01-03 16:30 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 11/18] xen/pvh: Piggyback on PVHVM for event channels (v2) Konrad Rzeszutek Wilk
2014-01-02 15:43 ` David Vrabel
2014-01-03 16:34 ` Stefano Stabellini
2014-01-03 18:10 ` Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 12/18] xen/grants: Remove gnttab_max_grant_frames dependency on gnttab_init Konrad Rzeszutek Wilk
2014-01-02 11:38 ` David Vrabel
2014-01-03 16:40 ` Stefano Stabellini [this message]
2014-01-01 4:35 ` [PATCH v12 13/18] xen/grant-table: Refactor gnttab_init Konrad Rzeszutek Wilk
2014-01-02 11:39 ` David Vrabel
2014-01-03 16:43 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 14/18] xen/grant: Implement an grant frame array struct Konrad Rzeszutek Wilk
2014-01-02 16:27 ` David Vrabel
2014-01-02 18:47 ` Konrad Rzeszutek Wilk
2014-01-03 12:11 ` [Xen-devel] " David Vrabel
2014-01-03 15:09 ` Konrad Rzeszutek Wilk
2014-01-03 16:53 ` Stefano Stabellini
2014-01-03 19:18 ` [Xen-devel] " Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 15/18] xen/pvh: Piggyback on PVHVM for grant driver (v2) Konrad Rzeszutek Wilk
2014-01-02 16:32 ` David Vrabel
2014-01-02 18:50 ` Konrad Rzeszutek Wilk
2014-01-03 11:54 ` David Vrabel
2014-01-03 14:44 ` Konrad Rzeszutek Wilk
2014-01-03 15:41 ` David Vrabel
2014-01-03 15:48 ` [Xen-devel] " Konrad Rzeszutek Wilk
2014-01-03 17:20 ` Stefano Stabellini
2014-01-03 18:14 ` Konrad Rzeszutek Wilk
2014-01-03 18:29 ` Stefano Stabellini
2014-01-03 18:39 ` Konrad Rzeszutek Wilk
2014-01-03 19:02 ` Stefano Stabellini
2014-01-03 17:26 ` Stefano Stabellini
2014-01-03 18:20 ` Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 16/18] xen/pvh: Piggyback on PVHVM XenBus Konrad Rzeszutek Wilk
2014-01-02 11:43 ` David Vrabel
2014-01-03 17:22 ` Stefano Stabellini
2014-01-01 4:35 ` [PATCH v12 17/18] xen/pvh/arm/arm64: Disable PV code that does not work with PVH (v2) Konrad Rzeszutek Wilk
2014-01-02 11:44 ` David Vrabel
2014-01-03 16:22 ` Stefano Stabellini
2014-01-03 17:59 ` Konrad Rzeszutek Wilk
2014-01-01 4:35 ` [PATCH v12 18/18] xen/pvh: Support ParaVirtualized Hardware extensions (v2) Konrad Rzeszutek Wilk
2014-01-02 11:48 ` David Vrabel
2014-01-02 18:27 ` Konrad Rzeszutek Wilk
2014-01-02 16:50 ` [PATCH v12] Linux Xen PVH support David Vrabel
2014-01-02 19:02 ` Konrad Rzeszutek Wilk
2014-01-03 13:37 ` David Vrabel
2014-01-02 18:39 ` H. Peter Anvin
2014-01-02 19:12 ` Konrad Rzeszutek Wilk
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=alpine.DEB.2.02.1401031640200.8667@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mukesh.rathor@oracle.com \
--cc=xen-devel@lists.xenproject.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®