Message-ID: <1424288411.9530.119.camel@schen9-desk2.jf.intel.com>
Subject: Re: [PATCH] pci-dma: Fix x86 dma_alloc_coherent to fully clear all
 pages returned
From: Tim Chen <tim.c.chen@linux.intel.com>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>, "H. Peter Anvin" <hpa@zytor.com>,
        Akinobu Mita <akinobu.mita@gmail.com>,
        Mathias Nyman <mathias.nyman@linux.intel.com>,
        Andi Kleen <andi@firstfloor.org>, Ingo Molnar <mingo@elte.hu>,
        Andrew Morton <akpm@linux-foundation.org>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org,
        x86@kernel.org, linux-usb@vger.kernel.org,
        stable <stable@vger.kernel.org>,
        Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 18 Feb 2015 11:40:11 -0800
In-Reply-To: <1423074632.9530.110.camel@schen9-desk2.jf.intel.com>
References: <1422647641.9530.2.camel@schen9-desk2.jf.intel.com>
	 <54CBF1A0.9080005@cogentembedded.com>
	 <1422654849.9530.8.camel@schen9-desk2.jf.intel.com>
	 <54CF8374.80704@suse.cz> <54CFA836.6010309@cogentembedded.com>
	 <1423074632.9530.110.camel@schen9-desk2.jf.intel.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2505
Lines: 77

On Wed, 2015-02-04 at 10:30 -0800, Tim Chen wrote:
> On Mon, 2015-02-02 at 19:39 +0300, Sergei Shtylyov wrote:
> 
> > 
> > > Hi, is this an open-coded version of PAGE_ALIGN?
> > 
> >     Yes, it appears so. :-)
> > 
> > WBR, Sergei
> > 
> 
> Thanks for the suggestion by Jiri. I updated the patch to use PAGE_ALIGN
> below.
> 
> Regards,
> Tim
> 

Is there any resolution on this patch?  I haven't seen fixes from the
XHCI folks yet.  This is breaking many of our systems.

Thanks.

Tim

> --->8---
> From: Tim Chen <tim.c.chen@linux.intel.com>
> Subject: [PATCH] pci-dma: Fix x86 dma_alloc_coherent to fully clear all pages returned
> 
> Commit d92ef66c4f8f ("x86: make dma_alloc_coherent() return zeroed memory
> if CMA is enabled") changed the dma_alloc_coherent page clearance from
> using an __GFP_ZERO in page allocation to not setting the flag but doing
> an explicit memory clear at the end.
> 
> However the memory clear only covered the memory size that
> was requested, but may not be up to the full extent of the
> last page, if the total pages returned exceed the
> memory size requested.  This behavior has caused problem with XHCI
> and caused it to hang:
> 
> kernel: xhci_hcd 0000:00:14.0: Stopped the command ring failed, maybe the host is dead
> kernel: xhci_hcd 0000:00:14.0: Abort command ring failed
> kernel: xhci_hcd 0000:00:14.0: HC died; cleaning up
> kernel: xhci_hcd 0000:00:14.0: Error while assigning device slot ID
> kernel: xhci_hcd 0000:00:14.0: Max number of devices this xHCI host supports is 64.
> 
> Other drivers may have similar issue if it assumes that the pages
> allocated are completely zeroed.
> 
> This patch ensures that the pages returned are fully cleared.
> 
> Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: stable@vger.kernel.org
> ---
>  arch/x86/kernel/pci-dma.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
> index a25e202..3bdee55 100644
> --- a/arch/x86/kernel/pci-dma.c
> +++ b/arch/x86/kernel/pci-dma.c
> @@ -125,6 +125,8 @@ again:
>  
>  		return NULL;
>  	}
> +	/* round up to full page size */
> +	size = PAGE_ALIGN(size);
>  	memset(page_address(page), 0, size);
>  	*dma_addr = addr;
>  	return page_address(page);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/