Re: [PATCH] HID: wacom: Fix deadlock on proximity in events with the Intuos Draw

[Lyude]

Yep! That's definitely the same as this one. Glad to hear it still was useful
even if it's obsolete :).



On Wed, 2015-12-30 at 12:39 -0800, Jason Gerecke wrote:
> Is this a fix for the same bug addressed in http://linux.kernel.narkive.com/zU
> Iw13xt/patch-hid-usbhid-hid-core-fix-recursive-deadlock
> I think Ping was going to work on something similar to this for the "input-
> wacom" backports (since we can't rely on a fixed hid_ctrl being present) after
> returning from vacation, but if you've already written it... :)
> On Dec 30, 2015 9:08 AM, "Lyude" <cpaul@xxxxxxxxxx> wrote:
> > Unfortunately, when we have an Intuos Draw connected using a USB
> > connection, wacom's IRQ handler will be called while the lock for the
> > usbhid driver is held by hid_ctrl. This means when we try to schedule a
> > new proximity event in wacom_intuos_schedule_prox_event() by calling
> > hid_hw_request(), we'll try to take the lock a second time which
> > deadlocks the system. This patch fixes that behavior by initializing a
> > worker when we have a INTUOSHT2 device connected, and using that worker
> > to schedule the proximity event instead.
> > 
> > Signed-off-by: Lyude <cpaul@xxxxxxxxxx>
> > ---
> > Âdrivers/hid/wacom_wac.c | 9 +++++++--
> > Âdrivers/hid/wacom_wac.h | 1 +
> > Â2 files changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> > index 01a4f05..b59ded6 100644
> > --- a/drivers/hid/wacom_wac.c
> > +++ b/drivers/hid/wacom_wac.c
> > @@ -433,8 +433,10 @@ exit:
> > Â Â Â Â return retval;
> > Â}
> > 
> > -static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac)
> > +static void wacom_intuos_schedule_prox_event(struct work_struct *work)
> > Â{
> > +Â Â Â Âstruct wacom_wac *wacom_wac =
> > +Â Â Â Â Â Â Â Âcontainer_of(work, struct wacom_wac,
> > intuos_prox_event_worker);
> > Â Â Â Â struct wacom *wacom = container_of(wacom_wac, struct wacom,
> > wacom_wac);
> > Â Â Â Â struct hid_report *r;
> > Â Â Â Â struct hid_report_enum *re;
> > @@ -624,7 +626,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
> > Â Â Â Â /* don't report other events if we don't know the ID */
> > Â Â Â Â if (!wacom->id[idx]) {
> > Â Â Â Â Â Â Â Â /* but reschedule a read of the current tool */
> > -Â Â Â Â Â Â Â Âwacom_intuos_schedule_prox_event(wacom);
> > +Â Â Â Â Â Â Â Âschedule_work(&wacom->intuos_prox_event_worker);
> > Â Â Â Â Â Â Â Â return 1;
> > Â Â Â Â }
> > 
> > @@ -2675,6 +2677,9 @@ int wacom_setup_pen_input_capabilities(struct
> > input_dev *input_dev,
> > 
> > Â Â Â Â Â Â Â Â if (features->type == INTUOSHT2) {
> > Â Â Â Â Â Â Â Â Â Â Â Â wacom_setup_basic_pro_pen(wacom_wac);
> > +
> > +Â Â Â Â Â Â Â Â Â Â Â ÂINIT_WORK(&wacom_wac->intuos_prox_event_worker,
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âwacom_intuos_schedule_prox_event);
> > Â Â Â Â Â Â Â Â } else {
> > Â Â Â Â Â Â Â Â Â Â Â Â __clear_bit(ABS_MISC, input_dev->absbit);
> > Â Â Â Â Â Â Â Â Â Â Â Â __set_bit(BTN_TOOL_PEN, input_dev->keybit);
> > diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> > index 877c24a..c24cfdc 100644
> > --- a/drivers/hid/wacom_wac.h
> > +++ b/drivers/hid/wacom_wac.h
> > @@ -237,6 +237,7 @@ struct wacom_wac {
> > Â Â Â Â int ps_connected;
> > Â Â Â Â u8 bt_features;
> > Â Â Â Â u8 bt_high_speed;
> > +Â Â Â Âstruct work_struct intuos_prox_event_worker;
> > Â Â Â Â struct hid_data hid_data;
> > Â};
> > 
> > --
> > 2.5.0
> > 
> > 
-- 
Cheers,
	Lyude

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/