Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757011Ab1CaHK0 (ORCPT ); Thu, 31 Mar 2011 03:10:26 -0400 Received: from serv04.lahn.de ([213.239.197.57]:41175 "EHLO serv04.lahn.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756999Ab1CaHKY (ORCPT ); Thu, 31 Mar 2011 03:10:24 -0400 Date: Thu, 31 Mar 2011 09:05:24 +0200 From: Michael Leun To: Yinghai Lu Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Mike Pagano Subject: Re: 2.6.38.2 breaks suspend to disk Message-ID: <20110331090524.07ad0069@xenia.leun.net> In-Reply-To: <4D940DD0.7000704@kernel.org> References: <20110330203215.0a1a41a7@xenia.leun.net> <4D940DD0.7000704@kernel.org> Organization: Not Organized X-Mailer: Claws Mail 3.7.8 (GTK+ 2.22.1; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3234 Lines: 89 On Wed, 30 Mar 2011 22:14:56 -0700 Yinghai Lu wrote: > On 03/30/2011 11:32 AM, Michael Leun wrote: > > Hi, > > > > suspend to disk works with 2.6.38.1 but does not with 2.6.38.2 on my > > acer 1825ptz. Machine freezes after resume. > > > > git bisect yields: > > > > ml@jill:/usr/src/kernel/b/linux-2.6.38.y> git bisect bad > > ff518ea26654e05d325d996f6e3a7f5f569cc2d5 is the first bad commit > > commit ff518ea26654e05d325d996f6e3a7f5f569cc2d5 > > Author: Yinghai Lu > > Date: Fri Feb 18 11:30:30 2011 +0000 > > > > x86: Cleanup highmap after brk is concluded > > > > commit e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e upstream. > > > > Now cleanup_highmap actually is in two steps: one is early in > > head64.c and only clears above _end; a second one is in > > init_memory_mapping() and tries to clean from _brk_end to _end. > > It should check if those boundaries are PMD_SIZE aligned but > > currently does not. > > Also init_memory_mapping() is called several times for numa or > > memory hotplug, so we really should not handle initial kernel > > mappings there. > > > > This patch moves cleanup_highmap() down after _brk_end is > > settled so we can do everything in one step. > > Also we honor max_pfn_mapped in the implementation of > > cleanup_highmap. > > > > Signed-off-by: Yinghai Lu > > Signed-off-by: Stefano > > Stabellini > > LKML-Reference: > > Signed-off-by: H. Peter Anvin Signed-off-by: Greg > > Kroah-Hartman > > > > :040000 040000 b5ed0c2971ba1162c7cd289dd351d1700eb52fbc > > 8f830fdb43fa30ddebb485e6f6455d669300874b M arch > > > > can you please try following partial reverting patch? > > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 7942335..07688d1 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -302,11 +302,11 @@ void __init init_extra_mapping_uc(unsigned long > phys, unsigned long size) void __init cleanup_highmap(void) > { > unsigned long vaddr = __START_KERNEL_map; > - unsigned long vaddr_end = __START_KERNEL_map + > (max_pfn_mapped << PAGE_SHIFT); unsigned long end = roundup((unsigned > long)_brk_end, PMD_SIZE) - 1; pmd_t *pmd = level2_kernel_pgt; > + pmd_t *last_pmd = pmd + PTRS_PER_PMD; > > - for (; vaddr + PMD_SIZE - 1 < vaddr_end; pmd++, vaddr += > PMD_SIZE) { > + for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { > if (pmd_none(*pmd)) > continue; > if (vaddr < (unsigned long) _text || vaddr > end) > Nope, unfortunately this does not change anything (neither when applying ontop of the tree resulting from bisecting, nor ontop 2.6.38.2). Just to make shure there was no mistake when bisecting I did patch -R -p1 <~/linux-2.6.38.y.git-ff518ea26654e05d325d996f6e3a7f5f569cc2d5.txt and then indeed it worked again. -- MfG, Michael Leun -- 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/