diff --git a/SOURCES/hpvd-tools-hv-Enable-debug-logs-for-hv_kvp_daemon.patch b/SOURCES/hpvd-tools-hv-Enable-debug-logs-for-hv_kvp_daemon.patch new file mode 100644 index 0000000..c82a7eb --- /dev/null +++ b/SOURCES/hpvd-tools-hv-Enable-debug-logs-for-hv_kvp_daemon.patch @@ -0,0 +1,204 @@ +From 4ab581e5f376ecdd894a73e3284a32c1c3606577 Mon Sep 17 00:00:00 2001 +From: Shradha Gupta +Date: Tue, 15 Apr 2025 04:19:38 -0700 +Subject: [PATCH] tools: hv: Enable debug logs for hv_kvp_daemon + +RH-Author: Xuemin Li +RH-MergeRequest: 13: tools: hv: Enable debug logs for hv_kvp_daemon +RH-Jira: RHEL-95812 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Ani Sinha +RH-Commit: [1/1] 7f88adf5ef8794d043811e66dba3e53dd7af2da9 + +Allow the KVP daemon to log the KVP updates triggered in the VM +with a new debug flag(-d). +When the daemon is started with this flag, it logs updates and debug +information in syslog with loglevel LOG_DEBUG. This information comes +in handy for debugging issues where the key-value pairs for certain +pools show mismatch/incorrect values. +The distro-vendors can further consume these changes and modify the +respective service files to redirect the logs to specific files as +needed. + +Signed-off-by: Shradha Gupta +Reviewed-by: Naman Jain +Reviewed-by: Dexuan Cui +Link: https://lore.kernel.org/r/1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com +Signed-off-by: Wei Liu +Message-ID: <1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com> +(cherry picked from commit a9c0b33ef2306327dd2db02c6274107065ff9307) +Signed-off-by: Xuemin Li +--- + hv_kvp_daemon.c | 64 +++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 59 insertions(+), 5 deletions(-) + +diff --git a/hv_kvp_daemon.c b/hv_kvp_daemon.c +index aa350d8..c8a55c9 100644 +--- a/hv_kvp_daemon.c ++++ b/hv_kvp_daemon.c +@@ -83,6 +83,7 @@ enum { + }; + + static int in_hand_shake; ++static int debug; + + static char *os_name = ""; + static char *os_major = ""; +@@ -183,6 +184,20 @@ static void kvp_update_file(int pool) + kvp_release_lock(pool); + } + ++static void kvp_dump_initial_pools(int pool) ++{ ++ int i; ++ ++ syslog(LOG_DEBUG, "===Start dumping the contents of pool %d ===\n", ++ pool); ++ ++ for (i = 0; i < kvp_file_info[pool].num_records; i++) ++ syslog(LOG_DEBUG, "pool: %d, %d/%d key=%s val=%s\n", ++ pool, i + 1, kvp_file_info[pool].num_records, ++ kvp_file_info[pool].records[i].key, ++ kvp_file_info[pool].records[i].value); ++} ++ + static void kvp_update_mem_state(int pool) + { + FILE *filep; +@@ -270,6 +285,8 @@ static int kvp_file_init(void) + return 1; + kvp_file_info[i].num_records = 0; + kvp_update_mem_state(i); ++ if (debug) ++ kvp_dump_initial_pools(i); + } + + return 0; +@@ -297,6 +314,9 @@ static int kvp_key_delete(int pool, const __u8 *key, int key_size) + * Found a match; just move the remaining + * entries up. + */ ++ if (debug) ++ syslog(LOG_DEBUG, "%s: deleting the KVP: pool=%d key=%s val=%s", ++ __func__, pool, record[i].key, record[i].value); + if (i == (num_records - 1)) { + kvp_file_info[pool].num_records--; + kvp_update_file(pool); +@@ -315,20 +335,36 @@ static int kvp_key_delete(int pool, const __u8 *key, int key_size) + kvp_update_file(pool); + return 0; + } ++ ++ if (debug) ++ syslog(LOG_DEBUG, "%s: could not delete KVP: pool=%d key=%s. Record not found", ++ __func__, pool, key); ++ + return 1; + } + + static int kvp_key_add_or_modify(int pool, const __u8 *key, int key_size, + const __u8 *value, int value_size) + { +- int i; +- int num_records; + struct kvp_record *record; ++ int num_records; + int num_blocks; ++ int i; ++ ++ if (debug) ++ syslog(LOG_DEBUG, "%s: got a KVP: pool=%d key=%s val=%s", ++ __func__, pool, key, value); + + if ((key_size > HV_KVP_EXCHANGE_MAX_KEY_SIZE) || +- (value_size > HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) ++ (value_size > HV_KVP_EXCHANGE_MAX_VALUE_SIZE)) { ++ syslog(LOG_ERR, "%s: Too long key or value: key=%s, val=%s", ++ __func__, key, value); ++ ++ if (debug) ++ syslog(LOG_DEBUG, "%s: Too long key or value: pool=%d, key=%s, val=%s", ++ __func__, pool, key, value); + return 1; ++ } + + /* + * First update the in-memory state. +@@ -348,6 +384,9 @@ static int kvp_key_add_or_modify(int pool, const __u8 *key, int key_size, + */ + memcpy(record[i].value, value, value_size); + kvp_update_file(pool); ++ if (debug) ++ syslog(LOG_DEBUG, "%s: updated: pool=%d key=%s val=%s", ++ __func__, pool, key, value); + return 0; + } + +@@ -359,8 +398,10 @@ static int kvp_key_add_or_modify(int pool, const __u8 *key, int key_size, + record = realloc(record, sizeof(struct kvp_record) * + ENTRIES_PER_BLOCK * (num_blocks + 1)); + +- if (record == NULL) ++ if (!record) { ++ syslog(LOG_ERR, "%s: Memory alloc failure", __func__); + return 1; ++ } + kvp_file_info[pool].num_blocks++; + + } +@@ -368,6 +409,11 @@ static int kvp_key_add_or_modify(int pool, const __u8 *key, int key_size, + memcpy(record[i].key, key, key_size); + kvp_file_info[pool].records = record; + kvp_file_info[pool].num_records++; ++ ++ if (debug) ++ syslog(LOG_DEBUG, "%s: added: pool=%d key=%s val=%s", ++ __func__, pool, key, value); ++ + kvp_update_file(pool); + return 0; + } +@@ -1661,6 +1707,7 @@ void print_usage(char *argv[]) + fprintf(stderr, "Usage: %s [options]\n" + "Options are:\n" + " -n, --no-daemon stay in foreground, don't daemonize\n" ++ " -d, --debug Enable debug logs(syslog debug by default)\n" + " -h, --help print this help\n", argv[0]); + } + +@@ -1682,10 +1729,11 @@ int main(int argc, char *argv[]) + static struct option long_options[] = { + {"help", no_argument, 0, 'h' }, + {"no-daemon", no_argument, 0, 'n' }, ++ {"debug", no_argument, 0, 'd' }, + {0, 0, 0, 0 } + }; + +- while ((opt = getopt_long(argc, argv, "hn", long_options, ++ while ((opt = getopt_long(argc, argv, "hnd", long_options, + &long_index)) != -1) { + switch (opt) { + case 'n': +@@ -1694,6 +1742,9 @@ int main(int argc, char *argv[]) + case 'h': + print_usage(argv); + exit(0); ++ case 'd': ++ debug = 1; ++ break; + default: + print_usage(argv); + exit(EXIT_FAILURE); +@@ -1716,6 +1767,9 @@ int main(int argc, char *argv[]) + */ + kvp_get_domain_name(full_domain_name, sizeof(full_domain_name)); + ++ if (debug) ++ syslog(LOG_INFO, "Logging debug info in syslog(debug)"); ++ + if (kvp_file_init()) { + syslog(LOG_ERR, "Failed to initialize the pools"); + exit(EXIT_FAILURE); +-- +2.48.1 + diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec index b1396dd..4a4d244 100644 --- a/SPECS/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons.spec @@ -13,7 +13,7 @@ Name: hyperv-daemons Version: 0 -Release: 0.43%{?snapver}%{?dist} +Release: 0.44%{?snapver}%{?dist} Summary: Hyper-V daemons suite License: GPLv2 @@ -68,6 +68,8 @@ Patch14: hpvd-hv-hv_kvp_daemon-Some-small-fixes-for-handling-NM-ke.patch Patch15: hpvd-hv-hv_kvp_daemon-Handle-IPv4-and-Ipv6-combination-fo.patch # For RHEL-9902 - [Hyper-V][RHEL-9] hyperv-daemons write incompatible IPv6 prefix (IPV6NETMASK) in ifcfg Patch16: hpvd-Changes-for-adding-keyfile-support-in-RHEL-specific-.patch +# For RHEL-95812 - [Hyper-V][RHEL-9]Backport tools: hv: Enable debug logs for hv_kvp_daemon for RHEL 9 +Patch17: hpvd-tools-hv-Enable-debug-logs-for-hv_kvp_daemon.patch # Source-git patches @@ -183,6 +185,7 @@ cp -pvL %{SOURCE301} lsvmbus %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build # HYPERV KVP DAEMON @@ -300,6 +303,11 @@ fi %{_sbindir}/vmbus_testing %changelog +* Mon Jun 23 2025 Jon Maloy - 0-0.44.20190303git +- hpvd-tools-hv-Enable-debug-logs-for-hv_kvp_daemon.patch [RHEL-95812] +- Resolves: RHEL-95812 + ([Hyper-V][RHEL-9]Backport tools: hv: Enable debug logs for hv_kvp_daemon for RHEL 9) + * Thu Apr 25 2024 Miroslav Rezanina - 0-0.43.20190303git - hpvd-hv-hv_kvp_daemon-Support-for-keyfile-based-connectio.patch [RHEL-9902] - hpvd-hv-hv_kvp_daemon-Some-small-fixes-for-handling-NM-ke.patch [RHEL-9902]