From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Christian Brauner <christian.brauner@ubuntu.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
netdev <netdev@vger.kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Linux PM <linux-pm@vger.kernel.org>
Subject: Re: [PATCH net-next 07/10] drivers/base/power: add dpm_sysfs_change_owner()
Date: Wed, 12 Feb 2020 11:52:49 +0100 [thread overview]
Message-ID: <CAJZ5v0i+BFg6fEt4UP0vGb=KXBf=iWQcf1cL-2nk-xr=2xZ66w@mail.gmail.com> (raw)
In-Reply-To: <20200212104321.43570-8-christian.brauner@ubuntu.com>
On Wed, Feb 12, 2020 at 11:43 AM Christian Brauner
<christian.brauner@ubuntu.com> wrote:
>
> Add a helper to change the owner of a device's power entries. This
> needs to happen when the ownership of a device is changed, e.g. when
> moving network devices between network namespaces.
> The ownership of a device's power entries is determined based on the
> ownership of the corresponding kobject, i.e. only if the ownership of a
> kobject is changed will this function change the ownership of the
> corresponding sysfs entries.
> This function will be used to correctly account for ownership changes,
> e.g. when moving network devices between network namespaces.
>
> Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
> ---
> drivers/base/core.c | 4 ++++
> drivers/base/power/power.h | 2 ++
> drivers/base/power/sysfs.c | 37 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 43 insertions(+)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 262217287a09..dfaf6d3614fa 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -3515,6 +3515,10 @@ int device_change_owner(struct device *dev)
> if (error)
> goto out;
>
> + error = dpm_sysfs_change_owner(dev);
> + if (error)
> + goto out;
> +
> #ifdef CONFIG_BLOCK
> if (sysfs_deprecated && dev->class == &block_class)
> goto out;
> diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
> index 444f5c169a0b..f68490d0811b 100644
> --- a/drivers/base/power/power.h
> +++ b/drivers/base/power/power.h
> @@ -74,6 +74,7 @@ extern int pm_qos_sysfs_add_flags(struct device *dev);
> extern void pm_qos_sysfs_remove_flags(struct device *dev);
> extern int pm_qos_sysfs_add_latency_tolerance(struct device *dev);
> extern void pm_qos_sysfs_remove_latency_tolerance(struct device *dev);
> +extern int dpm_sysfs_change_owner(struct device *dev);
>
> #else /* CONFIG_PM */
>
> @@ -88,6 +89,7 @@ static inline void pm_runtime_remove(struct device *dev) {}
>
> static inline int dpm_sysfs_add(struct device *dev) { return 0; }
> static inline void dpm_sysfs_remove(struct device *dev) {}
> +static inline int dpm_sysfs_change_owner(struct device *dev) { return 0; }
>
> #endif
>
> diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
> index d7d82db2e4bc..ce1fd346e854 100644
> --- a/drivers/base/power/sysfs.c
> +++ b/drivers/base/power/sysfs.c
> @@ -684,6 +684,43 @@ int dpm_sysfs_add(struct device *dev)
> return rc;
> }
>
> +int dpm_sysfs_change_owner(struct device *dev)
> +{
> + int rc;
> +
> + if (device_pm_not_required(dev))
> + return 0;
> +
> + rc = sysfs_group_change_owner(&dev->kobj, &pm_attr_group);
> + if (rc)
> + return rc;
> +
> + if (pm_runtime_callbacks_present(dev)) {
> + rc = sysfs_group_change_owner(&dev->kobj,
> + &pm_runtime_attr_group);
> + if (rc)
> + return rc;
> + }
> + if (device_can_wakeup(dev)) {
> + rc = sysfs_group_change_owner(&dev->kobj,
> + &pm_wakeup_attr_group);
> + if (rc)
> + return rc;
> + }
> + if (dev->power.set_latency_tolerance) {
> + rc = sysfs_group_change_owner(&dev->kobj,
> + &pm_qos_latency_tolerance_attr_group);
> + if (rc)
> + return rc;
> + }
> + if (dev->power.wakeup && dev->power.wakeup->dev) {
This is related to the device_can_wakeup(dev) condition above (i.e. it
will never be 'true' if that one is 'false').
LGTM apart from this.
> + rc = device_change_owner(dev->power.wakeup->dev);
> + if (rc)
> + return rc;
> + }
> + return 0;
> +}
> +
> int wakeup_sysfs_add(struct device *dev)
> {
> return sysfs_merge_group(&dev->kobj, &pm_wakeup_attr_group);
> --
> 2.25.0
>
next prev parent reply other threads:[~2020-02-12 10:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 10:43 [PATCH net-next 00/10] net: fix sysfs permssions when device changes network Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 01/10] sysfs: add sysfs_file_change_owner() Christian Brauner
2020-02-12 13:19 ` Greg Kroah-Hartman
2020-02-12 10:43 ` [PATCH net-next 02/10] sysfs: add sysfs_link_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 03/10] sysfs: add sysfs_group_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 04/10] sysfs: add sysfs_groups_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 05/10] sysfs: add sysfs_change_owner() Christian Brauner
2020-02-12 13:18 ` Greg Kroah-Hartman
2020-02-12 15:07 ` Christian Brauner
2020-02-12 16:04 ` Greg Kroah-Hartman
2020-02-12 10:43 ` [PATCH net-next 06/10] device: add device_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 07/10] drivers/base/power: add dpm_sysfs_change_owner() Christian Brauner
2020-02-12 10:52 ` Rafael J. Wysocki [this message]
2020-02-12 10:43 ` [PATCH net-next 08/10] net-sysfs: add netdev_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 09/10] net-sysfs: add queue_change_owner() Christian Brauner
2020-02-12 10:43 ` [PATCH net-next 10/10] net: fix sysfs permssions when device changes network namespace Christian Brauner
2020-02-12 17:53 ` [PATCH net-next 00/10] net: fix sysfs permssions when device changes network David Miller
2020-02-12 18:00 ` Christian Brauner
2020-02-12 18:16 ` David Miller
2020-02-12 18:20 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJZ5v0i+BFg6fEt4UP0vGb=KXBf=iWQcf1cL-2nk-xr=2xZ66w@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).