From owner-svn-soc-all@FreeBSD.ORG Sat Aug 9 15:33:54 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2EBD321B for ; Sat, 9 Aug 2014 15:33:54 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BDF827E5 for ; Sat, 9 Aug 2014 15:33:54 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s79FXrol083029 for ; Sat, 9 Aug 2014 15:33:53 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s79FXrfm082989 for svn-soc-all@FreeBSD.org; Sat, 9 Aug 2014 15:33:53 GMT (envelope-from op@FreeBSD.org) Date: Sat, 9 Aug 2014 15:33:53 GMT Message-Id: <201408091533.s79FXrfm082989@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org using -f From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272135 - soc2014/op/freebsd-base/sys/kern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 15:33:54 -0000 Author: op Date: Sat Aug 9 15:33:53 2014 New Revision: 272135 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272135 Log: KSP: temporary disable RWX setting because pmap_kenter_attr was not the right API to change RX -> RWX and back, it changes the caching attribure of page Signed-off-by: Oliver Pinter git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap+kpatch Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c ============================================================================== --- soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Sat Aug 9 15:33:40 2014 (r272134) +++ soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Sat Aug 9 15:33:53 2014 (r272135) @@ -193,7 +193,9 @@ pages[i] = pmap_kextract(kva); DBG("kva: %p page: %p\n", (void *)kva, (void *)pages[i]); +#ifdef NOT_THE_RIGHT_API pmap_kenter_attr(kva, pages[i], VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE); +#endif } DBG("done.\n"); @@ -206,7 +208,9 @@ vm_paddr_t kva; kva = trunc_page(p->patchable) + i * PAGE_SIZE; +#ifdef NOT_THE_RIGHT_API pmap_kenter_attr(kva, pages[i], VM_PROT_READ | VM_PROT_EXECUTE); +#endif } DBG("done.\n");