From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763671AbXKTSds (ORCPT ); Tue, 20 Nov 2007 13:33:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761725AbXKTS1I (ORCPT ); Tue, 20 Nov 2007 13:27:08 -0500 Received: from pentafluge.infradead.org ([213.146.154.40]:51949 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758034AbXKTS1E (ORCPT ); Tue, 20 Nov 2007 13:27:04 -0500 Date: Tue, 20 Nov 2007 10:24:33 -0800 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jan Beulich , Andi Kleen , Ingo Molnar , Thomas Gleixner Subject: [patch 18/29] i386: avoid temporarily inconsistent pte-s Message-ID: <20071120182433.GT28611@kroah.com> References: <20071120181733.702234406@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="x86-avoid-inconsistent-ptes.patch" In-Reply-To: <20071120182248.GA28611@kroah.com> User-Agent: Mutt/1.5.16 (2007-06-09) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 2.6.23-stable review patch. If anyone has any objections, please let us know. ------------------ From: Jan Beulich patch aa506dc7b12d03fbf8fd11aab752aed1aadd9c07 in mainline. i386: avoid temporarily inconsistent pte-s One more of these issues (which were considered fixed a few releases back): other than on x86-64, i386 allows set_fixmap() to replace already present mappings. Consequently, on PAE, care must be taken to not update the high half of a pte while the low half is still holding the old value. [ tglx: arch/x86 adaptation ] Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman --- arch/i386/mm/pgtable.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/i386/mm/pgtable.c +++ b/arch/i386/mm/pgtable.c @@ -97,8 +97,7 @@ static void set_pte_pfn(unsigned long va } pte = pte_offset_kernel(pmd, vaddr); if (pgprot_val(flags)) - /* stored as-is, to permit clearing entries */ - set_pte(pte, pfn_pte(pfn, flags)); + set_pte_present(&init_mm, vaddr, pte, pfn_pte(pfn, flags)); else pte_clear(&init_mm, vaddr, pte); --