From 343d4974b6037fd3beb08583a80d1334f9025b63 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 17:29:19 +0000
Subject: Prepare for a new update


Reverting patches so we can apply the latest update
and changes can be seen in the spec file and sources.

---

diff --git a/cputree.c b/cputree.c
index e2541aa..d09af43 100644
--- a/cputree.c
+++ b/cputree.c
@@ -361,14 +361,9 @@ static void do_one_cpu(char *path)
 			entry = readdir(dir);
 			if (!entry)
 				break;
-			if (strncmp(entry->d_name, "node", 4) == 0) {
-				char *end;
-				int num;
-				num = strtol(entry->d_name + 4, &end, 10);
-				if (!*end && num >= 0) {
-					nodeid = num;
-					break;
-				}
+			if (strstr(entry->d_name, "node")) {
+				nodeid = strtoul(&entry->d_name[4], NULL, 10);
+				break;
 			}
 		} while (entry);
 		closedir(dir);
diff --git a/irqbalance.1 b/irqbalance.1
index 61ae35e..68e3cf8 100644
--- a/irqbalance.1
+++ b/irqbalance.1
@@ -62,21 +62,12 @@ in an effort to prevent that CPU from waking up without need.
 .B -i, --banirq=<irqnum>
 Add the specified IRQ to the set of banned IRQs. irqbalance will not affect
 the affinity of any IRQs on the banned list, allowing them to be specified
-manually.  This option is additive and can be specified multiple times. For
+manually.  This option is addative and can be specified multiple times. For
 example to ban IRQs 43 and 44 from balancing, use the following command line:
 .B irqbalance --banirq=43 --banirq=44
 
 .TP
-.B -m, --banmod=<module_name>
-Add the specified module to the set of banned modules, similiar to --banirq.
-irqbalance will not affect the affinity of any IRQs of given modules, allowing
-them to be specified manually. This option is additive and can be specified
-multiple times. For example to ban all IRQs of module foo and module bar from
-balancing, use the following command line:
-.B irqbalance --banmod=foo --banmod=bar
-
-.TP
-.B -c, --deepestcache=<integer>
+.B --deepestcache=<integer>
 This allows a user to specify the cache level at which irqbalance partitions
 cache domains.  Specifying a deeper cache may allow a greater degree of
 flexibility for irqbalance to assign IRQ affinity to achieve greater performance
@@ -157,7 +148,7 @@ each assigned IRQ type, it's number, load, number of IRQs since last rebalancing
 and it's class are sent. Refer to types.h file for explanation of defines.
 .TP
 .B setup
-Get the current value of sleep interval, mask of banned CPUs and list of banned IRQs.
+Get the current value of sleep interval, mask of banned CPUs and and list of banned IRQs.
 .TP
 .B settings sleep <s>
 Set new value of sleep interval, <s> >= 1.
diff --git a/irqbalance.c b/irqbalance.c
index 43ca2f6..6412447 100644
--- a/irqbalance.c
+++ b/irqbalance.c
@@ -84,6 +84,7 @@ struct option lopts[] = {
 	{"oneshot", 0, NULL, 'o'},
 	{"debug", 0, NULL, 'd'},
 	{"foreground", 0, NULL, 'f'},
+	{"hintpolicy", 1, NULL, 'h'},
 	{"powerthresh", 1, NULL, 'p'},
 	{"banirq", 1 , NULL, 'i'},
 	{"banscript", 1, NULL, 'b'},
@@ -99,7 +100,7 @@ struct option lopts[] = {
 
 static void usage(void)
 {
-	log(TO_CONSOLE, LOG_INFO, "irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--journal | -j]\n");
+	log(TO_CONSOLE, LOG_INFO, "irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--journal | -j] [--hintpolicy= | -h [exact|subset|ignore]]\n");
 	log(TO_CONSOLE, LOG_INFO, "	[--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>] [--banmod= | -m <module>] [--policyscript= | -l <script>]\n");
 	log(TO_CONSOLE, LOG_INFO, "	[--pid= | -s <file>] [--deepestcache= | -c <n>] [--interval= | -t <n>]\n");
 }
@@ -384,11 +385,11 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 		sock = accept(fd, NULL, NULL);
 		if (sock < 0) {
 			log(TO_ALL, LOG_WARNING, "Connection couldn't be accepted.\n");
-			goto out;
+			return TRUE;
 		}
 		if ((recv_size = recvmsg(sock, &msg, 0)) < 0) {
 			log(TO_ALL, LOG_WARNING, "Error while receiving data.\n");
-			goto out_close;
+			return TRUE;
 		}
 		cmsg = CMSG_FIRSTHDR(&msg);
 		if ((cmsg->cmsg_level == SOL_SOCKET) &&
@@ -400,7 +401,7 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 		}
 		if (!valid_user) {
 			log(TO_ALL, LOG_INFO, "Permission denied for user to connect to socket.\n");
-			goto out_close;
+			return TRUE;
 		}
 
 		if (!strncmp(buff, "stats", strlen("stats"))) {
@@ -420,7 +421,6 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 				if (new_iterval >= 1) {
 					sleep_interval = new_iterval;
 				}
-				free(sleep_string);
 			} else if (!(strncmp(buff + strlen("settings "), "ban irqs ",
 							strlen("ban irqs ")))) {
 				char *end;
@@ -432,14 +432,12 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 				cl_banned_irqs = NULL;
 				need_rescan = 1;
 				if (!strncmp(irq_string, "NONE", strlen("NONE"))) {
-					free(irq_string);
-					goto out_close;
+					return TRUE;
 				}
 				int irq = strtoul(irq_string, &end, 10);
 				do {
 					add_cl_banned_irq(irq);
 				} while((irq = strtoul(end, &end, 10)));
-				free(irq_string);
 			} else if (!(strncmp(buff + strlen("settings "), "cpus ",
 							strlen("cpus")))) {
 				char *cpu_ban_string = malloc(
@@ -451,13 +449,12 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 					banned_cpumask_from_ui = NULL;
 				}
 				need_rescan = 1;
-				free(cpu_ban_string);
 			}
 		}
 		if (!strncmp(buff, "setup", strlen("setup"))) {
 			char banned[512];
-			char *setup = calloc(strlen("SLEEP  ") + 11 + 1, 1);
-			snprintf(setup, strlen("SLEEP  ") + 11 + 1, "SLEEP %d ", sleep_interval);
+			char *setup = calloc(strlen("SLEEP  ") + 11 +1, 1);
+			snprintf(setup, 2048, "SLEEP %d ", sleep_interval);
 			if(g_list_length(cl_banned_irqs) > 0) {
 				for_each_irq(cl_banned_irqs, get_irq_data, setup);
 			}
@@ -466,15 +463,10 @@ gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data __attri
 			snprintf(setup + strlen(setup), strlen(banned) + 7 + 1,
 					"BANNED %s", banned);
 			send(sock, setup, strlen(setup), 0);
-			free(setup);
 		}
 
-out_close:
 		close(sock);
 	}
-
-out:
-	free(msg.msg_control);
 	return TRUE;
 }
 
diff --git a/misc/irqbalance.service b/misc/irqbalance.service
index 8a5b1f4..e9a5527 100644
--- a/misc/irqbalance.service
+++ b/misc/irqbalance.service
@@ -3,7 +3,7 @@ Description=irqbalance daemon
 ConditionVirtualization=!container
 
 [Service]
-EnvironmentFile=/etc/sysconfig/irqbalance
+EnvironmentFile=/path/to/irqbalance.env
 ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
 
 [Install]
diff --git a/numa.c b/numa.c
index f0b1a98..cd67ec8 100644
--- a/numa.c
+++ b/numa.c
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -116,9 +115,7 @@ void build_numa_node_list(void)
 		entry = readdir(dir);
 		if (!entry)
 			break;
-		if ((entry->d_type == DT_DIR) &&
-		    (strncmp(entry->d_name, "node", 4) == 0) &&
-		    isdigit(entry->d_name[4])) {
+		if ((entry->d_type == DT_DIR) && (strstr(entry->d_name, "node"))) {
 			add_one_node(entry->d_name);
 		}
 	} while (entry);
diff --git a/procinterrupts.c b/procinterrupts.c
index ca9533b..eb84a1c 100644
--- a/procinterrupts.c
+++ b/procinterrupts.c
@@ -167,7 +167,6 @@ GList* collect_full_irq_list()
 
 	while (!feof(file)) {
 		int	 number;
-		int      is_xen_dyn = 0;
 		struct irq_info *info;
 		char *c;
 		char savedline[1024];
@@ -188,13 +187,9 @@ GList* collect_full_irq_list()
 
 		strncpy(savedline, line, sizeof(savedline));
 		irq_name = strtok_r(savedline, " ", &savedptr);
-		if (strstr(irq_name, "xen-dyn") != NULL)
-			is_xen_dyn = 1;
 		last_token = strtok_r(NULL, " ", &savedptr);
 		while ((p = strtok_r(NULL, " ", &savedptr))) {
 			irq_name = last_token;
-			if (strstr(irq_name, "xen-dyn") != NULL)
-				is_xen_dyn = 1;
 			last_token = p;
 		}
 
@@ -214,7 +209,7 @@ GList* collect_full_irq_list()
 		info = calloc(sizeof(struct irq_info), 1);
 		if (info) {
 			info->irq = number;
-			if (strstr(irq_name, "-event") != NULL && is_xen_dyn == 1) {
+			if (strstr(irq_name, "xen-dyn-event") != NULL) {
 				info->type = IRQ_TYPE_VIRT_EVENT;
 				info->class = IRQ_VIRT_EVENT;
 			} else {
diff --git a/ui/irqbalance-ui.c b/ui/irqbalance-ui.c
index 6d4c845..3fc46af 100644
--- a/ui/irqbalance-ui.c
+++ b/ui/irqbalance-ui.c
@@ -41,7 +41,6 @@ struct msghdr * create_credentials_msg()
 	cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
 	memcpy(CMSG_DATA(cmsg), credentials, sizeof(struct ucred));
 
-	free(credentials);
 	return msg;
 }
 
@@ -62,7 +61,6 @@ int init_connection()
 
 	if(connect(socket_fd, (struct sockaddr *)&addr,
 				sizeof(sa_family_t) + strlen(socket_name) + 1) < 0) {
-		close(socket_fd);
 		return 0;
 	}
 
@@ -89,8 +87,6 @@ void send_settings(char *data)
 	sendmsg(socket_fd, msg, 0);
 
 	close(socket_fd);
-	free(msg->msg_control);
-	free(msg);
 }
 
 char * get_data(char *string)
@@ -119,8 +115,6 @@ char * get_data(char *string)
 	int len = recv(socket_fd, data, 8192, 0);
 	close(socket_fd);
 	data[len] = '\0';
-	free(msg->msg_control);
-	free(msg);
 	return data;
 }
 
@@ -129,7 +123,6 @@ void parse_setup(char *setup_data)
 	char *token, *ptr;
 	int i,j;
 	char *copy;
-	irq_t *new_irq = NULL;
 	if((setup_data == NULL) || (strlen(setup_data) == 0)) return;
 	copy = strdup(setup_data);
 	if (!copy)
@@ -143,7 +136,7 @@ void parse_setup(char *setup_data)
 	token = strtok_r(NULL, " ", &ptr);
 	/* Parse banned IRQ data */
 	while(!strncmp(token, "IRQ", strlen("IRQ"))) {
-		new_irq = malloc(sizeof(irq_t));
+		irq_t *new_irq = malloc(sizeof(irq_t));
 		new_irq->vector = strtol(strtok_r(NULL, " ", &ptr), NULL, 10);
 		token = strtok_r(NULL, " ", &ptr);
 		if(strncmp(token, "LOAD", strlen("LOAD"))) goto out;
@@ -158,7 +151,6 @@ void parse_setup(char *setup_data)
 		new_irq->assigned_to = NULL;
 		setup.banned_irqs = g_list_append(setup.banned_irqs, new_irq);
 		token = strtok_r(NULL, " ", &ptr);
-		new_irq = NULL;
 	}
 
 	if(strncmp(token, "BANNED", strlen("BANNED"))) goto out;
@@ -173,7 +165,6 @@ void parse_setup(char *setup_data)
 								banned_cpu);
 			}
 		}
