From: Gaetan Rivet <gr...@u256.net> A lock is taken during conn_lookup() to check whether a connection is expired before returning it. This lock can have some contention.
Even though this lock ensures a consistent sequence of writes, it does not imply a specific order. A ct_clean thread taking the lock first could read a value that would be updated immediately after by a PMD waiting on the same lock, just as well as the inverse order. As such, the expiration time can be stale anytime it is read. In this context, using an atomic will ensure the same guarantees for either writes or reads, i.e. writes are consistent and reads are not undefined behaviour. Reading an atomic is however less costly than taking and releasing a lock. Signed-off-by: Gaetan Rivet <gr...@u256.net> Signed-off-by: Paolo Valerio <pvale...@redhat.com> --- v6: - A couple of hunks slipped away from the stg refresh before sending v5. --- lib/conntrack-private.h | 2 +- lib/conntrack-tp.c | 2 +- lib/conntrack.c | 27 +++++++++++++++------------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/conntrack-private.h b/lib/conntrack-private.h index 676f58d83..d36845c2d 100644 --- a/lib/conntrack-private.h +++ b/lib/conntrack-private.h @@ -136,7 +136,7 @@ struct conn { /* Mutable data. */ struct ovs_mutex lock; /* Guards all mutable fields. */ ovs_u128 label; - long long expiration; + atomic_llong expiration; uint32_t mark; int seq_skew; diff --git a/lib/conntrack-tp.c b/lib/conntrack-tp.c index 7b8f9007b..89cb2704a 100644 --- a/lib/conntrack-tp.c +++ b/lib/conntrack-tp.c @@ -255,7 +255,7 @@ conn_update_expiration(struct conntrack *ct, struct conn *conn, "val=%u sec.", ct_timeout_str[tm], conn->key.zone, conn->tp_id, val); - conn->expiration = now + val * 1000; + atomic_store_relaxed(&conn->expiration, now + val * 1000); } void diff --git a/lib/conntrack.c b/lib/conntrack.c index 819c356c1..9d7891d6a 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -100,6 +100,7 @@ static enum ct_update_res conn_update(struct conntrack *ct, struct conn *conn, struct dp_packet *pkt, struct conn_lookup_ctx *ctx, long long now); +static long long int conn_expiration(const struct conn *); static bool conn_expired(struct conn *, long long now); static void set_mark(struct dp_packet *, struct conn *, uint32_t val, uint32_t mask); @@ -512,9 +513,7 @@ conn_clean(struct conntrack *ct, struct conn *conn) static void conn_force_expire(struct conn *conn) { - ovs_mutex_lock(&conn->lock); - conn->expiration = 0; - ovs_mutex_unlock(&conn->lock); + atomic_store_relaxed(&conn->expiration, 0); } /* Destroys the connection tracker 'ct' and frees all the allocated memory. @@ -969,13 +968,10 @@ un_nat_packet(struct dp_packet *pkt, const struct conn *conn, static void conn_seq_skew_set(struct conntrack *ct, const struct conn *conn_in, long long now, int seq_skew, bool seq_skew_dir) - OVS_NO_THREAD_SAFETY_ANALYSIS { struct conn *conn; - ovs_mutex_unlock(&conn_in->lock); - conn_lookup(ct, &conn_in->key, now, &conn, NULL); - ovs_mutex_lock(&conn_in->lock); + conn_lookup(ct, &conn_in->key, now, &conn, NULL); if (conn && seq_skew) { conn->seq_skew = seq_skew; conn->seq_skew_dir = seq_skew_dir; @@ -2515,14 +2511,21 @@ conn_update(struct conntrack *ct, struct conn *conn, struct dp_packet *pkt, return update_res; } +static long long int +conn_expiration(const struct conn *conn) +{ + long long int expiration; + + atomic_read_relaxed(&CONST_CAST(struct conn *, conn)->expiration, + &expiration); + return expiration; +} + static bool conn_expired(struct conn *conn, long long now) { if (conn->conn_type == CT_CONN_TYPE_DEFAULT) { - ovs_mutex_lock(&conn->lock); - bool expired = now >= conn->expiration ? true : false; - ovs_mutex_unlock(&conn->lock); - return expired; + return now >= conn_expiration(conn); } return false; } @@ -2655,7 +2658,7 @@ conn_to_ct_dpif_entry(const struct conn *conn, struct ct_dpif_entry *entry, entry->mark = conn->mark; memcpy(&entry->labels, &conn->label, sizeof entry->labels); - long long expiration = conn->expiration - now; + long long expiration = conn_expiration(conn) - now; struct ct_l4_proto *class = l4_protos[conn->key.nw_proto]; if (class->conn_get_protoinfo) { _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev