From owner-svn-soc-all@FreeBSD.ORG Fri Jul 18 08:20:33 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A404589 for ; Fri, 18 Jul 2014 08:20:33 +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 461D1281B for ; Fri, 18 Jul 2014 08:20:33 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6I8KXAL032248 for ; Fri, 18 Jul 2014 08:20:33 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6I8KVuQ031526 for svn-soc-all@FreeBSD.org; Fri, 18 Jul 2014 08:20:31 GMT (envelope-from op@FreeBSD.org) Date: Fri, 18 Jul 2014 08:20:31 GMT Message-Id: <201407180820.s6I8KVuQ031526@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: r271058 - in soc2014/op/freebsd-base/sys: conf kern sys x86/include x86/x86 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: Fri, 18 Jul 2014 08:20:33 -0000 Author: op Date: Fri Jul 18 08:20:31 2014 New Revision: 271058 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271058 Log: KSP: create abstraction for MD parts git: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch Signed-off-by: Oliver Pinter --- sys/conf/files.amd64 | 1 + sys/kern/kern_selfpatch.c | 2 ++ sys/sys/selfpatch.h | 9 +++++++++ sys/x86/include/_selfpatch.h | 34 ++++++++++++++++++++++++++++++++++ sys/x86/x86/selfpatch_machdep.c | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 sys/x86/include/_selfpatch.h create mode 100644 sys/x86/x86/selfpatch_machdep.c Added: soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c Modified: soc2014/op/freebsd-base/sys/conf/files.amd64 soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c soc2014/op/freebsd-base/sys/sys/selfpatch.h Modified: soc2014/op/freebsd-base/sys/conf/files.amd64 ============================================================================== --- soc2014/op/freebsd-base/sys/conf/files.amd64 Fri Jul 18 07:52:35 2014 (r271057) +++ soc2014/op/freebsd-base/sys/conf/files.amd64 Fri Jul 18 08:20:31 2014 (r271058) @@ -554,6 +554,7 @@ x86/x86/nexus.c standard x86/x86/tsc.c standard x86/x86/delay.c standard +x86/x86/selfpatch.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xen | xenhvm x86/xen/pv.c optional xenhvm Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c ============================================================================== --- soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Fri Jul 18 07:52:35 2014 (r271057) +++ soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Fri Jul 18 08:20:31 2014 (r271058) @@ -37,3 +37,5 @@ #include #include + + Modified: soc2014/op/freebsd-base/sys/sys/selfpatch.h ============================================================================== --- soc2014/op/freebsd-base/sys/sys/selfpatch.h Fri Jul 18 07:52:35 2014 (r271057) +++ soc2014/op/freebsd-base/sys/sys/selfpatch.h Fri Jul 18 08:20:31 2014 (r271058) @@ -26,6 +26,11 @@ * $FreeBSD$ */ +#ifndef __SELFPATH_H__ +#define __SELFPATH_H__ + +#include + typedef struct lf_selfpatch { void *patchable; void *patch; @@ -33,3 +38,7 @@ int feature; char *comment; } lf_selfpatch_t; + +extern char *selfpatch_nop_table[]; + +#endif /* __SELFPATH_H__ */ Added: soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h Fri Jul 18 08:20:31 2014 (r271058) @@ -0,0 +1,34 @@ +/*- + * Copyright (c) 2014, by Oliver Pinter + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef __X86_SELFPATH_H__ +#define __X86_SELFPATH_H__ + +extern char *md_selfpatch_nop_table[]; + +#endif /* __X86_SELFPATH_H__ */ Added: soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/op/freebsd-base/sys/x86/x86/selfpatch_machdep.c Fri Jul 18 08:20:31 2014 (r271058) @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2014, by Oliver Pinter + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include + +#include +#include +#include +#include + +#include +#include + +#include +