[PATCH 4/4] Update source link

[PATCH 4/4] Update source link

[Jan Kiszka]

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 abb015a..8fdcaf6 160000
--- a/linux-2.6
+++ b/linux-2.6
@@ -1 +1 @@
-Subproject commit abb015ac65852287c7a7c243c8cdee966a38854d
+Subproject commit 8fdcaf60d3e7d96450f3ae05c56f1046327fb3fe

[PULL REQUEST] kvm-kmod

[Jan Kiszka]

The following changes since commit e19bf3254985d9b8b6b916acc82fc398595cff95:
  Jan Kiszka (1):
        x86: Remove zombie kvm_trace from build

are available in the git repository at:

  git://git.kiszka.org/kvm-kmod.git queue

Jan Kiszka (4):
      Remove const from vm_ops to avoid warnings on older kernels
      Add cpufreq_get wrapper for !CONFIG_CPU_FREQ
      Avoid kmap_atomic_to_page in svm
      Update source link

 external-module-compat-comm.h |    7 +++++++
 linux-2.6                     |    2 +-
 sync                          |   14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletions(-)

[PATCH 3/4] Avoid kmap_atomic_to_page in svm

[Jan Kiszka]

kmap_atomic_to_page was not exported before 2.6.32, and adding a compat
wrapper for it is impossible due to further missing exports. This breaks
x86-32 modules under CONFIG_HIGHMEM.

So avoid its use via a crude hack: nested_svm_map callers receive the
mapped page and have to pass it back to nested_svm_unmap.

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

 sync |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/sync b/sync
index 4821b84..8868e6d 100755
--- a/sync
+++ b/sync
@@ -121,6 +121,18 @@ def __hack(data):
         line = sub(r'boot_cpu_data.x86_phys_bits', 'kvm_x86_phys_bits', line)
         if match(r'^static const struct vm_operations_struct kvm_'):
             line = sub(r' const ', ' ', line)
+        if line == 'static void *nested_svm_map(struct vcpu_svm *svm, u64 gpa, enum km_type idx)':
+            line = sub(r'\)', ', struct page **mapped_page)', line)
+        if line == '\treturn kmap_atomic(page, idx);':
+            line = '\t*mapped_page = page;\n' + line
+        if line == 'static void nested_svm_unmap(void *addr, enum km_type idx)':
+            line = sub(r'\)', ', struct page *mapped_page)', line)
+        if line == '\tpage = kmap_atomic_to_page(addr);':
+            line = '\tpage = mapped_page;'
+        if match(r'= nested_svm_map(.*);'):
+            line = '\t{ struct page *mapped_page;\n' + sub(r'\);', ', &mapped_page);', line)
+        if match('nested_svm_unmap(.*);'):
+            line = sub(r'\);', ', mapped_page); }', line)
         w(line)
         if match(r'\tkvm_init_debug'):
             w('\thrtimer_kallsyms_resolve();')

[PATCH 1/4] Remove const from vm_ops to avoid warnings on older kernels

[Jan Kiszka]

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

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

diff --git a/sync b/sync
index 0bbd488..4821b84 100755
--- a/sync
+++ b/sync
@@ -119,6 +119,8 @@ def __hack(data):
             line = sub(r'flags', r'kvm_pt_regs_flags', line)
             mce = False
         line = sub(r'boot_cpu_data.x86_phys_bits', 'kvm_x86_phys_bits', line)
+        if match(r'^static const struct vm_operations_struct kvm_'):
+            line = sub(r' const ', ' ', line)
         w(line)
         if match(r'\tkvm_init_debug'):
             w('\thrtimer_kallsyms_resolve();')

[PATCH 2/4] Add cpufreq_get wrapper for !CONFIG_CPU_FREQ

[Jan Kiszka]

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

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

diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h
index 47fdc86..de8ab23 100644
--- a/external-module-compat-comm.h
+++ b/external-module-compat-comm.h
@@ -993,3 +993,10 @@ unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma)
 	}					\
 })
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) && !defined(CONFIG_CPU_FREQ)
+static inline unsigned int cpufreq_get(unsigned int cpu)
+{
+	return 0;
+}
+#endif

Re: [PULL REQUEST] kvm-kmod

[Marcelo Tosatti]

On Mon, Oct 12, 2009 at 10:54:54AM +0200, Jan Kiszka wrote:
> The following changes since commit e19bf3254985d9b8b6b916acc82fc398595cff95:
>   Jan Kiszka (1):
>         x86: Remove zombie kvm_trace from build
> 
> are available in the git repository at:
> 
>   git://git.kiszka.org/kvm-kmod.git queue
> 
> Jan Kiszka (4):
>       Remove const from vm_ops to avoid warnings on older kernels
>       Add cpufreq_get wrapper for !CONFIG_CPU_FREQ
>       Avoid kmap_atomic_to_page in svm
>       Update source link
> 
>  external-module-compat-comm.h |    7 +++++++
>  linux-2.6                     |    2 +-
>  sync                          |   14 ++++++++++++++
>  3 files changed, 22 insertions(+), 1 deletions(-)

Pushed, thanks.

[PULL REQUEST] kvm-kmod

[Jan Kiszka]

The following changes since commit bf860c9b3aa0803ee98d096b33a3ab72f576d79e:
  Jan Kiszka (1):
        Update source link

are available in the git repository at:

  git://git.kiszka.org/kvm-kmod.git queue

Jan Kiszka (12):
      Provide schedule_hrtimeout for pre-2.6.28 kernels
      Use DESTDIR consitently on installation
      Add udev rule
      Fix build without CONFIG_MMU_NOTIFIER
      Fix kvm_vma_kernel_pagesize for pre-2.6.27 kernels
      Add compat version of native_read_tsc
      Define X86_FEATURE_GBPAGES if missing
      Cleanup unused CONFIG_KVM_TRACE control
      Drop now unused config.kbuild
      Add compat version of hlist_del_init_rcu
      x86: Install compat wrapper for thread_struct.debugreg
      Update source link

 .gitignore                    |    1 -
 Makefile                      |   16 ++++-------
 configure                     |    9 ------
 external-module-compat-comm.h |   31 +++++++++++++++------
 external-module-compat.c      |   59 +++++++++++++++++++++++++++++++++++++++++
 linux-2.6                     |    2 +-
 scripts/65-kvm.rules          |    2 +
 sync                          |    2 +
 x86/Kbuild                    |    4 ---
 x86/external-module-compat.h  |   17 ++++++++++++
 x86/preempt.c                 |   16 +++-------
 11 files changed, 114 insertions(+), 45 deletions(-)
 create mode 100644 scripts/65-kvm.rules

Re: [PULL REQUEST] kvm-kmod

[Marcelo Tosatti]

On Mon, Oct 19, 2009 at 12:59:24PM +0200, Jan Kiszka wrote:
> The following changes since commit bf860c9b3aa0803ee98d096b33a3ab72f576d79e:
>   Jan Kiszka (1):
>         Update source link
> 
> are available in the git repository at:
> 
>   git://git.kiszka.org/kvm-kmod.git queue
> 
> Jan Kiszka (12):
>       Provide schedule_hrtimeout for pre-2.6.28 kernels
>       Use DESTDIR consitently on installation
>       Add udev rule
>       Fix build without CONFIG_MMU_NOTIFIER
>       Fix kvm_vma_kernel_pagesize for pre-2.6.27 kernels
>       Add compat version of native_read_tsc
>       Define X86_FEATURE_GBPAGES if missing
>       Cleanup unused CONFIG_KVM_TRACE control
>       Drop now unused config.kbuild
>       Add compat version of hlist_del_init_rcu
>       x86: Install compat wrapper for thread_struct.debugreg
>       Update source link

Pushed, thanks.