From owner-svn-src-head@freebsd.org Thu Jul 26 16:08:27 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9063A105367D; Thu, 26 Jul 2018 16:08:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4417E96004; Thu, 26 Jul 2018 16:08:27 +0000 (UTC) (envelope-from markj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 207543400; Thu, 26 Jul 2018 16:08:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QG8QQh003341; Thu, 26 Jul 2018 16:08:26 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QG8QAa003340; Thu, 26 Jul 2018 16:08:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201807261608.w6QG8QAa003340@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 26 Jul 2018 16:08:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336740 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 336740 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 16:08:27 -0000 Author: markj Date: Thu Jul 26 16:08:26 2018 New Revision: 336740 URL: https://svnweb.freebsd.org/changeset/base/336740 Log: Implement pmap_mincore() for riscv. Reviewed by: alc, br Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D16444 Modified: head/sys/riscv/riscv/pmap.c Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Thu Jul 26 14:42:20 2018 (r336739) +++ head/sys/riscv/riscv/pmap.c Thu Jul 26 16:08:26 2018 (r336740) @@ -389,6 +389,13 @@ pmap_l3_valid_cacheable(pt_entry_t l3) #define PTE_SYNC(pte) cpu_dcache_wb_range((vm_offset_t)pte, sizeof(*pte)) +static inline int +pmap_page_accessed(pt_entry_t pte) +{ + + return (pte & PTE_A); +} + /* Checks if the page is dirty. */ static inline int pmap_page_dirty(pt_entry_t pte) @@ -3176,8 +3183,47 @@ pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma) int pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *locked_pa) { + pt_entry_t *l2, *l3, tpte; + vm_paddr_t pa; + int val; + bool managed; - panic("RISCVTODO: pmap_mincore"); + PMAP_LOCK(pmap); +retry: + managed = false; + val = 0; + + l2 = pmap_l2(pmap, addr); + if (l2 != NULL && ((tpte = pmap_load(l2)) & PTE_V) != 0) { + if ((tpte & (PTE_R | PTE_W | PTE_X)) != 0) { + pa = PTE_TO_PHYS(tpte) | (addr & L2_OFFSET); + val = MINCORE_INCORE | MINCORE_SUPER; + } else { + l3 = pmap_l2_to_l3(l2, addr); + tpte = pmap_load(l3); + if ((tpte & PTE_V) == 0) + goto done; + pa = PTE_TO_PHYS(tpte) | (addr & L3_OFFSET); + val = MINCORE_INCORE; + } + + if (pmap_page_dirty(tpte)) + val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER; + if (pmap_page_accessed(tpte)) + val |= MINCORE_REFERENCED | MINCORE_REFERENCED_OTHER; + managed = (tpte & PTE_SW_MANAGED) == PTE_SW_MANAGED; + } + +done: + if ((val & (MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER)) != + (MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER) && managed) { + /* Ensure that "PHYS_TO_VM_PAGE(pa)->object" doesn't change. */ + if (vm_page_pa_tryrelock(pmap, pa, locked_pa)) + goto retry; + } else + PA_UNLOCK_COND(*locked_pa); + PMAP_UNLOCK(pmap); + return (val); } void