25 Oct, 2010
3 commits
-
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c -
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (321 commits)
KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
KVM: Fix signature of kvm_iommu_map_pages stub
KVM: MCE: Send SRAR SIGBUS directly
KVM: MCE: Add MCG_SER_P into KVM_MCE_CAP_SUPPORTED
KVM: fix typo in copyright notice
KVM: Disable interrupts around get_kernel_ns()
KVM: MMU: Avoid sign extension in mmu_alloc_direct_roots() pae root address
KVM: MMU: move access code parsing to FNAME(walk_addr) function
KVM: MMU: audit: check whether have unsync sps after root sync
KVM: MMU: audit: introduce audit_printk to cleanup audit code
KVM: MMU: audit: unregister audit tracepoints before module unloaded
KVM: MMU: audit: fix vcpu's spte walking
KVM: MMU: set access bit for direct mapping
KVM: MMU: cleanup for error mask set while walk guest page table
KVM: MMU: update 'root_hpa' out of loop in PAE shadow path
KVM: x86 emulator: Eliminate compilation warning in x86_decode_insn()
KVM: x86: Fix constant type in kvm_get_time_scale
KVM: VMX: Add AX to list of registers clobbered by guest switch
KVM guest: Move a printk that's using the clock before it's ready
KVM: x86: TSC catchup mode
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: Makefile - replace the use of -objs with -y
crypto: hifn_795x - use cancel_delayed_work_sync()
crypto: talitos - sparse check endian fixes
crypto: talitos - fix checkpatch warning
crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
crypto: cryptd - Adding the AEAD interface type support to cryptd
crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
crypto: Kconfig - update broken web addresses
crypto: omap-sham - Adjust DMA parameters
crypto: fips - FIPS requires algorithm self-tests
crypto: omap-aes - OMAP2/3 AES hw accelerator driver
crypto: updates to enable omap aes
padata: add missing __percpu markup in include/linux/padata.h
MAINTAINERS: Add maintainer entries for padata/pcrypt
24 Oct, 2010
37 commits
-
Originally, SRAR SIGBUS is sent to QEMU-KVM via touching the poisoned
page. But commit 96054569190bdec375fe824e48ca1f4e3b53dd36 prevents the
signal from being sent. So now the signal is sent via
force_sig_info_fault directly.[marcelo: use send_sig_info instead]
Reported-by: Dean Nelson
Signed-off-by: Huang Ying
Signed-off-by: Marcelo Tosatti -
Now we have MCG_SER_P (and corresponding SRAO/SRAR MCE) support in
kernel and QEMU-KVM, the MCG_SER_P should be added into
KVM_MCE_CAP_SUPPORTED to make all these code really works.Reported-by: Dean Nelson
Signed-off-by: Huang Ying
Signed-off-by: Marcelo Tosatti -
Fix typo in copyright notice.
Signed-off-by: Nicolas Kaiser
Signed-off-by: Marcelo Tosatti -
get_kernel_ns() wants preemption disabled. It doesn't make a lot of sense
during the get/set ioctls (no way to make them non-racy) but the callee wants
it.Signed-off-by: Avi Kivity
-
Signed-off-by: Avi Kivity
-
Move access code parsing from caller site to FNAME(walk_addr) function
Signed-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
After root synced, all unsync sps are synced, this patch add a check to make
sure it's no unsync sps in VCPU's page tableSigned-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
Introduce audit_printk, and record audit point instead audit name
Signed-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
fix:
Call Trace:
[] ? kvm_mmu_pte_write+0x229/0x911 [kvm]
[] ? gfn_to_memslot+0x39/0xa0 [kvm]
[] ? mark_page_dirty+0x16/0x2e [kvm]
[] ? kvm_write_guest_page+0x67/0x7f [kvm]
[] ? local_clock+0x2a/0x3b
[] emulator_write_phys+0x46/0x54 [kvm]
......
Code: Bad RIP value.
RIP [] 0xffffffffa0172056
RSP
CR2: ffffffffa0172056Signed-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
After nested nested paging, it may using long mode to shadow 32/PAE paging
guest, so this patch fix itSigned-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
Set access bit while setup up direct page table if it's nonpaing or npt enabled,
it's good for CPU's speculate accessSigned-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
Small cleanup for set page fault error code
Signed-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
The value of 'vcpu->arch.mmu.pae_root' is not modified, so we can update
'root_hpa' out of the loop.Signed-off-by: Xiao Guangrong
Signed-off-by: Avi Kivity -
Eliminate:
arch/x86/kvm/emulate.c:801: warning: ‘sv’ may be used uninitialized in this
functionon gcc 4.1.2
Signed-off-by: Sheng Yang
Signed-off-by: Marcelo Tosatti -
Older gcc versions complain about the improper type (for x86-32), 4.5
seems to fix this silently. However, we should better use the right type
initially.Signed-off-by: Jan Kiszka
Signed-off-by: Avi Kivity -
By chance this caused no harm so far. We overwrite AX during switch
to/from guest context, so we must declare this.Signed-off-by: Jan Kiszka
Signed-off-by: Avi Kivity -
Fix a hang during SMP kernel boot on KVM that showed up
after commit 489fb490dbf8dab0249ad82b56688ae3842a79e8
(2.6.35) and 59aab522154a2f17b25335b63c1cf68a51fb6ae0
(2.6.34.1). The problem only occurs when
CONFIG_PRINTK_TIME is set.KVM-Stable-Tag.
Signed-off-by: Arjan Koers
Signed-off-by: Avi Kivity -
Negate the effects of AN TYM spell while kvm thread is preempted by tracking
conversion factor to the highest TSC rate and catching the TSC up when it has
fallen behind the kernel view of time. Note that once triggered, we don't
turn off catchup mode.A slightly more clever version of this is possible, which only does catchup
when TSC rate drops, and which specifically targets only CPUs with broken
TSC, but since these all are considered unstable_tsc(), this patch covers
all necessary cases.Signed-off-by: Zachary Amsden
Signed-off-by: Marcelo Tosatti -
This just changes some names to better reflect the usage they
will be given. Separated out to keep confusion to a minimum.Signed-off-by: Zachary Amsden
Signed-off-by: Marcelo Tosatti -
The math in kvm_get_time_scale relies on the fact that
NSEC_PER_SEC < 2^32. To use the same function to compute
arbitrary time scales, we must extend the first reduction
step to shrink the base rate to a 32-bit value, and
possibly reduce the scaled rate into a 32-bit as well.Note we must take care to avoid an arithmetic overflow
when scaling up the tps32 value (this could not happen
with the fixed scaled value of NSEC_PER_SEC, but can
happen with scaled rates above 2^31.Signed-off-by: Zachary Amsden
Signed-off-by: Marcelo Tosatti -
If an interrupt is pending, we need to stop emulation so we
can inject it.Signed-off-by: Avi Kivity
Signed-off-by: Marcelo Tosatti -
Replace the inject-as-software-interrupt hack we currently have with
emulated injection.Signed-off-by: Mohammed Gamal
Signed-off-by: Avi Kivity
Signed-off-by: Marcelo Tosatti -
This adds a wrapper function kvm_inject_realmode_interrupt() around the
emulator function emulate_int_real() to allow real mode interrupt injection.[avi: initialize operand and address sizes before emulating interrupts]
[avi: initialize rip for real mode interrupt injection]
[avi: clear interrupt pending flag after emulating interrupt injection]Signed-off-by: Mohammed Gamal
Signed-off-by: Avi Kivity
Signed-off-by: Marcelo Tosatti -
Signed-off-by: Mohammed Gamal
Signed-off-by: Avi Kivity
Signed-off-by: Marcelo Tosatti -
It seems that rmap entries are under counted.
Signed-off-by: Hillf Danton
Signed-off-by: Marcelo Tosatti -
Nested SVM checks for external interrupt after injecting nested exception.
In case there is external interrupt pending the code generates "external
interrupt exit" and overwrites previous exit info. If previously injected
exception already generated exit it will be lost.Signed-off-by: Gleb Natapov
Acked-by: Joerg Roedel
Signed-off-by: Marcelo Tosatti -
The PIC code used to be called from preempt_disable() context, which
wasn't very good for PREEMPT_RT. That is no longer the case, so move
back from raw_spinlock_t to spinlock_t.Signed-off-by: Avi Kivity
Acked-by: Thomas Gleixner
Signed-off-by: Marcelo Tosatti -
If preempted after kvmclock values are updated, but before hardware
virtualization is entered, the last tsc time as read by the guest is
never set. It underflows the next time kvmclock is updated if there
has not yet been a successful entry / exit into hardware virt.Fix this by simply setting last_tsc to the newly read tsc value so
that any computed nsec advance of kvmclock is nulled.Signed-off-by: Zachary Amsden
Signed-off-by: Marcelo Tosatti -
This patch moves the detection whether a page-fault was
nested or not out of the error code and moves it into a
separate variable in the fault struct.Signed-off-by: Joerg Roedel
Signed-off-by: Avi Kivity -
No code changes.
Signed-off-by: Avi Kivity
-
Change the interrupt injection code to work from preemptible, interrupts
enabled context. This works by adding a ->cancel_injection() operation
that undoes an injection in case we were not able to actually enter the guest
(this condition could never happen with atomic injection).Signed-off-by: Avi Kivity
-
Currently vmx_complete_interrupts() can decode event information from vmx
exit fields into the generic kvm event queues. Make it able to decode
the information from the entry fields as well by parametrizing it.Signed-off-by: Avi Kivity
-
This allows reuse of vmx_complete_interrupts() for cancelling injections.
Signed-off-by: Avi Kivity
-
vmx_complete_interrupts() does too much, split it up:
- vmx_vcpu_run() gets the "cache important vmcs fields" part
- a new vmx_complete_atomic_exit() gets the parts that must be done atomically
- a new vmx_recover_nmi_blocking() does what its name says
- vmx_complete_interrupts() retains the event injection recovery codeThis helps in reducing the work done in atomic context.
Signed-off-by: Avi Kivity
-
Instead of blindly attempting to inject an event before each guest entry,
check for a possible event first in vcpu->requests. Sites that can trigger
event injection are modified to set KVM_REQ_EVENT:- interrupt, nmi window opening
- ppr updates
- i8259 output changes
- local apic irr changes
- rflags updates
- gif flag set
- event set on exitThis improves non-injecting entry performance, and sets the stage for
non-atomic injection.Signed-off-by: Avi Kivity
-
Commit "KVM: MMU: Make tdp_enabled a mmu-context parameter" made real-mode
set ->direct_map, and changed the code that merges in the memory type depend
on direct_map instead of tdp_enabled. However, in this case what really
matters is tdp, not direct_map, since tdp changes the pte format regardless
of whether the mapping is direct or not.As a result, real-mode shadow mappings got corrupted with ept memory types.
The result was a huge slowdown, likely due to the cache being disabled.Change it back as the simplest fix for the regression (real fix is to move
all that to vmx code, and not use tdp_enabled as a synonym for ept).Signed-off-by: Avi Kivity
-
This patch fixes a bug in KVM where it _always_ reports the
support of the SVM feature to userspace. But KVM only
supports SVM on AMD hardware and only when it is enabled in
the kernel module. This patch fixes the wrong reporting.Cc: stable@kernel.org
Signed-off-by: Joerg Roedel
Signed-off-by: Avi Kivity
