diff options
| author |   David Howells <dhowells@redhat.com> | 2017-11-24 10:18:42 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-11-24 10:18:42 +0000 |
| commit | 3d18cbb7fd0cfdf0b2ca18139950a4b0c1a0a220 (patch) | |
| tree | 0ef85eba5aeab8ba839a67e662a048544cce123e /net/rxrpc/ar-internal.h | |
| parent | rxrpc: Fix service endpoint expiry (diff) | |
| download | linux-dev-3d18cbb7fd0cfdf0b2ca18139950a4b0c1a0a220.tar.xz linux-dev-3d18cbb7fd0cfdf0b2ca18139950a4b0c1a0a220.zip | |
rxrpc: Fix conn expiry timers
Fix the rxrpc connection expiry timers so that connections for closed
AF_RXRPC sockets get deleted in a more timely fashion, freeing up the
transport UDP port much more quickly.
(1) Replace the delayed work items with work items plus timers so that
timer_reduce() can be used to shorten them and so that the timer
doesn't requeue the work item if the net namespace is dead.
(2) Don't use queue_delayed_work() as that won't alter the timeout if the
timer is already running.
(3) Don't rearm the timers if the network namespace is dead.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/ar-internal.h')
| -rw-r--r-- | net/rxrpc/ar-internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index a0082c407005..416688381eb7 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -79,7 +79,8 @@ struct rxrpc_net { struct list_head conn_proc_list; /* List of conns in this namespace for proc */ struct list_head service_conns; /* Service conns in this namespace */ rwlock_t conn_lock; /* Lock for ->conn_proc_list, ->service_conns */ - struct delayed_work service_conn_reaper; + struct work_struct service_conn_reaper; + struct timer_list service_conn_reap_timer; unsigned int nr_client_conns; unsigned int nr_active_client_conns; @@ -90,7 +91,8 @@ struct rxrpc_net { struct list_head waiting_client_conns; struct list_head active_client_conns; struct list_head idle_client_conns; - struct delayed_work client_conn_reaper; + struct work_struct client_conn_reaper; + struct timer_list client_conn_reap_timer; struct list_head local_endpoints; struct mutex local_mutex; /* Lock for ->local_endpoints */ |