From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [PATCH] spufs: always map local store non-guarded From: Michael Ellerman To: Arnd Bergmann In-Reply-To: <200611021346.49473.arnd@arndb.de> References: <200611021346.49473.arnd@arndb.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-vMd54lCZzLxY/25hzOPt" Date: Fri, 03 Nov 2006 11:28:54 +1100 Message-Id: <1162513734.8999.11.camel@localhost.localdomain> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org, Paul Mackerras , linux-kernel@vger.kernel.org, cbe-oss-dev Reply-To: michael@ellerman.id.au List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , --=-vMd54lCZzLxY/25hzOPt Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu, 2006-11-02 at 13:46 +0100, Arnd Bergmann wrote: > When fixing spufs to map the 'mem' file backing store cacheable, > I incorrectly set the physical mapping to use both cache-inhibited > and guarded mapping, which resulted in a serious performance > degradation. >=20 > Accessing the real local store memory needs to be cache-inhibited, > in order to maintain data consistency, but since it is actual > RAM, there is no point in a guarded mapping. >=20 > Debugged-by: Michael Ellerman > Signed-off-by: Arnd Bergmann > --- Looks good, cheers Acked-by: Michael Ellerman >=20 > This fixes a regression in 2.6.19, please merge. >=20 > Index: linux-2.6/arch/powerpc/platforms/cell/spufs/file.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- linux-2.6.orig/arch/powerpc/platforms/cell/spufs/file.c > +++ linux-2.6/arch/powerpc/platforms/cell/spufs/file.c > @@ -104,11 +104,11 @@ spufs_mem_mmap_nopage(struct vm_area_str > =20 > if (ctx->state =3D=3D SPU_STATE_SAVED) { > vma->vm_page_prot =3D __pgprot(pgprot_val(vma->vm_page_prot) > - & ~(_PAGE_NO_CACHE | _PAGE_GUARDED)); > + & ~_PAGE_NO_CACHE); > page =3D vmalloc_to_page(ctx->csa.lscsa->ls + offset); > } else { > vma->vm_page_prot =3D __pgprot(pgprot_val(vma->vm_page_prot) > - | _PAGE_NO_CACHE | _PAGE_GUARDED); > + | _PAGE_NO_CACHE); > page =3D pfn_to_page((ctx->spu->local_store_phys + offset) > >> PAGE_SHIFT); > } --=20 Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person --=-vMd54lCZzLxY/25hzOPt Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) iD8DBQBFSo1GdSjSd0sB4dIRApKCAJwJu1pKt4FkpIUdGyOAFwtck02llgCgnz06 f1GwOynbCVGxnxWO7xwVYcs= =zdse -----END PGP SIGNATURE----- --=-vMd54lCZzLxY/25hzOPt--