From nobody Sat Apr 4 03:19:49 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 E6D66378D7E for ; Fri, 20 Mar 2026 23:56:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774050996; cv=none; b=qrDqvFzTGtBRJhmlPIl/NTU0O9MPFD3IVm6MNAsLUoap/0n6d7uKH+WU4WHNS/OTHApcJtevCyTAiAPadks5o9+GZ4QuueNwTr1A88lx7CDDEoYM0ByJjB3gaUG+ygIQsknmSMe1tpYIdlOtb4lFb+q6rmjDtOJAybBofeNXYrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774050996; c=relaxed/simple; bh=N0+TgX/rArUJD3hQne/JBBia//Bzgxpbz+kEB8NVbI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sTK/ZM8BQ72ow8Ug9YX3s+r8K5C8mSy+dBxQ6f2JPMiwoLBYKE+MDdH77YvNfYvpk32d4tfE4UT05Nb8ZBNOJ3A1xjhcU5ekqFDbpAWipLpSw9watA4+b++qommD35esqK5+ji9gqz6kVKPsg97Xvv1NWAYZjo0yzKiW0PeVqlM= 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=YUBo22s9; arc=none smtp.client-ip=209.85.128.51 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="YUBo22s9" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-48371104ffdso3035715e9.1 for ; Fri, 20 Mar 2026 16:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774050975; x=1774655775; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t6i2pacmWXPZlRin0kPUg4dFhoX7+Br8EHyM4nKfejw=; b=YUBo22s9/oD8QZW30GhoYL2fPf2QOCjwQIAelykHHlcCagNOVK28rz/cXSJW0JLh/u F0LEZ3atZYIUcX8MMEcFS2v6w9aVVQeVHvmJ+LqciA5JmQNFFW4LsZX2piy7A9ZevqXJ y3mTErVXP9AHJOmKbCEPnbDpHyp+elVFqetfe/h+7EMEp0w9Dl3pYHJGYXBepWmMx4lQ qQlhHiv/R1KHI70YQUbd5LFlTRDMuLbkuvEymPshl5vops6e/y8sKntmVzspMs5+tQh/ pGL/BiU8tZ/zsl++djh9luk4qCCoDV+9oYzZjOMbjt/tt7cxs2HVL8XRPjLTRvcKic+r gl5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774050975; x=1774655775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=t6i2pacmWXPZlRin0kPUg4dFhoX7+Br8EHyM4nKfejw=; b=IA+hdGwmkk53czZgSZ0KSBPzwp2tBmMxr0QVA1rB45GpuDdeLygERFoWU/vdI3ypYF qB5m2GwyZDYmNm731QrYjVgW9ZWsqCbceyqe6u9M/b4eMG2LD0EBq5bfZ9xiNBIDCeEf DsJgFB77/XziQOAdOWJMJl0BKXzmqa+nwmY7pPmRE1j/IMkUhxZouZLJFgtvQIFbS778 qyVpUdzskKZiOLkpSiHDFXwC1xB6n10NQ3gOeUHnkqufg+c/ccUlLtlY5wZg8UR0vHSz 4C4KS4UEZNdqcgZUh6r1PcH1YXHvCDVIoNW0CaViZqTV8YPfVFz5FfYFAMc4sS5hl5oO YBWA== X-Forwarded-Encrypted: i=1; AJvYcCXyht3d31mQmt6B/tMsBILSVEyInvr+lexuaXY+IsoOgDQuQFGkbZlfteEmCfNnPdNHKsmxGoXo1bDfy7Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwxF4BjaxJQkUrdcUWBkZ6M49Hgc+Nrsu/brk1FARYMNDUy/uaZ fLjmTbqqaTBA9S9Cja56w+AAXn6TP5qTFknNdIY0zbSHHfcX01Sm6cJ+GV4CxYtnGzc= X-Gm-Gg: ATEYQzzRZUr61W+oG3vCRIruhJ1rOxYx72vKJNe/J2dW8OH3mZ8ogFA2KrAF5zBQQ/Z rBXXsf089mphYj3DaLeff59YpdA37c4Lf4opLeliFGJg4SW7YVOoeldebBSgK8rNL1xAK1mim/s Riy2sMlG8zJzzAsV8/5ohmNlKNgRp8gepf/6WR4I43y+XYj1WBdNeSsp/DkvMcdGcphotCwODw+ +LhppkJH9ExhSGPyr3ou2MXSSurE55ynmC7sb3q0voAvCl0PdOrYt7IVRfCgpd4pEf2KVTtM+o5 n7ASsFsRUpx4E7KXEGqUP8G24PJ5B/Norq3ZxCN3ojXdU0oFVzxAyNKeEqVJVaqCSpbmxkvKCib X1RM8dq/8x5E41YHCHsmvlBjn9K43N4yNb549boXOkcZ9fowqxX6ZnouMw382Y8YMleUjWunlK8 mKbSMtpUXoGhQ5JXTk6h/InzjjLeaUoRllgBEJmR9ZJhe8uQ== X-Received: by 2002:a05:600c:1f0e:b0:471:ab1:18f5 with SMTP id 5b1f17b1804b1-486fee2dcfdmr39588675e9.7.1774050974792; Fri, 20 Mar 2026 16:56:14 -0700 (PDT) Received: from fridge ([195.174.58.89]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6470c239sm9663418f8f.27.2026.03.20.16.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 16:56:14 -0700 (PDT) From: Emre Cecanpunar To: platform-driver-x86@vger.kernel.org Cc: hansg@kernel.org, ilpo.jarvinen@linux.intel.com, krishna.chomal108@gmail.com, linux-kernel@vger.kernel.org, Emre Cecanpunar Subject: [PATCH 5/5] platform/x86: hp-wmi: add locking for concurrent hwmon access Date: Sat, 21 Mar 2026 02:55:57 +0300 Message-ID: <20260320235557.56298-6-emreleno@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320235557.56298-1-emreleno@gmail.com> References: <20260320235557.56298-1-emreleno@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" hp_wmi_hwmon_priv.mode and .pwm are written by hp_wmi_hwmon_write() in sysfs context and read by hp_wmi_hwmon_keep_alive_handler() running in a workqueue. There is no synchronisation between them, so a concurrent sysfs write and keep-alive expiry can observe an inconsistent combination of mode and pwm (e.g. mode=3DMANUAL with an stale pwm value from the previous mode). Add a mutex to hp_wmi_hwmon_priv that protects mode and pwm. Acquire it in hp_wmi_hwmon_write() for the full write operation (field update plus hp_wmi_apply_fan_settings() call), and in hp_wmi_hwmon_keep_alive_handler() before calling hp_wmi_apply_fan_settings(). In hp_wmi_hwmon_read(), only the pwm_enable attribute reads priv->mode and requires the lock. Use scoped_guard() to hold the mutex only for the mode read, avoiding holding it across unrelated WMI hardware calls. Signed-off-by: Emre Cecanpunar --- drivers/platform/x86/hp/hp-wmi.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-= wmi.c index b8f22d70e996..cfb207f09e7b 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -434,6 +434,7 @@ enum pwm_modes { }; =20 struct hp_wmi_hwmon_priv { + struct mutex lock; /* protects mode, pwm */ u8 min_rpm; u8 max_rpm; u8 gpu_delta; @@ -2403,6 +2404,7 @@ static int hp_wmi_hwmon_read(struct device *dev, enum= hwmon_sensor_types type, { struct hp_wmi_hwmon_priv *priv; int rpm, ret; + u8 mode; =20 priv =3D dev_get_drvdata(dev); switch (type) { @@ -2426,11 +2428,13 @@ static int hp_wmi_hwmon_read(struct device *dev, en= um hwmon_sensor_types type, *val =3D rpm_to_pwm(rpm / 100, priv); return 0; } - switch (priv->mode) { + scoped_guard(mutex, &priv->lock) + mode =3D priv->mode; + switch (mode) { case PWM_MODE_MAX: case PWM_MODE_MANUAL: case PWM_MODE_AUTO: - *val =3D priv->mode; + *val =3D mode; return 0; default: /* shouldn't happen */ @@ -2448,6 +2452,7 @@ static int hp_wmi_hwmon_write(struct device *dev, enu= m hwmon_sensor_types type, int rpm; =20 priv =3D dev_get_drvdata(dev); + guard(mutex)(&priv->lock); switch (type) { case hwmon_pwm: if (attr =3D=3D hwmon_pwm_input) { @@ -2516,6 +2521,8 @@ static void hp_wmi_hwmon_keep_alive_handler(struct wo= rk_struct *work) =20 dwork =3D to_delayed_work(work); priv =3D container_of(dwork, struct hp_wmi_hwmon_priv, keep_alive_dwork); + + guard(mutex)(&priv->lock); /* * Re-apply the current hwmon context settings. * NOTE: hp_wmi_apply_fan_settings will handle the re-scheduling. @@ -2577,6 +2584,8 @@ static int hp_wmi_hwmon_init(void) if (!priv) return -ENOMEM; =20 + mutex_init(&priv->lock); + ret =3D hp_wmi_setup_fan_settings(priv); if (ret) return ret; --=20 2.53.0