From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84286C433E0 for ; Tue, 7 Jul 2020 15:31:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D36B204EC for ; Tue, 7 Jul 2020 15:31:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="G+VWkqkq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729823AbgGGPbe (ORCPT ); Tue, 7 Jul 2020 11:31:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730246AbgGGPba (ORCPT ); Tue, 7 Jul 2020 11:31:30 -0400 Received: from mail-vk1-xa43.google.com (mail-vk1-xa43.google.com [IPv6:2607:f8b0:4864:20::a43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13B41C08C5E1 for ; Tue, 7 Jul 2020 08:31:30 -0700 (PDT) Received: by mail-vk1-xa43.google.com with SMTP id v26so6506230vkn.2 for ; Tue, 07 Jul 2020 08:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=k9pD5UhiE599Tk9wmQP354KMod/Tb87VcByMMuwvg3k=; b=G+VWkqkqtjaLmPcbE4Vr+ciMMRNHr+VCxIoF6KeYJNsyLUH8ifsFw42bsVUuCQcL2v 4h8B6RVOb0A7JHYxkMMPFot6aNEHIX4sO1KFmTN9HVLhhirhuN/5M7I9phPJxLAU7aez 9P7ONjtIUTLRxZSOQviFEN8aNFPBqxVoZEhGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=k9pD5UhiE599Tk9wmQP354KMod/Tb87VcByMMuwvg3k=; b=bZxu1szZQ+TIlXC+WHm8MnZsUdpuMxUlfVHgwuJcHUZAIh19fgHlgbr9dwsMxkO9om bxjcmVz6FLlQAykQQLyfWdtigFte99vRtp09gk2b8pnMy4tkmlNuwAQqEDhoa+Nj6WZH 4LT4+UQypAIqckJfFdwf49mq1qTJBagZEhMs++LzlKm7T2zNnGw7VPZ8Ntd2FfsbZqxy dLoaR+JJCeQT0DoF4t1/mcBtBx/w7rgORIAEvHI2QJDWgAkfJ88JxrzejPiOE+4ibK5O VRD8ZCumLoCB21tyVoR1VNkSpFvVGyKrMYvBuhi+U84S/TXgTVM/ZjL/0LJ1rP9T7FjD zelg== X-Gm-Message-State: AOAM530WnI0ggKoeYhlJ/16vJv+FalySpyxXpdjkicHixz0J+MeBPvBQ izzK0LCYI37BKj0xNaQreqMuwT22xzc2cM53XAzLmA== X-Google-Smtp-Source: ABdhPJzywIHzvHEbshbYh1BPf/R2VSON3B3el7elCV5+s8tTIaZ0pNfM6hRiiIO9NHAG6kQxEZ1i9zEbDrKxhAAT9zg= X-Received: by 2002:a1f:418f:: with SMTP id o137mr37478018vka.25.1594135888939; Tue, 07 Jul 2020 08:31:28 -0700 (PDT) MIME-Version: 1.0 References: <20200706210717.1210639-1-abhishekpandit@chromium.org> <20200706140715.v2.1.I51f5a0be89595b73c4dc17e6cf4cc6f26dc7f2fc@changeid> <20200707142859.GB55434@kroah.com> In-Reply-To: <20200707142859.GB55434@kroah.com> From: Abhishek Pandit-Subedi Date: Tue, 7 Jul 2020 08:31:18 -0700 Message-ID: Subject: Re: [PATCH v2 1/1] power: Emit changed uevent on wakeup_sysfs_add/remove To: Greg Kroah-Hartman Cc: Linux PM , Bluez mailing list , ChromeOS Bluetooth Upstreaming , rafael.j.wysocki@intel.com, Stephen Boyd , "Rafael J. Wysocki" , LKML , Len Brown , Pavel Machek Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, On Tue, Jul 7, 2020 at 7:29 AM Greg Kroah-Hartman wrote: > > On Mon, Jul 06, 2020 at 02:07:17PM -0700, Abhishek Pandit-Subedi wrote: > > Udev rules that depend on the power/wakeup attribute don't get triggered > > correctly if device_set_wakeup_capable is called after the device is > > created. This can happen for several reasons (driver sets wakeup after > > device is created, wakeup is changed on parent device, etc) and it seems > > reasonable to emit a changed event when adding or removing attributes on > > the device. > > > > Signed-off-by: Abhishek Pandit-Subedi > > --- > > > > Changes in v2: > > - Add newline at end of bt_dev_err > > > > drivers/base/power/sysfs.c | 21 ++++++++++++++++++++- > > 1 file changed, 20 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c > > index 24d25cf8ab1487..d57e8e7f175ebf 100644 > > --- a/drivers/base/power/sysfs.c > > +++ b/drivers/base/power/sysfs.c > > @@ -1,6 +1,7 @@ > > // SPDX-License-Identifier: GPL-2.0 > > /* sysfs entries for device PM */ > > #include > > +#include > > #include > > #include > > #include > > @@ -739,12 +740,30 @@ int dpm_sysfs_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid) > > > > int wakeup_sysfs_add(struct device *dev) > > { > > - return sysfs_merge_group(&dev->kobj, &pm_wakeup_attr_group); > > + int ret = sysfs_merge_group(&dev->kobj, &pm_wakeup_attr_group); > > + > > + if (!ret) { > > + int tmp = kobject_uevent(&dev->kobj, KOBJ_CHANGE); > > + > > + if (tmp) > > + dev_err(dev, > > + "Error in uevent for wakeup_sysfs_add: %d\n", > > + tmp); > > + } > > + > > + return ret; > > } > > Shouldn't the above function look like this instead to be simpler: > > int wakeup_sysfs_add(struct device *dev) > { > int ret = sysfs_merge_group(&dev->kobj, &pm_wakeup_attr_group); > > if (ret) > return ret; > > return kobject_uevent(&dev->kobj, KOBJ_CHANGE); > } > > > > > > void wakeup_sysfs_remove(struct device *dev) > > { > > + int tmp; > > Use 'ret' like the above function had, to be consistent. > > > + > > sysfs_unmerge_group(&dev->kobj, &pm_wakeup_attr_group); > > + > > + tmp = kobject_uevent(&dev->kobj, KOBJ_CHANGE); > > + if (tmp) > > + dev_err(dev, "Error in uevent for wakeup_sysfs_remove: %d\n", > > nit, use __func__ to describe a function name, if you really want it. > Why do you need to send a message for this error, will that really ever > happen? > Looking through kobject_uevent, it does look like the errors are unlikely to be seen (-ENOMEM, -ENOENT) and probably don't need to be logged. Will apply the suggestions above and send a v3. Thanks, Abhishek > thanks, > > greg k-h