[Devel] [PATCH RHEL9 COMMIT] vecalls: Drop VEIP printing code

Konstantin Khorenko khorenko at virtuozzo.com
Wed Jun 8 19:04:21 MSK 2022


The commit is pushed to "branch-rh9-5.14.0-70.13.1.vz9.16.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-70.13.1.vz9.16.3
------>
commit 0b52649a374d52f4359ceeb3268ca88159c4db69
Author: Denis V. Lunev <den at openvz.org>
Date:   Wed Jun 8 14:50:53 2022 +0200

    vecalls: Drop VEIP printing code
    
    This code was used for venet only and that code was dropped nowadays.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    CC: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    To_merge: 78017a377a5f ("ve: Add vecalls")
    Related to https://jira.sw.ru/browse/PSBM-131070
---
 include/linux/vecalls.h | 22 ----------------------
 kernel/ve/vecalls.c     | 28 ++--------------------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/include/linux/vecalls.h b/include/linux/vecalls.h
deleted file mode 100644
index 059fd7446078..000000000000
--- a/include/linux/vecalls.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  include/linux/vecalls.h
- *
- *  Copyright (c) 2000-2008 SWsoft
- *  Copyright (c) 2009-2015 Parallels IP Holdings GmbH
- *  Copyright (c) 2017-2021 Virtuozzo International GmbH. All rights reserved.
- *
- */
-
-#ifndef _LINUX_VE_CALLS_H
-#define _LINUX_VE_CALLS_H
-
-#include <uapi/linux/vzcalluser.h>
-
-struct seq_file;
-
-typedef void (*ve_seq_print_t)(struct seq_file *, struct ve_struct *);
-
-extern void vzmon_register_veaddr_print_cb(ve_seq_print_t);
-extern void vzmon_unregister_veaddr_print_cb(ve_seq_print_t);
-
-#endif /*_LINUX_VE_CALLS_H */
diff --git a/kernel/ve/vecalls.c b/kernel/ve/vecalls.c
index 8f057aa79b11..2dccbe75653e 100644
--- a/kernel/ve/vecalls.c
+++ b/kernel/ve/vecalls.c
@@ -29,10 +29,10 @@
 #include <generated/utsrelease.h>
 
 #include <linux/ve.h>
-#include <linux/vecalls.h>
 #include <linux/vzctl.h>
 #include <linux/veowner.h>
 #include <linux/device_cgroup.h>
+#include <uapi/linux/vzcalluser.h>
 
 static int fill_cpu_stat(envid_t veid, struct vz_cpu_stat __user *buf)
 {
@@ -271,38 +271,14 @@ static struct proc_ops proc_vz_version_operations = {
 };
 
 /* /proc/vz/veinfo */
-static ve_seq_print_t veaddr_seq_print_cb;
-
-void vzmon_register_veaddr_print_cb(ve_seq_print_t cb)
-{
-	rcu_assign_pointer(veaddr_seq_print_cb, cb);
-}
-EXPORT_SYMBOL(vzmon_register_veaddr_print_cb);
-
-void vzmon_unregister_veaddr_print_cb(ve_seq_print_t cb)
-{
-	rcu_assign_pointer(veaddr_seq_print_cb, NULL);
-	synchronize_rcu();
-}
-EXPORT_SYMBOL(vzmon_unregister_veaddr_print_cb);
-
 static int veinfo_seq_show(struct seq_file *m, void *v)
 {
 	struct ve_struct *ve;
-	ve_seq_print_t veaddr_seq_print;
 
 	ve = list_entry((struct list_head *)v, struct ve_struct, ve_list);
 
 	/* second 0 is deprecated ve->class_id */
-	seq_printf(m, "%10s 0 %5u", ve_name(ve), nr_threads_ve(ve));
-
-	rcu_read_lock();
-	veaddr_seq_print = rcu_dereference(veaddr_seq_print_cb);
-	if (veaddr_seq_print)
-		veaddr_seq_print(m, ve);
-	rcu_read_unlock();
-
-	seq_putc(m, '\n');
+	seq_printf(m, "%10s 0 %5u\n", ve_name(ve), nr_threads_ve(ve));
 	return 0;
 }
 


More information about the Devel mailing list