mirror of
https://github.com/qosmio/nss-packages.git
synced 2025-12-19 01:31:49 +00:00
1f3addc3a2
Codeaurora is now in archive-only mode as everything has been moved to the Gitlab based git.codelinaro.org So, update all of the source URL-s as well as update to the latest 11.4 commit if there is a newer one. Refresh patches as well if any have offsets or fuzzes. Signed-off-by: Robert Marko <robimarko@gmail.com>
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From 6924b71ed809b37fffd74d6428a8ca83e5919746 Mon Sep 17 00:00:00 2001
|
|
From: Dirk Buchwalder <buchwalder@posteo.de>
|
|
Date: Sun, 27 Jun 2021 16:52:39 +0200
|
|
Subject: [PATCH] qca-nss-ecm: resolve the cpu high load regarding ecm
|
|
|
|
If using ECM, cpu load goes up (around 1.0) and stucks there.
|
|
This is due to using uninterruptible sleep function,
|
|
the patch changes this to interruptible sleep function.
|
|
|
|
Signed-off-by: Dirk Buchwalder buchwalder@posteo.de
|
|
---
|
|
frontends/nss/ecm_nss_ipv4.c | 4 ++--
|
|
frontends/nss/ecm_nss_ipv6.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/frontends/nss/ecm_nss_ipv4.c
|
|
+++ b/frontends/nss/ecm_nss_ipv4.c
|
|
@@ -2471,7 +2471,7 @@ static void ecm_nss_ipv4_stats_sync_req_
|
|
}
|
|
spin_unlock_bh(&ecm_nss_ipv4_lock);
|
|
|
|
- usleep_range(ECM_NSS_IPV4_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV4_STATS_SYNC_UDELAY);
|
|
+ msleep_interruptible(ECM_NSS_IPV4_STATS_SYNC_UDELAY / 1000);
|
|
|
|
/*
|
|
* If index is 0, we are starting a new round, but if we still have time remain
|
|
@@ -2485,7 +2485,7 @@ static void ecm_nss_ipv4_stats_sync_req_
|
|
}
|
|
|
|
if (time_after(ecm_nss_ipv4_next_req_time, current_jiffies)) {
|
|
- msleep(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
|
|
+ msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
|
|
}
|
|
ecm_nss_ipv4_roll_check_jiffies = jiffies;
|
|
ecm_nss_ipv4_next_req_time = ecm_nss_ipv4_roll_check_jiffies + ECM_NSS_IPV4_STATS_SYNC_PERIOD;
|
|
--- a/frontends/nss/ecm_nss_ipv6.c
|
|
+++ b/frontends/nss/ecm_nss_ipv6.c
|
|
@@ -2210,7 +2210,7 @@ static void ecm_nss_ipv6_stats_sync_req_
|
|
}
|
|
spin_unlock_bh(&ecm_nss_ipv6_lock);
|
|
|
|
- usleep_range(ECM_NSS_IPV6_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV6_STATS_SYNC_UDELAY);
|
|
+ msleep_interruptible(ECM_NSS_IPV6_STATS_SYNC_UDELAY / 1000);
|
|
|
|
/*
|
|
* If index is 0, we are starting a new round, but if we still have time remain
|
|
@@ -2224,7 +2224,7 @@ static void ecm_nss_ipv6_stats_sync_req_
|
|
}
|
|
|
|
if (time_after(ecm_nss_ipv6_next_req_time, current_jiffies)) {
|
|
- msleep(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
|
|
+ msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
|
|
}
|
|
ecm_nss_ipv6_roll_check_jiffies = jiffies;
|
|
ecm_nss_ipv6_next_req_time = ecm_nss_ipv6_roll_check_jiffies + ECM_NSS_IPV6_STATS_SYNC_PERIOD;
|