9 changed files with 1448 additions and 3 deletions
--- a/SOURCES/hpvd-Use-filename-for-connection-profile.patch
+++ b/SOURCES/hpvd-Use-filename-for-connection-profile.patch
@ -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
+
--- a/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
+++ b/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
@ -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
+
--- a/SOURCES/hpvd-hypervkvpd.service-ordering-fixes.patch
+++ b/SOURCES/hpvd-hypervkvpd.service-ordering-fixes.patch
@ -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
+
--- a/SOURCES/hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch
+++ b/SOURCES/hpvd-redhat-Add-ConditionalVirtualization-to-the-rest-of-.patch
@ -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
+
--- a/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
+++ b/SOURCES/hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch
@ -0,0 +1,46 @@
+From 8acc8ecc93352bfb3d78e8d37c5ed03a4948a39d Mon Sep 17 00:00:00 2001
+From: Mohammed Gamal <mgamal@redhat.com>
+Date: Tue, 8 Nov 2022 16:20:17 +0100
+Subject: [PATCH] redhat: hv_set_if_config: Workaround for gateway numbering in
+ NetworkManager
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 10: redhat: hv_set_if_config: Workaround for gateway numbering in NetworkManager
+RH-Bugzilla: 2150255
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
+RH-Commit: [1/1] a52af3c2a8c4365cbe6777fe1afe4ebcf81954d6
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2150255
+
+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
+
--- a/SOURCES/hvd-Add-vmbus_testing-tool-build-files.patch
+++ b/SOURCES/hvd-Add-vmbus_testing-tool-build-files.patch
@ -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
+
--- a/SOURCES/hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch
+++ b/SOURCES/hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch
@ -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
+
--- a/SOURCES/hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
+++ b/SOURCES/hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
@ -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
+
--- a/SPECS/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons.spec
@ -13,7 +13,7 @@

 Name:     hyperv-daemons
 Version:  0
-Release:  0.28%{?snapver}%{?dist}
+Release:  0.34%{?snapver}%{?dist}
 Summary:  Hyper-V daemons suite

 Group:    System Environment/Daemons
@ -52,11 +52,29 @@ Patch0: 0001-tools-hv-update-lsvmbus-to-be-compatible-with-python.patch
 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#2150255 - [Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0 [rhel-8.7.0.z]
+Patch10: hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.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 architectures
+# 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
+ExclusiveArch:  i686 x86_64 aarch64

 Requires:       hypervkvpd = %{version}-%{release}
 Requires:       hypervvssd = %{version}-%{release}
@ -159,6 +177,14 @@ cp -pvL %{SOURCE301} lsvmbus
 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

 %build
 # HYPERV KVP DAEMON
@ -201,6 +227,7 @@ 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
@ -272,8 +299,42 @@ fi

 %files -n hyperv-tools
 %{_sbindir}/lsvmbus
+%{_sbindir}/vmbus_testing

 %changelog
+* Mon Dec 05 2022 Jon Maloy <jmaloy@redhat.com> - 0-0.34.20180415git.el8_7
+- hpvd-redhat-hv_set_if_config-Workaround-for-gateway-numbe.patch [bz#2150255]
+- Resolves: bz#2150255
+  ([Hyper-V][RHEL-8] Cannot set gateway properly when set static IPADDR0,NETMASK0,GATEWAY in ifcfg-eth0 [rhel-8.7.0.z])
+
+* 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