* [PATCH 1/2] qmi: Separate the pending family creation queues
@ 2024-05-01 20:45 Steve Schrock
2024-05-01 20:45 ` [PATCH 2/2] qmi: Move the pending queues into qmi_device_qmux Steve Schrock
0 siblings, 1 reply; 2+ messages in thread
From: Steve Schrock @ 2024-05-01 20:45 UTC (permalink / raw
To: ofono; +Cc: Steve Schrock
The family_list hashmap is keyed by the client ID and service type,
unless qmux is creating the first client for a service type. In that
case the high bytes are 0x8000 instead of the client ID, and the
value is a queue of clients waiting for that service instead of the
service_family.
This commit moves the pending clients into thir own hashmap to ensure
that each hashmap contains a consistent type and eliminates the need
for marking pending keys with 0x80000000.
---
drivers/qmimodem/qmi.c | 73 ++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 34 deletions(-)
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 69a0e535f689..c3af4a4cd98c 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -101,6 +101,7 @@ struct qmi_device {
qmi_debug_func_t debug_func;
void *debug_data;
struct l_queue *service_infos;
+ struct l_hashmap *pending_family_creations; /* holds l_queues */
struct l_hashmap *family_list;
const struct qmi_device_ops *ops;
bool writer_active : 1;
@@ -354,10 +355,6 @@ static void __family_find_by_type(const void *key, void *value,
struct service_family *family = value;
struct service_find_by_type_data *data = user_data;
- /* ignore those that are in process of creation */
- if (L_PTR_TO_UINT(key) & 0x80000000)
- return;
-
if (family->info.service_type == data->type)
data->found_family = family;
}
@@ -785,10 +782,6 @@ static void service_notify(const void *key, void *value, void *user_data)
struct service_family *family = value;
struct qmi_result *result = user_data;
- /* ignore those that are in process of creation */
- if (L_PTR_TO_UINT(key) & 0x80000000)
- return;
-
l_queue_foreach(family->notify_list, service_notify_if_message_matches,
result);
}
@@ -927,6 +920,7 @@ static int qmi_device_init(struct qmi_device *device, int fd,
device->service_queue = l_queue_new();
device->discovery_queue = l_queue_new();
device->service_infos = l_queue_new();
+ device->pending_family_creations = l_hashmap_new();
device->family_list = l_hashmap_new();
device->next_service_tid = 256;
@@ -942,6 +936,15 @@ static void __qmi_device_shutdown_finished(struct qmi_device *device)
device->ops->destroy(device);
}
+static void free_pending_family_creations_queue(struct l_queue *pending)
+{
+ /*
+ * The service_create_shared_data objects are owned by the discovery
+ * queue and do not need to be freed here.
+ */
+ l_queue_destroy(pending, NULL);
+}
+
void qmi_device_free(struct qmi_device *device)
{
if (!device)
@@ -956,6 +959,8 @@ void qmi_device_free(struct qmi_device *device)
l_io_destroy(device->io);
l_hashmap_destroy(device->family_list, family_destroy);
+ l_hashmap_destroy(device->pending_family_creations,
+ (l_hashmap_destroy_func_t) free_pending_family_creations_queue);
l_queue_destroy(device->service_infos, l_free);
@@ -1535,11 +1540,12 @@ static void service_create_shared_pending_reply(struct qmi_device *device,
unsigned int type,
struct service_family *family)
{
- void *key = L_UINT_TO_PTR(type | 0x80000000);
- struct l_queue *shared = l_hashmap_remove(device->family_list, key);
+ void *key = L_UINT_TO_PTR(type);
+ struct l_queue *pending = l_hashmap_remove(
+ device->pending_family_creations, key);
const struct l_queue_entry *entry;
- for (entry = l_queue_get_entries(shared); entry; entry = entry->next) {
+ for (entry = l_queue_get_entries(pending); entry; entry = entry->next) {
struct service_create_shared_data *shared_data = entry->data;
shared_data->family = service_family_ref(family);
@@ -1547,7 +1553,7 @@ static void service_create_shared_pending_reply(struct qmi_device *device,
shared_data, NULL);
}
- l_queue_destroy(shared, NULL);
+ l_queue_destroy(pending, NULL);
}
static void service_create_shared_data_free(void *user_data)
@@ -1853,13 +1859,11 @@ static int qmi_device_qmux_client_create(struct qmi_device *device,
unsigned char client_req[] = { 0x01, 0x01, 0x00, service_type };
struct qmi_request *req;
struct qmux_client_create_data *data;
- struct l_queue *shared;
- unsigned int type_val = service_type;
+ struct l_queue *pending;
if (!l_queue_length(device->service_infos))
return -ENOENT;
- shared = l_queue_new();
data = l_new(struct qmux_client_create_data, 1);
data->super.destroy = qmux_client_create_data_free;
@@ -1884,9 +1888,13 @@ static int qmi_device_qmux_client_create(struct qmi_device *device,
__qmi_device_discovery_started(device, &data->super);
- /* Mark service creation as pending */
- l_hashmap_insert(device->family_list,
- L_UINT_TO_PTR(type_val | 0x80000000), shared);
+ /*
+ * Only subsequent requests for this same service will be added to
+ * the queue.
+ */
+ pending = l_queue_new();
+ l_hashmap_insert(device->pending_family_creations,
+ L_UINT_TO_PTR(service_type), pending);
return 0;
}
@@ -2615,9 +2623,8 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
qmi_create_func_t func, void *user_data,
qmi_destroy_func_t destroy)
{
- struct l_queue *shared;
+ struct l_queue *pending;
struct service_family *family = NULL;
- unsigned int type_val = type;
int r;
if (!device || !func)
@@ -2631,10 +2638,10 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
/*
* The hash id is simply the service type in this case. There
- * is no "pending" state for discovery and no client id.
+ * is no client id.
*/
family = l_hashmap_lookup(device->family_list,
- L_UINT_TO_PTR(type_val));
+ L_UINT_TO_PTR(type));
if (!family) {
const struct qmi_service_info *info;
@@ -2644,7 +2651,7 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
family = service_family_create(device, info, 0);
l_hashmap_insert(device->family_list,
- L_UINT_TO_PTR(type_val), family);
+ L_UINT_TO_PTR(type), family);
}
data = l_new(struct service_create_shared_data, 1);
@@ -2665,27 +2672,25 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
return true;
}
- shared = l_hashmap_lookup(device->family_list,
- L_UINT_TO_PTR(type_val | 0x80000000));
+ pending = l_hashmap_lookup(device->pending_family_creations,
+ L_UINT_TO_PTR(type));
- if (!shared) {
+ if (!pending) {
/*
* There is no way to find in an l_hashmap using a custom
* function. Instead we use a temporary struct to store the
- * found service. This is not very clean, but we expect this
- * code to be refactored soon.
+ * found service family.
*/
struct service_find_by_type_data data;
- data.type = type_val;
+ data.type = type;
data.found_family = NULL;
l_hashmap_foreach(device->family_list, __family_find_by_type,
&data);
family = data.found_family;
- } else
- type_val |= 0x80000000;
+ }
- if (shared || family) {
+ if (pending || family) {
struct service_create_shared_data *data;
data = l_new(struct service_create_shared_data, 1);
@@ -2696,12 +2701,12 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
data->user_data = user_data;
data->destroy = destroy;
- if (!(type_val & 0x80000000)) {
+ if (family) {
data->family = service_family_ref(family);
data->idle = l_idle_create(service_create_shared_reply,
data, NULL);
} else
- l_queue_push_head(shared, data);
+ l_queue_push_head(pending, data);
__qmi_device_discovery_started(device, &data->super);
--
2.43.2
--
*Confidentiality Note:* We care about protecting our proprietary
information, confidential material, and trade secrets. This message may
contain some or all of those things. Cruise will suffer material harm if
anyone other than the intended recipient disseminates or takes any action
based on this message. If you have received this message (including any
attachments) in error, please delete it immediately and notify the sender
promptly.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] qmi: Move the pending queues into qmi_device_qmux
2024-05-01 20:45 [PATCH 1/2] qmi: Separate the pending family creation queues Steve Schrock
@ 2024-05-01 20:45 ` Steve Schrock
0 siblings, 0 replies; 2+ messages in thread
From: Steve Schrock @ 2024-05-01 20:45 UTC (permalink / raw
To: ofono; +Cc: Steve Schrock
Only qmux needs to asynchronously create service clients so the list
of pending clients should move there. At the same time flatten the
hashmap of queues of pending clients into a single queue that is
linearly searched--the number of pending clients will be small so
there is no need for any extra hashmap overhead or complexity.
---
drivers/qmimodem/qmi.c | 262 +++++++++++++++++++++--------------------
1 file changed, 133 insertions(+), 129 deletions(-)
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index c3af4a4cd98c..824749e9be77 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -101,7 +101,6 @@ struct qmi_device {
qmi_debug_func_t debug_func;
void *debug_data;
struct l_queue *service_infos;
- struct l_hashmap *pending_family_creations; /* holds l_queues */
struct l_hashmap *family_list;
const struct qmi_device_ops *ops;
bool writer_active : 1;
@@ -121,6 +120,7 @@ struct qmi_device_qmux {
unsigned int release_users;
uint8_t next_control_tid;
struct l_queue *control_queue;
+ struct l_queue *pending_families;
};
struct service_family {
@@ -920,7 +920,6 @@ static int qmi_device_init(struct qmi_device *device, int fd,
device->service_queue = l_queue_new();
device->discovery_queue = l_queue_new();
device->service_infos = l_queue_new();
- device->pending_family_creations = l_hashmap_new();
device->family_list = l_hashmap_new();
device->next_service_tid = 256;
@@ -936,15 +935,6 @@ static void __qmi_device_shutdown_finished(struct qmi_device *device)
device->ops->destroy(device);
}
-static void free_pending_family_creations_queue(struct l_queue *pending)
-{
- /*
- * The service_create_shared_data objects are owned by the discovery
- * queue and do not need to be freed here.
- */
- l_queue_destroy(pending, NULL);
-}
-
void qmi_device_free(struct qmi_device *device)
{
if (!device)
@@ -959,8 +949,6 @@ void qmi_device_free(struct qmi_device *device)
l_io_destroy(device->io);
l_hashmap_destroy(device->family_list, family_destroy);
- l_hashmap_destroy(device->pending_family_creations,
- (l_hashmap_destroy_func_t) free_pending_family_creations_queue);
l_queue_destroy(device->service_infos, l_free);
@@ -1421,6 +1409,9 @@ static bool received_qmux_data(struct l_io *io, void *user_data)
static struct service_family *service_family_ref(struct service_family *family)
{
+ if (!family)
+ return NULL;
+
family->ref_count++;
return family;
@@ -1431,6 +1422,9 @@ static void service_family_unref(struct service_family *family)
struct qmi_device *device;
unsigned int hash_id;
+ if (!family)
+ return;
+
if (--family->ref_count)
return;
@@ -1453,6 +1447,7 @@ done:
struct service_create_shared_data {
struct discovery super;
+ uint16_t service_type;
struct service_family *family;
struct qmi_device *device;
qmi_create_func_t func;
@@ -1536,24 +1531,56 @@ static void service_create_shared_reply(struct l_idle *idle, void *user_data)
DISCOVERY_DONE(data, service, data->user_data);
}
-static void service_create_shared_pending_reply(struct qmi_device *device,
- unsigned int type,
- struct service_family *family)
+static bool pending_family_match(const void *data, const void *user_data)
{
- void *key = L_UINT_TO_PTR(type);
- struct l_queue *pending = l_hashmap_remove(
- device->pending_family_creations, key);
- const struct l_queue_entry *entry;
+ const struct service_create_shared_data *shared_data = data;
+ uint16_t service_type = L_PTR_TO_UINT(user_data);
+
+ return shared_data->service_type == service_type;
+}
+
+struct pending_family_reply_if_match_info {
+ uint16_t service_type;
+ struct service_family *family;
+};
- for (entry = l_queue_get_entries(pending); entry; entry = entry->next) {
- struct service_create_shared_data *shared_data = entry->data;
+static bool pending_family_reply_if_match(void *data, void *user_data)
+{
+ struct service_create_shared_data *shared_data = data;
+ struct pending_family_reply_if_match_info *info = user_data;
- shared_data->family = service_family_ref(family);
+ if (pending_family_match(data, L_UINT_TO_PTR(info->service_type))) {
+ shared_data->family = info->family;
+
+ /*
+ * Perform the callback later after we have incremented the ref
+ * count.
+ */
shared_data->idle = l_idle_create(service_create_shared_reply,
shared_data, NULL);
+
+ return true;
}
- l_queue_destroy(pending, NULL);
+ return false;
+}
+
+static void service_create_shared_pending_reply(struct qmi_device_qmux *qmux,
+ uint16_t service_type,
+ struct service_family *family)
+{
+ struct pending_family_reply_if_match_info info = {
+ .service_type = service_type,
+ .family = family,
+ };
+ unsigned int removed;
+
+ removed = l_queue_foreach_remove(qmux->pending_families,
+ pending_family_reply_if_match,
+ &info);
+
+ if (family)
+ family->ref_count += removed;
}
static void service_create_shared_data_free(void *user_data)
@@ -1752,8 +1779,6 @@ struct qmux_client_create_data {
uint16_t major;
uint16_t minor;
qmi_create_func_t func;
- void *user_data;
- qmi_destroy_func_t destroy;
struct l_timeout *timeout;
uint16_t tid;
};
@@ -1765,9 +1790,6 @@ static void qmux_client_create_data_free(void *user_data)
if (data->timeout)
l_timeout_remove(data->timeout);
- if (data->destroy)
- data->destroy(data->user_data);
-
l_free(data);
}
@@ -1781,7 +1803,7 @@ static void qmux_client_create_reply(struct l_timeout *timeout, void *user_data)
DBG("");
- service_create_shared_pending_reply(device, data->type, NULL);
+ service_create_shared_pending_reply(qmux, data->type, NULL);
/* remove request from queues */
req = find_control_request(qmux, data->tid);
@@ -1789,7 +1811,7 @@ static void qmux_client_create_reply(struct l_timeout *timeout, void *user_data)
l_timeout_remove(data->timeout);
data->timeout = NULL;
- DISCOVERY_DONE(data, NULL, data->user_data);
+ DISCOVERY_DONE(data, NULL, NULL);
if (req)
__request_free(req);
@@ -1800,9 +1822,10 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length,
{
struct qmux_client_create_data *data = user_data;
struct qmi_device *device = data->device;
+ struct qmi_device_qmux *qmux =
+ l_container_of(device, struct qmi_device_qmux, super);
struct service_family *family = NULL;
struct service_family *old_family = NULL;
- struct qmi_service *service = NULL;
struct qmi_service_info info;
const struct qmi_result_code *result_code;
const struct qmi_client_id *client_id;
@@ -1841,12 +1864,10 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length,
if (old_family)
family_destroy(old_family);
- service = service_create(family);
-
done:
- service_create_shared_pending_reply(device, data->type, family);
+ service_create_shared_pending_reply(qmux, data->type, family);
- DISCOVERY_DONE(data, service, data->user_data);
+ DISCOVERY_DONE(data, NULL, NULL);
}
static int qmi_device_qmux_client_create(struct qmi_device *device,
@@ -1858,43 +1879,50 @@ static int qmi_device_qmux_client_create(struct qmi_device *device,
l_container_of(device, struct qmi_device_qmux, super);
unsigned char client_req[] = { 0x01, 0x01, 0x00, service_type };
struct qmi_request *req;
- struct qmux_client_create_data *data;
- struct l_queue *pending;
+ struct service_create_shared_data *shared_data;
+ struct qmux_client_create_data *create_data;
+ bool create_in_progress;
if (!l_queue_length(device->service_infos))
return -ENOENT;
- data = l_new(struct qmux_client_create_data, 1);
+ create_in_progress = l_queue_find(qmux->pending_families,
+ pending_family_match,
+ L_UINT_TO_PTR(service_type));
- data->super.destroy = qmux_client_create_data_free;
- data->device = device;
- data->type = service_type;
- data->func = func;
- data->user_data = user_data;
- data->destroy = destroy;
+ shared_data = l_new(struct service_create_shared_data, 1);
+ shared_data->super.destroy = service_create_shared_data_free;
+ shared_data->service_type = service_type;
+ shared_data->device = device;
+ shared_data->func = func;
+ shared_data->user_data = user_data;
+ shared_data->destroy = destroy;
+ l_queue_push_tail(qmux->pending_families, shared_data);
+
+ if (create_in_progress)
+ return 0;
+
+ create_data = l_new(struct qmux_client_create_data, 1);
+ create_data->super.destroy = qmux_client_create_data_free;
+ create_data->device = device;
+ create_data->type = service_type;
__debug_device(device, "service create [type=%d]", service_type);
- qmi_device_get_service_version(device, data->type,
- &data->major, &data->minor);
+ qmi_device_get_service_version(device, create_data->type,
+ &create_data->major,
+ &create_data->minor);
req = __control_request_alloc(QMI_CTL_GET_CLIENT_ID,
client_req, sizeof(client_req),
- qmux_client_create_callback, data);
+ qmux_client_create_callback,
+ create_data);
- data->tid = __ctl_request_submit(qmux, req);
- data->timeout = l_timeout_create(8, qmux_client_create_reply,
- data, NULL);
-
- __qmi_device_discovery_started(device, &data->super);
+ create_data->tid = __ctl_request_submit(qmux, req);
+ create_data->timeout = l_timeout_create(8, qmux_client_create_reply,
+ create_data, NULL);
- /*
- * Only subsequent requests for this same service will be added to
- * the queue.
- */
- pending = l_queue_new();
- l_hashmap_insert(device->pending_family_creations,
- L_UINT_TO_PTR(service_type), pending);
+ __qmi_device_discovery_started(device, &create_data->super);
return 0;
}
@@ -1985,6 +2013,8 @@ static void qmi_device_qmux_destroy(struct qmi_device *device)
struct qmi_device_qmux *qmux =
l_container_of(device, struct qmi_device_qmux, super);
+ l_queue_destroy(qmux->pending_families,
+ (l_queue_destroy_func_t) service_create_shared_data_free);
l_queue_destroy(qmux->control_queue, __request_free);
if (qmux->shutdown_idle)
@@ -2022,6 +2052,7 @@ struct qmi_device *qmi_device_new_qmux(const char *device)
qmux->next_control_tid = 1;
qmux->control_queue = l_queue_new();
+ qmux->pending_families = l_queue_new();
l_io_set_read_handler(qmux->super.io, received_qmux_data, qmux, NULL);
return &qmux->super;
@@ -2623,9 +2654,8 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
qmi_create_func_t func, void *user_data,
qmi_destroy_func_t destroy)
{
- struct l_queue *pending;
- struct service_family *family = NULL;
- int r;
+ struct service_create_shared_data *data;
+ struct service_family *family;
if (!device || !func)
return false;
@@ -2633,88 +2663,62 @@ bool qmi_service_create_shared(struct qmi_device *device, uint16_t type,
if (type == QMI_SERVICE_CONTROL)
return false;
- if (!device->ops->client_create) {
- struct service_create_shared_data *data;
-
- /*
- * The hash id is simply the service type in this case. There
- * is no client id.
- */
- family = l_hashmap_lookup(device->family_list,
- L_UINT_TO_PTR(type));
- if (!family) {
- const struct qmi_service_info *info;
-
- info = __find_service_info_by_type(device, type);
- if (!info)
- return false;
-
- family = service_family_create(device, info, 0);
- l_hashmap_insert(device->family_list,
- L_UINT_TO_PTR(type), family);
- }
-
- data = l_new(struct service_create_shared_data, 1);
-
- data->super.destroy = service_create_shared_data_free;
- data->device = device;
- data->func = func;
- data->user_data = user_data;
- data->destroy = destroy;
- data->family = service_family_ref(family);
-
- data->idle = l_idle_create(service_create_shared_reply,
- data, NULL);
-
- /* Not really discovery... just tracking the idle callback. */
- __qmi_device_discovery_started(device, &data->super);
-
- return true;
- }
+ /*
+ * First check to see if the bare type is in the hashmap. If it is not
+ * the family might exist already, but have the client id included in
+ * the hash id.
+ */
+ family = l_hashmap_lookup(device->family_list, L_UINT_TO_PTR(type));
- pending = l_hashmap_lookup(device->pending_family_creations,
- L_UINT_TO_PTR(type));
+ if (!family) {
+ struct service_find_by_type_data find_data;
- if (!pending) {
/*
* There is no way to find in an l_hashmap using a custom
* function. Instead we use a temporary struct to store the
* found service family.
*/
- struct service_find_by_type_data data;
-
- data.type = type;
- data.found_family = NULL;
+ find_data.type = type;
+ find_data.found_family = NULL;
l_hashmap_foreach(device->family_list, __family_find_by_type,
- &data);
- family = data.found_family;
+ &find_data);
+ family = find_data.found_family;
}
- if (pending || family) {
- struct service_create_shared_data *data;
-
- data = l_new(struct service_create_shared_data, 1);
+ if (!family) {
+ const struct qmi_service_info *info;
- data->super.destroy = service_create_shared_data_free;
- data->device = device;
- data->func = func;
- data->user_data = user_data;
- data->destroy = destroy;
+ if (device->ops->client_create) {
+ int r;
- if (family) {
- data->family = service_family_ref(family);
- data->idle = l_idle_create(service_create_shared_reply,
- data, NULL);
- } else
- l_queue_push_head(pending, data);
+ r = device->ops->client_create(device, type, func,
+ user_data, destroy);
+ return r == 0;
+ }
- __qmi_device_discovery_started(device, &data->super);
+ info = __find_service_info_by_type(device, type);
+ if (!info)
+ return false;
- return true;
+ family = service_family_create(device, info, 0);
+ l_hashmap_insert(device->family_list, L_UINT_TO_PTR(type),
+ family);
}
- r = device->ops->client_create(device, type, func, user_data, destroy);
- return r == 0;
+ data = l_new(struct service_create_shared_data, 1);
+
+ data->super.destroy = service_create_shared_data_free;
+ data->device = device;
+ data->func = func;
+ data->user_data = user_data;
+ data->destroy = destroy;
+ data->family = service_family_ref(family);
+ data->idle = l_idle_create(service_create_shared_reply, data, NULL);
+
+ /* Not really discovery... just tracking the idle callback. */
+ __qmi_device_discovery_started(device, &data->super);
+
+ return true;
}
bool qmi_service_create(struct qmi_device *device,
--
2.43.2
--
*Confidentiality Note:* We care about protecting our proprietary
information, confidential material, and trade secrets. This message may
contain some or all of those things. Cruise will suffer material harm if
anyone other than the intended recipient disseminates or takes any action
based on this message. If you have received this message (including any
attachments) in error, please delete it immediately and notify the sender
promptly.
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-01 20:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-01 20:45 [PATCH 1/2] qmi: Separate the pending family creation queues Steve Schrock
2024-05-01 20:45 ` [PATCH 2/2] qmi: Move the pending queues into qmi_device_qmux Steve Schrock
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.