[Devel] [PATCH rh7] pfcache/ub: account pfcache peer files in ub0

[Andrey Ryabinin]

Pfcache's peer files is a shared resource, thus it shouldn't be accounted
per-container.
This makes peer files to be accounted in ub0, the same way as it is in PSBM6.

https://jira.sw.ru/browse/PSBM-56167

Signed-off-by: Andrey Ryabinin 
---
 mm/memory.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mm/memory.c b/mm/memory.c
index d6fcde2..8014dc8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4473,10 +4473,13 @@ int open_mapping_peer(struct address_space *mapping,
struct inode *inode = path->dentry->d_inode;
struct address_space *peer = inode->i_mapping;
struct file *file = NULL;
+   struct user_beancounter *ub;
 
 restart:
if (!peer->i_peer_file) {
+   ub = set_exec_ub();
file = dentry_open(path, O_RDONLY | O_LARGEFILE, cred);
+   set_exec_ub(ub);
if (IS_ERR(file)) {
return PTR_ERR(file);
}
-- 
2.10.2

___
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

[Devel] [PATCH RHEL7 COMMIT] ms/kvm:vmx: more complete state update on APICv on/off: lost hunk

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-514.vz7.27.x-ovz" and will appear at 
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.vz7.27.6
-->
commit 8e6dc095dd5d4494f8ecf1e4a1b3209e55910fd3
Author: Evgeny Yakovlev 
Date:   Mon Jan 9 20:22:54 2017 +0400

ms/kvm:vmx: more complete state update on APICv on/off: lost hunk

Fixes: 54b01f8 ("ms/kvm:vmx: more complete state update on APICv on/off")
ms commit: 3ce424e

This part of mentioned commit has been lost, restore it.

Fixes https://jira.sw.ru/browse/PSBM-57821

Signed-off-by: Evgeny Yakovlev 
---
 arch/x86/kvm/vmx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index d2d52c3..3d39923 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2329,7 +2329,9 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu)
 
if (is_guest_mode(vcpu))
msr_bitmap = vmx_msr_bitmap_nested;
-   else if (vcpu->arch.apic_base & X2APIC_ENABLE) {
+else if (cpu_has_secondary_exec_ctrls() &&
+ (vmcs_read32(SECONDARY_VM_EXEC_CONTROL) &
+  SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) {
if (is_long_mode(vcpu))
msr_bitmap = vmx_msr_bitmap_longmode_x2apic;
else
___
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel