Just for testing print the tick time every minute
Signed-off-by: Julian Anastasov <ja@xxxxxx>
---
net/netfilter/ipvs/ip_vs_est.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index 38a6c8ab308b..e214aa0b3abe 100644
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -147,7 +147,14 @@ static void ip_vs_tick_estimation(struct ip_vs_est_kt_data
*kd, int row)
{
struct ip_vs_est_tick_data *td;
int cid;
-
+ u64 ns = 0;
+ static int used_row = -1;
+ static int pass;
+
+ if (used_row < 0)
+ used_row = row;
+ if (row == used_row && !kd->id && !(pass & 31))
+ ns = ktime_get_ns();
rcu_read_lock();
td = rcu_dereference(kd->ticks[row]);
if (!td)
@@ -164,6 +171,16 @@ static void ip_vs_tick_estimation(struct ip_vs_est_kt_data
*kd, int row)
out:
rcu_read_unlock();
+ if (row == used_row && !kd->id && !(pass++ & 31)) {
+ static int ncpu;
+
+ ns = ktime_get_ns() - ns;
+ if (!ncpu)
+ ncpu = num_possible_cpus();
+ pr_info("tick time: %lluns for %d CPUs, %d ests, %d chains,
chain_max_len=%d\n",
+ (unsigned long long)ns, ncpu, kd->tick_len[row],
+ IPVS_EST_TICK_CHAINS, kd->chain_max_len);
+ }
}
static int ip_vs_estimation_kthread(void *data)
@@ -617,7 +634,7 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs,
int *chain_max_len)
bool is_fifo = false;
s32 min_est = 0;
ktime_t t1, t2;
- s64 diff, val;
+ s64 diff = 0, val;
int retry = 0;
int max = 2;
int ret = 1;
@@ -707,6 +724,8 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs,
int *chain_max_len)
out:
if (is_fifo)
sched_set_normal(current, sysctl_est_nice(ipvs));
+ pr_info("calc: chain_max_len=%d, single est=%dns, diff=%d, retry=%d,
ntest=%d\n",
+ max, min_est, (int)diff, retry, ntest);
for (;;) {
est = hlist_entry_safe(chain.first, struct ip_vs_estimator,
list);
@@ -752,6 +771,7 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)
int chain_max_len;
int id, row, cid;
bool last, last_td;
+ u64 ns = 0;
int step;
if (!ip_vs_est_calc_limits(ipvs, &chain_max_len))
@@ -780,6 +800,8 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)
*/
step = 0;
+ ns = ktime_get_ns();
+
next_kt:
/* Destroy contexts backwards */
id = ipvs->est_kt_count - 1;
@@ -858,6 +880,8 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)
goto walk_chain;
end_dequeue:
+ ns = ktime_get_ns() - ns;
+ pr_info("dequeue: %lluns\n", (unsigned long long)ns);
/* All estimators removed while calculating ? */
if (!ipvs->est_kt_count)
goto unlock;
--
2.37.3
|