Date: Mon, 23 Sep 2013 07:53:59 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r255811 - in stable/9/sys: amd64/amd64 i386/i386 Message-ID: <201309230753.r8N7rxmN028380@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Mon Sep 23 07:53:58 2013 New Revision: 255811 URL: http://svnweb.freebsd.org/changeset/base/255811 Log: MFC r255607: In pmap_copy(), when the copied region is mapped with superpage but does not cover entire superpage, avoid copying. MFC r255620: Merge the change r255607 from amd64 to i386. Modified: stable/9/sys/amd64/amd64/pmap.c stable/9/sys/i386/i386/pmap.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/pmap.c ============================================================================== --- stable/9/sys/amd64/amd64/pmap.c Mon Sep 23 07:20:13 2013 (r255810) +++ stable/9/sys/amd64/amd64/pmap.c Mon Sep 23 07:53:58 2013 (r255811) @@ -4107,6 +4107,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm continue; if (srcptepaddr & PG_PS) { + if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr) + continue; dstmpde = pmap_allocpde(dst_pmap, addr, NULL); if (dstmpde == NULL) break; Modified: stable/9/sys/i386/i386/pmap.c ============================================================================== --- stable/9/sys/i386/i386/pmap.c Mon Sep 23 07:20:13 2013 (r255810) +++ stable/9/sys/i386/i386/pmap.c Mon Sep 23 07:53:58 2013 (r255811) @@ -4070,6 +4070,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm continue; if (srcptepaddr & PG_PS) { + if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr) + continue; if (dst_pmap->pm_pdir[ptepindex] == 0 && ((srcptepaddr & PG_MANAGED) == 0 || pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr &
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309230753.r8N7rxmN028380>