From owner-svn-soc-all@FreeBSD.ORG  Fri Jul 18 08:48:21 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
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 EBA52FA
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:48:20 +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 CD7222A9B
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:48:20 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6I8mKqL097824
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 08:48:20 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6I8mJBM097815
 for svn-soc-all@FreeBSD.org; Fri, 18 Jul 2014 08:48:19 GMT
 (envelope-from op@FreeBSD.org)
Date: Fri, 18 Jul 2014 08:48:19 GMT
Message-Id: <201407180848.s6I8mJBM097815@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: r271062 - in soc2014/op/freebsd-base/sys: kern sys
 x86/include
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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jul 2014 08:48:21 -0000

Author: op
Date: Fri Jul 18 08:48:19 2014
New Revision: 271062
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271062

Log:
  KSP: implement  lf_selfpatch_patch_needed(struct lf_selfpatch *p)
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch

Modified:
  soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c
  soc2014/op/freebsd-base/sys/sys/selfpatch.h
  soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h

Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c
==============================================================================
--- soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c	Fri Jul 18 08:47:59 2014	(r271061)
+++ soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c	Fri Jul 18 08:48:19 2014	(r271062)
@@ -37,14 +37,51 @@
 
 #include <sys/linker.h>
 #include <sys/linker_set.h>
-
 #include <sys/selfpatch.h>
 
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+
 bool
 lf_selfpatch_patch_needed(struct lf_selfpatch *p)
 {
 
-	printf("NOT IMPLEMENTED: %s\n", __func__);
+	if (p == NULL)
+		return (false);
+
+	switch (p->feature_selector) {
+	case  KSP_CPU_FEATURE         :
+		if ((cpu_feature & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_CPU_FEATURE2        :
+		if ((cpu_feature2 & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_AMD_FEATURE         :
+		if ((amd_feature & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_AMD_FEATURE2        :
+		if ((amd_feature2 & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_VIA_FEATURE_RNG     :
+		if ((via_feature_rng & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_VIA_FEATURE_XCRYPT  :
+		if ((via_feature_xcrypt & p->feature) != 0)
+			return (true);
+		break;
+	case  KSP_CPU_STDEXT_FEATURE  :
+		if ((cpu_stdext_feature & p->feature) != 0)
+			return (true);
+		break;
+
+	default:
+		return (false);
+	}
 
 	return (false);
 }

Modified: soc2014/op/freebsd-base/sys/sys/selfpatch.h
==============================================================================
--- soc2014/op/freebsd-base/sys/sys/selfpatch.h	Fri Jul 18 08:47:59 2014	(r271061)
+++ soc2014/op/freebsd-base/sys/sys/selfpatch.h	Fri Jul 18 08:48:19 2014	(r271062)
@@ -31,6 +31,8 @@
 
 #include <machine/_selfpatch.h>
 
+struct linker_file_t;
+
 typedef struct lf_selfpatch {
 	void	*patchable;
 	void	*patch;

Modified: soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h
==============================================================================
--- soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h	Fri Jul 18 08:47:59 2014	(r271061)
+++ soc2014/op/freebsd-base/sys/x86/include/_selfpatch.h	Fri Jul 18 08:48:19 2014	(r271062)
@@ -37,6 +37,8 @@
 #define KSP_VIA_FEATURE_XCRYPT	6
 #define KSP_CPU_STDEXT_FEATURE	7
 
+struct lf_selfpatch;
+
 extern char *md_selfpatch_nop_table[];
 
 bool lf_selfpatch_patch_needed(struct lf_selfpatch *p);