xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com,
	Ian.Campbell@citrix.com, hpa@zytor.com, x86@kernel.org
Subject: Re: [PATCH 1/3] xen/mmu/p2m: Check extend_brk for NULL
Date: Tue, 31 Jul 2012 09:48:11 -0400	[thread overview]
Message-ID: <20120731134811.GH4789@phenom.dumpdata.com> (raw)
In-Reply-To: <1343731376-20658-2-git-send-email-konrad.wilk@oracle.com>

On Tue, Jul 31, 2012 at 06:42:54AM -0400, Konrad Rzeszutek Wilk wrote:
> Which allows us to be a bit smarter in case we exhaust the reserved
> virtual space.
> 
> [v1: Suggested by Ian Campbell]
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
>  arch/x86/xen/enlighten.c |    2 ++
>  arch/x86/xen/mmu.c       |    5 ++++-
>  arch/x86/xen/p2m.c       |   35 ++++++++++++++++++++++++-----------
>  3 files changed, 30 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index 993e2a5..923d98e 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1519,6 +1519,8 @@ void __ref xen_hvm_init_shared_info(void)
>  	if (!shared_info_page)
>  		shared_info_page = (struct shared_info *)
>  			extend_brk(PAGE_SIZE, PAGE_SIZE);
> +	if (!shared_info_page)
> +		return;
>  	xatp.domid = DOMID_SELF;
>  	xatp.idx = 0;
>  	xatp.space = XENMAPSPACE_shared_info;
> diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
> index 993ba07..d7a2044 100644
> --- a/arch/x86/xen/mmu.c
> +++ b/arch/x86/xen/mmu.c
> @@ -1711,6 +1711,8 @@ static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
>  
>  	level1_ident_pgt = extend_brk(sizeof(pte_t) * LEVEL1_IDENT_ENTRIES,
>  				      PAGE_SIZE);
> +	if (!level_ident_pgt)
> +		goto out;
>  

And this is what I get for posting patches in the wee mornings without coffee..
It obviously should have be level1_ident_pgt.

  reply	other threads:[~2012-07-31 13:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-31 10:42 [PATCH] extend_brk and fixes to users of extend_brk (v1) Konrad Rzeszutek Wilk
2012-07-31 10:42 ` [PATCH 1/3] xen/mmu/p2m: Check extend_brk for NULL Konrad Rzeszutek Wilk
2012-07-31 13:48   ` Konrad Rzeszutek Wilk [this message]
2012-07-31 10:42 ` [PATCH 2/3] xen/p2m: Reserve 4MB of _brk space for P2M leafs when populating back Konrad Rzeszutek Wilk
2012-07-31 10:42 ` [PATCH 3/3] x86: Let extend_brk return a NULL pointer instead of just BUG_ON Konrad Rzeszutek Wilk
2012-07-31 15:49 ` [PATCH] extend_brk and fixes to users of extend_brk (v1) H. Peter Anvin
2012-07-31 16:15   ` Konrad Rzeszutek Wilk
2012-07-31 16:41     ` [Xen-devel] " Jan Beulich
2012-07-31 17:29       ` 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=20120731134811.GH4789@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.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).