made kcpp work for new ubuntu

veltzer · Mark Veltzer · commit c19a5088f14a · 2013-06-23T16:19:37.000+03:00
diff --git a/Makefile b/Makefile
@@ -2,13 +2,13 @@
 # parameters #
 ##############
 
+# fill in the name of the module
+name:=kcpp
 # fill in the object files which are part of the module
-obj-m:=kcpp.o
-kcpp-objs:=top.o ser_mem.o ser_print.o
+obj-m:=$(name).o
+$(name)-objs:=top.o ser_mem.o ser_print.o ser_empty.o
 # fill in any extra compiler flags
 EXTRA_CFLAGS+=-Werror -I.
-# fill in the name of the module
-name:=kcpp
 # fill in the name of the genrated ko file
 ko-m:=$(name).ko
 # fill in the version of the kernel for which you want the module compiled to
@@ -41,21 +41,26 @@ C_OBJECTS:=$(addsuffix .o,$(basename $(C_SOURCES)))
 
 # this rule was also taken from running with V=1
 $(ko-m): top.o top.mod.o $(CC_OBJECTS) checkpatch
-	$(Q)ld -r -m elf_i386 --build-id -o $(ko-m) $(C_OBJECTS) kcpp.mod.o $(CC_OBJECTS)
+	$(info doing [$@])
+	$(Q)ld -r -m elf_i386 --build-id -o $(ko-m) $(C_OBJECTS) $(name).mod.o $(CC_OBJECTS)
 # how was this monstrosity created?
 # I ran the build with V=1 and registered the command to compile via gcc.
 # picked the same version g++ and gave it the entire flag set (especially the -f stuff).
 # removed all -D, preprocessor and
 # -ffreestanding -Wno-pointer-sign -Wdeclaration-after-statement
 # -Werror-implicit-function-declaration -Wstrict-prototypes
 # which are not relevant to C++ (the compiler told me so!)
+# trying to add -fno-exceptions
 %.o: %.cc
-	$(Q)g++ -nostdinc -Wall -Wundef -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -fno-stack-protector -m32 -msoft-float -mregparm=3 -freg-struct-return -mpreferred-stack-boundary=2 -march=i686 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fomit-frame-pointer -Werror -c -o $@ $<
+	$(info doing [$@])
+	$(Q)g++ -nostdinc -Wall -Wundef -Wno-trigraphs -fno-strict-aliasing -fno-common -fno-delete-null-pointer-checks -O2 -m32 -msoft-float -mregparm=3 -freg-struct-return -fno-pic -mpreferred-stack-boundary=2 -march=i686 -mtune=generic -maccumulate-outgoing-args -Wa,-mtune=generic32 -ffreestanding -fstack-protector -pipe -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-overflow -fconserve-stack -fno-exceptions -Werror -c -o $@ $<
 top.o top.mod.o: top.c
+	$(info doing [$@])
 	$(Q)$(MAKE) -C $(KDIR) M=$(CURDIR) V=$(V) modules
 	$(Q)-rm -f top.ko
 .PHONY: modules
 modules:
+	$(info doing [$@])
 	$(Q)$(MAKE) -C $(KDIR) M=$(CURDIR) V=$(V) modules
 .PHONY: modules_install
 modules_install:
@@ -65,36 +70,47 @@ clean:
 	$(Q)$(MAKE) -C $(KDIR) M=$(CURDIR) V=$(V) clean
 .PHONY: help
 help:
+	$(info doing [$@])
 	$(Q)$(MAKE) -C $(KDIR) M=$(CURDIR) V=$(V) help
 .PHONY: insmod
 insmod:
+	$(info doing [$@])
 	$(Q)sudo insmod $(ko-m) 
 .PHONY: lsmod
 lsmod:
+	$(info doing [$@])
 	$(Q)sudo lsmod | grep $(name)
 .PHONY: rmmod
 rmmod:
+	$(info doing [$@])
 	$(Q)sudo rmmod $(name)
 .PHONY: modinfo
 modinfo:
