Skip to content

Bluetooth: Audio: Fix ASE race condition #51027

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

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Bluetooth: Audio: Fix ASE race condition #51027

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
55 changes: 39 additions & 16 deletions subsys/bluetooth/audio/ascs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/gatt.h>
#include "zephyr/bluetooth/iso.h"
#include <zephyr/bluetooth/audio/audio.h>
#include <zephyr/bluetooth/audio/capabilities.h>

Expand Down Expand Up @@ -240,6 +241,7 @@ void ascs_ep_set_state(struct bt_audio_ep *ep, uint8_t state)
switch (old_state) {
case BT_AUDIO_EP_STATE_ENABLING:
case BT_AUDIO_EP_STATE_STREAMING:
ep->receiver_ready = false;
break;
default:
BT_ASSERT_MSG(false,
Expand Down Expand Up @@ -268,6 +270,7 @@ void ascs_ep_set_state(struct bt_audio_ep *ep, uint8_t state)
case BT_AUDIO_EP_STATE_QOS_CONFIGURED:
case BT_AUDIO_EP_STATE_ENABLING:
case BT_AUDIO_EP_STATE_STREAMING:
ep->receiver_ready = false;
break;
case BT_AUDIO_EP_STATE_DISABLING:
if (ep->dir == BT_AUDIO_DIR_SOURCE) {
Expand Down Expand Up @@ -477,6 +480,21 @@ static void ascs_iso_sent(struct bt_iso_chan *chan)
}
}

static int ase_stream_start(struct bt_audio_stream *stream)
{
int err = 0;

if (unicast_server_cb != NULL && unicast_server_cb->start != NULL) {
err = unicast_server_cb->start(stream);
} else {
err = -ENOTSUP;
}

ascs_ep_set_state(stream->ep, BT_AUDIO_EP_STATE_STREAMING);

return err;
}

static void ascs_iso_connected(struct bt_iso_chan *chan)
{
struct bt_audio_iso *audio_iso = CONTAINER_OF(chan, struct bt_audio_iso,
Expand All @@ -485,6 +503,7 @@ static void ascs_iso_connected(struct bt_iso_chan *chan)
struct bt_audio_stream *sink_stream = audio_iso->sink_stream;
struct bt_audio_stream *stream;
struct bt_audio_ep *ep;
int err;

if (sink_stream != NULL && sink_stream->iso == chan) {
stream = sink_stream;
Expand Down Expand Up @@ -512,7 +531,14 @@ static void ascs_iso_connected(struct bt_iso_chan *chan)
return;
}

ascs_ep_set_state(ep, BT_AUDIO_EP_STATE_STREAMING);
if (ep->dir == BT_AUDIO_DIR_SOURCE && !ep->receiver_ready) {
return;
}

err = ase_stream_start(stream);
if (err) {
BT_ERR("Could not start stream %d", err);
}
}

static void ascs_iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
Expand Down Expand Up @@ -2037,17 +2063,15 @@ static void ase_start(struct bt_ascs_ase *ase)
{
struct bt_audio_stream *stream;
struct bt_audio_ep *ep;
int err;

BT_DBG("ase %p", ase);

ep = &ase->ep;

/* Valid for an ASE only if ASE_State field = 0x02 (QoS Configured) */
if (ep->status.state != BT_AUDIO_EP_STATE_ENABLING) {
err = -EBADMSG;
BT_WARN("Invalid operation in state: %s", bt_audio_ep_state_str(ep->status.state));
ascs_cp_rsp_add_errno(ASE_ID(ase), BT_ASCS_START_OP, err,
ascs_cp_rsp_add_errno(ASE_ID(ase), BT_ASCS_START_OP, -EBADMSG,
BT_ASCS_REASON_NONE);
return;
}
Expand All @@ -2065,22 +2089,21 @@ static void ase_start(struct bt_ascs_ase *ase)
return;
}

ep->receiver_ready = true;

stream = ep->stream;
if (unicast_server_cb != NULL && unicast_server_cb->start != NULL) {
err = unicast_server_cb->start(stream);
} else {
err = -ENOTSUP;
}
if (stream->iso->state == BT_ISO_STATE_CONNECTED) {
int err;

if (err) {
BT_ERR("Start failed: %d", err);
ascs_cp_rsp_add(ASE_ID(ase), BT_ASCS_START_OP, err,
BT_ASCS_REASON_NONE);
return;
err = ase_stream_start(stream);
if (err) {
BT_ERR("Start failed: %d", err);
ascs_cp_rsp_add(ASE_ID(ase), BT_ASCS_START_OP, err,
BT_ASCS_REASON_NONE);
return;
}
}

ascs_ep_set_state(ep, BT_AUDIO_EP_STATE_STREAMING);

ascs_cp_rsp_success(ASE_ID(ase), BT_ASCS_START_OP);
}

Expand Down
3 changes: 3 additions & 0 deletions subsys/bluetooth/audio/endpoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ struct bt_audio_ep {
struct bt_gatt_subscribe_params subscribe;
struct bt_gatt_discover_params discover;

/* FIXME: Replace with metastate */
bool receiver_ready;

/* TODO: Consider client/server container split */
union {
struct {
Expand Down