Commit b7683155 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller

sfc: only schedule asynchronous filter work if needed

Prevent excessive CPU time spent running a workitem with nothing to do.

We avoid any races by keeping the same check in efx_filter_rfs_expire().
Suggested-by: default avatarMartin Habets <mhabets@solarflare.com>
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd706ff8
...@@ -159,7 +159,7 @@ static inline void efx_filter_rfs_expire(struct work_struct *data) ...@@ -159,7 +159,7 @@ static inline void efx_filter_rfs_expire(struct work_struct *data)
channel = container_of(dwork, struct efx_channel, filter_work); channel = container_of(dwork, struct efx_channel, filter_work);
time = jiffies - channel->rfs_last_expiry; time = jiffies - channel->rfs_last_expiry;
quota = channel->rfs_filter_count * time / (30 * HZ); quota = channel->rfs_filter_count * time / (30 * HZ);
if (quota > 20 && __efx_filter_rfs_expire(channel, min(channel->rfs_filter_count, quota))) if (quota >= 20 && __efx_filter_rfs_expire(channel, min(channel->rfs_filter_count, quota)))
channel->rfs_last_expiry += time; channel->rfs_last_expiry += time;
/* Ensure we do more work eventually even if NAPI poll is not happening */ /* Ensure we do more work eventually even if NAPI poll is not happening */
schedule_delayed_work(dwork, 30 * HZ); schedule_delayed_work(dwork, 30 * HZ);
......
...@@ -1166,6 +1166,9 @@ static int efx_poll(struct napi_struct *napi, int budget) ...@@ -1166,6 +1166,9 @@ static int efx_poll(struct napi_struct *napi, int budget)
struct efx_channel *channel = struct efx_channel *channel =
container_of(napi, struct efx_channel, napi_str); container_of(napi, struct efx_channel, napi_str);
struct efx_nic *efx = channel->efx; struct efx_nic *efx = channel->efx;
#ifdef CONFIG_RFS_ACCEL
unsigned int time;
#endif
int spent; int spent;
netif_vdbg(efx, intr, efx->net_dev, netif_vdbg(efx, intr, efx->net_dev,
...@@ -1185,7 +1188,10 @@ static int efx_poll(struct napi_struct *napi, int budget) ...@@ -1185,7 +1188,10 @@ static int efx_poll(struct napi_struct *napi, int budget)
#ifdef CONFIG_RFS_ACCEL #ifdef CONFIG_RFS_ACCEL
/* Perhaps expire some ARFS filters */ /* Perhaps expire some ARFS filters */
mod_delayed_work(system_wq, &channel->filter_work, 0); time = jiffies - channel->rfs_last_expiry;
/* Would our quota be >= 20? */
if (channel->rfs_filter_count * time >= 600 * HZ)
mod_delayed_work(system_wq, &channel->filter_work, 0);
#endif #endif
/* There is no race here; although napi_disable() will /* There is no race here; although napi_disable() will
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment