[PATCH 0/9] kvm-kmod: Various fixes

[PATCH 0/9] kvm-kmod: Various fixes

[Jan Kiszka]

As requested, here is my current kvm-kmod queue. Most fixes target
latest 2.6.31 so aren't that urgent yet, but some also affect older
kernels in specific configurations.

Find the patches also at git://git.kiszka.org/kvm-kmod.git queue

Jan Kiszka (9):
      x86: Pick up local arch trace headers
      Revert "kvm-kmod: Fix including of arch/*/kvm/trace.h"
      kvm_vma_kernel_pagesize support
      Update souce link
      Update .gitignore
      x86: Remove zombie kvm_trace from build
      Fix fragile kernelsourcedir construction
      Fix arch include for KVM trace headers
      Switch to bz2 tarball releases

 .gitignore                    |   11 ++++++-----
 Makefile                      |    4 ++--
 configure                     |    5 ++++-
 external-module-compat-comm.h |   10 +++++++---
 include/arch/x86/kvm          |    1 +
 linux-2.6                     |    2 +-
 scripts/make-release          |    4 ++--
 x86/Kbuild                    |    3 ---
 8 files changed, 23 insertions(+), 17 deletions(-)
 create mode 120000 include/arch/x86/kvm

--
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux

[PATCH 5/9] Update .gitignore

[Jan Kiszka]

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 .gitignore |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fdbc62..2089ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ Modules.symvers
 Module.markers
 .tmp_versions
 include-compat/asm
-include-compat/asm-x86/asm-x86
 include
 x86/modules.order
 x86/i825[49].[ch]
@@ -24,17 +23,14 @@ x86/vmx.[ch]
 x86/svm.[ch]
 x86/mmu.[ch]
 x86/paging_tmpl.h
-x86/x86_emulate.[ch]
 x86/ioapic.[ch]
 x86/iodev.h
 x86/irq.[ch]
-x86/kvm_trace.c
 x86/lapic.[ch]
 x86/tss.h
 x86/x86.[ch]
 x86/coalesced_mmio.[ch]
 x86/kvm_cache_regs.h
-x86/vtd.c
 x86/irq_comm.c
 x86/timer.c
 x86/kvm_timer.h
@@ -43,6 +39,10 @@ x86/svm-trace.h
 x86/trace-arch.h
 x86/trace.h
 x86/vmx-trace.h
+x86/assigned-dev.c
+x86/emulate.c
+x86/eventfd.c
+x86/mmutrace.h
 ia64/asm-offsets.c
 ia64/coalesced_mmio.[ch]
 ia64/ioapic.[ch]
@@ -55,7 +55,6 @@ ia64/kvm_fw.c
 ia64/kvm_lib.c
 ia64/kvm_main.c
 ia64/kvm_minstate.h
-ia64/kvm_trace.c
 ia64/lapic.h
 ia64/memcpy.S
 ia64/memset.S
@@ -69,4 +68,6 @@ ia64/vmm.c
 ia64/vmm_ivt.S
 ia64/vti.h
 ia64/vtlb.c
+ia64/assigned-dev.c
+ia64/eventfd.c
 .stgit-*

[PATCH 6/9] x86: Remove zombie kvm_trace from build

[Jan Kiszka]

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 x86/Kbuild |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/x86/Kbuild b/x86/Kbuild
index 0ccbeec..3499593 100644
--- a/x86/Kbuild
+++ b/x86/Kbuild
@@ -7,9 +7,6 @@ kvm-objs := kvm_main.o x86.o mmu.o emulate.o ../anon_inodes.o irq.o i8259.o \
 	 lapic.o ioapic.o preempt.o i8254.o coalesced_mmio.o irq_comm.o \
 	 timer.o eventfd.o assigned-dev.o \
 	 ../external-module-compat.o ../request-irq-compat.o
-ifeq ($(EXT_CONFIG_KVM_TRACE),y)
-kvm-objs += kvm_trace.o
-endif
 ifeq ($(CONFIG_IOMMU_API),y)
 kvm-objs += iommu.o
 endif

[PATCH 4/9] Update souce link

[Jan Kiszka]

This references KVM from stable 2.6.31.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 linux-2.6 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux-2.6 b/linux-2.6
index 46c6cf6..abb015a 160000
--- a/linux-2.6
+++ b/linux-2.6
@@ -1 +1 @@
-Subproject commit 46c6cf63295e00af6092977800049a716757381f
+Subproject commit abb015ac65852287c7a7c243c8cdee966a38854d

[PATCH 2/9] Revert "kvm-kmod: Fix including of arch/*/kvm/trace.h"

[Jan Kiszka]

This reverts commit 44fb6b1750287c22232fe559c865264ed1e741b1 which
became obsolete by 2bc6bb4157636c1f8e993aa508066d5ac3731398.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 4c813a6..ad08c45 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ all:: prerequisite
 	$(MAKE) -C $(KERNELDIR) M=`pwd` \
 		LINUXINCLUDE="-I`pwd`/include -Iinclude \
 		$(if $(KERNELSOURCEDIR),\
-			-Iinclude2 -I$(KERNELSOURCEDIR)/include -I$(KERNELSOURCEDIR)/arch/${ARCH_DIR}/include -I$(KERNELSOURCEDIR), \
+			-Iinclude2 -I$(KERNELSOURCEDIR)/include -I$(KERNELSOURCEDIR)/arch/${ARCH_DIR}/include, \
 			-Iarch/${ARCH_DIR}/include) -I`pwd`/include-compat \
 		-include include/linux/autoconf.h \
 		-include `pwd`/$(ARCH_DIR)/external-module-compat.h $(module_defines)" \

[PATCH 1/9] x86: Pick up local arch trace headers

[Jan Kiszka]

This unbreaks 2.6.31 builds but also ensures that we always use the most
recent ones.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 include/arch/x86/kvm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 120000 include/arch/x86/kvm

diff --git a/include/arch/x86/kvm b/include/arch/x86/kvm
new file mode 120000
index 0000000..c635817
--- /dev/null
+++ b/include/arch/x86/kvm
@@ -0,0 +1 @@
+../../../x86
\ No newline at end of file

Re: [PATCH 1/9] x86: Pick up local arch trace headers

[Avi Kivity]

On 09/25/2009 07:18 PM, Jan Kiszka wrote:
> This unbreaks 2.6.31 builds but also ensures that we always use the most
> recent ones.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> ---
>
>   include/arch/x86/kvm |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>   create mode 120000 include/arch/x86/kvm
>
> diff --git a/include/arch/x86/kvm b/include/arch/x86/kvm
> new file mode 120000
> index 0000000..c635817
> --- /dev/null
> +++ b/include/arch/x86/kvm
> @@ -0,0 +1 @@
> +../../../x86
> \ No newline at end of file
>
>    

Shouldn't it be asm-x86?

-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.

Re: [PATCH 1/9] x86: Pick up local arch trace headers

[Marcelo Tosatti]

On Sun, Sep 27, 2009 at 10:38:41AM +0200, Avi Kivity wrote:
> On 09/25/2009 07:18 PM, Jan Kiszka wrote:
>> This unbreaks 2.6.31 builds but also ensures that we always use the most
>> recent ones.
>>
>> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>> ---
>>
>>   include/arch/x86/kvm |    1 +
>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>   create mode 120000 include/arch/x86/kvm
>>
>> diff --git a/include/arch/x86/kvm b/include/arch/x86/kvm
>> new file mode 120000
>> index 0000000..c635817
>> --- /dev/null
>> +++ b/include/arch/x86/kvm
>> @@ -0,0 +1 @@
>> +../../../x86
>> \ No newline at end of file
>>
>>    
>
> Shouldn't it be asm-x86?

No, trace.h is in x86/

[PATCH 3/9] kvm_vma_kernel_pagesize support

[Jan Kiszka]

It was broken for !CONFIG_HUGETLB_PAGE and for kernel 2.6.31.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 external-module-compat-comm.h |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h
index c72fb86..47fdc86 100644
--- a/external-module-compat-comm.h
+++ b/external-module-compat-comm.h
@@ -954,9 +954,10 @@ static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n)
 
 #include <linux/hugetlb.h>
 
-/* vma_kernel_pagesize, 2.6.29 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+/* vma_kernel_pagesize, exported since 2.6.32 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 
+#ifdef CONFIG_HUGETLB_PAGE
 static inline
 unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma)
 {
@@ -969,8 +970,11 @@ unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma)
 
 	return 1UL << (hstate->order + PAGE_SHIFT);
 }
+#else /* !CONFIG_HUGETLB_SIZE */
+#define kvm_vma_kernel_pagesize(v) PAGE_SIZE
+#endif
 
-#else
+#else /* >= 2.6.32 */
 
 #define kvm_vma_kernel_pagesize vma_kernel_pagesize
 

[PATCH 7/9] Fix fragile kernelsourcedir construction

[Jan Kiszka]

So far, passing --kerneldir=/some/kernel/build could cause broken kernel
source paths as '/build' was incorrectly cut off. Use a smarter
approach.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 configure |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index e01ba98..533313e 100755
--- a/configure
+++ b/configure
@@ -91,7 +91,10 @@ arch=${arch%%-*}
 
 # see if we have split build and source directories
 if [ -d "$kerneldir/include2" ]; then
-    kernelsourcedir=${kerneldir%/*}/source
+    kernelsourcedir=$kerneldir/source
+    if [ ! -L "$kernelsourcedir" ]; then
+        kernelsourcedir=${kerneldir%/build*}/source
+    fi
 fi
 
 if [ -n "$no_uname" -a "$want_module" ]; then

[PATCH 9/9] Switch to bz2 tarball releases

[Jan Kiszka]

Save some electrons.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 scripts/make-release |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/make-release b/scripts/make-release
index 68e4874..94bf5a5 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -40,7 +40,7 @@ if [[ -z "$name" ]]; then
     name="$commit"
 fi
 
-tarball="$releasedir/$name.tar.gz"
+tarball="$releasedir/$name.tar.bz2"
 
 cd "$(dirname "$0")"/..
 LINUX="$(readlink -f "linux-2.6")"
@@ -86,7 +86,7 @@ if [[ -n "$formal" ]]; then
     echo "$name" > "$tmpdir/$name/KVM_VERSION"
 fi
 
-tar czf "$tarball" -C "$tmpdir" "$name"
+tar cjf "$tarball" -C "$tmpdir" "$name"
 
 rm -rf "$tmpdir"
 

[PATCH 8/9] Fix arch include for KVM trace headers

[Jan Kiszka]

Make sure recursive KVM trace header including works by adding the arch
source directory to the search path. This is at least required for
non-split kernel trees, but play safe and add it to both.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index ad08c45..37a14e1 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all:: prerequisite
 		LINUXINCLUDE="-I`pwd`/include -Iinclude \
 		$(if $(KERNELSOURCEDIR),\
 			-Iinclude2 -I$(KERNELSOURCEDIR)/include -I$(KERNELSOURCEDIR)/arch/${ARCH_DIR}/include, \
-			-Iarch/${ARCH_DIR}/include) -I`pwd`/include-compat \
+			-Iarch/${ARCH_DIR}/include) -I`pwd`/include-compat -I`pwd`/${ARCH_DIR} \
 		-include include/linux/autoconf.h \
 		-include `pwd`/$(ARCH_DIR)/external-module-compat.h $(module_defines)" \
 		"$$@"

Re: [PATCH 0/9] kvm-kmod: Various fixes

[Marcelo Tosatti]

On Fri, Sep 25, 2009 at 06:18:01PM +0200, Jan Kiszka wrote:
> As requested, here is my current kvm-kmod queue. Most fixes target
> latest 2.6.31 so aren't that urgent yet, but some also affect older
> kernels in specific configurations.
> 
> Find the patches also at git://git.kiszka.org/kvm-kmod.git queue
> 
> Jan Kiszka (9):
>       x86: Pick up local arch trace headers
>       Revert "kvm-kmod: Fix including of arch/*/kvm/trace.h"
>       kvm_vma_kernel_pagesize support
>       Update souce link
>       Update .gitignore
>       x86: Remove zombie kvm_trace from build
>       Fix fragile kernelsourcedir construction
>       Fix arch include for KVM trace headers
>       Switch to bz2 tarball releases

Applied, thanks.