+	$(info doing [$@])
 	$(Q)sudo modinfo $(ko-m)
 .PHONY: last
 last:
+	$(info doing [$@])
 	$(Q)sudo tail /var/log/kern.log
 .PHONY: log
 log:
+	$(info doing [$@])
 	$(Q)sudo tail -f /var/log/kern.log
 .PHONY: cleanlog
 cleanlog:
+	$(info doing [$@])
 	$(Q)sudo dmesg -c > /dev/null
 .PHONY: halt
 halt:
+	$(info doing [$@])
 	$(Q)sudo halt
 .PHONY: reboot
 reboot:
+	$(info doing [$@])
 	$(Q)sudo reboot
 .PHONY: tips
 tips:
+	$(info doing [$@])
 	$(Q)echo "do make V=1 [target] to see more of what is going on"
 	$(Q)echo
 	$(Q)echo "in order for the operational targets to work you need to"
@@ -108,6 +124,9 @@ tips:
 	$(Q)echo "or edit the file and permanently change the version"
 .PHONY: debug
 debug:
+	$(info doing [$@])
+	$(info name is $(name))
+	$(info ko-m is $(ko-m))
 	$(info V is $(V))
 	$(info CURDIR is $(CURDIR))
 	$(info KVER is $(KVER))
@@ -123,3 +142,7 @@ checkpatch:
 	$(Q)scripts/wrapper.py ~/install/linux-3.6.3/scripts/checkpatch.pl --file top.c --root ~/install/linux-3.6.3
 	$(Q)scripts/wrapper.py ~/install/linux-3.6.3/scripts/checkpatch.pl --file ser_mem.c --root ~/install/linux-3.6.3
 	$(Q)scripts/wrapper.py ~/install/linux-3.6.3/scripts/checkpatch.pl --file ser_print.c --root ~/install/linux-3.6.3
+test_stress_insmod_rmmod: $(ko-m)
+	$(info doing [$@])
+	-sudo rmmod $(name)
+	./scripts/test_stress_insmod_rmmod.pl $(ko-m) 1000
diff --git a/cpp_support.cc b/cpp_support.cc
@@ -1,8 +1,9 @@
 #include "services.h"
 
 /* to satisfy the kernel dynamic linker */
