From c2b3d8faaf9f0a1fc04021b789cefaa82668c1fd Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 26 Nov 2020 01:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201126013007679617 - https://github.com/Irqbalance/irqbalance/commit/76bb77bf64edc7d388047f9516308a65e0c9cdd4 --- ...77bf64edc7d388047f9516308a65e0c9cdd4.patch | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 76bb77bf64edc7d388047f9516308a65e0c9cdd4.patch diff --git a/76bb77bf64edc7d388047f9516308a65e0c9cdd4.patch b/76bb77bf64edc7d388047f9516308a65e0c9cdd4.patch new file mode 100644 index 0000000..0acf127 --- /dev/null +++ b/76bb77bf64edc7d388047f9516308a65e0c9cdd4.patch @@ -0,0 +1,108 @@ +diff --git a/constants.h b/constants.h +index 8e34339..c7439d8 100644 +--- a/constants.h ++++ b/constants.h +@@ -6,28 +6,4 @@ + + #define NSEC_PER_SEC 1e9 + +-/* NUMA topology refresh intervals, in units of SLEEP_INTERVAL */ +-#define NUMA_REFRESH_INTERVAL 32 +-/* NIC interrupt refresh interval, in units of SLEEP_INTERVAL */ +-#define NIC_REFRESH_INTERVAL 32 +- +-/* minimum number of interrupts since boot for an interrupt to matter */ +-#define MIN_IRQ_COUNT 20 +- +- +-/* balancing tunings */ +- +-#define CROSS_PACKAGE_PENALTY 3000 +-#define NUMA_PENALTY 500 +-#define POWER_MODE_PACKAGE_THRESHOLD 20000 +-#define CLASS_VIOLATION_PENTALTY 6000 +-#define MSI_CACHE_PENALTY 10000 +-#define CORE_SPECIFIC_THRESHOLD 5000 +- +-/* power mode */ +- +-#define POWER_MODE_SOFTIRQ_THRESHOLD 20 +-#define POWER_MODE_HYSTERESIS 3 +- +- + #endif +diff --git a/cputree.c b/cputree.c +index eed20db..fda0200 100644 +--- a/cputree.c ++++ b/cputree.c +@@ -102,7 +102,7 @@ static void get_mask_from_cpulist(char *line, void *mask) + /* + * By default do not place IRQs on CPUs the kernel keeps isolated or + * nohz_full, as specified through the boot commandline. Users can +- * override this with the IRQBALANCE_BANNED_CPUS environment variable. ++ * override this with the IRQBALANCE_BANNED_CPULIST environment variable. + */ + static void setup_banned_cpus(void) + { +@@ -118,9 +118,20 @@ static void setup_banned_cpus(void) + strlen(banned_cpumask_from_ui), banned_cpus); + goto out; + } ++ ++ /* ++ * Notes: ++ * The IRQBALANCE_BANNED_CPUS will be discarded, please use ++ * IRQBALANCE_BANNED_CPULIST instead. ++ * ++ * Before deleting this environment variable, Introduce a ++ * deprecation period first for the consider of compatibility. ++ */ + env = getenv("IRQBALANCE_BANNED_CPUS"); + if (env && strlen(env)) { + cpumask_parse_user(env, strlen(env), banned_cpus); ++ log(TO_ALL, LOG_WARNING, ++ "IRQBALANCE_BANNED_CPUS is discarded, Use IRQBALANCE_BANNED_CPULIST instead\n"); + goto out; + } + +diff --git a/irqbalance.1 b/irqbalance.1 +index fb96664..215f75a 100644 +--- a/irqbalance.1 ++++ b/irqbalance.1 +@@ -163,7 +163,9 @@ processors, each group of eight hex digits is separated by a comma ’,’. i.e. + to the 7th-12th cpus (cpu6-cpu11) or ‘export IRQBALANCE_BANNED_CPUS=ff000000,00000001‘ + would prevent irqbalance from assigning irqs to the 1st (cpu0) and 57th-64th cpus + (cpu56-cpu63). +- ++Notes: This environment variable will be discarded, please use IRQBALANCE_BANNED_CPULIST ++instead. Before deleting this environment variable, Introduce a deprecation period first ++for the consider of compatibility. + + .TP + .B IRQBALANCE_BANNED_CPULIST +diff --git a/misc/irqbalance.env b/misc/irqbalance.env +index 23570b2..237e4af 100644 +--- a/misc/irqbalance.env ++++ b/misc/irqbalance.env +@@ -21,6 +21,21 @@ + # + #IRQBALANCE_BANNED_CPUS= + ++# ++# IRQBALANCE_BANNED_CPULIST ++# The CPUs list which allows you to indicate which CPUs should ++# be skipped when reblancing IRQs. CPU numbers in CPUs list will ++# not have any IRQs assigned to them on rebalance. ++# ++# The format of CPUs list is: ++# ,..., ++# or a range: ++# - ++# or a mixture: ++# ,...,- ++# ++#IRQBALANCE_BANNED_CPULIST= ++ + # + # IRQBALANCE_ARGS + # Append any args here to the irqbalance daemon as documented in the man -- Gitee From 297bdcd5b404cca2f35750c10a38179dc263be36 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 26 Nov 2020 01:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201126013007679617 - update spec file --- irqbalance.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/irqbalance.spec b/irqbalance.spec index 4a14689..ec21056 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,12 +1,13 @@ Summary: A dynamic adaptive IRQ balancing daemon Name: irqbalance Version: 1.7.0 -Release: 1 +Release: 2 Epoch: 3 License: GPLv2 Source0: https://github.com/Irqbalance/irqbalance/archive/irqbalance-%{version}.tar.gz Source1: irqbalance.service Source2: irq_balancer +Patch6000: 76bb77bf64edc7d388047f9516308a65e0c9cdd4.patch Url: https://github.com/irqbalance/irqbalance BuildRequires: gdb autoconf automake libtool libcap-ng systemd @@ -77,6 +78,9 @@ fi /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : %changelog +* 20201126013007679617 patch-tracking 1.7.0-2 +- append patch file of upstream repository from <76bb77bf64edc7d388047f9516308a65e0c9cdd4> to <76bb77bf64edc7d388047f9516308a65e0c9cdd4> + * Fri Aug 14 2020 Liu Chao - 3:1.7.0-1 - Type:enhanced - ID:NA @@ -194,4 +198,3 @@ fi * Thu Aug 29 2019 caomeng - 3:1.4.0-2 - Package init - -- Gitee