From owner-svn-src-stable@freebsd.org Wed Sep 7 15:37:41 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0509DBCF3F7; Wed, 7 Sep 2016 15:37:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C90841FDF; Wed, 7 Sep 2016 15:37:40 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87FbecJ047504; Wed, 7 Sep 2016 15:37:40 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87FbeVO047503; Wed, 7 Sep 2016 15:37:40 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201609071537.u87FbeVO047503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 7 Sep 2016 15:37:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305540 - stable/11/sys/arm64/arm64 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 15:37:41 -0000 Author: andrew Date: Wed Sep 7 15:37:39 2016 New Revision: 305540 URL: https://svnweb.freebsd.org/changeset/base/305540 Log: MFC 303585, 303587: - Relax the barriers around a TLB invalidation - Fix the comment above pmap_invalidate_page Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/arm64/arm64/pmap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm64/arm64/pmap.c ============================================================================== --- stable/11/sys/arm64/arm64/pmap.c Wed Sep 7 14:24:29 2016 (r305539) +++ stable/11/sys/arm64/arm64/pmap.c Wed Sep 7 15:37:39 2016 (r305540) @@ -856,8 +856,7 @@ pmap_init(void) } /* - * Normal, non-SMP, invalidation functions. - * We inline these within pmap.c for speed. + * Invalidate a single TLB entry. */ PMAP_INLINE void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) @@ -865,9 +864,9 @@ pmap_invalidate_page(pmap_t pmap, vm_off sched_pin(); __asm __volatile( - "dsb sy \n" + "dsb ishst \n" "tlbi vaae1is, %0 \n" - "dsb sy \n" + "dsb ish \n" "isb \n" : : "r"(va >> PAGE_SHIFT)); sched_unpin(); @@ -879,13 +878,13 @@ pmap_invalidate_range(pmap_t pmap, vm_of vm_offset_t addr; sched_pin(); - __asm __volatile("dsb sy"); + dsb(ishst); for (addr = sva; addr < eva; addr += PAGE_SIZE) { __asm __volatile( "tlbi vaae1is, %0" : : "r"(addr >> PAGE_SHIFT)); } __asm __volatile( - "dsb sy \n" + "dsb ish \n" "isb \n"); sched_unpin(); } @@ -896,9 +895,9 @@ pmap_invalidate_all(pmap_t pmap) sched_pin(); __asm __volatile( - "dsb sy \n" + "dsb ishst \n" "tlbi vmalle1is \n" - "dsb sy \n" + "dsb ish \n" "isb \n"); sched_unpin(); }