From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 68D523D6CBE for ; Thu, 2 Apr 2026 13:05:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775135142; cv=none; b=LIC00tpTtt2aYxGAKhczvyULW6Yv8gArJq8BlV72zSGbKm+kaFqig8TRT45636Q128FzWTOiXOUqlMX1B9P4/G/rMMRfGFYIwxtVGLB5NhSqvaRd3kjiiMRDSN5NU+DF4XmfhJnIcgEvbCTv12noeYbD0Orf+wCIdRohqabKfD0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775135142; c=relaxed/simple; bh=DqOdxgdcCLGaldkHkXFgo5J0eGj1Kpcn2M6cxW6F0hY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ed0f05OOYxOv41p1ql1KU7GBRbutLZEvq1bnPGKcN79FFLzqJg67KQS64pOKXDrVKncFb/7Z0QTnHBYxTXMrs1EgpYDyOhxLmpvsAPiYSDkusCQhPzSnUrJafBUfSI56RMp0JT48KHGJJFu1TAvcKFsRKumh6RBP4PPS6CZJlWc= 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=Z0aAkjn8; arc=none smtp.client-ip=209.85.128.54 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="Z0aAkjn8" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-486507134e4so11077215e9.0 for ; Thu, 02 Apr 2026 06:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775135134; x=1775739934; darn=vger.kernel.org; h=content-transfer-encoding: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; bh=NPakThXcqJ7PCNMa7VzjIxV+o2G6zNPbZH8YS7//hxs=; b=Z0aAkjn8sRxQ1SUsWFRY3pz43uCr5x3x7iyFsz+64eDxrWKdJKV2YEHuvp7qI+xHWx ac+8/OxMRZ8oaWVdTioYDzARLCd599cZ6elPlleE7y64Tcz+V149KsKmvo5pm09mKFOU J9mA4vogfw0XNZJzFDBvXaAA4sLonYJBeXNZ8asiwk8KLoItgvJ2+o+56JnelqPM3LG7 oD34k+2KkaIs6F59pn6EBHlFYnQZ0mWeUnjHGP+Z1r72jm/aLKa25hYDIaHKlJvFIzo/ VKAVp8M5kB+pDWSFEdmyj+tcPPLYleCq+jG1Jc2FRNNGw1L0Uzv0fuKJANw7Lv4MNhmm pBMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775135134; x=1775739934; h=content-transfer-encoding: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; bh=NPakThXcqJ7PCNMa7VzjIxV+o2G6zNPbZH8YS7//hxs=; b=SNlMV2kvl+8whPAO+aAtreM8G6WgJjRMXgOjGbex+bnW87Pbx2US6dWQ+GjXkir7mS MXdiBIAf0B3RvXIcY+MQJB7b0awF1Gr95aTvk4O4hyzWjvwXcG7H30HcjSf/Shh7/RzZ VuJW91oRZm2zfnI4uysTbmDk7sUZYIc1JMXj5x+03xMr+YxkIS8w5zGADgO9qgNG/q0f XOZ5KZcQVu4TIWhpQ+tT8PY6wICONxeeMVqR6fLs3oCggmdzUm73ddd7147N/Q9GZVTp rgdGXgDHwLTMgWpcalrZDamCE1OPomMTgnbmrFu11AhpZQFMtZAfV3WF0UNRw7FXooHS ZXhw== X-Forwarded-Encrypted: i=1; AJvYcCXquQLTqcLOUvynRzUhLx/RX83HWSfwRuVp3O4xtyXBjQ4uposu0hbiQUlEqyp+qDyy8iCMQLpyoQ==@vger.kernel.org X-Gm-Message-State: AOJu0YwvOo+tDi1C/G5WvPvRcSoptAafgWGCstQaBlD2VDMKsd02gdzc NTaMbB+9glgZgiEnLtyZ4eooCcfwuD2THoIU7iiFK3ucOvUb6VI+Q4lh X-Gm-Gg: ATEYQzytw+RN0y8labZBhQ1nqbaZwqmdLdMb2Zk9GVAkMvW9AYGyNzEK27Bt+biVguB gnE+DMW3V9xQnInzJWVEwSBxI2DScZgtlMJ60MwiM0QnJwOm3VBvIrIlnr0rbtWOEGIXGqanjfP C7MBoMrv2ZOR23Hw8lc9QjyrKMbej1GfiwY8laiBc8NW+kDPjDOJGs7GR2JrCEof6wz280D7eJj L8ofH0DshL9q4DxAOYYml9S+PhuQP9x5xul5KgmhzE4rJHdR2lqdtjUbvqEgNlujyIJdT1KaIDv ZMK+xFwzv6fjc1lTFGKxREyy59PGrRspJya3xNR5Z5OHzYVFhG78Jsw3E79jkRV/K2ZuW60wJDx O6KVbwbmlsfUB6KN+Th+IEcI8AyASOJVi98Lw6VxohsNs5RO/iHS3GAjmd9bEnJ4UyfRmUcwtgX s6xdM8lTsBtkJ3w/0Uil6JfD4DbIgyFlLQNXfh1CyOGWp17eU9k2dPllK2Y0MRwmynxd1+ghhJ3 R1o5RSrNNl6KAuxZW3Vf4viGWZjsdDJxumLPpJhBOKJkKMTbY5qqscDUhzQGPYrQg== X-Received: by 2002:a05:600c:c056:b0:485:3a03:ceca with SMTP id 5b1f17b1804b1-488835b30a7mr87662745e9.23.1775135133581; Thu, 02 Apr 2026 06:05:33 -0700 (PDT) Received: from ?IPV6:2003:ea:8f19:9500:c168:ad27:2fdd:9334? (p200300ea8f199500c168ad272fdd9334.dip0.t-ipconnect.de. [2003:ea:8f19:9500:c168:ad27:2fdd:9334]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888a626100sm121936195e9.1.2026.04.02.06.05.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Apr 2026 06:05:32 -0700 (PDT) Message-ID: <0758441c-e88d-475a-80ef-061b227ae7fc@gmail.com> Date: Thu, 2 Apr 2026 15:05:31 +0200 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] PM / wakeup: Allocate class wakeup_class statically To: "Rafael J. Wysocki" Cc: Pavel Machek , Len Brown , Greg Kroah-Hartman , Danilo Krummrich , Linux PM , driver-core@lists.linux.dev References: <0fe1b679-ab28-4505-b0db-14e7ac3ba749@gmail.com> <744440a6-e1cb-4792-a848-57755de0686b@gmail.com> Content-Language: en-US From: Heiner Kallweit In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 01.04.2026 19:32, Rafael J. Wysocki wrote: > On Wed, Apr 1, 2026 at 5:45 PM Heiner Kallweit wrote: >> >> On 01.04.2026 16:19, Rafael J. Wysocki wrote: >>> On Sun, Mar 29, 2026 at 6:14 PM Heiner Kallweit wrote: >>>> >>>> Allocating wakeup_class statically avoids a little runtime overhead. >>>> Define groups and device release function as part of the class, so that >>>> we don't have to repeat this for each class device. >>>> Whilst at it, constify wakeup_source_attrs[]. >>>> >>>> Signed-off-by: Heiner Kallweit >>> >>> Can you please have a look at this and let me know what you think: >>> >>> https://sashiko.dev/#/patchset/0fe1b679-ab28-4505-b0db-14e7ac3ba749%40gmail.com >>> >> Interesting finding! I think the diagnosis is right. >> >> But: I would say the current behavior isn't a nice solution as well: > > It is not fantastic, but it doesn't have this issue. > >> wakeup_source_device_create() does: dev->class = wakeup_class; >> I think no reader will expect that wakeup_class may be NULL here due to >> initcall ordering. In addition this behavior results in such early >> wakeup sources not being shown in sysfs. > > They are registered too early to show up in sysfs, but they can work regardless. > > I think that it's just pointless to call device_register() for a given > wakeup source if wakeup_class has not been registered yet. > >> But I'm not sure whether registering class "wakeup" (and registering >> classes in general) would be possible early enough (core_initcall, >> or even pure_initcall). > > driver_init() is called before do_initcalls() is do_basic_setup(), so > class registration should work for all initcall levels AFAICS. > When testing the current code on my system, autosleep is the first wakeup source, registered in a core_initcall, and it's not shown in sysfs. Same result when class wakeup is registered in a core_initcall (instead of postcore_initcall). Registering class wakeup in a pure_initcall works and fixes the issue. So, would this be an acceptable solution for the discussed issue? >>>> --- >>>> drivers/base/power/wakeup_stats.c | 18 +++++++++--------- >>>> 1 file changed, 9 insertions(+), 9 deletions(-) >>>> >>>> diff --git a/drivers/base/power/wakeup_stats.c b/drivers/base/power/wakeup_stats.c >>>> index 308f8bde9..72beb8fce 100644 >>>> --- a/drivers/base/power/wakeup_stats.c >>>> +++ b/drivers/base/power/wakeup_stats.c >>>> @@ -18,8 +18,6 @@ >>>> >>>> #include "power.h" >>>> >>>> -static struct class *wakeup_class; >>>> - >>>> #define wakeup_attr(_name) \ >>>> static ssize_t _name##_show(struct device *dev, \ >>>> struct device_attribute *attr, char *buf) \ >>>> @@ -114,7 +112,7 @@ static ssize_t prevent_suspend_time_ms_show(struct device *dev, >>>> } >>>> static DEVICE_ATTR_RO(prevent_suspend_time_ms); >>>> >>>> -static struct attribute *wakeup_source_attrs[] = { >>>> +static const struct attribute *const wakeup_source_attrs[] = { >>>> &dev_attr_name.attr, >>>> &dev_attr_active_count.attr, >>>> &dev_attr_event_count.attr, >>>> @@ -135,6 +133,12 @@ static void device_create_release(struct device *dev) >>>> kfree(dev); >>>> } >>>> >>>> +static const struct class wakeup_class = { >>>> + .name = "wakeup", >>>> + .dev_release = device_create_release, >>>> + .dev_groups = wakeup_source_groups, >>>> +}; >>>> + >>>> static struct device *wakeup_source_device_create(struct device *parent, >>>> struct wakeup_source *ws) >>>> { >>>> @@ -149,10 +153,8 @@ static struct device *wakeup_source_device_create(struct device *parent, >>>> >>>> device_initialize(dev); >>>> dev->devt = MKDEV(0, 0); >>>> - dev->class = wakeup_class; >>>> + dev->class = &wakeup_class; >>>> dev->parent = parent; >>>> - dev->groups = wakeup_source_groups; >>>> - dev->release = device_create_release; >>>> dev_set_drvdata(dev, ws); >>>> device_set_pm_not_required(dev); >>>> >>>> @@ -212,8 +214,6 @@ void wakeup_source_sysfs_remove(struct wakeup_source *ws) >>>> >>>> static int __init wakeup_sources_sysfs_init(void) >>>> { >>>> - wakeup_class = class_create("wakeup"); >>>> - >>>> - return PTR_ERR_OR_ZERO(wakeup_class); >>>> + return class_register(&wakeup_class); >>>> } >>>> postcore_initcall(wakeup_sources_sysfs_init); >>>> -- >>>> 2.53.0 >>>> >>