On 04/11/2018 11:43 AM, Tomasz Figa wrote:
> Hi Hans,
>
> On Mon, Apr 9, 2018 at 11:20 PM Hans Verkuil <[email protected]> wrote:
>
>> From: Hans Verkuil <[email protected]>
>
>> Integrate the request support. This adds the v4l2_ctrl_request_complete
>> and v4l2_ctrl_request_setup functions to complete a request and (as a
>> helper function) to apply a request to the hardware.
>
> Please see my comments inline.
>
> [snip]
>> +static int v4l2_ctrl_request_clone(struct v4l2_ctrl_handler *hdl,
>> + const struct v4l2_ctrl_handler *from)
>> +{
>> + struct v4l2_ctrl_ref *ref;
>> + int err;
>> +
>> + if (WARN_ON(!hdl || hdl == from))
>> + return -EINVAL;
>> +
>> + if (hdl->error)
>> + return hdl->error;
>> +
>> + WARN_ON(hdl->lock != &hdl->_lock);
>> +
>> + mutex_lock(from->lock);
>> + list_for_each_entry(ref, &from->ctrl_refs, node) {
>> + struct v4l2_ctrl *ctrl = ref->ctrl;
>> + struct v4l2_ctrl_ref *new_ref;
>> +
>> + /* Skip refs inherited from other devices */
>> + if (ref->from_other_dev)
>> + continue;
>> + /* And buttons */
>> + if (ctrl->type == V4L2_CTRL_TYPE_BUTTON)
>> + continue;
>> + err = handler_new_ref(hdl, ctrl, &new_ref, false, true);
>> + if (err) {
>> + printk("%s: handler_new_ref on control %x (%s)
> returned %d\n", __func__, ctrl->id, ctrl->name, err);
>
> Perhaps pr_err()?
>
>> + err = 0;
>> + continue;
>
> Hmm, is it really fine to ignore the error and continue here?
It's a debugging left-over. It should just break and return the error.
>
>> + }
>> + if (err)
>> + break;
>> + }
>> + mutex_unlock(from->lock);
>> + return err;
>> +}
>> +
>> +static void v4l2_ctrl_request_queue(struct media_request_object *obj)
>> +{
>> + struct v4l2_ctrl_handler *hdl =
>> + container_of(obj, struct v4l2_ctrl_handler, req_obj);
>> + struct v4l2_ctrl_handler *main_hdl = obj->priv;
>> + struct v4l2_ctrl_handler *prev = NULL;
>> + struct v4l2_ctrl_ref *ref_hdl, *ref_prev = NULL;
>> +
>> + if (list_empty(&main_hdl->requests_queued))
>> + goto queue;
>> +
>> + prev = list_last_entry(&main_hdl->requests_queued,
>> + struct v4l2_ctrl_handler, requests_queued);
>> + mutex_lock(prev->lock);
>> + ref_prev = list_first_entry(&prev->ctrl_refs,
>> + struct v4l2_ctrl_ref, node);
>> + list_for_each_entry(ref_hdl, &hdl->ctrl_refs, node) {
>> + if (ref_hdl->req)
>> + continue;
>> + while (ref_prev->ctrl->id < ref_hdl->ctrl->id)
>> + ref_prev = list_next_entry(ref_prev, node);
>
> Is this really safe? The only stop condition here is the control id.
> Perhaps the code below could be better?
The two ctrl_refs lists must contain the same controls, so it is safe.
However, I modified the code to check that ref_prev isn't the last
element in the list, just in case something gets messed up.
BTW, the variable names in this function are awful :-)
I've changed them so this code is hopefully easier to understand.
>
> list_for_each_entry_from(ref_prev, &prev->ctrl_refs, node)
> if (ref_prev->ctrl->id >= ref_hdl->ctrl->id)
> break;
>
>> + if (WARN_ON(ref_prev->ctrl->id != ref_hdl->ctrl->id))
>> + break;
>> + ref_hdl->req = ref_prev->req;
>> + }
>> + mutex_unlock(prev->lock);
>> +queue:
>> + list_add_tail(&hdl->requests_queued, &main_hdl->requests_queued);
>> + hdl->request_is_queued = true;
>> +}
>> +
>
> [snip]
>> +void v4l2_ctrl_request_complete(struct media_request *req,
>> + struct v4l2_ctrl_handler *main_hdl)
>> +{
>> + struct media_request_object *obj;
>> + struct v4l2_ctrl_handler *hdl;
>> + struct v4l2_ctrl_ref *ref;
>> +
>> + if (!req || !main_hdl)
>> + return;
>
> Can this happen normally? Perhaps WARN_ON() would make sense?
Yes, this can happen. See e.g. vim2m_stop_streaming(). This function is
called for all buffers, but not all buffers may have a request associated
with them. In that case req == NULL and this function should do nothing.
There are also cases (rare, but they exist) where a handler may be NULL
because the specific hardware version does not support the controls in that
handler. In that case the handler may never be created.
Basically this function means: if there is a request, and if there is a
handler, then complete the request.
>
> [snip]
>> +void v4l2_ctrl_request_setup(struct media_request *req,
>> + struct v4l2_ctrl_handler *main_hdl)
>> +{
>> + struct media_request_object *obj;
>> + struct v4l2_ctrl_handler *hdl;
>> + struct v4l2_ctrl_ref *ref;
>> +
>> + if (!req || !main_hdl)
>
> Can this happen normally? Perhaps WARN_ON() would make sense?
Same reason as above.
>
>> + return;
>> +
>> + obj = media_request_object_find(req, &req_ops, main_hdl);
>> + if (!obj)
>> + return;
>> + if (obj->completed) {
>> + media_request_object_put(obj);
>> + return;
>> + }
>> + hdl = container_of(obj, struct v4l2_ctrl_handler, req_obj);
>> +
>> + mutex_lock(hdl->lock);
>> +
>> + list_for_each_entry(ref, &hdl->ctrl_refs, node)
>> + ref->done = false;
>> +
>> + list_for_each_entry(ref, &hdl->ctrl_refs, node) {
>> + struct v4l2_ctrl *ctrl = ref->ctrl;
>> + struct v4l2_ctrl *master = ctrl->cluster[0];
>> + bool have_new_data = false;
>> + int i;
>> +
>> + /* Skip if this control was already handled by a cluster.
> */
>> + /* Skip button controls and read-only controls. */
>> + if (ref->done || ctrl->type == V4L2_CTRL_TYPE_BUTTON ||
>> + (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY))
>> + continue;
>> +
>> + v4l2_ctrl_lock(master);
>> + for (i = 0; i < master->ncontrols; i++) {
>> + if (master->cluster[i]) {
>> + struct v4l2_ctrl_ref *r =
>> + find_ref(hdl,
> master->cluster[i]->id);
>> +
>> + if (r->req && r == r->req) {
>> + have_new_data = true;
>> + break;
>> + }
>> + }
>> + }
>> + if (!have_new_data)
>> + continue;
>
> No need to call v4l2_ctrl_unlock() here?
>
> [snip]
>> @@ -263,6 +267,8 @@ struct v4l2_ctrl_ref {
>> struct v4l2_ctrl *ctrl;
>> struct v4l2_ctrl_helper *helper;
>> bool from_other_dev;
>> + bool done;
>> + struct v4l2_ctrl_ref *req;
>
> Perhaps it could make sense to call this ref_req, which would use the same
> convention as p_req below?
I'll have to think some more about this name. It is not descriptive enough.
Regards,
Hans
>
>> union v4l2_ctrl_ptr p_req;
>> };
>
> Best regards,
> Tomasz
>
