Skip to content

nimble/ll: Fix race condition in aux scan #2087

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

Open
MariuszSkamra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nimble/ll: Fix race condition in aux scan #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 30 additions & 6 deletions nimble/controller/src/ble_ll_scan_aux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,10 +682,8 @@ ble_ll_hci_ev_send_ext_adv_report_for_ext(struct os_mbuf *rxpdu,
}

static void
ble_ll_scan_aux_break_ev(struct ble_npl_event *ev)
scan_aux_break(struct ble_ll_scan_aux_data *aux)
{
struct ble_ll_scan_aux_data *aux = ble_npl_event_get_arg(ev);

BLE_LL_ASSERT(aux);

if (ble_ll_scan_aux_need_truncation(aux)) {
Expand All @@ -701,6 +699,21 @@ ble_ll_scan_aux_break_ev(struct ble_npl_event *ev)
ble_ll_scan_chk_resume();
}

static void
scan_aux_break_ev(struct ble_npl_event *ev)
{
struct ble_ll_scan_aux_data *aux = ble_npl_event_get_arg(ev);

scan_aux_break(aux);
}

static void
scan_aux_break_to_ll(struct ble_ll_scan_aux_data *aux)
{
ble_npl_event_init(&aux->break_ev, scan_aux_break_ev, aux);
ble_ll_event_add(&aux->break_ev);
}

void
ble_ll_scan_aux_break(struct ble_ll_scan_aux_data *aux)
{
Expand All @@ -710,8 +723,7 @@ ble_ll_scan_aux_break(struct ble_ll_scan_aux_data *aux)
}
#endif

ble_npl_event_init(&aux->break_ev, ble_ll_scan_aux_break_ev, aux);
ble_ll_event_add(&aux->break_ev);
scan_aux_break_to_ll(aux);
}

static int
Expand Down Expand Up @@ -1766,7 +1778,19 @@ ble_ll_scan_aux_halt(void)
void
ble_ll_scan_aux_sched_remove(struct ble_ll_sched_item *sch)
{
ble_ll_scan_aux_break(sch->cb_arg);
struct ble_ll_scan_aux_data *aux = sch->cb_arg;

#if MYNEWT_VAL(BLE_LL_ROLE_CENTRAL)
if (aux->flags & BLE_LL_SCAN_AUX_F_W4_CONNECT_RSP) {
ble_ll_conn_send_connect_req_cancel();
}
#endif

if (ble_npl_event_is_queued(&aux->break_ev)) {
ble_ll_event_remove(&aux->break_ev);
}

scan_aux_break(aux);
}

void
Expand Down
2 changes: 1 addition & 1 deletion nimble/controller/src/ble_ll_sched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,8 @@ ble_ll_sched_rmv_elem_type(uint8_t type, sched_remove_cb_func remove_cb)
continue;
}
TAILQ_REMOVE(&g_ble_ll_sched_q, entry, link);
remove_cb(entry);
entry->enqueued = 0;
remove_cb(entry);
}

if (first_removed) {
Expand Down
Loading