From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FD1C5464C for ; Thu, 10 Sep 2026 20:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789071156; cv=none; b=Bbh4CAge5zRvCA7hwevsTY4RP/pNcyo23ADQL3BRN9MDpAYeh/3CvEUcf8KeAlfA1E+zCSxQ2qD6mrXhPnW2oA8Vth56KHoSRahi+T3BjQOjFxaI8MjljFnQLhjb6txS3gdt23ou3mc9c77ixUGFsCh7Ibo2iX9n6CkNghVnV40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789071156; c=relaxed/simple; bh=IL/B5xbFl3JxOIccUMzALG8qHyO9zcro8rwwEjt15ss=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ENj9ZW2UHe4qr49D6SVhhs1lp/m4Y0qLf12wpZsLFAIID4LNENBF2kIWq6TvA686k7xm2sH3GXEnN8BVbKOHfiJvoD+eaGrHNuoKQmRAU5Rriij54t3FFBGXDt1C50fUItCHKSnPPViw4AzSUu62ytPx09ZMSTzx1Tp8t1rgFRs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=p8kgZ2Lv; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p8kgZ2Lv" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-39647184c73so1205762a91.1 for ; Thu, 10 Sep 2026 13:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789071152; x=1789675952; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o2iriQrm9CmEkrRMgEG9C5hP2mZVWBMvEJhx/hNoLnw=; b=p8kgZ2Lv/WYZ2VtMj+9r+xDa0ZqLMOBAFknAgqDuXQWzdY2et5BFRMzFJS32Yx9zdf RGpGqlH/Ez0bls/KF2otqgGK8INwkQO6ktKZzWoCea5Kn1vXM/ap7vYufBjrILTrtxbT wpUFk6SvY2nRry6Er6+5FOro1rpL8m3fjmznV27baNS+L+jrW6d053PSTe5NIt4ibSUS RUwdCHqoNR5ehg8kVMgN9ov5XbtnNhhIaoq8HVitEaO+9PABRaUWOLkJCoVQZ8/jxcu/ 2nDdaMDd76cEtfmxUAKVyiSKspbPYCvFICMfhP/lxr5dJOp1rs/AQBWg13SLOaF/N2Oa pphA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789071152; x=1789675952; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=o2iriQrm9CmEkrRMgEG9C5hP2mZVWBMvEJhx/hNoLnw=; b=jbH0uT20wCTfyD6Rw4LbW4SNX000Y4dCjCsyx/HMbD36EhA9QUnPp4xv6RQCwHSez1 0Opr6yoA2EhtF3yVvEGO7IbnVnbdP3jO96eeTe4lQyBSl6lQPKNMUxldOGCSx9pKvRt4 TcpLS4kh97VRojb3qlxCLygWFV1NMslXk+sZ8aVNWhbdqZk1fVKsZVJdqEwzUqX4smpd 1moqBI7uNqNsS6KJbPqxGAjNaeIJqsY4aw+Pjl+Xl92RcnzAYkhWV22Xwxqtk5lwyL6H Xouxyh4Xb5u5td+jpydcA5kIR541JDK0dlMHu4U5n850oZeANdoU5cA2o6iW37rHM29F zMnw== X-Forwarded-Encrypted: i=1; AKwUvBwKlmWKQOaWHR5wLHguO2R6lNK/lV1KC8a5J/KL/oDVRX7FUtxNI27EO1xVWh0m0XgIN4XqVkC/cvNBanE=@vger.kernel.org X-Gm-Message-State: AFuF++kvmE92wYCXG3vb+FWVSFIzaeWrw3W+Af6WTeDYDXyNlzwqNm3L xp9amge0oRAGsCMZaw4+LoDmNcwn6rnBzxMm1Ely3DbKDObPi2mnuWnv X-Gm-Gg: AYBFou3D7rsoEs/dHs5JXgMyuk8zVmTCcnt5dLjFm1KHgTE3MRTXQVHxJzYY/QwBQVb SCCxDYc86VAX+q25KJ/8opetillVm7MUgSxl5n7H3oC/RU4p2qji2WgvvDn7JleSIH0k7xwCzRy RmBSpl5zGvcmc53mrVOUspQ6KuIlonM3yyweOBoU5k5XforzNlJPmWvessKbpkmbiWpy+S9XN5i goa/YZ0wrA93soI2qzHsTKVXIB5jLWC/Wh0gWVlxCf6aO+SUxcD5ROg+6Jb6s7PrnbMgvFd5I6w lfepwvYJiXdFG+c3Yj3ZU76y1SW3rPLyaSnnl7iSeNPe8HUkAFe/E572l73NIZFKSiUMoqReYzH g1VOmlWnUDNMt2zQl7Ma4fv2qJKDT9q10UBjmVlck/rhRS6J9BWNjYYkPhw5HprOURiE36evFqz lngCX07wMIp8jiMxJHzhhdBWPqpNpyZ1j0YKWmk/eLPkPVHQxjQHuYgCjrc99J23eDRbjVUEE5v JiGc49IOkex7XB6lC8dzTMrpDiQ5mkDgiCuP7g/WPdOWTu6N1/rWuu7o2DfaBan7Q== X-Received: by 2002:a17:90b:3c8b:b0:398:9beb:a2b6 with SMTP id 98e67ed59e1d1-39d77b7b11bmr8092164a91.24.1789071152117; Thu, 10 Sep 2026 13:12:32 -0700 (PDT) Received: from [192.168.0.158] (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33ba4f739b5sm459542eec.25.2026.09.10.13.12.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Sep 2026 13:12:31 -0700 (PDT) Message-ID: <023908a2-64ac-424d-b7c2-2c42e8cf18c7@gmail.com> Date: Thu, 10 Sep 2026 13:12:30 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 08/15] HID: hid-oxp: stop configuration work during teardown To: Andrei Aldea , Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones , Pavel Machek , linux-leds@vger.kernel.org References: <20260910032115.28669-1-andrei1998@gmail.com> <20260910032115.28669-9-andrei1998@gmail.com> Content-Language: en-US From: "Derek J. Clark" In-Reply-To: <20260910032115.28669-9-andrei1998@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 9/9/26 20:21, Andrei Aldea wrote: > Configuration callbacks can queue delayed RGB, button-mapping, and MCU > initialization work. Normal removal previously closed the HID transport > without synchronously stopping that work, while a later configuration > probe failure could leave work queued as devres released its objects. > > Track which work items have been initialized, reject new output once > teardown begins, disable initialized work synchronously, and drain an > in-flight transport write before closing the device. Use the same > shutdown path for normal removal and every probe-error unwind after work > can have been exposed. > > This also avoids operating on uninitialized work for HID interfaces that > do not own configuration state. > > Fixes: 84910c459d65 ("HID: hid-oxp: Add OneXPlayer configuration driver") > Assisted-by: LLM > Reviewed-by: Derek J. Clark > Signed-off-by: Andrei Aldea > --- > drivers/hid/hid-oxp.c | 94 +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 77 insertions(+), 17 deletions(-) > > diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c > index 9c22c8e..eef57c3 100644 > --- a/drivers/hid/hid-oxp.c > +++ b/drivers/hid/hid-oxp.c > @@ -188,6 +188,9 @@ static struct oxp_hid_cfg { > u8 rgb_effect; > u8 rgb_speed; > u8 rgb_en; > + bool rgb_work_initialized; > + bool gen2_work_initialized; > + bool removing; > } drvdata; > > #define OXP_FILL_PAGE_SLOT(page, btn) \ > @@ -320,7 +323,7 @@ static int oxp_hid_raw_event_gen_1(struct hid_device *hdev, > struct led_classdev_mc *led_mc = drvdata.led_mc; > struct oxp_gen_1_rgb_report *rgb_rep; > > - if (size < sizeof(*rgb_rep)) > + if (size < sizeof(*rgb_rep) || !led_mc) > return 0; > > if (data[1] != OXP_FID_GEN1_RGB_REPLY) > @@ -360,6 +363,9 @@ static void oxp_mcu_init_fn(struct work_struct *work) > u8 gp_mode_data[3] = { OXP_GP_MODE_DEBUG, 0x01, 0x02 }; > int ret; > > + if (READ_ONCE(drvdata.removing)) > + return; > + > /* Re-apply the button mapping */ > ret = oxp_set_buttons(); > if (ret) > @@ -406,13 +412,16 @@ static int oxp_hid_raw_event_gen_2(struct hid_device *hdev, > * Re-apply our settings after this has been received. > */ > if (data[3] == OXP_EFFECT_MONO_TRUE) { > - mod_delayed_work(system_dfl_wq, &drvdata.oxp_mcu_init, msecs_to_jiffies(50)); > + if (READ_ONCE(drvdata.gen2_work_initialized) && > + !READ_ONCE(drvdata.removing)) > + mod_delayed_work(system_dfl_wq, &drvdata.oxp_mcu_init, > + msecs_to_jiffies(50)); > return 0; > } > > if (data[3] != OXP_GET_PROPERTY) > return 0; > - if (size < sizeof(*rgb_rep)) > + if (size < sizeof(*rgb_rep) || !led_mc) > return 0; > > rgb_rep = (struct oxp_gen_2_rgb_report *)data; > @@ -449,6 +458,9 @@ static int oxp_hid_raw_event(struct hid_device *hdev, struct hid_report *report, > { > u16 up = get_usage_page(hdev); > > + if (!hid_get_drvdata(hdev) || READ_ONCE(drvdata.removing)) > + return 0; > + > dev_dbg(&hdev->dev, "raw event data: [%*ph]\n", size, data); > > switch (up) { > @@ -476,6 +488,9 @@ static int mcu_property_out(u8 *header, size_t header_size, u8 *data, > return -EINVAL; > > guard(mutex)(&drvdata.cfg_mutex); > + if (READ_ONCE(drvdata.removing)) > + return -ENODEV; > + > memcpy(dmabuf, header, header_size); > memcpy(dmabuf + header_size, data, data_size); > if (footer_size) > @@ -717,6 +732,9 @@ static void oxp_btn_queue_fn(struct work_struct *work) > { > int ret; > > + if (READ_ONCE(drvdata.removing)) > + return; > + > ret = oxp_set_buttons(); > if (ret) > dev_err(&drvdata.hdev->dev, > @@ -802,7 +820,9 @@ static ssize_t map_button_store(struct device *dev, > default: > return -EINVAL; > } > - mod_delayed_work(system_dfl_wq, &drvdata.oxp_btn_queue, msecs_to_jiffies(50)); > + if (!READ_ONCE(drvdata.removing)) > + mod_delayed_work(system_dfl_wq, &drvdata.oxp_btn_queue, > + msecs_to_jiffies(50)); > return count; > } > > @@ -1356,6 +1376,9 @@ static void oxp_rgb_queue_fn(struct work_struct *work) > u8 val = 4 * brightness / max_brightness; > int ret; > > + if (READ_ONCE(drvdata.removing)) > + return; > + > guard(mutex)(&drvdata.rgb_mutex); > > if (drvdata.rgb_brightness != val) { > @@ -1379,6 +1402,9 @@ static void oxp_rgb_queue_fn(struct work_struct *work) > static void oxp_rgb_brightness_set(struct led_classdev *led_cdev, > enum led_brightness brightness) > { > + if (READ_ONCE(drvdata.removing)) > + return; > + > led_cdev->brightness = brightness; > mod_delayed_work(system_dfl_wq, &drvdata.oxp_rgb_queue, msecs_to_jiffies(50)); > } > @@ -1480,6 +1506,24 @@ static bool oxp_hybrid_mcu_device(void) > return quirks->hybrid_mcu; > } > > +static void oxp_drain_output(void) > +{ > + /* Wait for any in-flight sysfs output before closing the transport. */ > + guard(mutex)(&drvdata.cfg_mutex); > +} > + > +static void oxp_quiesce_work(void) > +{ > + WRITE_ONCE(drvdata.removing, true); > + if (drvdata.rgb_work_initialized) > + disable_delayed_work_sync(&drvdata.oxp_rgb_queue); > + if (drvdata.gen2_work_initialized) { > + disable_delayed_work_sync(&drvdata.oxp_btn_queue); > + disable_delayed_work_sync(&drvdata.oxp_mcu_init); > + } > + oxp_drain_output(); > +} > + > static int oxp_cfg_probe(struct hid_device *hdev, u16 up) > { > struct oxp_bmap_page_1 *bmap_1; > @@ -1490,6 +1534,7 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 up) > mutex_init(&drvdata.cfg_mutex); > mutex_init(&drvdata.rgb_mutex); > drvdata.hdev = hdev; > + drvdata.removing = false; > > if (up == GEN2_USAGE_PAGE && oxp_hybrid_mcu_device()) > goto skip_rgb; > @@ -1497,16 +1542,21 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 up) > drvdata.led_mc = &oxp_cdev_rgb; > > INIT_DELAYED_WORK(&drvdata.oxp_rgb_queue, oxp_rgb_queue_fn); > + drvdata.rgb_work_initialized = true; > ret = devm_led_classdev_multicolor_register(&hdev->dev, &oxp_cdev_rgb); > - if (ret) > - return dev_err_probe(&hdev->dev, ret, > + if (ret) { > + dev_err_probe(&hdev->dev, ret, > "Failed to create RGB device\n"); > + goto err_quiesce; > + } > > ret = devm_device_add_group(drvdata.led_mc->led_cdev.dev, > &oxp_rgb_attr_group); > - if (ret) > - return dev_err_probe(drvdata.led_mc->led_cdev.dev, ret, > + if (ret) { > + dev_err_probe(drvdata.led_mc->led_cdev.dev, ret, > "Failed to create RGB configuration attributes\n"); > + goto err_quiesce; > + } > > ret = oxp_rgb_status_show(); > if (ret) > @@ -1519,14 +1569,18 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 up) > > skip_rgb: > bmap_1 = devm_kzalloc(&hdev->dev, sizeof(struct oxp_bmap_page_1), GFP_KERNEL); > - if (!bmap_1) > - return dev_err_probe(&hdev->dev, -ENOMEM, > + if (!bmap_1) { > + ret = dev_err_probe(&hdev->dev, -ENOMEM, > "Unable to allocate button map page 1\n"); > + goto err_quiesce; > + } > > bmap_2 = devm_kzalloc(&hdev->dev, sizeof(struct oxp_bmap_page_2), GFP_KERNEL); > - if (!bmap_2) > - return dev_err_probe(&hdev->dev, -ENOMEM, > + if (!bmap_2) { > + ret = dev_err_probe(&hdev->dev, -ENOMEM, > "Unable to allocate button map page 2\n"); > + goto err_quiesce; > + } > > drvdata.bmap_1 = bmap_1; > drvdata.bmap_2 = bmap_2; > @@ -1537,14 +1591,21 @@ skip_rgb: > drvdata.rumble_intensity = 5; > > INIT_DELAYED_WORK(&drvdata.oxp_mcu_init, oxp_mcu_init_fn); > + WRITE_ONCE(drvdata.gen2_work_initialized, true); > mod_delayed_work(system_dfl_wq, &drvdata.oxp_mcu_init, msecs_to_jiffies(50)); > > ret = devm_device_add_group(&hdev->dev, &oxp_cfg_attrs_group); > - if (ret) > - return dev_err_probe(&hdev->dev, ret, > + if (ret) { > + dev_err_probe(&hdev->dev, ret, > "Failed to attach configuration attributes\n"); > + goto err_quiesce; > + } > > return 0; > + > +err_quiesce: > + oxp_quiesce_work(); > + return ret; > } > > static int oxp_hid_probe(struct hid_device *hdev, > @@ -1587,9 +1648,8 @@ static int oxp_hid_probe(struct hid_device *hdev, > > static void oxp_hid_remove(struct hid_device *hdev) > { > - cancel_delayed_work(&drvdata.oxp_rgb_queue); > - cancel_delayed_work(&drvdata.oxp_btn_queue); > - cancel_delayed_work(&drvdata.oxp_mcu_init); > + if (hid_get_drvdata(hdev)) > + oxp_quiesce_work(); > hid_hw_close(hdev); > hid_hw_stop(hdev); > } Tested-by: Derek J. Clark Reviewed-by: Derek J. Clark