mctp: Implement a timeout for tags
Currently, a MCTP (local-eid,remote-eid,tag) tuple is allocated to a socket on send, and only expires when the socket is closed. This change introduces a tag timeout, freeing the tuple after a fixed expiry - currently six seconds. This is greater than (but close to) the max response timeout in upper-layer bindings. Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
43f55f23f7
commit
7b14e15ae6
@@ -223,16 +223,60 @@ static const struct proto_ops mctp_dgram_ops = {
|
||||
.sendpage = sock_no_sendpage,
|
||||
};
|
||||
|
||||
static void mctp_sk_expire_keys(struct timer_list *timer)
|
||||
{
|
||||
struct mctp_sock *msk = container_of(timer, struct mctp_sock,
|
||||
key_expiry);
|
||||
struct net *net = sock_net(&msk->sk);
|
||||
unsigned long next_expiry, flags;
|
||||
struct mctp_sk_key *key;
|
||||
struct hlist_node *tmp;
|
||||
bool next_expiry_valid = false;
|
||||
|
||||
spin_lock_irqsave(&net->mctp.keys_lock, flags);
|
||||
|
||||
hlist_for_each_entry_safe(key, tmp, &msk->keys, sklist) {
|
||||
spin_lock(&key->lock);
|
||||
|
||||
if (!time_after_eq(key->expiry, jiffies)) {
|
||||
key->valid = false;
|
||||
hlist_del_rcu(&key->hlist);
|
||||
hlist_del_rcu(&key->sklist);
|
||||
spin_unlock(&key->lock);
|
||||
mctp_key_unref(key);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (next_expiry_valid) {
|
||||
if (time_before(key->expiry, next_expiry))
|
||||
next_expiry = key->expiry;
|
||||
} else {
|
||||
next_expiry = key->expiry;
|
||||
next_expiry_valid = true;
|
||||
}
|
||||
spin_unlock(&key->lock);
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&net->mctp.keys_lock, flags);
|
||||
|
||||
if (next_expiry_valid)
|
||||
mod_timer(timer, next_expiry);
|
||||
}
|
||||
|
||||
static int mctp_sk_init(struct sock *sk)
|
||||
{
|
||||
struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);
|
||||
|
||||
INIT_HLIST_HEAD(&msk->keys);
|
||||
timer_setup(&msk->key_expiry, mctp_sk_expire_keys, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mctp_sk_close(struct sock *sk, long timeout)
|
||||
{
|
||||
struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);
|
||||
|
||||
del_timer_sync(&msk->key_expiry);
|
||||
sk_common_release(sk);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user