LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Peter Zijlstra <peterz@infradead.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Linux PM <linux-pm@vger.kernel.org>
Subject: Re: [PATCH 18/38] powercap: intel_rapl: Replace deprecated CPU-hotplug functions.
Date: Wed, 4 Aug 2021 20:14:59 +0200	[thread overview]
Message-ID: <CAJZ5v0gsS+v23yMBnOV8GTiCF9OaXSLffJn1p+K3kJaQQkzEcw@mail.gmail.com> (raw)
In-Reply-To: <20210803141621.780504-19-bigeasy@linutronix.de>

On Tue, Aug 3, 2021 at 4:17 PM Sebastian Andrzej Siewior
<bigeasy@linutronix.de> wrote:
>
> The functions get_online_cpus() and put_online_cpus() have been
> deprecated during the CPU hotplug rework. They map directly to
> cpus_read_lock() and cpus_read_unlock().
>
> Replace deprecated CPU-hotplug functions with the official version.
> The behavior remains unchanged.
>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
>  drivers/powercap/intel_rapl_common.c | 50 ++++++++++++++--------------
>  1 file changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index 73cf68af97700..7c0099e7a6d72 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -158,16 +158,16 @@ static int get_energy_counter(struct powercap_zone *power_zone,
>         /* prevent CPU hotplug, make sure the RAPL domain does not go
>          * away while reading the counter.
>          */
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>
>         if (!rapl_read_data_raw(rd, ENERGY_COUNTER, true, &energy_now)) {
>                 *energy_raw = energy_now;
> -               put_online_cpus();
> +               cpus_read_unlock();
>
>                 return 0;
>         }
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return -EIO;
>  }
> @@ -216,11 +216,11 @@ static int set_domain_enable(struct powercap_zone *power_zone, bool mode)
>         if (rd->state & DOMAIN_STATE_BIOS_LOCKED)
>                 return -EACCES;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rapl_write_data_raw(rd, PL1_ENABLE, mode);
>         if (rapl_defaults->set_floor_freq)
>                 rapl_defaults->set_floor_freq(rd, mode);
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return 0;
>  }
> @@ -234,13 +234,13 @@ static int get_domain_enable(struct powercap_zone *power_zone, bool *mode)
>                 *mode = false;
>                 return 0;
>         }
> -       get_online_cpus();
> +       cpus_read_lock();
>         if (rapl_read_data_raw(rd, PL1_ENABLE, true, &val)) {
> -               put_online_cpus();
> +               cpus_read_unlock();
>                 return -EIO;
>         }
>         *mode = val;
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return 0;
>  }
> @@ -317,7 +317,7 @@ static int set_power_limit(struct powercap_zone *power_zone, int cid,
>         int ret = 0;
>         int id;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>         id = contraint_to_pl(rd, cid);
>         if (id < 0) {
> @@ -350,7 +350,7 @@ static int set_power_limit(struct powercap_zone *power_zone, int cid,
>         if (!ret)
>                 package_power_limit_irq_save(rp);
>  set_exit:
> -       put_online_cpus();
> +       cpus_read_unlock();
>         return ret;
>  }
>
> @@ -363,7 +363,7 @@ static int get_current_power_limit(struct powercap_zone *power_zone, int cid,
>         int ret = 0;
>         int id;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>         id = contraint_to_pl(rd, cid);
>         if (id < 0) {
> @@ -382,7 +382,7 @@ static int get_current_power_limit(struct powercap_zone *power_zone, int cid,
>                 prim = POWER_LIMIT4;
>                 break;
>         default:
> -               put_online_cpus();
> +               cpus_read_unlock();
>                 return -EINVAL;
>         }
>         if (rapl_read_data_raw(rd, prim, true, &val))
> @@ -391,7 +391,7 @@ static int get_current_power_limit(struct powercap_zone *power_zone, int cid,
>                 *data = val;
>
>  get_exit:
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return ret;
>  }
> @@ -403,7 +403,7 @@ static int set_time_window(struct powercap_zone *power_zone, int cid,
>         int ret = 0;
>         int id;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>         id = contraint_to_pl(rd, cid);
>         if (id < 0) {
> @@ -423,7 +423,7 @@ static int set_time_window(struct powercap_zone *power_zone, int cid,
>         }
>
>  set_time_exit:
> -       put_online_cpus();
> +       cpus_read_unlock();
>         return ret;
>  }
>
> @@ -435,7 +435,7 @@ static int get_time_window(struct powercap_zone *power_zone, int cid,
>         int ret = 0;
>         int id;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>         id = contraint_to_pl(rd, cid);
>         if (id < 0) {
> @@ -458,14 +458,14 @@ static int get_time_window(struct powercap_zone *power_zone, int cid,
>                 val = 0;
>                 break;
>         default:
> -               put_online_cpus();
> +               cpus_read_unlock();
>                 return -EINVAL;
>         }
>         if (!ret)
>                 *data = val;
>
>  get_time_exit:
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return ret;
>  }
> @@ -491,7 +491,7 @@ static int get_max_power(struct powercap_zone *power_zone, int id, u64 *data)
>         int prim;
>         int ret = 0;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         rd = power_zone_to_rapl_domain(power_zone);
>         switch (rd->rpl[id].prim_id) {
>         case PL1_ENABLE:
> @@ -504,7 +504,7 @@ static int get_max_power(struct powercap_zone *power_zone, int id, u64 *data)
>                 prim = MAX_POWER;
>                 break;
>         default:
> -               put_online_cpus();
> +               cpus_read_unlock();
>                 return -EINVAL;
>         }
>         if (rapl_read_data_raw(rd, prim, true, &val))
> @@ -516,7 +516,7 @@ static int get_max_power(struct powercap_zone *power_zone, int id, u64 *data)
>         if (rd->rpl[id].prim_id == PL4_ENABLE)
>                 *data = *data * 2;
>
> -       put_online_cpus();
> +       cpus_read_unlock();
>
>         return ret;
>  }
> @@ -1358,7 +1358,7 @@ static void power_limit_state_save(void)
>         struct rapl_domain *rd;
>         int nr_pl, ret, i;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         list_for_each_entry(rp, &rapl_packages, plist) {
>                 if (!rp->power_zone)
>                         continue;
> @@ -1390,7 +1390,7 @@ static void power_limit_state_save(void)
>                         }
>                 }
>         }
> -       put_online_cpus();
> +       cpus_read_unlock();
>  }
>
>  static void power_limit_state_restore(void)
> @@ -1399,7 +1399,7 @@ static void power_limit_state_restore(void)
>         struct rapl_domain *rd;
>         int nr_pl, i;
>
> -       get_online_cpus();
> +       cpus_read_lock();
>         list_for_each_entry(rp, &rapl_packages, plist) {
>                 if (!rp->power_zone)
>                         continue;
> @@ -1425,7 +1425,7 @@ static void power_limit_state_restore(void)
>                         }
>                 }
>         }
> -       put_online_cpus();
> +       cpus_read_unlock();
>  }
>
>  static int rapl_pm_callback(struct notifier_block *nb,
> --

Applied as 5.15 material, thanks!

  reply	other threads:[~2021-08-04 18:15 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 14:15 [PATCH 00/38] Replace deprecated CPU-hotplug Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 01/38] Documentation: Replace deprecated CPU-hotplug functions Sebastian Andrzej Siewior
2021-08-27 23:53   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 02/38] MIPS: " Sebastian Andrzej Siewior
2021-08-05  9:02   ` Thomas Bogendoerfer
2021-08-03 14:15 ` [PATCH 03/38] powerpc: " Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 04/38] s390: " Sebastian Andrzej Siewior
2021-08-03 15:40   ` Heiko Carstens
2021-08-03 14:15 ` [PATCH 05/38] s390/sclp: " Sebastian Andrzej Siewior
2021-08-03 15:40   ` Heiko Carstens
2021-08-03 14:15 ` [PATCH 06/38] x86/mmiotrace: " Sebastian Andrzej Siewior
2021-08-03 15:03   ` [Nouveau] " Karol Herbst
2021-08-04  1:07   ` Steven Rostedt
2021-08-10 12:52   ` [tip: x86/cleanups] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 07/38] x86/mtrr: " Sebastian Andrzej Siewior
2021-08-10 12:52   ` [tip: x86/cleanups] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 08/38] x86/microcode: " Sebastian Andrzej Siewior
2021-08-10 12:52   ` [tip: x86/cleanups] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 09/38] x86/mce/inject: " Sebastian Andrzej Siewior
2021-08-10 12:52   ` [tip: x86/cleanups] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 10/38] perf/x86/intel: " Sebastian Andrzej Siewior
2021-08-10 13:04   ` [tip: perf/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-26  8:09   ` tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 11/38] perf/hw_breakpoint: " Sebastian Andrzej Siewior
2021-08-10 13:04   ` [tip: perf/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-26  8:09   ` tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 12/38] crypto: virtio: " Sebastian Andrzej Siewior
2021-08-12 11:36   ` Herbert Xu
2021-08-03 14:15 ` [PATCH 13/38] hwmon: " Sebastian Andrzej Siewior
2021-08-03 15:29   ` Guenter Roeck
2021-08-03 14:15 ` [PATCH 14/38] coresight: " Sebastian Andrzej Siewior
2021-08-03 15:52   ` Mathieu Poirier
2021-08-03 14:15 ` [PATCH 15/38] md/raid5: " Sebastian Andrzej Siewior
2021-08-05 16:20   ` Song Liu
2021-08-27 23:53   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:15 ` [PATCH 16/38] sgi-xpc: " Sebastian Andrzej Siewior
2021-08-03 15:54   ` Steve Wahl
2021-08-03 21:30   ` Robin Holt
2021-08-03 14:16 ` [PATCH 17/38] platform/x86: " Sebastian Andrzej Siewior
2021-08-06 13:36   ` Hans de Goede
2021-08-03 14:16 ` [PATCH 18/38] powercap: intel_rapl: " Sebastian Andrzej Siewior
2021-08-04 18:14   ` Rafael J. Wysocki [this message]
2021-08-03 14:16 ` [PATCH 19/38] thermal: " Sebastian Andrzej Siewior
2021-08-14 10:52   ` Daniel Lezcano
2021-09-10 22:45   ` [tip: smp/urgent] " tip-bot2 for Sebastian Andrzej Siewior
2021-09-11 20:48     ` Daniel Lezcano
2021-09-11 21:11       ` Borislav Petkov
2021-08-03 14:16 ` [PATCH 20/38] mm: " Sebastian Andrzej Siewior
2021-08-27 23:53   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 21/38] virtio_net: " Sebastian Andrzej Siewior
2021-08-04 22:41   ` Jakub Kicinski
2021-08-03 14:16 ` [PATCH 22/38] net/af_iucv: " Sebastian Andrzej Siewior
2021-08-04  6:36   ` Julian Wiedmann
2021-08-03 14:16 ` [PATCH 23/38] net: " Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 24/38] cgroup: " Sebastian Andrzej Siewior
2021-08-09 22:37   ` Tejun Heo
2021-08-03 14:16 ` [PATCH 25/38] genirq/affinity: " Sebastian Andrzej Siewior
2021-08-10 12:58   ` [tip: irq/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 26/38] livepatch: " Sebastian Andrzej Siewior
2021-08-04  7:52   ` Petr Mladek
2021-08-19 10:01     ` Jiri Kosina
2021-08-03 14:16 ` [PATCH 27/38] padata: " Sebastian Andrzej Siewior
2021-08-04 14:52   ` Daniel Jordan
2021-08-12 11:36   ` Herbert Xu
2021-08-03 14:16 ` [PATCH 28/38] cpufreq: " Sebastian Andrzej Siewior
2021-08-04 18:19   ` Rafael J. Wysocki
2021-08-03 14:16 ` [PATCH 29/38] ACPI: processor: " Sebastian Andrzej Siewior
2021-08-04 18:27   ` Rafael J. Wysocki
2021-08-03 14:16 ` [PATCH 30/38] ACPI: PM: s2idle: " Sebastian Andrzej Siewior
2021-08-04 18:20   ` Rafael J. Wysocki
2021-08-03 14:16 ` [PATCH 31/38] rcu: " Sebastian Andrzej Siewior
2021-08-03 16:00   ` Paul E. McKenney
2021-08-10 12:42     ` Thomas Gleixner
2021-08-10 18:20       ` Paul E. McKenney
2021-08-03 14:16 ` [PATCH 32/38] sched: " Sebastian Andrzej Siewior
2021-08-10 12:58   ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 33/38] smpboot: " Sebastian Andrzej Siewior
2021-08-10 13:04   ` [tip: smp/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 34/38] clocksource: " Sebastian Andrzej Siewior
2021-08-10 12:58   ` [tip: timers/core] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 35/38] torture: " Sebastian Andrzej Siewior
2021-08-03 14:16 ` [PATCH 36/38] tracing: " Sebastian Andrzej Siewior
2021-08-03 15:16   ` Daniel Bristot de Oliveira
2021-08-04  2:26   ` Steven Rostedt
2021-08-10 13:34     ` Sebastian Andrzej Siewior
2021-08-10 19:12       ` Steven Rostedt
2021-08-03 14:16 ` [PATCH 37/38] workqueue: " Sebastian Andrzej Siewior
2021-08-04  1:36   ` Lai Jiangshan
2021-08-09 22:33   ` Tejun Heo
2021-08-03 14:16 ` [PATCH 38/38] cpu/hotplug: Remove " Sebastian Andrzej Siewior
2021-09-10 22:45   ` [tip: smp/urgent] " tip-bot2 for Sebastian Andrzej Siewior
2021-08-03 15:30 ` [PATCH 00/38] Replace deprecated CPU-hotplug Hans de Goede
2021-08-03 16:10   ` Sebastian Andrzej Siewior
2021-08-18 13:38 ` (subset) " Michael Ellerman

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=CAJZ5v0gsS+v23yMBnOV8GTiCF9OaXSLffJn1p+K3kJaQQkzEcw@mail.gmail.com \
    --to=rafael@kernel.org \
    --cc=bigeasy@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 18/38] powercap: intel_rapl: Replace deprecated CPU-hotplug functions.' \
    /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

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).