-		free(map);
 	
 	}
 	free(copy);
@@ -182,9 +173,6 @@ void parse_setup(char *setup_data)
 out: {
 	/* Invalid data presented */
 	printf("Invalid data sent.  Unexpected token: %s", token);
-	if (new_irq) {
-		free(new_irq);
-	}
 	free(copy);
 	g_list_free(tree);
 	exit(1);
@@ -252,9 +240,7 @@ void parse_into_tree(char *data)
 	cpu_node_t *parent = NULL;
 	char *copy;
 	tree = NULL;
-	irq_t *new_irq = NULL;
-	cpu_node_t *new = NULL;
-
+	
 	if (!data || strlen(data) == 0)
 		return;
 
@@ -269,7 +255,7 @@ void parse_into_tree(char *data)
 			free(copy);
 			 goto out;
 		}
-		new = malloc(sizeof(cpu_node_t));
+		cpu_node_t *new = malloc(sizeof(cpu_node_t));
 		new->irqs = NULL;
 		new->children = NULL;
 		new->cpu_list = NULL;
@@ -293,7 +279,7 @@ void parse_into_tree(char *data)
 
 		/* Parse assigned IRQ data */
 		while((token != NULL) && (!strncmp(token, "IRQ", strlen("IRQ")))) {
-			new_irq = malloc(sizeof(irq_t));
+			irq_t *new_irq = malloc(sizeof(irq_t));
 			new_irq->vector = strtol(strtok_r(NULL, " ", &ptr), NULL, 10);
 			token = strtok_r(NULL, " ", &ptr);
 			if(strncmp(token, "LOAD", strlen("LOAD"))) goto out;
@@ -307,7 +293,6 @@ void parse_into_tree(char *data)
 			new_irq->is_banned = 0;
 			new->irqs = g_list_append(new->irqs, new_irq);
 			token = strtok_r(NULL, " ", &ptr);
-			new_irq = NULL;
 		}
 
 		if((token == NULL) || (strncmp(token, "IRQ", strlen("IRQ")))) {
@@ -321,8 +306,6 @@ void parse_into_tree(char *data)
 				parent = new;
 			}
 		}
-
-		new = NULL;
 	}
 	free(copy);
 	for_each_node(tree, assign_cpu_lists, NULL);
@@ -332,12 +315,6 @@ void parse_into_tree(char *data)
 out: {
 	/* Invalid data presented */
 	printf("Invalid data sent.  Unexpected token: %s\n", token);
-	if (new_irq) {
-		free(new_irq);
-	}
-	if (new) {
-		free(new);
-	}
 	g_list_free(tree);
 	exit(1);
 }
@@ -353,7 +330,6 @@ gboolean rescan_tree(gpointer data __attribute__((unused)))
 		display_tree();
 	}
 	free(setup_data);
-	free(irqbalance_data);
 	return TRUE;
 }
 
diff --git a/ui/ui.c b/ui/ui.c
index 06ec472..4054f0e 100644
--- a/ui/ui.c
+++ b/ui/ui.c
@@ -71,7 +71,6 @@ char * check_control_in_sleep_input(int max_len, int column_offest, int line_off
 			attrset(COLOR_PAIR(6));
 			break;
 		case 27:
-			free(input_to);
 			return NULL;
 		default:
 			input_to[iteration] = new;
@@ -116,7 +115,6 @@ int get_valid_sleep_input(int column_offest)
 				input);
 			refresh();
 		}
-		free(input);
 	}
 
 	attrset(COLOR_PAIR(1));