-int __gxx_personality_v0;
-int _Unwind_Resume;
+//int __gxx_personality_v0;
+//int _Unwind_Resume;
+//int _GLOBAL_OFFSET_TABLE_;
 
 /* support code for new and delete */
 void *operator new(unsigned int x) {
diff --git a/doc/flags.txt b/doc/flags.txt
@@ -0,0 +1 @@
+-Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fno-delete-null-pointer-checks -O2 -m32 -msoft-float -mregparm=3 -freg-struct-return -fno-pic -mpreferred-stack-boundary=2 -march=i686 -mtune=generic -maccumulate-outgoing-args -Wa,-mtune=generic32 -ffreestanding -fstack-protector -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -DCONFIG_AS_AVX=1 -DCONFIG_AS_AVX2=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -Wframe-larger-than=1024 -Wno-unused-but-set-variable -fno-omit-frame-pointer -fno-optimize-sibling-calls -pg -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -DCC_HAVE_ASM_GOTO -Werror -I.  -DMODULE  -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(top)"  -D"KBUILD_MODNAME=KBUILD_STR(kcpp)" -c -o /home/mark/git/branches/kcpp/.tmp_top.o /home/mark/git/branches/kcpp/top.c
diff --git a/driver.cc b/driver.cc
@@ -17,7 +17,15 @@ extern "C" {
 	int cpp_init(void);
 	void cpp_exit(void);
 }
+
+void test_kmalloc(void) {
+	void* p = service_malloc(1000);
+	service_free(p);
+}
+
 int cpp_init() {
+	test_kmalloc();
+
 	driver = new Driver();
 
 	return(0);
diff --git a/kernel_helper.h b/kernel_helper.h
@@ -20,10 +20,10 @@ static const char myname[]=MYNAME;
 #define WARNING(fmt,args...) printk(KERN_WARNING "WARNING: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args);
 
 // errors are always shown as KERN_ERR; ERROR does not do a BUG()
-#define ERROR(fmt,args...) printk(KERN_ERR "ERROR: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args); BUG();
+#define ERROR(fmt,args...) do { printk(KERN_ERR "ERROR: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args); BUG(); } while(0)
 
 // fatals are always shown as KERN_ERR; FATAL also does a BUG()
-#define FATAL(fmt,args...) printk(KERN_ERR "FATAL: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args); BUG();
+#define FATAL(fmt,args...) do { printk(KERN_ERR "FATAL: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args); BUG(); } while(0)
 
 // prints are always show as KERN_INFO 
 #define PRINT(fmt,args...) printk(KERN_INFO "PRINT: %s %s %s %d: " fmt "\n",myname,__BASE_FILE__,__FUNCTION__,__LINE__,## args);
diff --git a/scripts/test_stress_insmod_rmmod.pl b/scripts/test_stress_insmod_rmmod.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+
+# this is a stress testing script which runs many insmod/rmmod combinations
+# to check that there are no problems in loading/unloading the driver...
+#					Mark Veltzer
+
+use strict;
+use diagnostics;
+
+my($module)=$ARGV[0];
+my($count)=$ARGV[1];
+print "module is [$module]\n";
+print "count is [$count]\n";
+
+sub my_system($) {
+	my($cmd)=$_[0];
+	print "doing [$cmd]\n";
+	my($res)=system($cmd);
+	if($res!=0) {
+		die("failed to do cmd [$cmd] with result [$res]");
+	}
+	#print "res is [$res]\n";
+}
+
+for(my($i)=0;$i<$count;$i++) {
+	my_system("sudo insmod $module");
+	my_system("sudo rmmod $module");
+}
diff --git a/ser_empty.c b/ser_empty.c
@@ -0,0 +1,20 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/cdev.h>
+#include <linux/uaccess.h>
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/proc_fs.h>
+#include <linux/mm.h>
+#include <linux/timex.h>
+#include <linux/cpufreq.h>
+
+#include "services.h"
+#include "kernel_helper.h"
+
+void service_empty(void) {
+}
diff --git a/services.h b/services.h
@@ -14,6 +14,9 @@ typedef void (*func_void_pvoid_pvoid_pvoid_pvoid)(void*,void*,void*,void*);
 extern "C" {
 #endif // __cplusplus
 
+// empty class
+void service_empty(void);
+
 // infrastructure calls
 void service_init(void);
 void service_finish(void);
diff --git a/top.c b/top.c
@@ -1,8 +1,19 @@
 #include <linux/module.h> /* for MODULE_* macros */
+#include <linux/slab.h>	/* for kmalloc */
 #include "connect.h"
 
+void *service_malloc2(unsigned int size)
+{
+	void *p;
+	p = kmalloc(size+1, GFP_KERNEL);
+	return p;
+}
+
 static int __init link_init(void)
 {
+	char *p = kmalloc(1000, GFP_KERNEL);
+	mb();
+	kfree(p);
 	return cpp_init();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+-Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fno-delete-null-pointer-checks -O2 -m32 -msoft-float -mregparm=3 -freg-struct-return -fno-pic -mpreferred-stack-boundary=2 -march=i686 -mtune=generic -maccumulate-outgoing-args -Wa,-mtune=generic32 -ffreestanding -fstack-protector -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -DCONFIG_AS_AVX=1 -DCONFIG_AS_AVX2=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -Wframe-larger-than=1024 -Wno-unused-but-set-variable -fno-omit-frame-pointer -fno-optimize-sibling-calls -pg -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -DCC_HAVE_ASM_GOTO -Werror -I. -DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(top)" -D"KBUILD_MODNAME=KBUILD_STR(kcpp)" -c -o /home/mark/git/branches/kcpp/.tmp_top.o /home/mark/git/branches/kcpp/top.c