From owner-svn-src-all@FreeBSD.ORG Wed Nov 3 16:21:47 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDA86106566B; Wed, 3 Nov 2010 16:21:47 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DC1F18FC1C; Wed, 3 Nov 2010 16:21:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA3GLl3u026615; Wed, 3 Nov 2010 16:21:47 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA3GLlOk026612; Wed, 3 Nov 2010 16:21:47 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201011031621.oA3GLlOk026612@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 3 Nov 2010 16:21:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214749 - head/sys/powerpc/aim X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2010 16:21:48 -0000 Author: nwhitehorn Date: Wed Nov 3 16:21:47 2010 New Revision: 214749 URL: http://svn.freebsd.org/changeset/base/214749 Log: Fix two mistakes on 32-bit systems. The slbmte code in syscall() is 64-bit only, and should be protected with an ifdef, and the no-execute bit in 32-bit set_user_sr() should be set before the comparison, not after, or it will never match. Modified: head/sys/powerpc/aim/copyinout.c head/sys/powerpc/aim/trap.c Modified: head/sys/powerpc/aim/copyinout.c ============================================================================== --- head/sys/powerpc/aim/copyinout.c Wed Nov 3 16:19:35 2010 (r214748) +++ head/sys/powerpc/aim/copyinout.c Wed Nov 3 16:21:47 2010 (r214749) @@ -117,13 +117,13 @@ set_user_sr(pmap_t pm, const void *addr) vsid = va_to_vsid(pm, (vm_offset_t)addr); + /* Mark segment no-execute */ + vsid |= SR_N; + /* If we have already set this VSID, we can just return */ if (curthread->td_pcb->pcb_cpu.aim.usr_vsid == vsid) return; - /* Mark segment no-execute */ - vsid |= SR_N; - __asm __volatile("isync"); curthread->td_pcb->pcb_cpu.aim.usr_segm = (uintptr_t)addr >> ADDR_SR_SHFT; Modified: head/sys/powerpc/aim/trap.c ============================================================================== --- head/sys/powerpc/aim/trap.c Wed Nov 3 16:19:35 2010 (r214748) +++ head/sys/powerpc/aim/trap.c Wed Nov 3 16:21:47 2010 (r214749) @@ -455,12 +455,14 @@ syscall(struct trapframe *frame) td = PCPU_GET(curthread); td->td_frame = frame; +#ifdef __powerpc64__ /* * Speculatively restore last user SLB segment, which we know is * invalid already, since we are likely to do copyin()/copyout(). */ __asm __volatile ("slbmte %0, %1; isync" :: "r"(td->td_pcb->pcb_cpu.aim.usr_vsid), "r"(USER_SLB_SLBE)); +#endif error = syscallenter(td, &sa); syscallret(td, error, &sa);