Page MenuHomeFreeBSD
Files F97700820

D37729.diff
No OneTemporary
Actions

D37729.diff
View Options

diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c
--- a/sys/net/route/fib_algo.c
+++ b/sys/net/route/fib_algo.c
@@ -1738,7 +1738,7 @@
void
fib_epoch_call(epoch_callback_t callback, epoch_context_t ctx)
{
- epoch_call(net_epoch_preempt, callback, ctx);
+ NET_EPOCH_CALL(callback, ctx);
}
/*
diff --git a/sys/net/route/nhgrp_ctl.c b/sys/net/route/nhgrp_ctl.c
--- a/sys/net/route/nhgrp_ctl.c
+++ b/sys/net/route/nhgrp_ctl.c
@@ -385,8 +385,7 @@
NET_EPOCH_EXIT(et);
KASSERT((nhg_priv->nhg_idx == 0), ("gr_idx != 0"));
- epoch_call(net_epoch_preempt, destroy_nhgrp_epoch,
- &nhg_priv->nhg_epoch_ctx);
+ NET_EPOCH_CALL(destroy_nhgrp_epoch, &nhg_priv->nhg_epoch_ctx);
}
/*
diff --git a/sys/net/route/nhop.c b/sys/net/route/nhop.c
--- a/sys/net/route/nhop.c
+++ b/sys/net/route/nhop.c
@@ -170,8 +170,7 @@
* Postpone destruction till the end of current epoch
* so nhop_free() can safely use nh_control pointer.
*/
- epoch_call(net_epoch_preempt, destroy_ctl_epoch,
- &ctl->ctl_epoch_ctx);
+ NET_EPOCH_CALL(destroy_ctl_epoch, &ctl->ctl_epoch_ctx);
}
/*
diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c
--- a/sys/net/route/nhop_ctl.c
+++ b/sys/net/route/nhop_ctl.c
@@ -638,8 +638,7 @@
}
NET_EPOCH_EXIT(et);
- epoch_call(net_epoch_preempt, destroy_nhop_epoch,
- &nh_priv->nh_epoch_ctx);
+ NET_EPOCH_CALL(destroy_nhop_epoch, &nh_priv->nh_epoch_ctx);
}
void
diff --git a/sys/net/route/route_rtentry.c b/sys/net/route/route_rtentry.c
--- a/sys/net/route/route_rtentry.c
+++ b/sys/net/route/route_rtentry.c
@@ -154,8 +154,7 @@
KASSERT(rt != NULL, ("%s: NULL rt", __func__));
- epoch_call(net_epoch_preempt, destroy_rtentry_epoch,
- &rt->rt_epoch_ctx);
+ NET_EPOCH_CALL(destroy_rtentry_epoch, &rt->rt_epoch_ctx);
}
void
diff --git a/sys/net/route/route_subscription.c b/sys/net/route/route_subscription.c
--- a/sys/net/route/route_subscription.c
+++ b/sys/net/route/route_subscription.c
@@ -157,8 +157,7 @@
CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next);
RIB_WUNLOCK(rnh);
- epoch_call(net_epoch_preempt, destroy_subscription_epoch,
- &rs->epoch_ctx);
+ NET_EPOCH_CALL(destroy_subscription_epoch, &rs->epoch_ctx);
}
void
@@ -171,8 +170,7 @@
CK_STAILQ_REMOVE(&rnh->rnh_subscribers, rs, rib_subscription, next);
- epoch_call(net_epoch_preempt, destroy_subscription_epoch,
- &rs->epoch_ctx);
+ NET_EPOCH_CALL(destroy_subscription_epoch, &rs->epoch_ctx);
}
/*
@@ -205,8 +203,7 @@
RIB_WLOCK(rnh);
while ((rs = CK_STAILQ_FIRST(&rnh->rnh_subscribers)) != NULL) {
CK_STAILQ_REMOVE_HEAD(&rnh->rnh_subscribers, next);
- epoch_call(net_epoch_preempt, destroy_subscription_epoch,
- &rs->epoch_ctx);
+ NET_EPOCH_CALL(destroy_subscription_epoch, &rs->epoch_ctx);
}
RIB_WUNLOCK(rnh);
NET_EPOCH_EXIT(et);
diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c
--- a/sys/net/route/route_tables.c
+++ b/sys/net/route/route_tables.c
@@ -245,7 +245,7 @@
/* Wait till all cpus see new pointers */
atomic_thread_fence_rel();
- epoch_wait_preempt(net_epoch_preempt);
+ NET_EPOCH_WAIT();
/* Set number of fibs to a new value */
V_rt_numfibs = num_tables;

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 8:28 PM (22 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13260066
Default Alt Text
D37729.diff (3 KB)

Event Timeline