Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1255: Introduce an activation lock to protect the raw connecti… #1262

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Fixes #1255: Introduce an activation lock to protect the raw connecti… #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c2184
Fixes #1255: Introduce an activation lock to protect the raw connecti…
ganeshmurthy Oct 16, 2023
9607aa5
Moved the connection check before locking using activation lock in sr…
ganeshmurthy Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/adaptors/tcp_lite/tcp_lite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ static void free_connection_IO(void *context)
sys_atomic_destroy(&conn->core_activation);
sys_atomic_destroy(&conn->raw_opened);
qd_timer_free(conn->close_timer);
sys_mutex_free(&conn->activation_lock);
free_tcplite_connection_t(conn);
}

Expand All @@ -406,7 +407,11 @@ static void close_raw_connection_XSIDE_IO(tcplite_connection_t *conn)
pn_raw_connection_close(conn->raw_conn);
drain_read_buffers_XSIDE_IO(conn->raw_conn);
drain_write_buffers_XSIDE_IO(conn->raw_conn);

sys_mutex_lock(&conn->activation_lock);
pn_raw_connection_set_context(conn->raw_conn, 0);
conn->raw_conn = 0;
sys_mutex_unlock(&conn->activation_lock);
}
}
}
Expand Down Expand Up @@ -1020,9 +1025,11 @@ static void handle_outbound_delivery_CSIDE(tcplite_connection_t *conn, qdr_link_
// It is not guaranteed that this function will be called on the proper IO thread. Wake the raw connection for
// continued processing in the correct context.
//
sys_mutex_lock(&conn->activation_lock);
if (IS_ATOMIC_FLAG_SET(&conn->raw_opened)) {
pn_raw_connection_wake(conn->raw_conn);
}
sys_mutex_unlock(&conn->activation_lock);
}


Expand Down Expand Up @@ -1349,6 +1356,7 @@ void on_accept(qd_adaptor_listener_t *listener, pn_listener_t *pn_listener, void
conn->common.context_type = TL_CONNECTION;
conn->common.parent = (tcplite_common_t*) li;

sys_mutex_init(&conn->activation_lock);
sys_atomic_init(&conn->core_activation, 0);
sys_atomic_init(&conn->raw_opened, 1);

Expand Down Expand Up @@ -1393,10 +1401,12 @@ static void CORE_activate(void *context, qdr_connection_t *core_conn)

case TL_CONNECTION:
conn = (tcplite_connection_t*) common;
sys_mutex_lock(&conn->activation_lock);
if (IS_ATOMIC_FLAG_SET(&conn->raw_opened)) {
SET_ATOMIC_FLAG(&conn->core_activation);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this lock in place, are there any atomic flags we can convert to bools?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the conn->raw_opened flag can be knocked down to boolean. The conn->core_activation flag needs to remain atomic.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added code to this PR that set the conn->raw_opened to boolean. Please take a look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is super wrong with the change I made. CI is blowing up. I am looking into it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After further analysis, the atomic flags that are used inside the new activation lock are also sometimes used outside the activation lock, so my conclusion is that those flags cannot be converted from atomic to boolean

pn_raw_connection_wake(conn->raw_conn);
}
sys_mutex_unlock(&conn->activation_lock);
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/adaptors/tcp_lite/tcp_lite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ typedef struct tcplite_connection_t {
tcplite_common_t common;
DEQ_LINKS(tcplite_connection_t);
pn_raw_connection_t *raw_conn;
sys_mutex_t activation_lock;
sys_atomic_t core_activation;
sys_atomic_t raw_opened;
qd_timer_t *close_timer;
Expand Down
8 changes: 6 additions & 2 deletions src/cutthrough_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ static void activate_connection(qd_message_activation_t *activation, qd_directio

case QD_ACTIVATION_TCP: {
tcplite_connection_t *conn = safe_deref_tcplite_connection_t(activation->safeptr);
if (!!conn && IS_ATOMIC_FLAG_SET(&conn->raw_opened)) {
pn_raw_connection_wake(conn->raw_conn);
if (!!conn) {
sys_mutex_lock(&conn->activation_lock);
if (IS_ATOMIC_FLAG_SET(&conn->raw_opened)) {
pn_raw_connection_wake(conn->raw_conn);
}
sys_mutex_unlock(&conn->activation_lock);
}
break;
}
Expand Down