Bluetooth: hci_sync: Refactor add Adv Monitor
Make use of hci_cmd_sync_queue for adding an advertisement monitor. Signed-off-by: Manish Mandlik <mmandlik@google.com> Reviewed-by: Miao-chen Chou <mcchou@google.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Manish Mandlik
Luiz Augusto von Dentz
Родитель
63b1a7dd38
Коммит
b747a83690
|
|
@ -1420,10 +1420,8 @@ bool hci_adv_instance_is_scannable(struct hci_dev *hdev, u8 instance);
|
|||
|
||||
void hci_adv_monitors_clear(struct hci_dev *hdev);
|
||||
void hci_free_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor);
|
||||
int hci_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status);
|
||||
int hci_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status);
|
||||
bool hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor,
|
||||
int *err);
|
||||
int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor);
|
||||
bool hci_remove_single_adv_monitor(struct hci_dev *hdev, u16 handle, int *err);
|
||||
bool hci_remove_all_adv_monitor(struct hci_dev *hdev, int *err);
|
||||
bool hci_is_adv_monitoring(struct hci_dev *hdev);
|
||||
|
|
@ -1885,7 +1883,6 @@ void mgmt_advertising_removed(struct sock *sk, struct hci_dev *hdev,
|
|||
u8 instance);
|
||||
void mgmt_adv_monitor_removed(struct hci_dev *hdev, u16 handle);
|
||||
int mgmt_phy_configuration_changed(struct hci_dev *hdev, struct sock *skip);
|
||||
int mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status);
|
||||
int mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status);
|
||||
void mgmt_adv_monitor_device_lost(struct hci_dev *hdev, u16 handle,
|
||||
bdaddr_t *bdaddr, u8 addr_type);
|
||||
|
|
|
|||
|
|
@ -1880,11 +1880,6 @@ void hci_free_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)
|
|||
kfree(monitor);
|
||||
}
|
||||
|
||||
int hci_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status)
|
||||
{
|
||||
return mgmt_add_adv_patterns_monitor_complete(hdev, status);
|
||||
}
|
||||
|
||||
int hci_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status)
|
||||
{
|
||||
return mgmt_remove_adv_monitor_complete(hdev, status);
|
||||
|
|
@ -1892,49 +1887,48 @@ int hci_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status)
|
|||
|
||||
/* Assigns handle to a monitor, and if offloading is supported and power is on,
|
||||
* also attempts to forward the request to the controller.
|
||||
* Returns true if request is forwarded (result is pending), false otherwise.
|
||||
* This function requires the caller holds hdev->lock.
|
||||
* This function requires the caller holds hci_req_sync_lock.
|
||||
*/
|
||||
bool hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor,
|
||||
int *err)
|
||||
int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)
|
||||
{
|
||||
int min, max, handle;
|
||||
int status = 0;
|
||||
|
||||
*err = 0;
|
||||
if (!monitor)
|
||||
return -EINVAL;
|
||||
|
||||
if (!monitor) {
|
||||
*err = -EINVAL;
|
||||
return false;
|
||||
}
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
min = HCI_MIN_ADV_MONITOR_HANDLE;
|
||||
max = HCI_MIN_ADV_MONITOR_HANDLE + HCI_MAX_ADV_MONITOR_NUM_HANDLES;
|
||||
handle = idr_alloc(&hdev->adv_monitors_idr, monitor, min, max,
|
||||
GFP_KERNEL);
|
||||
if (handle < 0) {
|
||||
*err = handle;
|
||||
return false;
|
||||
}
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
if (handle < 0)
|
||||
return handle;
|
||||
|
||||
monitor->handle = handle;
|
||||
|
||||
if (!hdev_is_powered(hdev))
|
||||
return false;
|
||||
return status;
|
||||
|
||||
switch (hci_get_adv_monitor_offload_ext(hdev)) {
|
||||
case HCI_ADV_MONITOR_EXT_NONE:
|
||||
hci_update_passive_scan(hdev);
|
||||
bt_dev_dbg(hdev, "%s add monitor status %d", hdev->name, *err);
|
||||
bt_dev_dbg(hdev, "%s add monitor %d status %d", hdev->name,
|
||||
monitor->handle, status);
|
||||
/* Message was not forwarded to controller - not an error */
|
||||
return false;
|
||||
break;
|
||||
|
||||
case HCI_ADV_MONITOR_EXT_MSFT:
|
||||
*err = msft_add_monitor_pattern(hdev, monitor);
|
||||
bt_dev_dbg(hdev, "%s add monitor msft status %d", hdev->name,
|
||||
*err);
|
||||
status = msft_add_monitor_pattern(hdev, monitor);
|
||||
bt_dev_dbg(hdev, "%s add monitor %d msft status %d", hdev->name,
|
||||
monitor->handle, status);
|
||||
break;
|
||||
}
|
||||
|
||||
return (*err == 0);
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Attempts to tell the controller and free the monitor. If somehow the
|
||||
|
|
|
|||
|
|
@ -4646,23 +4646,15 @@ static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev,
|
|||
return err;
|
||||
}
|
||||
|
||||
int mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status)
|
||||
static void mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev,
|
||||
void *data, int status)
|
||||
{
|
||||
struct mgmt_rp_add_adv_patterns_monitor rp;
|
||||
struct mgmt_pending_cmd *cmd;
|
||||
struct adv_monitor *monitor;
|
||||
int err = 0;
|
||||
struct mgmt_pending_cmd *cmd = data;
|
||||
struct adv_monitor *monitor = cmd->user_data;
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
cmd = pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev);
|
||||
if (!cmd) {
|
||||
cmd = pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR, hdev);
|
||||
if (!cmd)
|
||||
goto done;
|
||||
}
|
||||
|
||||
monitor = cmd->user_data;
|
||||
rp.monitor_handle = cpu_to_le16(monitor->handle);
|
||||
|
||||
if (!status) {
|
||||
|
|
@ -4673,26 +4665,29 @@ int mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status)
|
|||
hci_update_passive_scan(hdev);
|
||||
}
|
||||
|
||||
err = mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
|
||||
mgmt_status(status), &rp, sizeof(rp));
|
||||
mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
|
||||
mgmt_status(status), &rp, sizeof(rp));
|
||||
mgmt_pending_remove(cmd);
|
||||
|
||||
done:
|
||||
hci_dev_unlock(hdev);
|
||||
bt_dev_dbg(hdev, "add monitor %d complete, status %u",
|
||||
bt_dev_dbg(hdev, "add monitor %d complete, status %d",
|
||||
rp.monitor_handle, status);
|
||||
}
|
||||
|
||||
return err;
|
||||
static int mgmt_add_adv_patterns_monitor_sync(struct hci_dev *hdev, void *data)
|
||||
{
|
||||
struct mgmt_pending_cmd *cmd = data;
|
||||
struct adv_monitor *monitor = cmd->user_data;
|
||||
|
||||
return hci_add_adv_monitor(hdev, monitor);
|
||||
}
|
||||
|
||||
static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,
|
||||
struct adv_monitor *m, u8 status,
|
||||
void *data, u16 len, u16 op)
|
||||
{
|
||||
struct mgmt_rp_add_adv_patterns_monitor rp;
|
||||
struct mgmt_pending_cmd *cmd;
|
||||
int err;
|
||||
bool pending;
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
|
|
@ -4714,12 +4709,11 @@ static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,
|
|||
}
|
||||
|
||||
cmd->user_data = m;
|
||||
pending = hci_add_adv_monitor(hdev, m, &err);
|
||||
err = hci_cmd_sync_queue(hdev, mgmt_add_adv_patterns_monitor_sync, cmd,
|
||||
mgmt_add_adv_patterns_monitor_complete);
|
||||
if (err) {
|
||||
if (err == -ENOSPC || err == -ENOMEM)
|
||||
if (err == -ENOMEM)
|
||||
status = MGMT_STATUS_NO_RESOURCES;
|
||||
else if (err == -EINVAL)
|
||||
status = MGMT_STATUS_INVALID_PARAMS;
|
||||
else
|
||||
status = MGMT_STATUS_FAILED;
|
||||
|
||||
|
|
@ -4727,18 +4721,6 @@ static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,
|
|||
goto unlock;
|
||||
}
|
||||
|
||||
if (!pending) {
|
||||
mgmt_pending_remove(cmd);
|
||||
rp.monitor_handle = cpu_to_le16(m->handle);
|
||||
mgmt_adv_monitor_added(sk, hdev, m->handle);
|
||||
m->state = ADV_MONITOR_STATE_REGISTERED;
|
||||
hdev->adv_monitors_cnt++;
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
return mgmt_cmd_complete(sk, hdev->id, op, MGMT_STATUS_SUCCESS,
|
||||
&rp, sizeof(rp));
|
||||
}
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -99,15 +99,12 @@ struct msft_data {
|
|||
__u8 evt_prefix_len;
|
||||
__u8 *evt_prefix;
|
||||
struct list_head handle_map;
|
||||
__u16 pending_add_handle;
|
||||
__u16 pending_remove_handle;
|
||||
__u8 resuming;
|
||||
__u8 suspending;
|
||||
__u8 filter_enabled;
|
||||
};
|
||||
|
||||
static int __msft_add_monitor_pattern(struct hci_dev *hdev,
|
||||
struct adv_monitor *monitor);
|
||||
static int __msft_remove_monitor(struct hci_dev *hdev,
|
||||
struct adv_monitor *monitor, u16 handle);
|
||||
|
||||
|
|
@ -164,34 +161,6 @@ failed:
|
|||
return false;
|
||||
}
|
||||
|
||||
static void reregister_monitor(struct hci_dev *hdev, int handle)
|
||||
{
|
||||
struct adv_monitor *monitor;
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
int err;
|
||||
|
||||
while (1) {
|
||||
monitor = idr_get_next(&hdev->adv_monitors_idr, &handle);
|
||||
if (!monitor) {
|
||||
/* All monitors have been resumed */
|
||||
msft->resuming = false;
|
||||
hci_update_passive_scan(hdev);
|
||||
return;
|
||||
}
|
||||
|
||||
msft->pending_add_handle = (u16)handle;
|
||||
err = __msft_add_monitor_pattern(hdev, monitor);
|
||||
|
||||
/* If success, we return and wait for monitor added callback */
|
||||
if (!err)
|
||||
return;
|
||||
|
||||
/* Otherwise remove the monitor and keep registering */
|
||||
hci_free_adv_monitor(hdev, monitor);
|
||||
handle++;
|
||||
}
|
||||
}
|
||||
|
||||
/* is_mgmt = true matches the handle exposed to userspace via mgmt.
|
||||
* is_mgmt = false matches the handle used by the msft controller.
|
||||
* This function requires the caller holds hdev->lock
|
||||
|
|
@ -243,34 +212,27 @@ static int msft_monitor_device_del(struct hci_dev *hdev, __u16 mgmt_handle,
|
|||
return count;
|
||||
}
|
||||
|
||||
static void msft_le_monitor_advertisement_cb(struct hci_dev *hdev,
|
||||
u8 status, u16 opcode,
|
||||
struct sk_buff *skb)
|
||||
static int msft_le_monitor_advertisement_cb(struct hci_dev *hdev, u16 opcode,
|
||||
struct adv_monitor *monitor,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
struct msft_rp_le_monitor_advertisement *rp;
|
||||
struct adv_monitor *monitor;
|
||||
struct msft_monitor_advertisement_handle_data *handle_data;
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
int status = 0;
|
||||
|
||||
hci_dev_lock(hdev);
|
||||
|
||||
monitor = idr_find(&hdev->adv_monitors_idr, msft->pending_add_handle);
|
||||
if (!monitor) {
|
||||
bt_dev_err(hdev, "msft add advmon: monitor %u is not found!",
|
||||
msft->pending_add_handle);
|
||||
status = HCI_ERROR_UNSPECIFIED;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (status)
|
||||
goto unlock;
|
||||
|
||||
rp = (struct msft_rp_le_monitor_advertisement *)skb->data;
|
||||
if (skb->len < sizeof(*rp)) {
|
||||
status = HCI_ERROR_UNSPECIFIED;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
status = rp->status;
|
||||
if (status)
|
||||
goto unlock;
|
||||
|
||||
handle_data = kmalloc(sizeof(*handle_data), GFP_KERNEL);
|
||||
if (!handle_data) {
|
||||
status = HCI_ERROR_UNSPECIFIED;
|
||||
|
|
@ -285,13 +247,12 @@ static void msft_le_monitor_advertisement_cb(struct hci_dev *hdev,
|
|||
monitor->state = ADV_MONITOR_STATE_OFFLOADED;
|
||||
|
||||
unlock:
|
||||
if (status && monitor)
|
||||
if (status)
|
||||
hci_free_adv_monitor(hdev, monitor);
|
||||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
if (!msft->resuming)
|
||||
hci_add_adv_patterns_monitor_complete(hdev, status);
|
||||
return status;
|
||||
}
|
||||
|
||||
static void msft_le_cancel_monitor_advertisement_cb(struct hci_dev *hdev,
|
||||
|
|
@ -463,7 +424,6 @@ static int msft_add_monitor_sync(struct hci_dev *hdev,
|
|||
ptrdiff_t offset = 0;
|
||||
u8 pattern_count = 0;
|
||||
struct sk_buff *skb;
|
||||
u8 status;
|
||||
|
||||
if (!msft_monitor_pattern_valid(monitor))
|
||||
return -EINVAL;
|
||||
|
|
@ -505,20 +465,40 @@ static int msft_add_monitor_sync(struct hci_dev *hdev,
|
|||
if (IS_ERR(skb))
|
||||
return PTR_ERR(skb);
|
||||
|
||||
status = skb->data[0];
|
||||
skb_pull(skb, 1);
|
||||
return msft_le_monitor_advertisement_cb(hdev, hdev->msft_opcode,
|
||||
monitor, skb);
|
||||
}
|
||||
|
||||
msft_le_monitor_advertisement_cb(hdev, status, hdev->msft_opcode, skb);
|
||||
/* This function requires the caller holds hci_req_sync_lock */
|
||||
static void reregister_monitor(struct hci_dev *hdev)
|
||||
{
|
||||
struct adv_monitor *monitor;
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
int handle = 0;
|
||||
|
||||
return status;
|
||||
if (!msft)
|
||||
return;
|
||||
|
||||
msft->resuming = true;
|
||||
|
||||
while (1) {
|
||||
monitor = idr_get_next(&hdev->adv_monitors_idr, &handle);
|
||||
if (!monitor)
|
||||
break;
|
||||
|
||||
msft_add_monitor_sync(hdev, monitor);
|
||||
|
||||
handle++;
|
||||
}
|
||||
|
||||
/* All monitors have been reregistered */
|
||||
msft->resuming = false;
|
||||
}
|
||||
|
||||
/* This function requires the caller holds hci_req_sync_lock */
|
||||
int msft_resume_sync(struct hci_dev *hdev)
|
||||
{
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
struct adv_monitor *monitor;
|
||||
int handle = 0;
|
||||
|
||||
if (!msft || !msft_monitor_supported(hdev))
|
||||
return 0;
|
||||
|
|
@ -533,24 +513,12 @@ int msft_resume_sync(struct hci_dev *hdev)
|
|||
|
||||
hci_dev_unlock(hdev);
|
||||
|
||||
msft->resuming = true;
|
||||
|
||||
while (1) {
|
||||
monitor = idr_get_next(&hdev->adv_monitors_idr, &handle);
|
||||
if (!monitor)
|
||||
break;
|
||||
|
||||
msft_add_monitor_sync(hdev, monitor);
|
||||
|
||||
handle++;
|
||||
}
|
||||
|
||||
/* All monitors have been resumed */
|
||||
msft->resuming = false;
|
||||
reregister_monitor(hdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* This function requires the caller holds hci_req_sync_lock */
|
||||
void msft_do_open(struct hci_dev *hdev)
|
||||
{
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
|
|
@ -583,7 +551,7 @@ void msft_do_open(struct hci_dev *hdev)
|
|||
/* Monitors get removed on power off, so we need to explicitly
|
||||
* tell the controller to re-monitor.
|
||||
*/
|
||||
reregister_monitor(hdev, 0);
|
||||
reregister_monitor(hdev);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -829,66 +797,7 @@ static void msft_le_set_advertisement_filter_enable_cb(struct hci_dev *hdev,
|
|||
hci_dev_unlock(hdev);
|
||||
}
|
||||
|
||||
/* This function requires the caller holds hdev->lock */
|
||||
static int __msft_add_monitor_pattern(struct hci_dev *hdev,
|
||||
struct adv_monitor *monitor)
|
||||
{
|
||||
struct msft_cp_le_monitor_advertisement *cp;
|
||||
struct msft_le_monitor_advertisement_pattern_data *pattern_data;
|
||||
struct msft_le_monitor_advertisement_pattern *pattern;
|
||||
struct adv_pattern *entry;
|
||||
struct hci_request req;
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
size_t total_size = sizeof(*cp) + sizeof(*pattern_data);
|
||||
ptrdiff_t offset = 0;
|
||||
u8 pattern_count = 0;
|
||||
int err = 0;
|
||||
|
||||
if (!msft_monitor_pattern_valid(monitor))
|
||||
return -EINVAL;
|
||||
|
||||
list_for_each_entry(entry, &monitor->patterns, list) {
|
||||
pattern_count++;
|
||||
total_size += sizeof(*pattern) + entry->length;
|
||||
}
|
||||
|
||||
cp = kmalloc(total_size, GFP_KERNEL);
|
||||
if (!cp)
|
||||
return -ENOMEM;
|
||||
|
||||
cp->sub_opcode = MSFT_OP_LE_MONITOR_ADVERTISEMENT;
|
||||
cp->rssi_high = monitor->rssi.high_threshold;
|
||||
cp->rssi_low = monitor->rssi.low_threshold;
|
||||
cp->rssi_low_interval = (u8)monitor->rssi.low_threshold_timeout;
|
||||
cp->rssi_sampling_period = monitor->rssi.sampling_period;
|
||||
|
||||
cp->cond_type = MSFT_MONITOR_ADVERTISEMENT_TYPE_PATTERN;
|
||||
|
||||
pattern_data = (void *)cp->data;
|
||||
pattern_data->count = pattern_count;
|
||||
|
||||
list_for_each_entry(entry, &monitor->patterns, list) {
|
||||
pattern = (void *)(pattern_data->data + offset);
|
||||
/* the length also includes data_type and offset */
|
||||
pattern->length = entry->length + 2;
|
||||
pattern->data_type = entry->ad_type;
|
||||
pattern->start_byte = entry->offset;
|
||||
memcpy(pattern->pattern, entry->value, entry->length);
|
||||
offset += sizeof(*pattern) + entry->length;
|
||||
}
|
||||
|
||||
hci_req_init(&req, hdev);
|
||||
hci_req_add(&req, hdev->msft_opcode, total_size, cp);
|
||||
err = hci_req_run_skb(&req, msft_le_monitor_advertisement_cb);
|
||||
kfree(cp);
|
||||
|
||||
if (!err)
|
||||
msft->pending_add_handle = monitor->handle;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
/* This function requires the caller holds hdev->lock */
|
||||
/* This function requires the caller holds hci_req_sync_lock */
|
||||
int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monitor *monitor)
|
||||
{
|
||||
struct msft_data *msft = hdev->msft_data;
|
||||
|
|
@ -899,7 +808,7 @@ int msft_add_monitor_pattern(struct hci_dev *hdev, struct adv_monitor *monitor)
|
|||
if (msft->resuming || msft->suspending)
|
||||
return -EBUSY;
|
||||
|
||||
return __msft_add_monitor_pattern(hdev, monitor);
|
||||
return msft_add_monitor_sync(hdev, monitor);
|
||||
}
|
||||
|
||||
/* This function requires the caller holds hdev->lock */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче