From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keir Fraser <keir.xen@gmail.com>
Subject: Re: [PATCH v2] x86/mm: Ensure useful progress in
	alloc_l2_table()
Date: Wed, 03 Jul 2013 13:41:02 +0100
Message-ID: <CDF9DA6E.2BF6C%keir.xen@gmail.com>
References: <1372854537-4897-1-git-send-email-andrew.cooper3@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1372854537-4897-1-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Andrew Cooper <andrew.cooper3@citrix.com>, Xen-devel <xen-devel@lists.xen.org>
Cc: Tim Deegan <tim@xen.org>, Jan Beulich <JBeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

On 03/07/2013 13:28, "Andrew Cooper" <andrew.cooper3@citrix.com> wrote:

> While debugging the issue which turned out to be XSA-58, a printk in this loop
> showed that it was quite easy to never make useful progress, because of
> consistently failing the preemption check.
> 
> One single l2 entry is a reasonable amount of work to do, even if an action is
> pending, and also assures forwards progress across repeat continuations.
> 
> Tweak the continuation criteria to fail on the first iteration of the loop.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Keir <keir@xen.org>

Acked-by: Keir Fraser <keir@xen.org>

> Cc: Jan Beulich <JBeulich@suse.com>
> Cc: Tim Deegan <tim@xen.org>
> 
> ---
> Changes since v1:
>  * Dont move the continuation block to the end
> ---
>  xen/arch/x86/mm.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
> index 77dcafc..f151dec 100644
> --- a/xen/arch/x86/mm.c
> +++ b/xen/arch/x86/mm.c
> @@ -1278,7 +1278,8 @@ static int alloc_l2_table(struct page_info *page,
> unsigned long type,
>  
>      for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; i++ )
>      {
> -        if ( preemptible && i && hypercall_preempt_check() )
> +        if ( preemptible && i > page->nr_validated_ptes
> +             && hypercall_preempt_check() )
>          {
>              page->nr_validated_ptes = i;
>              rc = -EAGAIN;