commit
01952e1df2
@ -0,0 +1,48 @@
|
||||
From 1e2d32c6ee12b45823ba3cda0054a4bd843896fc Mon Sep 17 00:00:00 2001
|
||||
From: Olaf Hering <olaf@aepfle.de>
|
||||
Date: Tue, 5 Jun 2018 13:37:55 -0700
|
||||
Subject: [PATCH] tools: hv: update lsvmbus to be compatible with python3
|
||||
|
||||
Python3 changed the way how 'print' works.
|
||||
Adjust the code to a syntax that is understood by python2 and python3.
|
||||
|
||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
Acked-by: Dexuan Cui <decui@microsoft.com>
|
||||
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
||||
---
|
||||
tools/hv/lsvmbus | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tools/hv/lsvmbus b/tools/hv/lsvmbus
|
||||
index 353e56768df8..55e7374bade0 100644
|
||||
--- a/tools/hv/lsvmbus
|
||||
+++ b/tools/hv/lsvmbus
|
||||
@@ -17,7 +17,7 @@ if options.verbose is not None:
|
||||
|
||||
vmbus_sys_path = '/sys/bus/vmbus/devices'
|
||||
if not os.path.isdir(vmbus_sys_path):
|
||||
- print "%s doesn't exist: exiting..." % vmbus_sys_path
|
||||
+ print("%s doesn't exist: exiting..." % vmbus_sys_path)
|
||||
exit(-1)
|
||||
|
||||
vmbus_dev_dict = {
|
||||
@@ -93,11 +93,11 @@ format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID = %s\n\tSysfs path: %s\n%s'
|
||||
|
||||
for d in vmbus_dev_list:
|
||||
if verbose == 0:
|
||||
- print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
|
||||
+ print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
|
||||
elif verbose == 1:
|
||||
- print ('VMBUS ID ' + format1) % \
|
||||
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
||||
+ print (('VMBUS ID ' + format1) % \
|
||||
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
|
||||
else:
|
||||
- print ('VMBUS ID ' + format2) % \
|
||||
+ print (('VMBUS ID ' + format2) % \
|
||||
(d.vmbus_id, d.class_id, d.dev_desc, \
|
||||
- d.device_id, d.sysfs_path, d.chn_vp_mapping)
|
||||
+ d.device_id, d.sysfs_path, d.chn_vp_mapping))
|
||||
--
|
||||
2.14.4
|
||||
|
@ -0,0 +1,10 @@
|
||||
--- hv_set_ifconfig.sh.orig 2018-06-11 15:57:50.000000000 +0200
|
||||
+++ hv_set_ifconfig.sh 2018-09-03 09:34:57.470114502 +0200
|
||||
@@ -51,7 +51,6 @@
|
||||
|
||||
|
||||
echo "IPV6INIT=yes" >> $1
|
||||
-echo "NM_CONTROLLED=no" >> $1
|
||||
echo "PEERDNS=yes" >> $1
|
||||
echo "ONBOOT=yes" >> $1
|
||||
|
@ -0,0 +1,74 @@
|
||||
From 2b218c6e29ff031862c0976deb9810dfb2d79ab2 Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Thu, 14 Nov 2019 12:21:46 +0100
|
||||
Subject: [PATCH] Set IgnoreOnIsolate=1 in systemd units
|
||||
|
||||
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Message-id: <20191114122146.17009-1-vkuznets@redhat.com>
|
||||
Patchwork-id: 92251
|
||||
O-Subject: [RHEL8.2 hyperv-daemons PATCH] Set IgnoreOnIsolate=1 in systemd units
|
||||
Bugzilla: 1769920
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||||
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1769920
|
||||
Branch: rhel-8.2.0
|
||||
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=24699501
|
||||
Upstream: RHEL-only (upstream doesn't ship systemd units)
|
||||
|
||||
Hyper-V daemons' units are udev activated: when the appropriate device
|
||||
appears systemd unit is started and normal targets (e.g. multi-user.target)
|
||||
don't depend on these units. With systemd it is possible to try to isolate
|
||||
the target (somewhat similar to switching runlevel), this is supposed to
|
||||
shut everything which the target doesn't depend on (like units started
|
||||
manually) off. It seems that the general users' expectation is that
|
||||
hyperv-daemons units survive the procedure.
|
||||
|
||||
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
hypervfcopyd.service | 1 +
|
||||
hypervkvpd.service | 1 +
|
||||
hypervvssd.service | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/hypervfcopyd.service b/hypervfcopyd.service
|
||||
index fa4a0a3..dd14a97 100644
|
||||
--- a/hypervfcopyd.service
|
||||
+++ b/hypervfcopyd.service
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=Hyper-V FCOPY daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
||||
+IgnoreOnIsolate=1
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/hypervfcopyd -n
|
||||
diff --git a/hypervkvpd.service b/hypervkvpd.service
|
||||
index d8bfdf3..36ee11c 100644
|
||||
--- a/hypervkvpd.service
|
||||
+++ b/hypervkvpd.service
|
||||
@@ -2,6 +2,7 @@
|
||||
Description=Hyper-V KVP daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
||||
After=network.target
|
||||
+IgnoreOnIsolate=1
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
diff --git a/hypervvssd.service b/hypervvssd.service
|
||||
index 9751cb3..1e5ff43 100644
|
||||
--- a/hypervvssd.service
|
||||
+++ b/hypervvssd.service
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=Hyper-V VSS daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
||||
+IgnoreOnIsolate=1
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/hypervvssd -n
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -0,0 +1,36 @@
|
||||
From c04d9b584862ee913720632d7fdf83b79525a7d3 Mon Sep 17 00:00:00 2001
|
||||
From: Till Maas <timaas@redhat.com>
|
||||
Date: Tue, 14 Dec 2021 08:07:40 +0000
|
||||
Subject: [PATCH 2/2] Use filename for connection profile
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands
|
||||
RH-Commit: [2/2] 1b69f98b9c30ee6904475b78f2b93fabe2131074
|
||||
RH-Bugzilla: 2056566
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566
|
||||
|
||||
Signed-off-by: Till Maas <tmaas@redhat.com>
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_set_ifconfig.sh | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||
index 5a64efe..146829b 100644
|
||||
--- a/hv_set_ifconfig.sh
|
||||
+++ b/hv_set_ifconfig.sh
|
||||
@@ -57,5 +57,6 @@ echo "ONBOOT=yes" >> $1
|
||||
|
||||
cp $1 /etc/sysconfig/network-scripts/
|
||||
|
||||
-nmcli connection load "/etc/sysconfig/network-scripts/$1"
|
||||
-nmcli connection up filename "/etc/sysconfig/network-scripts/$1"
|
||||
+filename="${1##*/}"
|
||||
+nmcli connection load "/etc/sysconfig/network-scripts/${filename}"
|
||||
+nmcli connection up filename "/etc/sysconfig/network-scripts/${filename}"
|
||||
--
|
||||
2.27.0
|
||||
|
@ -0,0 +1,41 @@
|
||||
From 2db75ec41c2e346af992f9c00f2e90ed9fec694b Mon Sep 17 00:00:00 2001
|
||||
From: Till Maas <timaas@redhat.com>
|
||||
Date: Mon, 13 Dec 2021 16:08:42 +0000
|
||||
Subject: [PATCH 1/2] hv_set_ifconfig.sh: Use nmcli commands
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands
|
||||
RH-Commit: [1/2] c045f4c849a7d8841c8ad4b6e4ba63abfb946187
|
||||
RH-Bugzilla: 2056566
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566
|
||||
|
||||
Instead of using deprecated ifup/ifdown commands, use nmcli commands.
|
||||
Taking the connection down is not necessary with NM, so don't do it.
|
||||
|
||||
Signed-off-by: Till Maas <tmaas@redhat.com>
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_set_ifconfig.sh | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||
index 3dd064c..5a64efe 100644
|
||||
--- a/hv_set_ifconfig.sh
|
||||
+++ b/hv_set_ifconfig.sh
|
||||
@@ -57,8 +57,5 @@ echo "ONBOOT=yes" >> $1
|
||||
|
||||
cp $1 /etc/sysconfig/network-scripts/
|
||||
|
||||
-
|
||||
-interface=$(echo $1 | awk -F - '{ print $2 }')
|
||||
-
|
||||
-/sbin/ifdown $interface 2>/dev/null
|
||||
-/sbin/ifup $interface 2>/dev/null
|
||||
+nmcli connection load "/etc/sysconfig/network-scripts/$1"
|
||||
+nmcli connection up filename "/etc/sysconfig/network-scripts/$1"
|
||||
--
|
||||
2.27.0
|
||||
|
@ -0,0 +1,54 @@
|
||||
From 33725de60efa5e867ed73d2404d316785d0e4bb5 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 20 Jul 2022 11:48:40 +0200
|
||||
Subject: [PATCH 1/2] hypervkvpd.service: ordering fixes
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 3: hypervkvpd.service: ordering fixes
|
||||
RH-Commit: [1/2] f5bec088f7cf4afd641a2d7184a4e29cd1734bf4
|
||||
RH-Bugzilla: 2115761
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761
|
||||
|
||||
From 8dcff588c8eb1ab3119c6b0acead03189814b955 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Patterson <cpatterson@microsoft.com>
|
||||
Date: Jul 01 2022 14:36:25 +0000
|
||||
Subject: hypervkvpd.service: ordering fixes
|
||||
|
||||
- Only start kvpd under Hyper-V.
|
||||
|
||||
- Minimize dependencies for kvpd by removing the unnecessary
|
||||
network.target requirement, but add kvp device and mount
|
||||
requirements.
|
||||
|
||||
Start before cloud-init-local.service which relies on kvpd
|
||||
for Azure.
|
||||
|
||||
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hypervkvpd.service | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hypervkvpd.service b/hypervkvpd.service
|
||||
index 36ee11c..40dff13 100644
|
||||
--- a/hypervkvpd.service
|
||||
+++ b/hypervkvpd.service
|
||||
@@ -1,7 +1,10 @@
|
||||
[Unit]
|
||||
Description=Hyper-V KVP daemon
|
||||
+ConditionVirtualization=microsoft
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
||||
-After=network.target
|
||||
+After=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
||||
+RequiresMountsFor=/var/lib/hyperv
|
||||
+Before=cloud-init-local.service
|
||||
IgnoreOnIsolate=1
|
||||
|
||||
[Service]
|
||||
--
|
||||
2.31.1
|
||||
|
@ -0,0 +1,49 @@
|
||||
From 3eb64f25afdf65d9999d155d8c89327cf9d27036 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Mon, 15 Aug 2022 17:38:37 +0200
|
||||
Subject: [PATCH 2/2] redhat: Add ConditionalVirtualization to the rest of
|
||||
systemd units
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 3: hypervkvpd.service: ordering fixes
|
||||
RH-Commit: [2/2] 6638ac3cfcff63e664d6ba86772a4bdfe45d2084
|
||||
RH-Bugzilla: 2115761
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115761
|
||||
|
||||
Add ConditionalVirtualization to the rest of systemd units to make sure
|
||||
they're started when running in Azure/Hyper-V.
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hypervfcopyd.service | 1 +
|
||||
hypervvssd.service | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/hypervfcopyd.service b/hypervfcopyd.service
|
||||
index dd14a97..aab4b6b 100644
|
||||
--- a/hypervfcopyd.service
|
||||
+++ b/hypervfcopyd.service
|
||||
@@ -1,5 +1,6 @@
|
||||
[Unit]
|
||||
Description=Hyper-V FCOPY daemon
|
||||
+ConditionVirtualization=microsoft
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
||||
IgnoreOnIsolate=1
|
||||
|
||||
diff --git a/hypervvssd.service b/hypervvssd.service
|
||||
index 1e5ff43..6a0fad0 100644
|
||||
--- a/hypervvssd.service
|
||||
+++ b/hypervvssd.service
|
||||
@@ -1,5 +1,6 @@
|
||||
[Unit]
|
||||
Description=Hyper-V VSS daemon
|
||||
+ConditionVirtualization=microsoft
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
||||
IgnoreOnIsolate=1
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
@ -0,0 +1,46 @@
|
||||
From 0a6bfc42945419eba5ed92c10ae722625a2ccb05 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Tue, 8 Nov 2022 16:20:17 +0100
|
||||
Subject: [PATCH 1/3] redhat: hv_set_if_config: Workaround for gateway
|
||||
numbering in NetworkManager
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 4: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager
|
||||
RH-Bugzilla: 2142028
|
||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
RH-Commit: [1/1] 85b28bc13239a64b7a200ca4edb83ac5d0fe5ebd
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2142028
|
||||
|
||||
Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
|
||||
So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
|
||||
Workaround this by replacing GATEWAY= with GATEWAY0=.
|
||||
|
||||
A proper fix however, would be to generate NetworkManager keyfiles instead of ifcfg files.
|
||||
That can be done eitter by changing hypervkvpd code to do that or to let the script parse
|
||||
ifcfg files and generate corresponding NetworkManager keyfiles
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_set_ifconfig.sh | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||
index 146829b..fe7fccf 100644
|
||||
--- a/hv_set_ifconfig.sh
|
||||
+++ b/hv_set_ifconfig.sh
|
||||
@@ -54,6 +54,10 @@ echo "IPV6INIT=yes" >> $1
|
||||
echo "PEERDNS=yes" >> $1
|
||||
echo "ONBOOT=yes" >> $1
|
||||
|
||||
+#Unlike older sysconfig scripts, NetworkManager expects GATEWAYx=ipaddr for all values of x.
|
||||
+#So the first gateway is GATEWAY0 instead of GATEWAY. Other values should remain unchanged.
|
||||
+#Workaround this by replacing GATEWAY= with GATEWAY0=.
|
||||
+sed -i "s/GATEWAY=/GATEWAY0=/" $1
|
||||
|
||||
cp $1 /etc/sysconfig/network-scripts/
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
@ -0,0 +1,47 @@
|
||||
From 2171b1e58d19b8af77aecc56fa7ce2529cb0ec97 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Thu, 17 Nov 2022 18:56:20 +0100
|
||||
Subject: [PATCH 2/3] tools: hv: Remove an extraneous "the"
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8
|
||||
RH-Bugzilla: 2139456
|
||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Commit: [1/2] 7ae4fbcb80ed5795a43cbd355b8e8fe58ab78ba0
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456
|
||||
|
||||
commit f15f39fabed2248311607445ddfa6dba63abebb9
|
||||
Author: Jason Wang <wangborong@cdjrlc.com>
|
||||
Date: Thu Aug 11 21:34:33 2022 +0800
|
||||
|
||||
tools: hv: Remove an extraneous "the"
|
||||
|
||||
There are two "the" in the text. Remove one.
|
||||
|
||||
Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
|
||||
Link: https://lore.kernel.org/r/20220811133433.10175-1-wangborong@cdjrlc.com
|
||||
Signed-off-by: Wei Liu <wei.liu@kernel.org>
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_kvp_daemon.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||
index 1e6fd6c..c97c12e 100644
|
||||
--- a/hv_kvp_daemon.c
|
||||
+++ b/hv_kvp_daemon.c
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
/*
|
||||
* KVP protocol: The user mode component first registers with the
|
||||
- * the kernel component. Subsequently, the kernel component requests, data
|
||||
+ * kernel component. Subsequently, the kernel component requests, data
|
||||
* for the specified keys. In response to this message the user mode component
|
||||
* fills in the value corresponding to the specified key. We overload the
|
||||
* sequence field in the cn_msg header to define our KVP message types.
|
||||
--
|
||||
2.37.3
|
||||
|
@ -0,0 +1,53 @@
|
||||
From 0452c1c7a5f5f27aebefcc2816f3781c7bbb55e2 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Thu, 17 Nov 2022 18:58:31 +0100
|
||||
Subject: [PATCH 3/3] tools: hv: kvp: remove unnecessary (void*) conversions
|
||||
|
||||
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||
RH-MergeRequest: 5: Update hyperv-daemons for RHEL-8.8
|
||||
RH-Bugzilla: 2139456
|
||||
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Commit: [2/2] 739e447d4cff82f47cb60a14d8bd87ca3601a59b
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139456
|
||||
|
||||
commit 2258954234db7530e9d86bb32cd6ad54485ff926
|
||||
Author: Zhou jie <zhoujie@nfschina.com>
|
||||
Date: Tue Aug 23 11:45:52 2022 +0800
|
||||
|
||||
tools: hv: kvp: remove unnecessary (void*) conversions
|
||||
|
||||
Remove unnecessary void* type casting.
|
||||
|
||||
Signed-off-by: Zhou jie <zhoujie@nfschina.com>
|
||||
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
|
||||
Link: https://lore.kernel.org/r/20220823034552.8596-1-zhoujie@nfschina.com
|
||||
Signed-off-by: Wei Liu <wei.liu@kernel.org>
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_kvp_daemon.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||
index c97c12e..27f5e7d 100644
|
||||
--- a/hv_kvp_daemon.c
|
||||
+++ b/hv_kvp_daemon.c
|
||||
@@ -772,11 +772,11 @@ static int kvp_process_ip_address(void *addrp,
|
||||
const char *str;
|
||||
|
||||
if (family == AF_INET) {
|
||||
- addr = (struct sockaddr_in *)addrp;
|
||||
+ addr = addrp;
|
||||
str = inet_ntop(family, &addr->sin_addr, tmp, 50);
|
||||
addr_length = INET_ADDRSTRLEN;
|
||||
} else {
|
||||
- addr6 = (struct sockaddr_in6 *)addrp;
|
||||
+ addr6 = addrp;
|
||||
str = inet_ntop(family, &addr6->sin6_addr.s6_addr, tmp, 50);
|
||||
addr_length = INET6_ADDRSTRLEN;
|
||||
}
|
||||
--
|
||||
2.37.3
|
||||
|
@ -0,0 +1,247 @@
|
||||
/*
|
||||
* An implementation of host to guest copy functionality for Linux.
|
||||
*
|
||||
* Copyright (C) 2014, Microsoft, Inc.
|
||||
*
|
||||
* Author : K. Y. Srinivasan <kys@microsoft.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published
|
||||
* by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
||||
* NON INFRINGEMENT. See the GNU General Public License for more
|
||||
* details.
|
||||
*/
|
||||
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <linux/hyperv.h>
|
||||
#include <linux/limits.h>
|
||||
#include <syslog.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
|
||||
static int target_fd;
|
||||
static char target_fname[PATH_MAX];
|
||||
static unsigned long long filesize;
|
||||
|
||||
static int hv_start_fcopy(struct hv_start_fcopy *smsg)
|
||||
{
|
||||
int error = HV_E_FAIL;
|
||||
char *q, *p;
|
||||
|
||||
filesize = 0;
|
||||
p = (char *)smsg->path_name;
|
||||
snprintf(target_fname, sizeof(target_fname), "%s/%s",
|
||||
(char *)smsg->path_name, (char *)smsg->file_name);
|
||||
|
||||
syslog(LOG_INFO, "Target file name: %s", target_fname);
|
||||
/*
|
||||
* Check to see if the path is already in place; if not,
|
||||
* create if required.
|
||||
*/
|
||||
while ((q = strchr(p, '/')) != NULL) {
|
||||
if (q == p) {
|
||||
p++;
|
||||
continue;
|
||||
}
|
||||
*q = '\0';
|
||||
if (access((char *)smsg->path_name, F_OK)) {
|
||||
if (smsg->copy_flags & CREATE_PATH) {
|
||||
if (mkdir((char *)smsg->path_name, 0755)) {
|
||||
syslog(LOG_ERR, "Failed to create %s",
|
||||
(char *)smsg->path_name);
|
||||
goto done;
|
||||
}
|
||||
} else {
|
||||
syslog(LOG_ERR, "Invalid path: %s",
|
||||
(char *)smsg->path_name);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
p = q + 1;
|
||||
*q = '/';
|
||||
}
|
||||
|
||||
if (!access(target_fname, F_OK)) {
|
||||
syslog(LOG_INFO, "File: %s exists", target_fname);
|
||||
if (!(smsg->copy_flags & OVER_WRITE)) {
|
||||
error = HV_ERROR_ALREADY_EXISTS;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
target_fd = open(target_fname,
|
||||
O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0744);
|
||||
if (target_fd == -1) {
|
||||
syslog(LOG_INFO, "Open Failed: %s", strerror(errno));
|
||||
goto done;
|
||||
}
|
||||
|
||||
error = 0;
|
||||
done:
|
||||
return error;
|
||||
}
|
||||
|
||||
static int hv_copy_data(struct hv_do_fcopy *cpmsg)
|
||||
{
|
||||
ssize_t bytes_written;
|
||||
int ret = 0;
|
||||
|
||||
bytes_written = pwrite(target_fd, cpmsg->data, cpmsg->size,
|
||||
cpmsg->offset);
|
||||
|
||||
filesize += cpmsg->size;
|
||||
if (bytes_written != cpmsg->size) {
|
||||
switch (errno) {
|
||||
case ENOSPC:
|
||||
ret = HV_ERROR_DISK_FULL;
|
||||
break;
|
||||
default:
|
||||
ret = HV_E_FAIL;
|
||||
break;
|
||||
}
|
||||
syslog(LOG_ERR, "pwrite failed to write %llu bytes: %ld (%s)",
|
||||
filesize, (long)bytes_written, strerror(errno));
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int hv_copy_finished(void)
|
||||
{
|
||||
close(target_fd);
|
||||
return 0;
|
||||
}
|
||||
static int hv_copy_cancel(void)
|
||||
{
|
||||
close(target_fd);
|
||||
unlink(target_fname);
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
void print_usage(char *argv[])
|
||||
{
|
||||
fprintf(stderr, "Usage: %s [options]\n"
|
||||
"Options are:\n"
|
||||
" -n, --no-daemon stay in foreground, don't daemonize\n"
|
||||
" -h, --help print this help\n", argv[0]);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int fcopy_fd;
|
||||
int error;
|
||||
int daemonize = 1, long_index = 0, opt;
|
||||
int version = FCOPY_CURRENT_VERSION;
|
||||
union {
|
||||
struct hv_fcopy_hdr hdr;
|
||||
struct hv_start_fcopy start;
|
||||
struct hv_do_fcopy copy;
|
||||
__u32 kernel_modver;
|
||||
} buffer = { };
|
||||
int in_handshake = 1;
|
||||
|
||||
static struct option long_options[] = {
|
||||
{"help", no_argument, 0, 'h' },
|
||||
{"no-daemon", no_argument, 0, 'n' },
|
||||
{0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
while ((opt = getopt_long(argc, argv, "hn", long_options,
|
||||
&long_index)) != -1) {
|
||||
switch (opt) {
|
||||
case 'n':
|
||||
daemonize = 0;
|
||||
break;
|
||||
case 'h':
|
||||
default:
|
||||
print_usage(argv);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (daemonize && daemon(1, 0)) {
|
||||
syslog(LOG_ERR, "daemon() failed; error: %s", strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
openlog("HV_FCOPY", 0, LOG_USER);
|
||||
syslog(LOG_INFO, "starting; pid is:%d", getpid());
|
||||
|
||||
fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
|
||||
|
||||
if (fcopy_fd < 0) {
|
||||
syslog(LOG_ERR, "open /dev/vmbus/hv_fcopy failed; error: %d %s",
|
||||
errno, strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Register with the kernel.
|
||||
*/
|
||||
if ((write(fcopy_fd, &version, sizeof(int))) != sizeof(int)) {
|
||||
syslog(LOG_ERR, "Registration failed: %s", strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
while (1) {
|
||||
/*
|
||||
* In this loop we process fcopy messages after the
|
||||
* handshake is complete.
|
||||
*/
|
||||
ssize_t len;
|
||||
|
||||
len = pread(fcopy_fd, &buffer, sizeof(buffer), 0);
|
||||
if (len < 0) {
|
||||
syslog(LOG_ERR, "pread failed: %s", strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (in_handshake) {
|
||||
if (len != sizeof(buffer.kernel_modver)) {
|
||||
syslog(LOG_ERR, "invalid version negotiation");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
in_handshake = 0;
|
||||
syslog(LOG_INFO, "kernel module version: %u",
|
||||
buffer.kernel_modver);
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (buffer.hdr.operation) {
|
||||
case START_FILE_COPY:
|
||||
error = hv_start_fcopy(&buffer.start);
|
||||
break;
|
||||
case WRITE_TO_FILE:
|
||||
error = hv_copy_data(&buffer.copy);
|
||||
break;
|
||||
case COMPLETE_FCOPY:
|
||||
error = hv_copy_finished();
|
||||
break;
|
||||
case CANCEL_FCOPY:
|
||||
error = hv_copy_cancel();
|
||||
break;
|
||||
|
||||
default:
|
||||
syslog(LOG_ERR, "Unknown operation: %d",
|
||||
buffer.hdr.operation);
|
||||
|
||||
}
|
||||
|
||||
if (pwrite(fcopy_fd, &error, sizeof(int), 0) != sizeof(int)) {
|
||||
syslog(LOG_ERR, "pwrite failed: %s", strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,29 @@
|
||||
#!/bin/bash
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
# This example script retrieves the DHCP state of a given interface.
|
||||
# In the interest of keeping the KVP daemon code free of distro specific
|
||||
# information; the kvp daemon code invokes this external script to gather
|
||||
# DHCP setting for the specific interface.
|
||||
#
|
||||
# Input: Name of the interface
|
||||
#
|
||||
# Output: The script prints the string "Enabled" to stdout to indicate
|
||||
# that DHCP is enabled on the interface. If DHCP is not enabled,
|
||||
# the script prints the string "Disabled" to stdout.
|
||||
#
|
||||
# Each Distro is expected to implement this script in a distro specific
|
||||
# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||
# this script can be based on the Network Manager APIs for retrieving DHCP
|
||||
# information.
|
||||
|
||||
if_file="/etc/sysconfig/network-scripts/ifcfg-"$1
|
||||
|
||||
dhcp=$(grep "dhcp" $if_file 2>/dev/null)
|
||||
|
||||
if [ "$dhcp" != "" ];
|
||||
then
|
||||
echo "Enabled"
|
||||
else
|
||||
echo "Disabled"
|
||||
fi
|
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
|
||||
# This example script parses /etc/resolv.conf to retrive DNS information.
|
||||
# In the interest of keeping the KVP daemon code free of distro specific
|
||||
# information; the kvp daemon code invokes this external script to gather
|
||||
# DNS information.
|
||||
# This script is expected to print the nameserver values to stdout.
|
||||
# Each Distro is expected to implement this script in a distro specific
|
||||
# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||
# this script can be based on the Network Manager APIs for retrieving DNS
|
||||
# entries.
|
||||
|
||||
cat /etc/resolv.conf 2>/dev/null | awk '/^nameserver/ { print $2 }'
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,65 @@
|
||||
#!/bin/bash
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
# This example script activates an interface based on the specified
|
||||
# configuration.
|
||||
#
|
||||
# In the interest of keeping the KVP daemon code free of distro specific
|
||||
# information; the kvp daemon code invokes this external script to configure
|
||||
# the interface.
|
||||
#
|
||||
# The only argument to this script is the configuration file that is to
|
||||
# be used to configure the interface.
|
||||
#
|
||||
# Each Distro is expected to implement this script in a distro specific
|
||||
# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||
# this script can be based on the Network Manager APIs for configuring the
|
||||
# interface.
|
||||
#
|
||||
# This example script is based on a RHEL environment.
|
||||
#
|
||||
# Here is the format of the ip configuration file:
|
||||
#
|
||||
# HWADDR=macaddr
|
||||
# DEVICE=interface name
|
||||
# BOOTPROTO=<protocol> (where <protocol> is "dhcp" if DHCP is configured
|
||||
# or "none" if no boot-time protocol should be used)
|
||||
#
|
||||
# IPADDR0=ipaddr1
|
||||
# IPADDR1=ipaddr2
|
||||
# IPADDRx=ipaddry (where y = x + 1)
|
||||
#
|
||||
# NETMASK0=netmask1
|
||||
# NETMASKx=netmasky (where y = x + 1)
|
||||
#
|
||||
# GATEWAY=ipaddr1
|
||||
# GATEWAYx=ipaddry (where y = x + 1)
|
||||
#
|
||||
# DNSx=ipaddrx (where first DNS address is tagged as DNS1 etc)
|
||||
#
|
||||
# IPV6 addresses will be tagged as IPV6ADDR, IPV6 gateway will be
|
||||
# tagged as IPV6_DEFAULTGW and IPV6 NETMASK will be tagged as
|
||||
# IPV6NETMASK.
|
||||
#
|
||||
# The host can specify multiple ipv4 and ipv6 addresses to be
|
||||
# configured for the interface. Furthermore, the configuration
|
||||
# needs to be persistent. A subsequent GET call on the interface
|
||||
# is expected to return the configuration that is set via the SET
|
||||
# call.
|
||||
#
|
||||
|
||||
|
||||
|
||||
echo "IPV6INIT=yes" >> $1
|
||||
echo "NM_CONTROLLED=no" >> $1
|
||||
echo "PEERDNS=yes" >> $1
|
||||
echo "ONBOOT=yes" >> $1
|
||||
|
||||
|
||||
cp $1 /etc/sysconfig/network-scripts/
|
||||
|
||||
|
||||
interface=$(echo $1 | awk -F - '{ print $2 }')
|
||||
|
||||
/sbin/ifdown $interface 2>/dev/null
|
||||
/sbin/ifup $interface 2>/dev/null
|
@ -0,0 +1,280 @@
|
||||
/*
|
||||
* An implementation of the host initiated guest snapshot for Hyper-V.
|
||||
*
|
||||
*
|
||||
* Copyright (C) 2013, Microsoft, Inc.
|
||||
* Author : K. Y. Srinivasan <kys@microsoft.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published
|
||||
* by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
||||
* NON INFRINGEMENT. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/poll.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysmacros.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <mntent.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/hyperv.h>
|
||||
#include <syslog.h>
|
||||
#include <getopt.h>
|
||||
|
||||
/* Don't use syslog() in the function since that can cause write to disk */
|
||||
static int vss_do_freeze(char *dir, unsigned int cmd)
|
||||
{
|
||||
int ret, fd = open(dir, O_RDONLY);
|
||||
|
||||
if (fd < 0)
|
||||
return 1;
|
||||
|
||||
ret = ioctl(fd, cmd, 0);
|
||||
|
||||
/*
|
||||
* If a partition is mounted more than once, only the first
|
||||
* FREEZE/THAW can succeed and the later ones will get
|
||||
* EBUSY/EINVAL respectively: there could be 2 cases:
|
||||
* 1) a user may mount the same partition to differnt directories
|
||||
* by mistake or on purpose;
|
||||
* 2) The subvolume of btrfs appears to have the same partition
|
||||
* mounted more than once.
|
||||
*/
|
||||
if (ret) {
|
||||
if ((cmd == FIFREEZE && errno == EBUSY) ||
|
||||
(cmd == FITHAW && errno == EINVAL)) {
|
||||
close(fd);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
close(fd);
|
||||
return !!ret;
|
||||
}
|
||||
|
||||
static int vss_operate(int operation)
|
||||
{
|
||||
char match[] = "/dev/";
|
||||
FILE *mounts;
|
||||
struct mntent *ent;
|
||||
struct stat sb;
|
||||
char errdir[1024] = {0};
|
||||
unsigned int cmd;
|
||||
int error = 0, root_seen = 0, save_errno = 0;
|
||||
|
||||
switch (operation) {
|
||||
case VSS_OP_FREEZE:
|
||||
cmd = FIFREEZE;
|
||||
break;
|
||||
case VSS_OP_THAW:
|
||||
cmd = FITHAW;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
|
||||
mounts = setmntent("/proc/mounts", "r");
|
||||
if (mounts == NULL)
|
||||
return -1;
|
||||
|
||||
while ((ent = getmntent(mounts))) {
|
||||
if (strncmp(ent->mnt_fsname, match, strlen(match)))
|
||||
continue;
|
||||
if (stat(ent->mnt_fsname, &sb) == -1)
|
||||
continue;
|
||||
if (S_ISBLK(sb.st_mode) && major(sb.st_rdev) == LOOP_MAJOR)
|
||||
continue;
|
||||
if (hasmntopt(ent, MNTOPT_RO) != NULL)
|
||||
continue;
|
||||
if (strcmp(ent->mnt_type, "vfat") == 0)
|
||||
continue;
|
||||
if (strcmp(ent->mnt_dir, "/") == 0) {
|
||||
root_seen = 1;
|
||||
continue;
|
||||
}
|
||||
error |= vss_do_freeze(ent->mnt_dir, cmd);
|
||||
if (error && operation == VSS_OP_FREEZE)
|
||||
goto err;
|
||||
}
|
||||
|
||||
endmntent(mounts);
|
||||
|
||||
if (root_seen) {
|
||||
error |= vss_do_freeze("/", cmd);
|
||||
if (error && operation == VSS_OP_FREEZE)
|
||||
goto err;
|
||||
}
|
||||
|
||||
goto out;
|
||||
err:
|
||||
save_errno = errno;
|
||||
if (ent) {
|
||||
strncpy(errdir, ent->mnt_dir, sizeof(errdir)-1);
|
||||
endmntent(mounts);
|
||||
}
|
||||
vss_operate(VSS_OP_THAW);
|
||||
/* Call syslog after we thaw all filesystems */
|
||||
if (ent)
|
||||
syslog(LOG_ERR, "FREEZE of %s failed; error:%d %s",
|
||||
errdir, save_errno, strerror(save_errno));
|
||||
else
|
||||
syslog(LOG_ERR, "FREEZE of / failed; error:%d %s", save_errno,
|
||||
strerror(save_errno));
|
||||
out:
|
||||
return error;
|
||||
}
|
||||
|
||||
void print_usage(char *argv[])
|
||||
{
|
||||
fprintf(stderr, "Usage: %s [options]\n"
|
||||
"Options are:\n"
|
||||
" -n, --no-daemon stay in foreground, don't daemonize\n"
|
||||
" -h, --help print this help\n", argv[0]);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int vss_fd, len;
|
||||
int error;
|
||||
struct pollfd pfd;
|
||||
int op;
|
||||
struct hv_vss_msg vss_msg[1];
|
||||
int daemonize = 1, long_index = 0, opt;
|
||||
int in_handshake = 1;
|
||||
__u32 kernel_modver;
|
||||
|
||||
static struct option long_options[] = {
|
||||
{"help", no_argument, 0, 'h' },
|
||||
{"no-daemon", no_argument, 0, 'n' },
|
||||
{0, 0, 0, 0 }
|
||||
};
|
||||
|
||||
while ((opt = getopt_long(argc, argv, "hn", long_options,
|
||||
&long_index)) != -1) {
|
||||
switch (opt) {
|
||||
case 'n':
|
||||
daemonize = 0;
|
||||
break;
|
||||
case 'h':
|
||||
default:
|
||||
print_usage(argv);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (daemonize && daemon(1, 0))
|
||||
return 1;
|
||||
|
||||
openlog("Hyper-V VSS", 0, LOG_USER);
|
||||
syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
|
||||
|
||||
vss_fd = open("/dev/vmbus/hv_vss", O_RDWR);
|
||||
if (vss_fd < 0) {
|
||||
syslog(LOG_ERR, "open /dev/vmbus/hv_vss failed; error: %d %s",
|
||||
errno, strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
/*
|
||||
* Register ourselves with the kernel.
|
||||
*/
|
||||
vss_msg->vss_hdr.operation = VSS_OP_REGISTER1;
|
||||
|
||||
len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
||||
if (len < 0) {
|
||||
syslog(LOG_ERR, "registration to kernel failed; error: %d %s",
|
||||
errno, strerror(errno));
|
||||
close(vss_fd);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
pfd.fd = vss_fd;
|
||||
|
||||
while (1) {
|
||||
pfd.events = POLLIN;
|
||||
pfd.revents = 0;
|
||||
|
||||
if (poll(&pfd, 1, -1) < 0) {
|
||||
syslog(LOG_ERR, "poll failed; error:%d %s", errno, strerror(errno));
|
||||
if (errno == EINVAL) {
|
||||
close(vss_fd);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
len = read(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
||||
|
||||
if (in_handshake) {
|
||||
if (len != sizeof(kernel_modver)) {
|
||||
syslog(LOG_ERR, "invalid version negotiation");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
kernel_modver = *(__u32 *)vss_msg;
|
||||
in_handshake = 0;
|
||||
syslog(LOG_INFO, "VSS: kernel module version: %d",
|
||||
kernel_modver);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (len != sizeof(struct hv_vss_msg)) {
|
||||
syslog(LOG_ERR, "read failed; error:%d %s",
|
||||
errno, strerror(errno));
|
||||
close(vss_fd);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
op = vss_msg->vss_hdr.operation;
|
||||
error = HV_S_OK;
|
||||
|
||||
switch (op) {
|
||||
case VSS_OP_FREEZE:
|
||||
case VSS_OP_THAW:
|
||||
error = vss_operate(op);
|
||||
syslog(LOG_INFO, "VSS: op=%s: %s\n",
|
||||
op == VSS_OP_FREEZE ? "FREEZE" : "THAW",
|
||||
error ? "failed" : "succeeded");
|
||||
|
||||
if (error) {
|
||||
error = HV_E_FAIL;
|
||||
syslog(LOG_ERR, "op=%d failed!", op);
|
||||
syslog(LOG_ERR, "report it with these files:");
|
||||
syslog(LOG_ERR, "/etc/fstab and /proc/mounts");
|
||||
}
|
||||
break;
|
||||
case VSS_OP_HOT_BACKUP:
|
||||
syslog(LOG_INFO, "VSS: op=CHECK HOT BACKUP\n");
|
||||
break;
|
||||
default:
|
||||
syslog(LOG_ERR, "Illegal op:%d\n", op);
|
||||
}
|
||||
vss_msg->error = error;
|
||||
len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
||||
if (len != sizeof(struct hv_vss_msg)) {
|
||||
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
||||
strerror(errno));
|
||||
|
||||
if (op == VSS_OP_FREEZE)
|
||||
vss_operate(VSS_OP_THAW);
|
||||
}
|
||||
}
|
||||
|
||||
close(vss_fd);
|
||||
exit(0);
|
||||
}
|
@ -0,0 +1,414 @@
|
||||
From d8ca5e0a429b8f7395e136e713980db6a7ac8dc2 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 15 Apr 2020 12:00:30 +0200
|
||||
Subject: [PATCH 2/2] Add vmbus_testing tool build files
|
||||
|
||||
RH-Author: Mohammed Gamal <mgamal@redhat.com>
|
||||
Message-id: <20200414183955.194006-3-mgamal@redhat.com>
|
||||
Patchwork-id: 94690
|
||||
O-Subject: [RHEL8.3 virt hyperv-daemons PATCH v5 2/2] Add vmbus_testing tool build files
|
||||
Bugzilla: 1816750
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
Add the vmbus_testing tool to redhat build dirs
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
redhat/hyperv-daemons.spec.template | 2 +
|
||||
vmbus_testing | 376 ++++++++++++++++++++++++++++
|
||||
2 files changed, 378 insertions(+)
|
||||
create mode 100755 vmbus_testing
|
||||
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
redhat/hyperv-daemons.spec.template | 2 +
|
||||
vmbus_testing | 376 ++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 378 insertions(+)
|
||||
create mode 100755 vmbus_testing
|
||||
|
||||
diff --git a/vmbus_testing b/vmbus_testing
|
||||
new file mode 100755
|
||||
index 0000000..e721290
|
||||
--- /dev/null
|
||||
+++ b/vmbus_testing
|
||||
@@ -0,0 +1,376 @@
|
||||
+#!/usr/bin/env python3
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+#
|
||||
+# Program to allow users to fuzz test Hyper-V drivers
|
||||
+# by interfacing with Hyper-V debugfs attributes.
|
||||
+# Current test methods available:
|
||||
+# 1. delay testing
|
||||
+#
|
||||
+# Current file/directory structure of hyper-V debugfs:
|
||||
+# /sys/kernel/debug/hyperv/UUID
|
||||
+# /sys/kernel/debug/hyperv/UUID/<test-state filename>
|
||||
+# /sys/kernel/debug/hyperv/UUID/<test-method sub-directory>
|
||||
+#
|
||||
+# author: Branden Bonaby <brandonbonaby94@gmail.com>
|
||||
+
|
||||
+import os
|
||||
+import cmd
|
||||
+import argparse
|
||||
+import glob
|
||||
+from argparse import RawDescriptionHelpFormatter
|
||||
+from argparse import RawTextHelpFormatter
|
||||
+from enum import Enum
|
||||
+
|
||||
+# Do not change unless, you change the debugfs attributes
|
||||
+# in /drivers/hv/debugfs.c. All fuzz testing
|
||||
+# attributes will start with "fuzz_test".
|
||||
+
|
||||
+# debugfs path for hyperv must exist before proceeding
|
||||
+debugfs_hyperv_path = "/sys/kernel/debug/hyperv"
|
||||
+if not os.path.isdir(debugfs_hyperv_path):
|
||||
+ print("{} doesn't exist/check permissions".format(debugfs_hyperv_path))
|
||||
+ exit(-1)
|
||||
+
|
||||
+class dev_state(Enum):
|
||||
+ off = 0
|
||||
+ on = 1
|
||||
+
|
||||
+# File names, that correspond to the files created in
|
||||
+# /drivers/hv/debugfs.c
|
||||
+class f_names(Enum):
|
||||
+ state_f = "fuzz_test_state"
|
||||
+ buff_f = "fuzz_test_buffer_interrupt_delay"
|
||||
+ mess_f = "fuzz_test_message_delay"
|
||||
+
|
||||
+# Both single_actions and all_actions are used
|
||||
+# for error checking and to allow for some subparser
|
||||
+# names to be abbreviated. Do not abbreviate the
|
||||
+# test method names, as it will become less intuitive
|
||||
+# as to what the user can do. If you do decide to
|
||||
+# abbreviate the test method name, make sure the main
|
||||
+# function reflects this change.
|
||||
+
|
||||
+all_actions = [
|
||||
+ "disable_all",
|
||||
+ "D",
|
||||
+ "enable_all",
|
||||
+ "view_all",
|
||||
+ "V"
|
||||
+]
|
||||
+
|
||||
+single_actions = [
|
||||
+ "disable_single",
|
||||
+ "d",
|
||||
+ "enable_single",
|
||||
+ "view_single",
|
||||
+ "v"
|
||||
+]
|
||||
+
|
||||
+def main():
|
||||
+
|
||||
+ file_map = recursive_file_lookup(debugfs_hyperv_path, dict())
|
||||
+ args = parse_args()
|
||||
+ if (not args.action):
|
||||
+ print ("Error, no options selected...exiting")
|
||||
+ exit(-1)
|
||||
+ arg_set = { k for (k,v) in vars(args).items() if v and k != "action" }
|
||||
+ arg_set.add(args.action)
|
||||
+ path = args.path if "path" in arg_set else None
|
||||
+ if (path and path[-1] == "/"):
|
||||
+ path = path[:-1]
|
||||
+ validate_args_path(path, arg_set, file_map)
|
||||
+ if (path and "enable_single" in arg_set):
|
||||
+ state_path = locate_state(path, file_map)
|
||||
+ set_test_state(state_path, dev_state.on.value, args.quiet)
|
||||
+
|
||||
+ # Use subparsers as the key for different actions
|
||||
+ if ("delay" in arg_set):
|
||||
+ validate_delay_values(args.delay_time)
|
||||
+ if (args.enable_all):
|
||||
+ set_delay_all_devices(file_map, args.delay_time,
|
||||
+ args.quiet)
|
||||
+ else:
|
||||
+ set_delay_values(path, file_map, args.delay_time,
|
||||
+ args.quiet)
|
||||
+ elif ("disable_all" in arg_set or "D" in arg_set):
|
||||
+ disable_all_testing(file_map)
|
||||
+ elif ("disable_single" in arg_set or "d" in arg_set):
|
||||
+ disable_testing_single_device(path, file_map)
|
||||
+ elif ("view_all" in arg_set or "V" in arg_set):
|
||||
+ get_all_devices_test_status(file_map)
|
||||
+ elif ("view_single" in arg_set or "v" in arg_set):
|
||||
+ get_device_test_values(path, file_map)
|
||||
+
|
||||
+# Get the state location
|
||||
+def locate_state(device, file_map):
|
||||
+ return file_map[device][f_names.state_f.value]
|
||||
+
|
||||
+# Validate delay values to make sure they are acceptable to
|
||||
+# enable delays on a device
|
||||
+def validate_delay_values(delay):
|
||||
+
|
||||
+ if (delay[0] == -1 and delay[1] == -1):
|
||||
+ print("\nError, At least 1 value must be greater than 0")
|
||||
+ exit(-1)
|
||||
+ for i in delay:
|
||||
+ if (i < -1 or i == 0 or i > 1000):
|
||||
+ print("\nError, Values must be equal to -1 "
|
||||
+ "or be > 0 and <= 1000")
|
||||
+ exit(-1)
|
||||
+
|
||||
+# Validate argument path
|
||||
+def validate_args_path(path, arg_set, file_map):
|
||||
+
|
||||
+ if (not path and any(element in arg_set for element in single_actions)):
|
||||
+ print("Error, path (-p) REQUIRED for the specified option. "
|
||||
+ "Use (-h) to check usage.")
|
||||
+ exit(-1)
|
||||
+ elif (path and any(item in arg_set for item in all_actions)):
|
||||
+ print("Error, path (-p) NOT REQUIRED for the specified option. "
|
||||
+ "Use (-h) to check usage." )
|
||||
+ exit(-1)
|
||||
+ elif (path not in file_map and any(item in arg_set
|
||||
+ for item in single_actions)):
|
||||
+ print("Error, path '{}' not a valid vmbus device".format(path))
|
||||
+ exit(-1)
|
||||
+
|
||||
+# display Testing status of single device
|
||||
+def get_device_test_values(path, file_map):
|
||||
+
|
||||
+ for name in file_map[path]:
|
||||
+ file_location = file_map[path][name]
|
||||
+ print( name + " = " + str(read_test_files(file_location)))
|
||||
+
|
||||
+# Create a map of the vmbus devices and their associated files
|
||||
+# [key=device, value = [key = filename, value = file path]]
|
||||
+def recursive_file_lookup(path, file_map):
|
||||
+
|
||||
+ for f_path in glob.iglob(path + '**/*'):
|
||||
+ if (os.path.isfile(f_path)):
|
||||
+ if (f_path.rsplit("/",2)[0] == debugfs_hyperv_path):
|
||||
+ directory = f_path.rsplit("/",1)[0]
|
||||
+ else:
|
||||
+ directory = f_path.rsplit("/",2)[0]
|
||||
+ f_name = f_path.split("/")[-1]
|
||||
+ if (file_map.get(directory)):
|
||||
+ file_map[directory].update({f_name:f_path})
|
||||
+ else:
|
||||
+ file_map[directory] = {f_name:f_path}
|
||||
+ elif (os.path.isdir(f_path)):
|
||||
+ recursive_file_lookup(f_path,file_map)
|
||||
+ return file_map
|
||||
+
|
||||
+# display Testing state of devices
|
||||
+def get_all_devices_test_status(file_map):
|
||||
+
|
||||
+ for device in file_map:
|
||||
+ if (get_test_state(locate_state(device, file_map)) is 1):
|
||||
+ print("Testing = ON for: {}"
|
||||
+ .format(device.split("/")[5]))
|
||||
+ else:
|
||||
+ print("Testing = OFF for: {}"
|
||||
+ .format(device.split("/")[5]))
|
||||
+
|
||||
+# read the vmbus device files, path must be absolute path before calling
|
||||
+def read_test_files(path):
|
||||
+ try:
|
||||
+ with open(path,"r") as f:
|
||||
+ file_value = f.readline().strip()
|
||||
+ return int(file_value)
|
||||
+
|
||||
+ except IOError as e:
|
||||
+ errno, strerror = e.args
|
||||
+ print("I/O error({0}): {1} on file {2}"
|
||||
+ .format(errno, strerror, path))
|
||||
+ exit(-1)
|
||||
+ except ValueError:
|
||||
+ print ("Element to int conversion error in: \n{}".format(path))
|
||||
+ exit(-1)
|
||||
+
|
||||
+# writing to vmbus device files, path must be absolute path before calling
|
||||
+def write_test_files(path, value):
|
||||
+
|
||||
+ try:
|
||||
+ with open(path,"w") as f:
|
||||
+ f.write("{}".format(value))
|
||||
+ except IOError as e:
|
||||
+ errno, strerror = e.args
|
||||
+ print("I/O error({0}): {1} on file {2}"
|
||||
+ .format(errno, strerror, path))
|
||||
+ exit(-1)
|
||||
+
|
||||
+# set testing state of device
|
||||
+def set_test_state(state_path, state_value, quiet):
|
||||
+
|
||||
+ write_test_files(state_path, state_value)
|
||||
+ if (get_test_state(state_path) is 1):
|
||||
+ if (not quiet):
|
||||
+ print("Testing = ON for device: {}"
|
||||
+ .format(state_path.split("/")[5]))
|
||||
+ else:
|
||||
+ if (not quiet):
|
||||
+ print("Testing = OFF for device: {}"
|
||||
+ .format(state_path.split("/")[5]))
|
||||
+
|
||||
+# get testing state of device
|
||||
+def get_test_state(state_path):
|
||||
+ #state == 1 - test = ON
|
||||
+ #state == 0 - test = OFF
|
||||
+ return read_test_files(state_path)
|
||||
+
|
||||
+# write 1 - 1000 microseconds, into a single device using the
|
||||
+# fuzz_test_buffer_interrupt_delay and fuzz_test_message_delay
|
||||
+# debugfs attributes
|
||||
+def set_delay_values(device, file_map, delay_length, quiet):
|
||||
+
|
||||
+ try:
|
||||
+ interrupt = file_map[device][f_names.buff_f.value]
|
||||
+ message = file_map[device][f_names.mess_f.value]
|
||||
+
|
||||
+ # delay[0]- buffer interrupt delay, delay[1]- message delay
|
||||
+ if (delay_length[0] >= 0 and delay_length[0] <= 1000):
|
||||
+ write_test_files(interrupt, delay_length[0])
|
||||
+ if (delay_length[1] >= 0 and delay_length[1] <= 1000):
|
||||
+ write_test_files(message, delay_length[1])
|
||||
+ if (not quiet):
|
||||
+ print("Buffer delay testing = {} for: {}"
|
||||
+ .format(read_test_files(interrupt),
|
||||
+ interrupt.split("/")[5]))
|
||||
+ print("Message delay testing = {} for: {}"
|
||||
+ .format(read_test_files(message),
|
||||
+ message.split("/")[5]))
|
||||
+ except IOError as e:
|
||||
+ errno, strerror = e.args
|
||||
+ print("I/O error({0}): {1} on files {2}{3}"
|
||||
+ .format(errno, strerror, interrupt, message))
|
||||
+ exit(-1)
|
||||
+
|
||||
+# enabling delay testing on all devices
|
||||
+def set_delay_all_devices(file_map, delay, quiet):
|
||||
+
|
||||
+ for device in (file_map):
|
||||
+ set_test_state(locate_state(device, file_map),
|
||||
+ dev_state.on.value,
|
||||
+ quiet)
|
||||
+ set_delay_values(device, file_map, delay, quiet)
|
||||
+
|
||||
+# disable all testing on a SINGLE device.
|
||||
+def disable_testing_single_device(device, file_map):
|
||||
+
|
||||
+ for name in file_map[device]:
|
||||
+ file_location = file_map[device][name]
|
||||
+ write_test_files(file_location, dev_state.off.value)
|
||||
+ print("ALL testing now OFF for {}".format(device.split("/")[-1]))
|
||||
+
|
||||
+# disable all testing on ALL devices
|
||||
+def disable_all_testing(file_map):
|
||||
+
|
||||
+ for device in file_map:
|
||||
+ disable_testing_single_device(device, file_map)
|
||||
+
|
||||
+def parse_args():
|
||||
+ parser = argparse.ArgumentParser(prog = "vmbus_testing",usage ="\n"
|
||||
+ "%(prog)s [delay] [-h] [-e|-E] -t [-p]\n"
|
||||
+ "%(prog)s [view_all | V] [-h]\n"
|
||||
+ "%(prog)s [disable_all | D] [-h]\n"
|
||||
+ "%(prog)s [disable_single | d] [-h|-p]\n"
|
||||
+ "%(prog)s [view_single | v] [-h|-p]\n"
|
||||
+ "%(prog)s --version\n",
|
||||
+ description = "\nUse lsvmbus to get vmbus device type "
|
||||
+ "information.\n" "\nThe debugfs root path is "
|
||||
+ "/sys/kernel/debug/hyperv",
|
||||
+ formatter_class = RawDescriptionHelpFormatter)
|
||||
+ subparsers = parser.add_subparsers(dest = "action")
|
||||
+ parser.add_argument("--version", action = "version",
|
||||
+ version = '%(prog)s 0.1.0')
|
||||
+ parser.add_argument("-q","--quiet", action = "store_true",
|
||||
+ help = "silence none important test messages."
|
||||
+ " This will only work when enabling testing"
|
||||
+ " on a device.")
|
||||
+ # Use the path parser to hold the --path attribute so it can
|
||||
+ # be shared between subparsers. Also do the same for the state
|
||||
+ # parser, as all testing methods will use --enable_all and
|
||||
+ # enable_single.
|
||||
+ path_parser = argparse.ArgumentParser(add_help=False)
|
||||
+ path_parser.add_argument("-p","--path", metavar = "",
|
||||
+ help = "Debugfs path to a vmbus device. The path "
|
||||
+ "must be the absolute path to the device.")
|
||||
+ state_parser = argparse.ArgumentParser(add_help=False)
|
||||
+ state_group = state_parser.add_mutually_exclusive_group(required = True)
|
||||
+ state_group.add_argument("-E", "--enable_all", action = "store_const",
|
||||
+ const = "enable_all",
|
||||
+ help = "Enable the specified test type "
|
||||
+ "on ALL vmbus devices.")
|
||||
+ state_group.add_argument("-e", "--enable_single",
|
||||
+ action = "store_const",
|
||||
+ const = "enable_single",
|
||||
+ help = "Enable the specified test type on a "
|
||||
+ "SINGLE vmbus device.")
|
||||
+ parser_delay = subparsers.add_parser("delay",
|
||||
+ parents = [state_parser, path_parser],
|
||||
+ help = "Delay the ring buffer interrupt or the "
|
||||
+ "ring buffer message reads in microseconds.",
|
||||
+ prog = "vmbus_testing",
|
||||
+ usage = "%(prog)s [-h]\n"
|
||||
+ "%(prog)s -E -t [value] [value]\n"
|
||||
+ "%(prog)s -e -t [value] [value] -p",
|
||||
+ description = "Delay the ring buffer interrupt for "
|
||||
+ "vmbus devices, or delay the ring buffer message "
|
||||
+ "reads for vmbus devices (both in microseconds). This "
|
||||
+ "is only on the host to guest channel.")
|
||||
+ parser_delay.add_argument("-t", "--delay_time", metavar = "", nargs = 2,
|
||||
+ type = check_range, default =[0,0], required = (True),
|
||||
+ help = "Set [buffer] & [message] delay time. "
|
||||
+ "Value constraints: -1 == value "
|
||||
+ "or 0 < value <= 1000.\n"
|
||||
+ "Use -1 to keep the previous value for that delay "
|
||||
+ "type, or a value > 0 <= 1000 to change the delay "
|
||||
+ "time.")
|
||||
+ parser_dis_all = subparsers.add_parser("disable_all",
|
||||
+ aliases = ['D'], prog = "vmbus_testing",
|
||||
+ usage = "%(prog)s [disable_all | D] -h\n"
|
||||
+ "%(prog)s [disable_all | D]\n",
|
||||
+ help = "Disable ALL testing on ALL vmbus devices.",
|
||||
+ description = "Disable ALL testing on ALL vmbus "
|
||||
+ "devices.")
|
||||
+ parser_dis_single = subparsers.add_parser("disable_single",
|
||||
+ aliases = ['d'],
|
||||
+ parents = [path_parser], prog = "vmbus_testing",
|
||||
+ usage = "%(prog)s [disable_single | d] -h\n"
|
||||
+ "%(prog)s [disable_single | d] -p\n",
|
||||
+ help = "Disable ALL testing on a SINGLE vmbus device.",
|
||||
+ description = "Disable ALL testing on a SINGLE vmbus "
|
||||
+ "device.")
|
||||
+ parser_view_all = subparsers.add_parser("view_all", aliases = ['V'],
|
||||
+ help = "View the test state for ALL vmbus devices.",
|
||||
+ prog = "vmbus_testing",
|
||||
+ usage = "%(prog)s [view_all | V] -h\n"
|
||||
+ "%(prog)s [view_all | V]\n",
|
||||
+ description = "This shows the test state for ALL the "
|
||||
+ "vmbus devices.")
|
||||
+ parser_view_single = subparsers.add_parser("view_single",
|
||||
+ aliases = ['v'],parents = [path_parser],
|
||||
+ help = "View the test values for a SINGLE vmbus "
|
||||
+ "device.",
|
||||
+ description = "This shows the test values for a SINGLE "
|
||||
+ "vmbus device.", prog = "vmbus_testing",
|
||||
+ usage = "%(prog)s [view_single | v] -h\n"
|
||||
+ "%(prog)s [view_single | v] -p")
|
||||
+
|
||||
+ return parser.parse_args()
|
||||
+
|
||||
+# value checking for range checking input in parser
|
||||
+def check_range(arg1):
|
||||
+
|
||||
+ try:
|
||||
+ val = int(arg1)
|
||||
+ except ValueError as err:
|
||||
+ raise argparse.ArgumentTypeError(str(err))
|
||||
+ if val < -1 or val > 1000:
|
||||
+ message = ("\n\nvalue must be -1 or 0 < value <= 1000. "
|
||||
+ "Value program received: {}\n").format(val)
|
||||
+ raise argparse.ArgumentTypeError(message)
|
||||
+ return val
|
||||
+
|
||||
+if __name__ == "__main__":
|
||||
+ main()
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -0,0 +1,685 @@
|
||||
From b0a20fac0e74b0b3eecc20ffe74006e7877da352 Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 15 Apr 2020 12:00:14 +0200
|
||||
Subject: [PATCH 1/2] Update C files and scripts to kernel version 5.7-rc1
|
||||
|
||||
RH-Author: Mohammed Gamal <mgamal@redhat.com>
|
||||
Message-id: <20200414183955.194006-2-mgamal@redhat.com>
|
||||
Patchwork-id: 94689
|
||||
O-Subject: [RHEL8.3 virt hyperv-daemons PATCH v5 1/2] Update C files and scripts to kernel version 5.7-rc1
|
||||
Bugzilla: 1816750
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_fcopy_daemon.c | 38 ++++++++++++--
|
||||
hv_get_dhcp_info.sh | 2 +-
|
||||
hv_kvp_daemon.c | 63 ++++++++++++++---------
|
||||
hv_set_ifconfig.sh | 2 +-
|
||||
hv_vss_daemon.c | 118 ++++++++++++++++++++++++++++++++++++++------
|
||||
lsvmbus | 75 +++++++++++++++-------------
|
||||
6 files changed, 220 insertions(+), 78 deletions(-)
|
||||
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
hv_fcopy_daemon.c | 38 ++++++++++++++---
|
||||
hv_get_dhcp_info.sh | 2 +-
|
||||
hv_kvp_daemon.c | 63 ++++++++++++++++++----------
|
||||
hv_set_ifconfig.sh | 2 +-
|
||||
hv_vss_daemon.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-------
|
||||
lsvmbus | 75 ++++++++++++++++++---------------
|
||||
6 files changed, 220 insertions(+), 78 deletions(-)
|
||||
|
||||
diff --git a/hv_fcopy_daemon.c b/hv_fcopy_daemon.c
|
||||
index d78aed8..f40ddaf 100644
|
||||
--- a/hv_fcopy_daemon.c
|
||||
+++ b/hv_fcopy_daemon.c
|
||||
@@ -89,6 +89,8 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
|
||||
|
||||
error = 0;
|
||||
done:
|
||||
+ if (error)
|
||||
+ target_fname[0] = '\0';
|
||||
return error;
|
||||
}
|
||||
|
||||
@@ -117,15 +119,29 @@ static int hv_copy_data(struct hv_do_fcopy *cpmsg)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Reset target_fname to "" in the two below functions for hibernation: if
|
||||
+ * the fcopy operation is aborted by hibernation, the daemon should remove the
|
||||
+ * partially-copied file; to achieve this, the hv_utils driver always fakes a
|
||||
+ * CANCEL_FCOPY message upon suspend, and later when the VM resumes back,
|
||||
+ * the daemon calls hv_copy_cancel() to remove the file; if a file is copied
|
||||
+ * successfully before suspend, hv_copy_finished() must reset target_fname to
|
||||
+ * avoid that the file can be incorrectly removed upon resume, since the faked
|
||||
+ * CANCEL_FCOPY message is spurious in this case.
|
||||
+ */
|
||||
static int hv_copy_finished(void)
|
||||
{
|
||||
close(target_fd);
|
||||
+ target_fname[0] = '\0';
|
||||
return 0;
|
||||
}
|
||||
static int hv_copy_cancel(void)
|
||||
{
|
||||
close(target_fd);
|
||||
- unlink(target_fname);
|
||||
+ if (strlen(target_fname) > 0) {
|
||||
+ unlink(target_fname);
|
||||
+ target_fname[0] = '\0';
|
||||
+ }
|
||||
return 0;
|
||||
|
||||
}
|
||||
@@ -140,7 +156,7 @@ void print_usage(char *argv[])
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- int fcopy_fd;
|
||||
+ int fcopy_fd = -1;
|
||||
int error;
|
||||
int daemonize = 1, long_index = 0, opt;
|
||||
int version = FCOPY_CURRENT_VERSION;
|
||||
@@ -150,7 +166,7 @@ int main(int argc, char *argv[])
|
||||
struct hv_do_fcopy copy;
|
||||
__u32 kernel_modver;
|
||||
} buffer = { };
|
||||
- int in_handshake = 1;
|
||||
+ int in_handshake;
|
||||
|
||||
static struct option long_options[] = {
|
||||
{"help", no_argument, 0, 'h' },
|
||||
@@ -179,6 +195,12 @@ int main(int argc, char *argv[])
|
||||
openlog("HV_FCOPY", 0, LOG_USER);
|
||||
syslog(LOG_INFO, "starting; pid is:%d", getpid());
|
||||
|
||||
+reopen_fcopy_fd:
|
||||
+ if (fcopy_fd != -1)
|
||||
+ close(fcopy_fd);
|
||||
+ /* Remove any possible partially-copied file on error */
|
||||
+ hv_copy_cancel();
|
||||
+ in_handshake = 1;
|
||||
fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
|
||||
|
||||
if (fcopy_fd < 0) {
|
||||
@@ -205,7 +227,7 @@ int main(int argc, char *argv[])
|
||||
len = pread(fcopy_fd, &buffer, sizeof(buffer), 0);
|
||||
if (len < 0) {
|
||||
syslog(LOG_ERR, "pread failed: %s", strerror(errno));
|
||||
- exit(EXIT_FAILURE);
|
||||
+ goto reopen_fcopy_fd;
|
||||
}
|
||||
|
||||
if (in_handshake) {
|
||||
@@ -234,14 +256,20 @@ int main(int argc, char *argv[])
|
||||
break;
|
||||
|
||||
default:
|
||||
+ error = HV_E_FAIL;
|
||||
syslog(LOG_ERR, "Unknown operation: %d",
|
||||
buffer.hdr.operation);
|
||||
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * pwrite() may return an error due to the faked CANCEL_FCOPY
|
||||
+ * message upon hibernation. Ignore the error by resetting the
|
||||
+ * dev file, i.e. closing and re-opening it.
|
||||
+ */
|
||||
if (pwrite(fcopy_fd, &error, sizeof(int), 0) != sizeof(int)) {
|
||||
syslog(LOG_ERR, "pwrite failed: %s", strerror(errno));
|
||||
- exit(EXIT_FAILURE);
|
||||
+ goto reopen_fcopy_fd;
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/hv_get_dhcp_info.sh b/hv_get_dhcp_info.sh
|
||||
index c38686c..2f2a3c7 100644
|
||||
--- a/hv_get_dhcp_info.sh
|
||||
+++ b/hv_get_dhcp_info.sh
|
||||
@@ -13,7 +13,7 @@
|
||||
# the script prints the string "Disabled" to stdout.
|
||||
#
|
||||
# Each Distro is expected to implement this script in a distro specific
|
||||
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
||||
# this script can be based on the Network Manager APIs for retrieving DHCP
|
||||
# information.
|
||||
|
||||
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||
index dbf6e8b..ee9c1bb 100644
|
||||
--- a/hv_kvp_daemon.c
|
||||
+++ b/hv_kvp_daemon.c
|
||||
@@ -76,7 +76,7 @@ enum {
|
||||
DNS
|
||||
};
|
||||
|
||||
-static int in_hand_shake = 1;
|
||||
+static int in_hand_shake;
|
||||
|
||||
static char *os_name = "";
|
||||
static char *os_major = "";
|
||||
@@ -286,7 +286,7 @@ static int kvp_key_delete(int pool, const __u8 *key, int key_size)
|
||||
* Found a match; just move the remaining
|
||||
* entries up.
|
||||
*/
|
||||
- if (i == num_records) {
|
||||
+ if (i == (num_records - 1)) {
|
||||
kvp_file_info[pool].num_records--;
|
||||
kvp_update_file(pool);
|
||||
return 0;
|
||||
@@ -700,7 +700,7 @@ static void kvp_get_ipconfig_info(char *if_name,
|
||||
|
||||
|
||||
/*
|
||||
- * Gather the DNS state.
|
||||
+ * Gather the DNS state.
|
||||
* Since there is no standard way to get this information
|
||||
* across various distributions of interest; we just invoke
|
||||
* an external script that needs to be ported across distros
|
||||
@@ -809,7 +809,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
|
||||
int sn_offset = 0;
|
||||
int error = 0;
|
||||
char *buffer;
|
||||
- struct hv_kvp_ipaddr_value *ip_buffer;
|
||||
+ struct hv_kvp_ipaddr_value *ip_buffer = NULL;
|
||||
char cidr_mask[5]; /* /xyz */
|
||||
int weight;
|
||||
int i;
|
||||
@@ -1051,7 +1051,7 @@ static int parse_ip_val_buffer(char *in_buf, int *offset,
|
||||
char *start;
|
||||
|
||||
/*
|
||||
- * in_buf has sequence of characters that are seperated by
|
||||
+ * in_buf has sequence of characters that are separated by
|
||||
* the character ';'. The last sequence does not have the
|
||||
* terminating ";" character.
|
||||
*/
|
||||
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
|
||||
FILE *file;
|
||||
char cmd[PATH_MAX];
|
||||
char *mac_addr;
|
||||
+ int str_len;
|
||||
|
||||
/*
|
||||
* Set the configuration for the specified interface with
|
||||
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
|
||||
* invoke the external script to do its magic.
|
||||
*/
|
||||
|
||||
- snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s",
|
||||
- "hv_set_ifconfig", if_file);
|
||||
+ str_len = snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s",
|
||||
+ "hv_set_ifconfig", if_file);
|
||||
+ /*
|
||||
+ * This is a little overcautious, but it's necessary to suppress some
|
||||
+ * false warnings from gcc 8.0.1.
|
||||
+ */
|
||||
+ if (str_len <= 0 || (unsigned int)str_len >= sizeof(cmd)) {
|
||||
+ syslog(LOG_ERR, "Cmd '%s' (len=%d) may be too long",
|
||||
+ cmd, str_len);
|
||||
+ return HV_E_FAIL;
|
||||
+ }
|
||||
+
|
||||
if (system(cmd)) {
|
||||
syslog(LOG_ERR, "Failed to execute cmd '%s'; error: %d %s",
|
||||
cmd, errno, strerror(errno));
|
||||
@@ -1349,7 +1360,7 @@ void print_usage(char *argv[])
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- int kvp_fd, len;
|
||||
+ int kvp_fd = -1, len;
|
||||
int error;
|
||||
struct pollfd pfd;
|
||||
char *p;
|
||||
@@ -1375,6 +1386,8 @@ int main(int argc, char *argv[])
|
||||
daemonize = 0;
|
||||
break;
|
||||
case 'h':
|
||||
+ print_usage(argv);
|
||||
+ exit(0);
|
||||
default:
|
||||
print_usage(argv);
|
||||
exit(EXIT_FAILURE);
|
||||
@@ -1387,14 +1400,6 @@ int main(int argc, char *argv[])
|
||||
openlog("KVP", 0, LOG_USER);
|
||||
syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
|
||||
|
||||
- kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
||||
-
|
||||
- if (kvp_fd < 0) {
|
||||
- syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
||||
- errno, strerror(errno));
|
||||
- exit(EXIT_FAILURE);
|
||||
- }
|
||||
-
|
||||
/*
|
||||
* Retrieve OS release information.
|
||||
*/
|
||||
@@ -1410,6 +1415,18 @@ int main(int argc, char *argv[])
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
+reopen_kvp_fd:
|
||||
+ if (kvp_fd != -1)
|
||||
+ close(kvp_fd);
|
||||
+ in_hand_shake = 1;
|
||||
+ kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR | O_CLOEXEC);
|
||||
+
|
||||
+ if (kvp_fd < 0) {
|
||||
+ syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
|
||||
+ errno, strerror(errno));
|
||||
+ exit(EXIT_FAILURE);
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Register ourselves with the kernel.
|
||||
*/
|
||||
@@ -1443,9 +1460,7 @@ int main(int argc, char *argv[])
|
||||
if (len != sizeof(struct hv_kvp_msg)) {
|
||||
syslog(LOG_ERR, "read failed; error:%d %s",
|
||||
errno, strerror(errno));
|
||||
-
|
||||
- close(kvp_fd);
|
||||
- return EXIT_FAILURE;
|
||||
+ goto reopen_kvp_fd;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1479,7 +1494,7 @@ int main(int argc, char *argv[])
|
||||
case KVP_OP_GET_IP_INFO:
|
||||
kvp_ip_val = &hv_msg->body.kvp_ip_val;
|
||||
|
||||
- error = kvp_mac_to_ip(kvp_ip_val);
|
||||
+ error = kvp_mac_to_ip(kvp_ip_val);
|
||||
|
||||
if (error)
|
||||
hv_msg->error = error;
|
||||
@@ -1604,13 +1619,17 @@ int main(int argc, char *argv[])
|
||||
break;
|
||||
}
|
||||
|
||||
- /* Send the value back to the kernel. */
|
||||
+ /*
|
||||
+ * Send the value back to the kernel. Note: the write() may
|
||||
+ * return an error due to hibernation; we can ignore the error
|
||||
+ * by resetting the dev file, i.e. closing and re-opening it.
|
||||
+ */
|
||||
kvp_done:
|
||||
len = write(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
|
||||
if (len != sizeof(struct hv_kvp_msg)) {
|
||||
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
||||
strerror(errno));
|
||||
- exit(EXIT_FAILURE);
|
||||
+ goto reopen_kvp_fd;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
|
||||
index 18b27cc..3dd064c 100644
|
||||
--- a/hv_set_ifconfig.sh
|
||||
+++ b/hv_set_ifconfig.sh
|
||||
@@ -12,7 +12,7 @@
|
||||
# be used to configure the interface.
|
||||
#
|
||||
# Each Distro is expected to implement this script in a distro specific
|
||||
-# fashion. For instance on Distros that ship with Network Manager enabled,
|
||||
+# fashion. For instance, on Distros that ship with Network Manager enabled,
|
||||
# this script can be based on the Network Manager APIs for configuring the
|
||||
# interface.
|
||||
#
|
||||
diff --git a/hv_vss_daemon.c b/hv_vss_daemon.c
|
||||
index 34031a2..8fe0a5c 100644
|
||||
--- a/hv_vss_daemon.c
|
||||
+++ b/hv_vss_daemon.c
|
||||
@@ -36,6 +36,10 @@
|
||||
#include <linux/hyperv.h>
|
||||
#include <syslog.h>
|
||||
#include <getopt.h>
|
||||
+#include <stdbool.h>
|
||||
+#include <dirent.h>
|
||||
+
|
||||
+static bool fs_frozen;
|
||||
|
||||
/* Don't use syslog() in the function since that can cause write to disk */
|
||||
static int vss_do_freeze(char *dir, unsigned int cmd)
|
||||
@@ -51,7 +55,7 @@ static int vss_do_freeze(char *dir, unsigned int cmd)
|
||||
* If a partition is mounted more than once, only the first
|
||||
* FREEZE/THAW can succeed and the later ones will get
|
||||
* EBUSY/EINVAL respectively: there could be 2 cases:
|
||||
- * 1) a user may mount the same partition to differnt directories
|
||||
+ * 1) a user may mount the same partition to different directories
|
||||
* by mistake or on purpose;
|
||||
* 2) The subvolume of btrfs appears to have the same partition
|
||||
* mounted more than once.
|
||||
@@ -68,6 +72,55 @@ static int vss_do_freeze(char *dir, unsigned int cmd)
|
||||
return !!ret;
|
||||
}
|
||||
|
||||
+static bool is_dev_loop(const char *blkname)
|
||||
+{
|
||||
+ char *buffer;
|
||||
+ DIR *dir;
|
||||
+ struct dirent *entry;
|
||||
+ bool ret = false;
|
||||
+
|
||||
+ buffer = malloc(PATH_MAX);
|
||||
+ if (!buffer) {
|
||||
+ syslog(LOG_ERR, "Can't allocate memory!");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ snprintf(buffer, PATH_MAX, "%s/loop", blkname);
|
||||
+ if (!access(buffer, R_OK | X_OK)) {
|
||||
+ ret = true;
|
||||
+ goto free_buffer;
|
||||
+ } else if (errno != ENOENT) {
|
||||
+ syslog(LOG_ERR, "Can't access: %s; error:%d %s!",
|
||||
+ buffer, errno, strerror(errno));
|
||||
+ }
|
||||
+
|
||||
+ snprintf(buffer, PATH_MAX, "%s/slaves", blkname);
|
||||
+ dir = opendir(buffer);
|
||||
+ if (!dir) {
|
||||
+ if (errno != ENOENT)
|
||||
+ syslog(LOG_ERR, "Can't opendir: %s; error:%d %s!",
|
||||
+ buffer, errno, strerror(errno));
|
||||
+ goto free_buffer;
|
||||
+ }
|
||||
+
|
||||
+ while ((entry = readdir(dir)) != NULL) {
|
||||
+ if (strcmp(entry->d_name, ".") == 0 ||
|
||||
+ strcmp(entry->d_name, "..") == 0)
|
||||
+ continue;
|
||||
+
|
||||
+ snprintf(buffer, PATH_MAX, "%s/slaves/%s", blkname,
|
||||
+ entry->d_name);
|
||||
+ if (is_dev_loop(buffer)) {
|
||||
+ ret = true;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ closedir(dir);
|
||||
+free_buffer:
|
||||
+ free(buffer);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static int vss_operate(int operation)
|
||||
{
|
||||
char match[] = "/dev/";
|
||||
@@ -75,6 +128,7 @@ static int vss_operate(int operation)
|
||||
struct mntent *ent;
|
||||
struct stat sb;
|
||||
char errdir[1024] = {0};
|
||||
+ char blkdir[23]; /* /sys/dev/block/XXX:XXX */
|
||||
unsigned int cmd;
|
||||
int error = 0, root_seen = 0, save_errno = 0;
|
||||
|
||||
@@ -96,10 +150,15 @@ static int vss_operate(int operation)
|
||||
while ((ent = getmntent(mounts))) {
|
||||
if (strncmp(ent->mnt_fsname, match, strlen(match)))
|
||||
continue;
|
||||
- if (stat(ent->mnt_fsname, &sb) == -1)
|
||||
- continue;
|
||||
- if (S_ISBLK(sb.st_mode) && major(sb.st_rdev) == LOOP_MAJOR)
|
||||
- continue;
|
||||
+ if (stat(ent->mnt_fsname, &sb)) {
|
||||
+ syslog(LOG_ERR, "Can't stat: %s; error:%d %s!",
|
||||
+ ent->mnt_fsname, errno, strerror(errno));
|
||||
+ } else {
|
||||
+ sprintf(blkdir, "/sys/dev/block/%d:%d",
|
||||
+ major(sb.st_rdev), minor(sb.st_rdev));
|
||||
+ if (is_dev_loop(blkdir))
|
||||
+ continue;
|
||||
+ }
|
||||
if (hasmntopt(ent, MNTOPT_RO) != NULL)
|
||||
continue;
|
||||
if (strcmp(ent->mnt_type, "vfat") == 0)
|
||||
@@ -109,18 +168,27 @@ static int vss_operate(int operation)
|
||||
continue;
|
||||
}
|
||||
error |= vss_do_freeze(ent->mnt_dir, cmd);
|
||||
- if (error && operation == VSS_OP_FREEZE)
|
||||
- goto err;
|
||||
+ if (operation == VSS_OP_FREEZE) {
|
||||
+ if (error)
|
||||
+ goto err;
|
||||
+ fs_frozen = true;
|
||||
+ }
|
||||
}
|
||||
|
||||
endmntent(mounts);
|
||||
|
||||
if (root_seen) {
|
||||
error |= vss_do_freeze("/", cmd);
|
||||
- if (error && operation == VSS_OP_FREEZE)
|
||||
- goto err;
|
||||
+ if (operation == VSS_OP_FREEZE) {
|
||||
+ if (error)
|
||||
+ goto err;
|
||||
+ fs_frozen = true;
|
||||
+ }
|
||||
}
|
||||
|
||||
+ if (operation == VSS_OP_THAW && !error)
|
||||
+ fs_frozen = false;
|
||||
+
|
||||
goto out;
|
||||
err:
|
||||
save_errno = errno;
|
||||
@@ -129,6 +197,7 @@ err:
|
||||
endmntent(mounts);
|
||||
}
|
||||
vss_operate(VSS_OP_THAW);
|
||||
+ fs_frozen = false;
|
||||
/* Call syslog after we thaw all filesystems */
|
||||
if (ent)
|
||||
syslog(LOG_ERR, "FREEZE of %s failed; error:%d %s",
|
||||
@@ -150,13 +219,13 @@ void print_usage(char *argv[])
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- int vss_fd, len;
|
||||
+ int vss_fd = -1, len;
|
||||
int error;
|
||||
struct pollfd pfd;
|
||||
int op;
|
||||
struct hv_vss_msg vss_msg[1];
|
||||
int daemonize = 1, long_index = 0, opt;
|
||||
- int in_handshake = 1;
|
||||
+ int in_handshake;
|
||||
__u32 kernel_modver;
|
||||
|
||||
static struct option long_options[] = {
|
||||
@@ -172,6 +241,8 @@ int main(int argc, char *argv[])
|
||||
daemonize = 0;
|
||||
break;
|
||||
case 'h':
|
||||
+ print_usage(argv);
|
||||
+ exit(0);
|
||||
default:
|
||||
print_usage(argv);
|
||||
exit(EXIT_FAILURE);
|
||||
@@ -184,6 +255,18 @@ int main(int argc, char *argv[])
|
||||
openlog("Hyper-V VSS", 0, LOG_USER);
|
||||
syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
|
||||
|
||||
+reopen_vss_fd:
|
||||
+ if (vss_fd != -1)
|
||||
+ close(vss_fd);
|
||||
+ if (fs_frozen) {
|
||||
+ if (vss_operate(VSS_OP_THAW) || fs_frozen) {
|
||||
+ syslog(LOG_ERR, "failed to thaw file system: err=%d",
|
||||
+ errno);
|
||||
+ exit(EXIT_FAILURE);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ in_handshake = 1;
|
||||
vss_fd = open("/dev/vmbus/hv_vss", O_RDWR);
|
||||
if (vss_fd < 0) {
|
||||
syslog(LOG_ERR, "open /dev/vmbus/hv_vss failed; error: %d %s",
|
||||
@@ -236,8 +319,7 @@ int main(int argc, char *argv[])
|
||||
if (len != sizeof(struct hv_vss_msg)) {
|
||||
syslog(LOG_ERR, "read failed; error:%d %s",
|
||||
errno, strerror(errno));
|
||||
- close(vss_fd);
|
||||
- return EXIT_FAILURE;
|
||||
+ goto reopen_vss_fd;
|
||||
}
|
||||
|
||||
op = vss_msg->vss_hdr.operation;
|
||||
@@ -264,14 +346,18 @@ int main(int argc, char *argv[])
|
||||
default:
|
||||
syslog(LOG_ERR, "Illegal op:%d\n", op);
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * The write() may return an error due to the faked VSS_OP_THAW
|
||||
+ * message upon hibernation. Ignore the error by resetting the
|
||||
+ * dev file, i.e. closing and re-opening it.
|
||||
+ */
|
||||
vss_msg->error = error;
|
||||
len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
|
||||
if (len != sizeof(struct hv_vss_msg)) {
|
||||
syslog(LOG_ERR, "write failed; error: %d %s", errno,
|
||||
strerror(errno));
|
||||
-
|
||||
- if (op == VSS_OP_FREEZE)
|
||||
- vss_operate(VSS_OP_THAW);
|
||||
+ goto reopen_vss_fd;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/lsvmbus b/lsvmbus
|
||||
index 55e7374..099f2c4 100644
|
||||
--- a/lsvmbus
|
||||
+++ b/lsvmbus
|
||||
@@ -4,10 +4,10 @@
|
||||
import os
|
||||
from optparse import OptionParser
|
||||
|
||||
+help_msg = "print verbose messages. Try -vv, -vvv for more verbose messages"
|
||||
parser = OptionParser()
|
||||
-parser.add_option("-v", "--verbose", dest="verbose",
|
||||
- help="print verbose messages. Try -vv, -vvv for \
|
||||
- more verbose messages", action="count")
|
||||
+parser.add_option(
|
||||
+ "-v", "--verbose", dest="verbose", help=help_msg, action="count")
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
@@ -21,27 +21,28 @@ if not os.path.isdir(vmbus_sys_path):
|
||||
exit(-1)
|
||||
|
||||
vmbus_dev_dict = {
|
||||
- '{0e0b6031-5213-4934-818b-38d90ced39db}' : '[Operating system shutdown]',
|
||||
- '{9527e630-d0ae-497b-adce-e80ab0175caf}' : '[Time Synchronization]',
|
||||
- '{57164f39-9115-4e78-ab55-382f3bd5422d}' : '[Heartbeat]',
|
||||
- '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}' : '[Data Exchange]',
|
||||
- '{35fa2e29-ea23-4236-96ae-3a6ebacba440}' : '[Backup (volume checkpoint)]',
|
||||
- '{34d14be3-dee4-41c8-9ae7-6b174977c192}' : '[Guest services]',
|
||||
- '{525074dc-8985-46e2-8057-a307dc18a502}' : '[Dynamic Memory]',
|
||||
- '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}' : 'Synthetic mouse',
|
||||
- '{f912ad6d-2b17-48ea-bd65-f927a61c7684}' : 'Synthetic keyboard',
|
||||
- '{da0a7802-e377-4aac-8e77-0558eb1073f8}' : 'Synthetic framebuffer adapter',
|
||||
- '{f8615163-df3e-46c5-913f-f2d2f965ed0e}' : 'Synthetic network adapter',
|
||||
- '{32412632-86cb-44a2-9b5c-50d1417354f5}' : 'Synthetic IDE Controller',
|
||||
- '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}' : 'Synthetic SCSI Controller',
|
||||
- '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}' : 'Synthetic fiber channel adapter',
|
||||
- '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}' : 'Synthetic RDMA adapter',
|
||||
- '{44c4f61d-4444-4400-9d52-802e27ede19f}' : 'PCI Express pass-through',
|
||||
- '{276aacf4-ac15-426c-98dd-7521ad3f01fe}' : '[Reserved system device]',
|
||||
- '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}' : '[Reserved system device]',
|
||||
- '{3375baf4-9e15-4b30-b765-67acb10d607b}' : '[Reserved system device]',
|
||||
+ '{0e0b6031-5213-4934-818b-38d90ced39db}': '[Operating system shutdown]',
|
||||
+ '{9527e630-d0ae-497b-adce-e80ab0175caf}': '[Time Synchronization]',
|
||||
+ '{57164f39-9115-4e78-ab55-382f3bd5422d}': '[Heartbeat]',
|
||||
+ '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}': '[Data Exchange]',
|
||||
+ '{35fa2e29-ea23-4236-96ae-3a6ebacba440}': '[Backup (volume checkpoint)]',
|
||||
+ '{34d14be3-dee4-41c8-9ae7-6b174977c192}': '[Guest services]',
|
||||
+ '{525074dc-8985-46e2-8057-a307dc18a502}': '[Dynamic Memory]',
|
||||
+ '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}': 'Synthetic mouse',
|
||||
+ '{f912ad6d-2b17-48ea-bd65-f927a61c7684}': 'Synthetic keyboard',
|
||||
+ '{da0a7802-e377-4aac-8e77-0558eb1073f8}': 'Synthetic framebuffer adapter',
|
||||
+ '{f8615163-df3e-46c5-913f-f2d2f965ed0e}': 'Synthetic network adapter',
|
||||
+ '{32412632-86cb-44a2-9b5c-50d1417354f5}': 'Synthetic IDE Controller',
|
||||
+ '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}': 'Synthetic SCSI Controller',
|
||||
+ '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}': 'Synthetic fiber channel adapter',
|
||||
+ '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}': 'Synthetic RDMA adapter',
|
||||
+ '{44c4f61d-4444-4400-9d52-802e27ede19f}': 'PCI Express pass-through',
|
||||
+ '{276aacf4-ac15-426c-98dd-7521ad3f01fe}': '[Reserved system device]',
|
||||
+ '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}': '[Reserved system device]',
|
||||
+ '{3375baf4-9e15-4b30-b765-67acb10d607b}': '[Reserved system device]',
|
||||
}
|
||||
|
||||
+
|
||||
def get_vmbus_dev_attr(dev_name, attr):
|
||||
try:
|
||||
f = open('%s/%s/%s' % (vmbus_sys_path, dev_name, attr), 'r')
|
||||
@@ -52,6 +53,7 @@ def get_vmbus_dev_attr(dev_name, attr):
|
||||
|
||||
return lines
|
||||
|
||||
+
|
||||
class VMBus_Dev:
|
||||
pass
|
||||
|
||||
@@ -66,12 +68,13 @@ for f in os.listdir(vmbus_sys_path):
|
||||
|
||||
chn_vp_mapping = get_vmbus_dev_attr(f, 'channel_vp_mapping')
|
||||
chn_vp_mapping = [c.strip() for c in chn_vp_mapping]
|
||||
- chn_vp_mapping = sorted(chn_vp_mapping,
|
||||
- key = lambda c : int(c.split(':')[0]))
|
||||
+ chn_vp_mapping = sorted(
|
||||
+ chn_vp_mapping, key=lambda c: int(c.split(':')[0]))
|
||||
|
||||
- chn_vp_mapping = ['\tRel_ID=%s, target_cpu=%s' %
|
||||
- (c.split(':')[0], c.split(':')[1])
|
||||
- for c in chn_vp_mapping]
|
||||
+ chn_vp_mapping = [
|
||||
+ '\tRel_ID=%s, target_cpu=%s' %
|
||||
+ (c.split(':')[0], c.split(':')[1]) for c in chn_vp_mapping
|
||||
+ ]
|
||||
d = VMBus_Dev()
|
||||
d.sysfs_path = '%s/%s' % (vmbus_sys_path, f)
|
||||
d.vmbus_id = vmbus_id
|
||||
@@ -85,7 +88,7 @@ for f in os.listdir(vmbus_sys_path):
|
||||
vmbus_dev_list.append(d)
|
||||
|
||||
|
||||
-vmbus_dev_list = sorted(vmbus_dev_list, key = lambda d : int(d.vmbus_id))
|
||||
+vmbus_dev_list = sorted(vmbus_dev_list, key=lambda d: int(d.vmbus_id))
|
||||
|
||||
format0 = '%2s: %s'
|
||||
format1 = '%2s: Class_ID = %s - %s\n%s'
|
||||
@@ -95,9 +98,15 @@ for d in vmbus_dev_list:
|
||||
if verbose == 0:
|
||||
print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
|
||||
elif verbose == 1:
|
||||
- print (('VMBUS ID ' + format1) % \
|
||||
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
|
||||
+ print(
|
||||
+ ('VMBUS ID ' + format1) %
|
||||
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
||||
+ )
|
||||
else:
|
||||
- print (('VMBUS ID ' + format2) % \
|
||||
- (d.vmbus_id, d.class_id, d.dev_desc, \
|
||||
- d.device_id, d.sysfs_path, d.chn_vp_mapping))
|
||||
+ print(
|
||||
+ ('VMBUS ID ' + format2) %
|
||||
+ (
|
||||
+ d.vmbus_id, d.class_id, d.dev_desc,
|
||||
+ d.device_id, d.sysfs_path, d.chn_vp_mapping
|
||||
+ )
|
||||
+ )
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -0,0 +1,59 @@
|
||||
From e956573e4fd5e489fd68a7d46f0aa715ee19084e Mon Sep 17 00:00:00 2001
|
||||
From: Mohammed Gamal <mgamal@redhat.com>
|
||||
Date: Wed, 25 Nov 2020 15:23:29 +0100
|
||||
Subject: [PATCH] tools: hv: change http to https in hv_kvp_daemon.c
|
||||
|
||||
RH-Author: Mohammed Gamal Morsy (mmorsy)
|
||||
RH-MergeRequest: 1: RHEL 8.4.0 updates
|
||||
RH-Commit: [1/1] b7202f11 (mmorsy/hyperv-daemons)
|
||||
RH-Bugzilla: 1886104
|
||||
|
||||
The patch has no functional change. Only changes the URL pointed to
|
||||
in one of the comments
|
||||
|
||||
commit fa52a4b2d0ab416508538bb47a95167d4c94caac
|
||||
Author: Alexander A. Klimov <grandmaster@al2klimov.de>
|
||||
Date: Sun Jul 5 23:44:57 2020 +0200
|
||||
|
||||
tools: hv: change http to https in hv_kvp_daemon.c
|
||||
|
||||
Rationale:
|
||||
Reduces attack surface on kernel devs opening the links for MITM
|
||||
as HTTPS traffic is much harder to manipulate.
|
||||
|
||||
Deterministic algorithm:
|
||||
For each file:
|
||||
If not .svg:
|
||||
For each line:
|
||||
If doesn't contain `\bxmlns\b`:
|
||||
For each link, `\bhttp://[^# \t\r\n]*(?:\w|/)`:
|
||||
If both the HTTP and HTTPS versions
|
||||
return 200 OK and serve the same content:
|
||||
Replace HTTP with HTTPS.
|
||||
|
||||
Signed-off-by: Alexander A. Klimov <grandmaster@al2klimov.de>
|
||||
Link: https://lore.kernel.org/r/20200705214457.28433-1-grandmaster@al2klimov.de
|
||||
[ wei: change subject line to be more specific ]
|
||||
Signed-off-by: Wei Liu <wei.liu@kernel.org>
|
||||
|
||||
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
---
|
||||
hv_kvp_daemon.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c
|
||||
index ee9c1bb..1e6fd6c 100644
|
||||
--- a/hv_kvp_daemon.c
|
||||
+++ b/hv_kvp_daemon.c
|
||||
@@ -437,7 +437,7 @@ void kvp_get_os_info(void)
|
||||
|
||||
/*
|
||||
* Parse the /etc/os-release file if present:
|
||||
- * http://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
+ * https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
*/
|
||||
file = fopen("/etc/os-release", "r");
|
||||
if (file != NULL) {
|
||||
--
|
||||
2.18.4
|
||||
|
@ -0,0 +1 @@
|
||||
SUBSYSTEM=="misc", KERNEL=="vmbus/hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hypervfcopyd.service"
|
@ -0,0 +1,6 @@
|
||||
[Unit]
|
||||
Description=Hyper-V FCOPY daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/hypervfcopyd -n
|
@ -0,0 +1 @@
|
||||
SUBSYSTEM=="misc", KERNEL=="vmbus/hv_kvp", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hypervkvpd.service"
|
@ -0,0 +1,8 @@
|
||||
[Unit]
|
||||
Description=Hyper-V KVP daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/sbin/hypervkvpd -n
|
@ -0,0 +1 @@
|
||||
SUBSYSTEM=="misc", KERNEL=="vmbus/hv_vss", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hypervvssd.service"
|
@ -0,0 +1,6 @@
|
||||
[Unit]
|
||||
Description=Hyper-V VSS daemon
|
||||
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/hypervvssd -n
|
@ -0,0 +1,103 @@
|
||||
#!/usr/bin/env python
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
import os
|
||||
from optparse import OptionParser
|
||||
|
||||
parser = OptionParser()
|
||||
parser.add_option("-v", "--verbose", dest="verbose",
|
||||
help="print verbose messages. Try -vv, -vvv for \
|
||||
more verbose messages", action="count")
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
verbose = 0
|
||||
if options.verbose is not None:
|
||||
verbose = options.verbose
|
||||
|
||||
vmbus_sys_path = '/sys/bus/vmbus/devices'
|
||||
if not os.path.isdir(vmbus_sys_path):
|
||||
print "%s doesn't exist: exiting..." % vmbus_sys_path
|
||||
exit(-1)
|
||||
|
||||
vmbus_dev_dict = {
|
||||
'{0e0b6031-5213-4934-818b-38d90ced39db}' : '[Operating system shutdown]',
|
||||
'{9527e630-d0ae-497b-adce-e80ab0175caf}' : '[Time Synchronization]',
|
||||
'{57164f39-9115-4e78-ab55-382f3bd5422d}' : '[Heartbeat]',
|
||||
'{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}' : '[Data Exchange]',
|
||||
'{35fa2e29-ea23-4236-96ae-3a6ebacba440}' : '[Backup (volume checkpoint)]',
|
||||
'{34d14be3-dee4-41c8-9ae7-6b174977c192}' : '[Guest services]',
|
||||
'{525074dc-8985-46e2-8057-a307dc18a502}' : '[Dynamic Memory]',
|
||||
'{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}' : 'Synthetic mouse',
|
||||
'{f912ad6d-2b17-48ea-bd65-f927a61c7684}' : 'Synthetic keyboard',
|
||||
'{da0a7802-e377-4aac-8e77-0558eb1073f8}' : 'Synthetic framebuffer adapter',
|
||||
'{f8615163-df3e-46c5-913f-f2d2f965ed0e}' : 'Synthetic network adapter',
|
||||
'{32412632-86cb-44a2-9b5c-50d1417354f5}' : 'Synthetic IDE Controller',
|
||||
'{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}' : 'Synthetic SCSI Controller',
|
||||
'{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}' : 'Synthetic fiber channel adapter',
|
||||
'{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}' : 'Synthetic RDMA adapter',
|
||||
'{44c4f61d-4444-4400-9d52-802e27ede19f}' : 'PCI Express pass-through',
|
||||
'{276aacf4-ac15-426c-98dd-7521ad3f01fe}' : '[Reserved system device]',
|
||||
'{f8e65716-3cb3-4a06-9a60-1889c5cccab5}' : '[Reserved system device]',
|
||||
'{3375baf4-9e15-4b30-b765-67acb10d607b}' : '[Reserved system device]',
|
||||
}
|
||||
|
||||
def get_vmbus_dev_attr(dev_name, attr):
|
||||
try:
|
||||
f = open('%s/%s/%s' % (vmbus_sys_path, dev_name, attr), 'r')
|
||||
lines = f.readlines()
|
||||
f.close()
|
||||
except IOError:
|
||||
lines = []
|
||||
|
||||
return lines
|
||||
|
||||
class VMBus_Dev:
|
||||
pass
|
||||
|
||||
|
||||
vmbus_dev_list = []
|
||||
|
||||
for f in os.listdir(vmbus_sys_path):
|
||||
vmbus_id = get_vmbus_dev_attr(f, 'id')[0].strip()
|
||||
class_id = get_vmbus_dev_attr(f, 'class_id')[0].strip()
|
||||
device_id = get_vmbus_dev_attr(f, 'device_id')[0].strip()
|
||||
dev_desc = vmbus_dev_dict.get(class_id, 'Unknown')
|
||||
|
||||
chn_vp_mapping = get_vmbus_dev_attr(f, 'channel_vp_mapping')
|
||||
chn_vp_mapping = [c.strip() for c in chn_vp_mapping]
|
||||
chn_vp_mapping = sorted(chn_vp_mapping,
|
||||
key = lambda c : int(c.split(':')[0]))
|
||||
|
||||
chn_vp_mapping = ['\tRel_ID=%s, target_cpu=%s' %
|
||||
(c.split(':')[0], c.split(':')[1])
|
||||
for c in chn_vp_mapping]
|
||||
d = VMBus_Dev()
|
||||
d.sysfs_path = '%s/%s' % (vmbus_sys_path, f)
|
||||
d.vmbus_id = vmbus_id
|
||||
d.class_id = class_id
|
||||
d.device_id = device_id
|
||||
d.dev_desc = dev_desc
|
||||
d.chn_vp_mapping = '\n'.join(chn_vp_mapping)
|
||||
if d.chn_vp_mapping:
|
||||
d.chn_vp_mapping += '\n'
|
||||
|
||||
vmbus_dev_list.append(d)
|
||||
|
||||
|
||||
vmbus_dev_list = sorted(vmbus_dev_list, key = lambda d : int(d.vmbus_id))
|
||||
|
||||
format0 = '%2s: %s'
|
||||
format1 = '%2s: Class_ID = %s - %s\n%s'
|
||||
format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID = %s\n\tSysfs path: %s\n%s'
|
||||
|
||||
for d in vmbus_dev_list:
|
||||
if verbose == 0:
|
||||
print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
|
||||
elif verbose == 1:
|
||||
print ('VMBUS ID ' + format1) % \
|
||||
(d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
||||
else:
|
||||
print ('VMBUS ID ' + format2) % \
|
||||
(d.vmbus_id, d.class_id, d.dev_desc, \
|
||||
d.device_id, d.sysfs_path, d.chn_vp_mapping)
|
@ -0,0 +1,447 @@
|
||||
# Hyper-V KVP daemon binary name
|
||||
%global hv_kvp_daemon hypervkvpd
|
||||
# Hyper-V VSS daemon binary name
|
||||
%global hv_vss_daemon hypervvssd
|
||||
# Hyper-V FCOPY daemon binary name
|
||||
%global hv_fcopy_daemon hypervfcopyd
|
||||
# snapshot version
|
||||
%global snapver .20180415git
|
||||
# use hardened build
|
||||
%global _hardened_build 1
|
||||
# udev rules prefix
|
||||
%global udev_prefix 70
|
||||
|
||||
Name: hyperv-daemons
|
||||
Version: 0
|
||||
Release: 0.34%{?snapver}%{?dist}
|
||||
Summary: Hyper-V daemons suite
|
||||
|
||||
Group: System Environment/Daemons
|
||||
License: GPLv2
|
||||
URL: http://www.kernel.org
|
||||
|
||||
# Source files obtained from kernel upstream 4.17-rc1 (60cc43fc888428bb2f18f08997432d426a243338)
|
||||
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
|
||||
Source0: COPYING
|
||||
|
||||
# HYPERV KVP DAEMON
|
||||
Source1: hv_kvp_daemon.c
|
||||
Source2: hv_get_dhcp_info.sh
|
||||
Source3: hv_get_dns_info.sh
|
||||
Source4: hv_set_ifconfig.sh
|
||||
Source5: hypervkvpd.service
|
||||
Source6: hypervkvp.rules
|
||||
|
||||
# HYPERV VSS DAEMON
|
||||
Source100: hv_vss_daemon.c
|
||||
Source101: hypervvssd.service
|
||||
Source102: hypervvss.rules
|
||||
|
||||
# HYPERV FCOPY DAEMON
|
||||
Source200: hv_fcopy_daemon.c
|
||||
Source201: hypervfcopyd.service
|
||||
Source202: hypervfcopy.rules
|
||||
|
||||
# HYPERV TOOLS
|
||||
Source301: lsvmbus
|
||||
|
||||
# Make lsvmbus Python3 compatible
|
||||
Patch0: 0001-tools-hv-update-lsvmbus-to-be-compatible-with-python.patch
|
||||
|
||||
# Do not set NM_CONTROLED=no
|
||||
Patch1: 0002-hv_set_ifconfig_nm_enable.patch
|
||||
# For bz#1769920 - [Hyper-V][RHEL8] Running 'systemctl isolate' on any target stops hyperv-daemon services
|
||||
Patch2: hpvd-Set-IgnoreOnIsolate-1-in-systemd-units.patch
|
||||
# For bz#1816750 - [Hyper-V][RHEL8.3] Update Hyper-V tools
|
||||
Patch3: hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch
|
||||
# For bz#1816750 - [Hyper-V][RHEL8.3] Update Hyper-V tools
|
||||
Patch4: hvd-Add-vmbus_testing-tool-build-files.patch
|
||||
# For bz#1886104 - [Hyper-V][RHEL8.4] Update Hyper-V-Daemons
|
||||
Patch5: hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
|
||||
# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8
|
||||
Patch6: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
|
||||
# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8
|
||||
Patch7: hpvd-Use-filename-for-connection-profile.patch
|
||||
# For bz#2115761 - [Hyper-V][RHEL-8] hypervkvpd.service service ordering
|
||||
Patch8: hpvd-hypervkvpd.service-ordering-fixes.patch
|
||||
# For bz#2115761 - [Hyper-V][RHEL-8] hypervkvpd.service service ordering
|
||||
Patch9: hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch
|
||||
# For bz#2142028 - [Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0
|
||||
Patch10: hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
|
||||
# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons
|
||||
Patch11: hpvd-tools-hv-Remove-an-extraneous-the.patch
|
||||
# For bz#2139456 - [Hyper-V][RHEL8.8] Update Hyper-V-Daemons
|
||||
Patch12: hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch
|
||||
# For bz#2020141 - [Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform
|
||||
# Patch6: hpvd-Enable-build-on-aarch64.patch
|
||||
|
||||
# Hyper-V is available only on x86 and aarch64 architectures
|
||||
# The base empty (a.k.a. virtual) package can not be noarch
|
||||
# due to http://www.rpm.org/ticket/78
|
||||
ExclusiveArch: i686 x86_64 aarch64
|
||||
|
||||
Requires: hypervkvpd = %{version}-%{release}
|
||||
Requires: hypervvssd = %{version}-%{release}
|
||||
Requires: hypervfcopyd = %{version}-%{release}
|
||||
BuildRequires: gcc
|
||||
|
||||
%description
|
||||
Suite of daemons that are needed when Linux guest
|
||||
is running on Windows Host with Hyper-V.
|
||||
|
||||
|
||||
%package -n hypervkvpd
|
||||
Summary: Hyper-V key value pair (KVP) daemon
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name}-license = %{version}-%{release}
|
||||
BuildRequires: systemd, kernel-headers
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description -n hypervkvpd
|
||||
Hypervkvpd is an implementation of Hyper-V key value pair (KVP)
|
||||
functionality for Linux. The daemon first registers with the
|
||||
kernel driver. After this is done it collects information
|
||||
requested by Windows Host about the Linux Guest. It also supports
|
||||
IP injection functionality on the Guest.
|
||||
|
||||
|
||||
%package -n hypervvssd
|
||||
Summary: Hyper-V VSS daemon
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name}-license = %{version}-%{release}
|
||||
BuildRequires: systemd, kernel-headers
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description -n hypervvssd
|
||||
Hypervvssd is an implementation of Hyper-V VSS functionality
|
||||
for Linux. The daemon is used for host initiated guest snapshot
|
||||
on Hyper-V hypervisor. The daemon first registers with the
|
||||
kernel driver. After this is done it waits for instructions
|
||||
from Windows Host if to "freeze" or "thaw" the filesystem
|
||||
on the Linux Guest.
|
||||
|
||||
|
||||
%package -n hypervfcopyd
|
||||
Summary: Hyper-V FCOPY daemon
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name}-license = %{version}-%{release}
|
||||
BuildRequires: systemd, kernel-headers
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description -n hypervfcopyd
|
||||
Hypervfcopyd is an implementation of file copy service functionality
|
||||
for Linux Guest running on Hyper-V. The daemon enables host to copy
|
||||
a file (over VMBUS) into the Linux Guest. The daemon first registers
|
||||
with the kernel driver. After this is done it waits for instructions
|
||||
from Windows Host.
|
||||
|
||||
|
||||
%package license
|
||||
Summary: License of the Hyper-V daemons suite
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
|
||||
%description license
|
||||
Contains license of the Hyper-V daemons suite.
|
||||
|
||||
%package -n hyperv-tools
|
||||
Summary: Tools for Hyper-V guests
|
||||
Group: Applications/System
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n hyperv-tools
|
||||
Contains tools and scripts useful for Hyper-V guests.
|
||||
|
||||
%prep
|
||||
%setup -Tc
|
||||
cp -pvL %{SOURCE0} COPYING
|
||||
|
||||
cp -pvL %{SOURCE1} hv_kvp_daemon.c
|
||||
cp -pvL %{SOURCE2} hv_get_dhcp_info.sh
|
||||
cp -pvL %{SOURCE3} hv_get_dns_info.sh
|
||||
cp -pvL %{SOURCE4} hv_set_ifconfig.sh
|
||||
cp -pvL %{SOURCE5} hypervkvpd.service
|
||||
cp -pvL %{SOURCE6} hypervkvp.rules
|
||||
cp -pvL %{SOURCE100} hv_vss_daemon.c
|
||||
cp -pvL %{SOURCE101} hypervvssd.service
|
||||
cp -pvL %{SOURCE102} hypervvss.rules
|
||||
cp -pvL %{SOURCE200} hv_fcopy_daemon.c
|
||||
cp -pvL %{SOURCE201} hypervfcopyd.service
|
||||
cp -pvL %{SOURCE202} hypervfcopy.rules
|
||||
|
||||
cp -pvL %{SOURCE301} lsvmbus
|
||||
%patch0 -p3 -b .lsvmbus_python3
|
||||
|
||||
cp -pvL %{SOURCE4} hv_set_ifconfig.sh
|
||||
%patch1 -p0 -b .hv_set_ifconfig_nm_enable
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
%build
|
||||
# HYPERV KVP DAEMON
|
||||
gcc $RPM_OPT_FLAGS -c hv_kvp_daemon.c
|
||||
gcc $RPM_LD_FLAGS hv_kvp_daemon.o -o %{hv_kvp_daemon}
|
||||
|
||||
# HYPERV VSS DAEMON
|
||||
gcc $RPM_OPT_FLAGS -c hv_vss_daemon.c
|
||||
gcc $RPM_LD_FLAGS hv_vss_daemon.o -o %{hv_vss_daemon}
|
||||
|
||||
# HYPERV FCOPY DAEMON
|
||||
gcc $RPM_OPT_FLAGS -c hv_fcopy_daemon.c
|
||||
gcc $RPM_LD_FLAGS hv_fcopy_daemon.o -o %{hv_fcopy_daemon}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
install -p -m 0755 %{hv_kvp_daemon} %{buildroot}%{_sbindir}
|
||||
install -p -m 0755 %{hv_vss_daemon} %{buildroot}%{_sbindir}
|
||||
install -p -m 0755 %{hv_fcopy_daemon} %{buildroot}%{_sbindir}
|
||||
# Systemd unit file
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 hypervkvpd.service %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 hypervvssd.service %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 hypervfcopyd.service %{buildroot}%{_unitdir}
|
||||
# Udev rules
|
||||
mkdir -p %{buildroot}%{_udevrulesdir}
|
||||
install -p -m 0644 hypervkvp.rules %{buildroot}%{_udevrulesdir}/%{udev_prefix}-hypervkvp.rules
|
||||
install -p -m 0644 hypervvss.rules %{buildroot}%{_udevrulesdir}/%{udev_prefix}-hypervvss.rules
|
||||
install -p -m 0644 hypervfcopy.rules %{buildroot}%{_udevrulesdir}/%{udev_prefix}-hypervfcopy.rules
|
||||
# Shell scripts for the KVP daemon
|
||||
mkdir -p %{buildroot}%{_libexecdir}/%{hv_kvp_daemon}
|
||||
install -p -m 0755 hv_get_dhcp_info.sh %{buildroot}%{_libexecdir}/%{hv_kvp_daemon}/hv_get_dhcp_info
|
||||
install -p -m 0755 hv_get_dns_info.sh %{buildroot}%{_libexecdir}/%{hv_kvp_daemon}/hv_get_dns_info
|
||||
install -p -m 0755 hv_set_ifconfig.sh %{buildroot}%{_libexecdir}/%{hv_kvp_daemon}/hv_set_ifconfig
|
||||
# Directory for pool files
|
||||
mkdir -p %{buildroot}%{_sharedstatedir}/hyperv
|
||||
|
||||
# Tools
|
||||
install -p -m 0755 lsvmbus %{buildroot}%{_sbindir}/
|
||||
sed -i 's,#!/usr/bin/env python,#!%{__python3},' %{buildroot}%{_sbindir}/lsvmbus
|
||||
install -p -m 0755 vmbus_testing %{buildroot}%{_sbindir}/
|
||||
|
||||
%post -n hypervkvpd
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl --no-reload disable hypervkvpd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun -n hypervkvpd
|
||||
%systemd_preun hypervkvpd.service
|
||||
|
||||
%postun -n hypervkvpd
|
||||
# hypervkvpd daemon does NOT support restarting (driver, neither)
|
||||
%systemd_postun hypervkvpd.service
|
||||
# If removing the package, delete %%{_sharedstatedir}/hyperv directory
|
||||
if [ "$1" -eq "0" ] ; then
|
||||
rm -rf %{_sharedstatedir}/hyperv || :
|
||||
fi
|
||||
|
||||
|
||||
%post -n hypervvssd
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl --no-reload disable hypervvssd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun -n hypervvssd
|
||||
%systemd_postun hypervvssd.service
|
||||
|
||||
%preun -n hypervvssd
|
||||
%systemd_preun hypervvssd.service
|
||||
|
||||
|
||||
%post -n hypervfcopyd
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl --no-reload disable hypervfcopyd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun -n hypervfcopyd
|
||||
%systemd_postun hypervfcopyd.service
|
||||
|
||||
%preun -n hypervfcopyd
|
||||
%systemd_preun hypervfcopyd.service
|
||||
|
||||
|
||||
%files
|
||||
# the base package does not contain any files.
|
||||
|
||||
%files -n hypervkvpd
|
||||
%{_sbindir}/%{hv_kvp_daemon}
|
||||
%{_unitdir}/hypervkvpd.service
|
||||
%{_udevrulesdir}/%{udev_prefix}-hypervkvp.rules
|
||||
%dir %{_libexecdir}/%{hv_kvp_daemon}
|
||||
%{_libexecdir}/%{hv_kvp_daemon}/*
|
||||
%dir %{_sharedstatedir}/hyperv
|
||||
|
||||
%files -n hypervvssd
|
||||
%{_sbindir}/%{hv_vss_daemon}
|
||||
%{_unitdir}/hypervvssd.service
|
||||
%{_udevrulesdir}/%{udev_prefix}-hypervvss.rules
|
||||
|
||||
%files -n hypervfcopyd
|
||||
%{_sbindir}/%{hv_fcopy_daemon}
|
||||
%{_unitdir}/hypervfcopyd.service
|
||||
%{_udevrulesdir}/%{udev_prefix}-hypervfcopy.rules
|
||||
|
||||
%files license
|
||||
%doc COPYING
|
||||
|
||||
%files -n hyperv-tools
|
||||
%{_sbindir}/lsvmbus
|
||||
%{_sbindir}/vmbus_testing
|
||||
|
||||
%changelog
|
||||
* Fri Dec 02 2022 Jon Maloy <jmaloy@redhat.com> - 0-0.34.20180415git
|
||||
- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2142028]
|
||||
- hpvd-tools-hv-Remove-an-extraneous-the.patch [bz#2139456]
|
||||
- hpvd-tools-hv-kvp-remove-unnecessary-void-conversions.patch [bz#2139456]
|
||||
- Resolves: bz#2142028
|
||||
([Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0)
|
||||
- Resolves: bz#2139456
|
||||
([Hyper-V][RHEL8.8] Update Hyper-V-Daemons)
|
||||
|
||||
* Tue Aug 16 2022 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.33.20180415git
|
||||
- hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2115761]
|
||||
- hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch [bz#2115761]
|
||||
- Resolves: bz#2115761
|
||||
([Hyper-V][RHEL-8] hypervkvpd.service service ordering)
|
||||
|
||||
* Tue Mar 22 2022 Jon Maloy <jmaloy@redhat.com> - 0-0.32.20180415git.el8
|
||||
- hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch [bz#2065202]
|
||||
- hpvd-Use-filename-for-connection-profile.patch [bz#2065202]
|
||||
- Resolves: bz#2065202
|
||||
([RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8 [rhel-8.7.0])
|
||||
|
||||
* Wed Nov 10 2021 Jon Maloy <jmaloy@redhat.com> - 0-0.31.20180415git.el8
|
||||
- hpvd-Enable-build-on-aarch64.patch [bz#2020141]
|
||||
- Resolves: bz#2020141
|
||||
([Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform)
|
||||
|
||||
* Thu Dec 03 2020 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.30.20180415git.el8
|
||||
- hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch [bz#1886104]
|
||||
- Resolves: bz#1886104
|
||||
([Hyper-V][RHEL8.4] Update Hyper-V-Daemons)
|
||||
|
||||
* Wed Apr 15 2020 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.29.20180415git.el8
|
||||
- hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch [bz#1816750]
|
||||
- hvd-Add-vmbus_testing-tool-build-files.patch [bz#1816750]
|
||||
- Resolves: bz#1816750
|
||||
([Hyper-V][RHEL8.3] Update Hyper-V tools)
|
||||
|
||||
* Tue Nov 19 2019 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.28.20180415git.el8
|
||||
- hpvd-Set-IgnoreOnIsolate-1-in-systemd-units.patch [bz#1769920]
|
||||
- Resolves: bz#1769920
|
||||
([Hyper-V][RHEL8] Running 'systemctl isolate' on any target stops hyperv-daemon services)
|
||||
|
||||
* Mon Sep 03 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.27.20180415git
|
||||
- Do not set NM_CONTROLLED=no (#1624355)
|
||||
|
||||
* Wed Aug 01 2018 Charalampos Stratakis <cstratak@redhat.com> - 0-0.26.20180415git
|
||||
- Fix python shebangs
|
||||
|
||||
* Mon Jun 11 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.25.20180415git
|
||||
- Switch lsvmbus to Python3
|
||||
|
||||
* Thu Apr 26 2018 Tomas Hozza <thozza@redhat.com> - 0-0.24.20180415git
|
||||
- Added gcc as an explicit BuildRequires
|
||||
|
||||
* Thu Apr 19 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.23.20180415git
|
||||
- Rebase to 4.17-rc1
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.22.20170105git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Dec 11 2017 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.21.20170105git
|
||||
- Rebase to 4.15-rc2, drop fedora patches as changes are upstream
|
||||
- Start kvpd after network.target
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.20.20170105git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.19.20170105git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.18.20170105git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jan 11 2017 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.17.20160728git
|
||||
- Use '-gt' instead of '>' to do the right comparison (#1412033)
|
||||
|
||||
* Thu Jan 05 2017 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.16.20160728git
|
||||
- Rebase to 4.9
|
||||
- hyperv-tools subpackage added
|
||||
|
||||
* Thu Jul 28 2016 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.15.20160728git
|
||||
- Rebase to 4.8-rc0 (20160728 git snapshot)
|
||||
- Disable services and remove ConditionVirtualization, multi-user.target
|
||||
dependencies switching to udev-only activation (#1331577)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.14.20150702git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Nov 18 2015 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.13.20150702git
|
||||
- Add udev rules to properly restart services (#1195029)
|
||||
- Spec cleanup
|
||||
|
||||
* Thu Jul 02 2015 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.12.20150702git
|
||||
- Rebase to 4.2-rc0 (20150702 git snapshot)
|
||||
- Switch to new chardev-based communication layer (#1195029)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.11.20150108git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Jan 08 2015 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.10.20150108git
|
||||
- Rebase to 3.19-rc3 (20150108 git snapshot)
|
||||
- Drop 'nodaemon' patches, use newly introduced '-n' option
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.9.20140714git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Mon Jul 14 2014 Tomas Hozza <thozza@redhat.com> - 0-0.8.20140714git
|
||||
- Update the File copy daemon to the latest git snapshot
|
||||
- Fix hyperfcopyd.service to check for /dev/vmbus/hv_fcopy
|
||||
|
||||
* Wed Jun 11 2014 Tomas Hozza <thozza@redhat.com> - 0-0.7.20140611git
|
||||
- Fix FTBFS (#1106781)
|
||||
- Use kernel-headers instead of kernel-devel for building
|
||||
- package new Hyper-V fcopy daemon as hypervfcopyd sub-package
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.6.20140219git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Feb 19 2014 Tomas Hozza <thozza@redhat.com> - 0-0.5.20140219git
|
||||
- rebase to the latest git snapshot next-20140219
|
||||
- KVP, VSS: removed inclusion of linux/types.h
|
||||
- VSS: Ignore VFAT mounts during freeze operation
|
||||
|
||||
* Fri Jan 10 2014 Tomas Hozza <thozza@redhat.com> - 0-0.4.20131022git
|
||||
- provide 'hyperv-daemons' package for convenient installation of all daemons
|
||||
|
||||
* Tue Oct 22 2013 Tomas Hozza <thozza@redhat.com> - 0-0.3.20131022git
|
||||
- rebase to the latest git snapshot next-20130927 (obtained 2013-10-22)
|
||||
- KVP, VSS: daemon use single buffer for send/recv
|
||||
- KVP: FQDN is obtained on start and cached
|
||||
|
||||
* Fri Sep 20 2013 Tomas Hozza <thozza@redhat.com> - 0-0.2.20130826git
|
||||
- Use 'hypervkvpd' directory in libexec for KVP daemon scripts (#1010268)
|
||||
- daemons are now WantedBy multi-user.target instead of basic.target (#1010260)
|
||||
|
||||
* Mon Aug 26 2013 Tomas Hozza <thozza@redhat.com> - 0-0.1.20130826git
|
||||
- Initial package
|
Loading…
Reference in new issue