* Re: [PATCH 5/5] arm64: dts: imx8mq: add DCSS node
From: Fabio Estevam @ 2019-09-23 17:53 UTC (permalink / raw)
To: Lucas Stach
Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
Laurentiu Palcu, Sascha Hauer, linux-kernel, NXP Linux Team,
Pengutronix Kernel Team, Shawn Guo, Guido Günther,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
In-Reply-To: <45ad0ec1bfd5af4f46efd7d24c627822ac17fdbf.camel@pengutronix.de>
On Mon, Sep 23, 2019 at 2:01 PM Lucas Stach <l.stach@pengutronix.de> wrote:
> No, they are not. Those are imx-irqsteer IRQs, this controller has 0
> irq cells, so the description in this patch is correct.
Good point, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v2 linux-next 1/4] arm: configs: omap2plus_defconfig: Change CONFIG_REMOTEPROC from m to y
From: Tony Lindgren @ 2019-09-23 17:56 UTC (permalink / raw)
To: Keerthy
Cc: linux-omap, arnd, catalin.marinas, nsekhar, linux-kernel,
bjorn.andersson, t-kristo, olof, will, hch, linux-arm-kernel
In-Reply-To: <20190920075946.13282-2-j-keerthy@ti.com>
* Keerthy <j-keerthy@ti.com> [190920 08:00]:
> Commit 6334150e9a36 ("remoteproc: don't allow modular build")
> changes CONFIG_REMOTEPROC to a boolean from a tristate config
> option which inhibits all defconfigs marking CONFIG_REMOTEPROC as
> a module in compiling the remoteproc and dependent config options.
>
> So fix the omap2plus_defconfig to have CONFIG_REMOTEPROC built in.
Acked-by: Tony Lindgren <tony@atomide.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 2/6] PM / devfreq: Move more initialization before registration
From: Matthias Kaehlcke @ 2019-09-23 18:10 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan, linux-pm,
Viresh Kumar, NXP Linux Team, Krzysztof Kozlowski, Lukasz Luba,
Chanwoo Choi, Kyungmin Park, MyungJoo Ham, Alexandre Bailon,
Georgi Djakov, linux-arm-kernel, Jacky Bai
In-Reply-To: <0ad496507cd7e6731e46249b1499dfdebe205c16.1569252537.git.leonard.crestez@nxp.com>
On Mon, Sep 23, 2019 at 06:51:05PM +0300, Leonard Crestez wrote:
> In general it is a better to initialize an object before making it
> accessible externally (through device_register).
>
> This makes it possible to avoid relying on locking a partially
> initialized object.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> ---
> drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++----------------
> 1 file changed, 25 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index 323d43315d1e..b4d2bfebb140 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -587,10 +587,12 @@ static void devfreq_dev_release(struct device *dev)
> mutex_unlock(&devfreq_list_lock);
>
> if (devfreq->profile->exit)
> devfreq->profile->exit(devfreq->dev.parent);
>
> + kfree(devfreq->time_in_state);
> + kfree(devfreq->trans_table);
> mutex_destroy(&devfreq->lock);
> kfree(devfreq);
> }
>
> /**
> @@ -670,44 +672,43 @@ struct devfreq *devfreq_add_device(struct device *dev,
> devfreq->max_freq = devfreq->scaling_max_freq;
>
> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
> atomic_set(&devfreq->suspend_count, 0);
>
> - dev_set_name(&devfreq->dev, "devfreq%d",
> - atomic_inc_return(&devfreq_no));
> - err = device_register(&devfreq->dev);
> - if (err) {
> - mutex_unlock(&devfreq->lock);
> - put_device(&devfreq->dev);
> - goto err_out;
> - }
> -
> - devfreq->trans_table = devm_kzalloc(&devfreq->dev,
> + devfreq->trans_table = kzalloc(
> array3_size(sizeof(unsigned int),
> devfreq->profile->max_state,
> devfreq->profile->max_state),
> GFP_KERNEL);
> if (!devfreq->trans_table) {
> mutex_unlock(&devfreq->lock);
> err = -ENOMEM;
> - goto err_devfreq;
> + goto err_dev;
> }
>
> - devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
> - devfreq->profile->max_state,
> - sizeof(unsigned long),
> - GFP_KERNEL);
> + devfreq->time_in_state = kcalloc(devfreq->profile->max_state,
> + sizeof(unsigned long),
> + GFP_KERNEL);
> if (!devfreq->time_in_state) {
> mutex_unlock(&devfreq->lock);
> err = -ENOMEM;
> - goto err_devfreq;
> + goto err_dev;
> }
>
> devfreq->last_stat_updated = jiffies;
>
> srcu_init_notifier_head(&devfreq->transition_notifier_list);
>
> + dev_set_name(&devfreq->dev, "devfreq%d",
> + atomic_inc_return(&devfreq_no));
> + err = device_register(&devfreq->dev);
> + if (err) {
> + mutex_unlock(&devfreq->lock);
> + put_device(&devfreq->dev);
> + goto err_out;
As per my comment on v5 I think the goto needs to go to 'err_dev'. The
device registration failed, hence devfreq_dev_release() won't be
called to free allocated memory.
> + }
> +
> mutex_unlock(&devfreq->lock);
>
> mutex_lock(&devfreq_list_lock);
>
> governor = try_then_request_governor(devfreq->governor_name);
> @@ -733,14 +734,20 @@ struct devfreq *devfreq_add_device(struct device *dev,
>
> return devfreq;
>
> err_init:
> mutex_unlock(&devfreq_list_lock);
> -err_devfreq:
> devfreq_remove_device(devfreq);
> - devfreq = NULL;
> + return ERR_PTR(err);
> +
> err_dev:
> + /*
> + * Cleanup path for errors that happen before registration.
> + * Otherwise we rely on devfreq_dev_release
nit: add a period at the end of the second sentence.
> + */
> + kfree(devfreq->time_in_state);
> + kfree(devfreq->trans_table);
> kfree(devfreq);
> err_out:
> return ERR_PTR(err);
> }
> EXPORT_SYMBOL(devfreq_add_device);
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 4/6] PM / devfreq: Introduce devfreq_get_freq_range
From: Matthias Kaehlcke @ 2019-09-23 18:16 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan, linux-pm,
Viresh Kumar, NXP Linux Team, Krzysztof Kozlowski, Lukasz Luba,
Chanwoo Choi, Kyungmin Park, MyungJoo Ham, Alexandre Bailon,
Georgi Djakov, linux-arm-kernel, Jacky Bai
In-Reply-To: <4e274855585940ec6fb0e219c7539d4cf600d9f1.1569252537.git.leonard.crestez@nxp.com>
On Mon, Sep 23, 2019 at 06:51:07PM +0300, Leonard Crestez wrote:
> Moving handling of min/max freq to a single function and call it from
> update_devfreq and for printing min/max freq values in sysfs.
>
> This changes the behavior of out-of-range min_freq/max_freq: clamping
> is now done at evaluation time. This means that if an out-of-range
> constraint is imposed by sysfs and it later becomes valid then it will
> be enforced.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> drivers/devfreq/devfreq.c | 111 +++++++++++++++++++++-----------------
> 1 file changed, 63 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index 0eee4dd79fbb..b6acb827fee5 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -24,10 +24,12 @@
> #include <linux/printk.h>
> #include <linux/hrtimer.h>
> #include <linux/of.h>
> #include "governor.h"
>
> +#define HZ_PER_KHZ 1000
> +
> #define CREATE_TRACE_POINTS
> #include <trace/events/devfreq.h>
>
> static struct class *devfreq_class;
>
> @@ -96,10 +98,50 @@ static unsigned long find_available_max_freq(struct devfreq *devfreq)
> dev_pm_opp_put(opp);
>
> return max_freq;
> }
>
> +/**
> + * devfreq_get_freq_range() - Get the current freq range
> + * @devfreq: the devfreq instance
> + * @min_freq: the min frequency
> + * @max_freq: the max frequency
> + *
> + * This takes into consideration all constraints.
> + */
> +static void devfreq_get_freq_range(struct devfreq *devfreq,
> + unsigned long *min_freq,
> + unsigned long *max_freq)
> +{
> + unsigned long *freq_table = devfreq->profile->freq_table;
> +
> + lockdep_assert_held(&devfreq->lock);
> +
> + /* Init min/max frequency from freq table */
> + if (freq_table[0] < freq_table[devfreq->profile->max_state - 1]) {
> + *min_freq = freq_table[0];
> + *max_freq = freq_table[devfreq->profile->max_state - 1];
> + } else {
> + *min_freq = freq_table[devfreq->profile->max_state - 1];
> + *max_freq = freq_table[0];
> + }
> +
> + /* constraints from sysfs: */
one more nit if you are respinning anyway: remove colon
> + *min_freq = max(*min_freq, devfreq->min_freq);
> + *max_freq = min(*max_freq, devfreq->max_freq);
> +
> + /* constraints from OPP interface: */
ditto
> + *min_freq = max(*min_freq, devfreq->scaling_min_freq);
> + /* scaling_max_freq can be zero on error */
> + if (devfreq->scaling_max_freq)
> + *max_freq = min(*max_freq, devfreq->scaling_max_freq);
> +
> + /* max_freq takes precedence over min_freq */
> + if (*min_freq > *max_freq)
> + *min_freq = *max_freq;
> +}
> +
> /**
> * devfreq_get_freq_level() - Lookup freq_table for the frequency
> * @devfreq: the devfreq instance
> * @freq: the target frequency
> */
> @@ -348,21 +390,13 @@ int update_devfreq(struct devfreq *devfreq)
>
> /* Reevaluate the proper frequency */
> err = devfreq->governor->get_target_freq(devfreq, &freq);
> if (err)
> return err;
> + devfreq_get_freq_range(devfreq, &min_freq, &max_freq);
>
> - /*
> - * Adjust the frequency with user freq, QoS and available freq.
> - *
> - * List from the highest priority
> - * max_freq
> - * min_freq
> - */
> - max_freq = min(devfreq->scaling_max_freq, devfreq->max_freq);
> - min_freq = max(devfreq->scaling_min_freq, devfreq->min_freq);
> -
> + /* max freq takes priority over min freq */
> if (freq < min_freq) {
> freq = min_freq;
> flags &= ~DEVFREQ_FLAG_LEAST_UPPER_BOUND; /* Use GLB */
> }
> if (freq > max_freq) {
> @@ -1297,40 +1331,28 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr,
> ret = sscanf(buf, "%lu", &value);
> if (ret != 1)
> return -EINVAL;
>
> mutex_lock(&df->lock);
> -
> - if (value) {
> - if (value > df->max_freq) {
> - ret = -EINVAL;
> - goto unlock;
> - }
> - } else {
> - unsigned long *freq_table = df->profile->freq_table;
> -
> - /* Get minimum frequency according to sorting order */
> - if (freq_table[0] < freq_table[df->profile->max_state - 1])
> - value = freq_table[0];
> - else
> - value = freq_table[df->profile->max_state - 1];
> - }
> -
> df->min_freq = value;
> update_devfreq(df);
> - ret = count;
> -unlock:
> mutex_unlock(&df->lock);
> - return ret;
> +
> + return count;
> }
>
> static ssize_t min_freq_show(struct device *dev, struct device_attribute *attr,
> char *buf)
> {
> struct devfreq *df = to_devfreq(dev);
> + unsigned long min_freq, max_freq;
>
> - return sprintf(buf, "%lu\n", max(df->scaling_min_freq, df->min_freq));
> + mutex_lock(&df->lock);
> + devfreq_get_freq_range(df, &min_freq, &max_freq);
> + mutex_unlock(&df->lock);
> +
> + return sprintf(buf, "%lu\n", min_freq);
> }
>
> static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
> const char *buf, size_t count)
> {
> @@ -1342,40 +1364,33 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
> if (ret != 1)
> return -EINVAL;
>
> mutex_lock(&df->lock);
>
> - if (value) {
> - if (value < df->min_freq) {
> - ret = -EINVAL;
> - goto unlock;
> - }
> - } else {
> - unsigned long *freq_table = df->profile->freq_table;
> -
> - /* Get maximum frequency according to sorting order */
> - if (freq_table[0] < freq_table[df->profile->max_state - 1])
> - value = freq_table[df->profile->max_state - 1];
> - else
> - value = freq_table[0];
> - }
> + /* Interpret zero as "don't care" */
> + if (!value)
> + value = ULONG_MAX;
>
> df->max_freq = value;
> update_devfreq(df);
> - ret = count;
> -unlock:
> mutex_unlock(&df->lock);
> - return ret;
> +
> + return count;
> }
> static DEVICE_ATTR_RW(min_freq);
>
> static ssize_t max_freq_show(struct device *dev, struct device_attribute *attr,
> char *buf)
> {
> struct devfreq *df = to_devfreq(dev);
> + unsigned long min_freq, max_freq;
> +
> + mutex_lock(&df->lock);
> + devfreq_get_freq_range(df, &min_freq, &max_freq);
> + mutex_unlock(&df->lock);
>
> - return sprintf(buf, "%lu\n", min(df->scaling_max_freq, df->max_freq));
> + return sprintf(buf, "%lu\n", max_freq);
> }
> static DEVICE_ATTR_RW(max_freq);
>
> static ssize_t available_frequencies_show(struct device *d,
> struct device_attribute *attr,
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* [PATCH] ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci
From: Stefan Wahren @ 2019-09-23 18:21 UTC (permalink / raw)
To: Eric Anholt, Florian Fainelli, Ray Jui, Scott Branden
Cc: bcm-kernel-feedback-list, Stefan Wahren, linux-arm-kernel
The commit e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at
board level") accidently dropped the bus width for the sdhci on the
RPi Zero W, because the board file was relying on the defaults
from bcm2835-rpi.dtsi. So fix this performance regression by adding
the bus width to the board file.
Fixes: e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at board level")
Reported-by: Phil Elwell <phil@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 09a088f..b75af21 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -113,6 +113,7 @@
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
+ bus-width = <4>;
mmc-pwrseq = <&wifi_pwrseq>;
non-removable;
status = "okay";
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related
* Re: [PATCH] ARM: omap2plus_defconfig: Enable DRM_TI_TFP410
From: Tony Lindgren @ 2019-09-23 18:23 UTC (permalink / raw)
To: Adam Ford
Cc: linux-kernel, sre, Russell King, linux-omap, adam.ford,
linux-arm-kernel
In-Reply-To: <20190911174647.29721-1-aford173@gmail.com>
* Adam Ford <aford173@gmail.com> [190911 10:47]:
> The TFP410 driver was removed but the replacement driver was
> never enabled. This patch enableds the DRM_TI_TFP410
>
> Fixes: be3143d8b27f ("drm/omap: Remove TFP410 and DVI connector drivers")
Applying into fixes thanks.
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH trivial] sound: Fix Kconfig indentation
From: Mark Brown @ 2019-09-23 18:26 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Pierre-Louis Bossart, Cezary Rojewski, Jiri Kosina, alsa-devel,
Jie Yang, Takashi Iwai, Clemens Ladisch, Liam Girdwood,
Takashi Sakamoto, linux-arm-kernel, Jaroslav Kysela, linux-kernel
In-Reply-To: <20190923154547.26532-1-krzk@kernel.org>
[-- Attachment #1.1: Type: text/plain, Size: 261 bytes --]
On Mon, Sep 23, 2019 at 05:45:47PM +0200, Krzysztof Kozlowski wrote:
> Adjust indentation from spaces to tab (+optional two spaces) as in
> coding style with command like:
> $ sed -e 's/^ /\t/' -i */Kconfig
Acked-by: Mark Brown <broonie@kernel.org>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 5/6] PM / devfreq: Add PM QoS support
From: Matthias Kaehlcke @ 2019-09-23 18:28 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan, linux-pm,
Viresh Kumar, NXP Linux Team, Krzysztof Kozlowski, Lukasz Luba,
Chanwoo Choi, Kyungmin Park, MyungJoo Ham, Alexandre Bailon,
Georgi Djakov, linux-arm-kernel, Jacky Bai
In-Reply-To: <55807c847f072690f3ec904168023484767dc603.1569252537.git.leonard.crestez@nxp.com>
Please see my comments on v5: https://patchwork.kernel.org/patch/11149485/
an additional nit inline
On Mon, Sep 23, 2019 at 06:51:08PM +0300, Leonard Crestez wrote:
> Register notifiers with the PM QoS framework in order to respond to
> requests for DEV_PM_QOS_MIN_FREQUENCY and DEV_PM_QOS_MAX_FREQUENCY.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> ---
> drivers/devfreq/devfreq.c | 71 +++++++++++++++++++++++++++++++++++++++
> include/linux/devfreq.h | 5 +++
> 2 files changed, 76 insertions(+)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index b6acb827fee5..a4c7dde17a06 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -22,17 +22,20 @@
> #include <linux/platform_device.h>
> #include <linux/list.h>
> #include <linux/printk.h>
> #include <linux/hrtimer.h>
> #include <linux/of.h>
> +#include <linux/pm_qos.h>
> #include "governor.h"
>
> #define HZ_PER_KHZ 1000
>
> #define CREATE_TRACE_POINTS
> #include <trace/events/devfreq.h>
>
> +#define HZ_PER_KHZ 1000
> +
> static struct class *devfreq_class;
>
> /*
> * devfreq core provides delayed work based load monitoring helper
> * functions. Governors can use these or can implement their own
> @@ -123,10 +126,16 @@ static void devfreq_get_freq_range(struct devfreq *devfreq,
> } else {
> *min_freq = freq_table[devfreq->profile->max_state - 1];
> *max_freq = freq_table[0];
> }
>
> + /* constraints from PM QoS: */
nit: remove colon
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH 1/2] ARM: omap2plus_defconfig: Update for removed items
From: Tony Lindgren @ 2019-09-23 18:30 UTC (permalink / raw)
To: Adam Ford
Cc: Linux Kernel Mailing List, Sebastian Reichel, Russell King,
Linux-OMAP, Adam Ford, arm-soc
In-Reply-To: <CAHCN7xKin45Hqr1fgoOmbBKaM_hM_xnvrs2_5nnxAifHL2Sz0A@mail.gmail.com>
* Adam Ford <aford173@gmail.com> [190911 17:14]:
> On Wed, Sep 11, 2019 at 11:50 AM Sebastian Reichel <sre@kernel.org> wrote:
> >
> > Hi,
> >
> > On Wed, Sep 11, 2019 at 09:52:25AM -0500, Adam Ford wrote:
> > > The omap panel-dpi driver was removed in
> > > Commit 8bf4b1621178 ("drm/omap: Remove panel-dpi driver")
> > >
> > > The tFP410 and DVI connector was remove in
> > > Commit be3143d8b27f ("drm/omap: Remove TFP410 and DVI connector drivers")
> > >
> > > This patch removes these items from the omap2plus_defconfig.
> >
> > The omapdrm specific drivers have generic replacements, that
> > should be added to the defconfig instead:
> >
> > DRM_OMAP_PANEL_DPI -> DRM_PANEL_SIMPLE
> > DRM_OMAP_ENCODER_TFP410 -> DRM_TI_TFP410
> >
> > Nothing should be required for DRM_OMAP_CONNECTOR_DVI.
>
> The DPI panel was already done.
>
> https://patchwork.kernel.org/patch/11119569/
>
> I'll submit a patch for the TFP410
I picked that one into fixes, will apply the rest
of defconfig changes into omap-for-v5.5/defconfig.
Not planning on pushing it out until after -rc1
though.
Regards,
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] seccomp: remove unused arg from secure_computing()
From: Andy Lutomirski @ 2019-09-23 18:41 UTC (permalink / raw)
To: Borislav Petkov
Cc: linux-s390, Will Drewry, Kees Cook, Parisc List, X86 ML, linux-um,
LKML, Oleg Nesterov, Andy Lutomirski, Christian Brauner,
Thomas Gleixner, linux-arm-kernel
In-Reply-To: <20190923094916.GB15355@zn.tnic>
On Mon, Sep 23, 2019 at 2:49 AM Borislav Petkov <bp@alien8.de> wrote:
>
> On Fri, Sep 20, 2019 at 03:19:09PM +0200, Christian Brauner wrote:
> > While touching seccomp code I realized that the struct seccomp_data
> > argument to secure_computing() seems to be unused by all current
> > callers. So let's remove it unless there is some subtlety I missed.
> > Note, I only tested this on x86.
>
> What was amluto thinking in
>
> 2f275de5d1ed ("seccomp: Add a seccomp_data parameter secure_computing()")
IIRC there was a period of time in which x86 used secure_computing()
for normal syscalls, and it was a good deal faster to have the arch
code supply seccomp_data. x86 no longer works like this, and syscalls
aren't fast anymore ayway :(
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 6/6] PM / devfreq: Use PM QoS for sysfs min/max_freq
From: Matthias Kaehlcke @ 2019-09-23 18:47 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan, linux-pm,
Viresh Kumar, NXP Linux Team, Krzysztof Kozlowski, Lukasz Luba,
Chanwoo Choi, Kyungmin Park, MyungJoo Ham, Alexandre Bailon,
Georgi Djakov, linux-arm-kernel, Jacky Bai
In-Reply-To: <d103b4b19b63640233bd449486466e0c24232e35.1569252537.git.leonard.crestez@nxp.com>
On Mon, Sep 23, 2019 at 06:51:09PM +0300, Leonard Crestez wrote:
> Switch the handling of min_freq and max_freq from sysfs to use the
> dev_pm_qos_request interface.
>
> Since PM QoS handles frequencies as kHz this change reduces the
> precision of min_freq and max_freq. This shouldn't introduce problems
> because frequencies which are not an integer number of kHz are likely
> not an integer number of Hz either.
>
> Try to ensure compatibility by rounding min values down and rounding
> max values up.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> ---
> drivers/devfreq/devfreq.c | 49 +++++++++++++++++++++++++--------------
> include/linux/devfreq.h | 9 +++----
> 2 files changed, 36 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index a4c7dde17a06..4c58fbf7d4e4 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -132,14 +132,10 @@ static void devfreq_get_freq_range(struct devfreq *devfreq,
> *min_freq = max(*min_freq, HZ_PER_KHZ * (unsigned long)dev_pm_qos_read_value(
> devfreq->dev.parent, DEV_PM_QOS_MIN_FREQUENCY));
> *max_freq = min(*max_freq, HZ_PER_KHZ * (unsigned long)dev_pm_qos_read_value(
> devfreq->dev.parent, DEV_PM_QOS_MAX_FREQUENCY));
>
> - /* constraints from sysfs: */
> - *min_freq = max(*min_freq, devfreq->min_freq);
> - *max_freq = min(*max_freq, devfreq->max_freq);
> -
> /* constraints from OPP interface: */
> *min_freq = max(*min_freq, devfreq->scaling_min_freq);
> /* scaling_max_freq can be zero on error */
> if (devfreq->scaling_max_freq)
> *max_freq = min(*max_freq, devfreq->scaling_max_freq);
> @@ -674,10 +670,12 @@ static void devfreq_dev_release(struct device *dev)
> DEV_PM_QOS_MIN_FREQUENCY);
>
> if (devfreq->profile->exit)
> devfreq->profile->exit(devfreq->dev.parent);
>
> + dev_pm_qos_remove_request(&devfreq->user_max_freq_req);
> + dev_pm_qos_remove_request(&devfreq->user_min_freq_req);
> kfree(devfreq->time_in_state);
> kfree(devfreq->trans_table);
> mutex_destroy(&devfreq->lock);
> kfree(devfreq);
> }
> @@ -742,18 +740,26 @@ struct devfreq *devfreq_add_device(struct device *dev,
> devfreq->scaling_min_freq = find_available_min_freq(devfreq);
> if (!devfreq->scaling_min_freq) {
> err = -EINVAL;
> goto err_dev;
> }
> - devfreq->min_freq = devfreq->scaling_min_freq;
>
> devfreq->scaling_max_freq = find_available_max_freq(devfreq);
> if (!devfreq->scaling_max_freq) {
> err = -EINVAL;
> goto err_dev;
> }
> - devfreq->max_freq = devfreq->scaling_max_freq;
> +
> + /* PM QoS requests for min/max freq from sysfs */
> + err = dev_pm_qos_add_request(dev, &devfreq->user_min_freq_req,
> + DEV_PM_QOS_MIN_FREQUENCY, 0);
> + if (err < 0)
> + goto err_dev;
> + err = dev_pm_qos_add_request(dev, &devfreq->user_max_freq_req,
> + DEV_PM_QOS_MAX_FREQUENCY, S32_MAX);
> + if (err < 0)
> + goto err_dev;
>
> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
> atomic_set(&devfreq->suspend_count, 0);
>
> devfreq->trans_table = kzalloc(
> @@ -837,10 +843,14 @@ struct devfreq *devfreq_add_device(struct device *dev,
> err_dev:
> /*
> * Cleanup path for errors that happen before registration.
> * Otherwise we rely on devfreq_dev_release
> */
> + if (dev_pm_qos_request_active(&devfreq->user_max_freq_req))
> + dev_pm_qos_remove_request(&devfreq->user_max_freq_req);
> + if (dev_pm_qos_request_active(&devfreq->user_min_freq_req))
> + dev_pm_qos_remove_request(&devfreq->user_min_freq_req);
> kfree(devfreq->time_in_state);
> kfree(devfreq->trans_table);
> kfree(devfreq);
> err_out:
> return ERR_PTR(err);
> @@ -1401,14 +1411,17 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr,
>
> ret = sscanf(buf, "%lu", &value);
> if (ret != 1)
> return -EINVAL;
>
> - mutex_lock(&df->lock);
> - df->min_freq = value;
> - update_devfreq(df);
> - mutex_unlock(&df->lock);
> + /* round down to kHz for dev_pm_qos */
> + if (value)
> + value = value / HZ_PER_KHZ;
> +
> + ret = dev_pm_qos_update_request(&df->user_min_freq_req, value);
> + if (ret < 0)
> + return ret;
>
> return count;
> }
>
> static ssize_t min_freq_show(struct device *dev, struct device_attribute *attr,
> @@ -1433,19 +1446,19 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
>
> ret = sscanf(buf, "%lu", &value);
> if (ret != 1)
> return -EINVAL;
>
> - mutex_lock(&df->lock);
> -
> - /* Interpret zero as "don't care" */
> - if (!value)
> - value = ULONG_MAX;
> + /* round up to kHz for dev_pm_qos and interpret zero as "don't care" */
> + if (value)
> + value = DIV_ROUND_UP(value, HZ_PER_KHZ);
> + else
> + value = S32_MAX;
>
> - df->max_freq = value;
> - update_devfreq(df);
> - mutex_unlock(&df->lock);
> + ret = dev_pm_qos_update_request(&df->user_max_freq_req, value);
> + if (ret < 0)
> + return ret;
>
> return count;
> }
> static DEVICE_ATTR_RW(min_freq);
>
> diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
> index dac0dffeabb4..7849fe4c666d 100644
> --- a/include/linux/devfreq.h
> +++ b/include/linux/devfreq.h
> @@ -11,10 +11,11 @@
> #define __LINUX_DEVFREQ_H__
>
> #include <linux/device.h>
> #include <linux/notifier.h>
> #include <linux/pm_opp.h>
> +#include <linux/pm_qos.h>
>
> #define DEVFREQ_NAME_LEN 16
>
> /* DEVFREQ governor name */
> #define DEVFREQ_GOV_SIMPLE_ONDEMAND "simple_ondemand"
> @@ -121,12 +122,12 @@ struct devfreq_dev_profile {
> * devfreq.nb to the corresponding register notifier call chain.
> * @work: delayed work for load monitoring.
> * @previous_freq: previously configured frequency value.
> * @data: Private data of the governor. The devfreq framework does not
> * touch this.
> - * @min_freq: Limit minimum frequency requested by user (0: none)
> - * @max_freq: Limit maximum frequency requested by user (0: none)
> + * @user_min_freq_req: PM QoS min frequency request from user (via sysfs)
> + * @user_max_freq_req: PM QoS max frequency request from user (via sysfs)
> * @scaling_min_freq: Limit minimum frequency requested by OPP interface
> * @scaling_max_freq: Limit maximum frequency requested by OPP interface
> * @stop_polling: devfreq polling status of a device.
> * @suspend_freq: frequency of a device set during suspend phase.
> * @resume_freq: frequency of a device set in resume phase.
> @@ -161,12 +162,12 @@ struct devfreq {
> unsigned long previous_freq;
> struct devfreq_dev_status last_status;
>
> void *data; /* private data for governors */
>
> - unsigned long min_freq;
> - unsigned long max_freq;
> + struct dev_pm_qos_request user_min_freq_req;
> + struct dev_pm_qos_request user_max_freq_req;
> unsigned long scaling_min_freq;
> unsigned long scaling_max_freq;
> bool stop_polling;
>
> unsigned long suspend_freq;
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] PM / devfreq: Check NULL governor in available_governors_show
From: Matthias Kaehlcke @ 2019-09-23 18:50 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, linux-pm, Krzysztof Kozlowski,
Lukasz Luba, Chanwoo Choi, Kyungmin Park, MyungJoo Ham,
linux-arm-kernel
In-Reply-To: <96f459015e6418cee4fa20fdbdb80c4caf417c19.1569256298.git.leonard.crestez@nxp.com>
On Mon, Sep 23, 2019 at 07:34:43PM +0300, Leonard Crestez wrote:
> The governor is initialized after sysfs attributes become visible so in
> theory the governor field can be NULL here.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> ---
> drivers/devfreq/devfreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Found this by hacking device core to call attribute "show" functions
> from inside device_add.
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index 00fc23fea5b2..896fb2312f2f 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -1322,11 +1322,11 @@ static ssize_t available_governors_show(struct device *d,
>
> /*
> * The devfreq with immutable governor (e.g., passive) shows
> * only own governor.
> */
> - if (df->governor->immutable) {
> + if (df->governor && df->governor->immutable) {
> count = scnprintf(&buf[count], DEVFREQ_NAME_LEN,
> "%s ", df->governor_name);
> /*
> * The devfreq device shows the registered governor except for
> * immutable governors such as passive governor .
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] PM / devfreq: Lock devfreq in trans_stat_show
From: Matthias Kaehlcke @ 2019-09-23 18:54 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, linux-pm, Krzysztof Kozlowski,
Lukasz Luba, Chanwoo Choi, Kyungmin Park, MyungJoo Ham,
NXP Linux Team, Georgi Djakov, linux-arm-kernel
In-Reply-To: <714675448e7fbf3c930b0dca6fbe54fa5f87211b.1569256001.git.leonard.crestez@nxp.com>
On Mon, Sep 23, 2019 at 07:27:27PM +0300, Leonard Crestez wrote:
> There is no locking in this sysfs show function so stats printing can
> race with a devfreq_update_status called as part of freq switching or
> with initialization.
>
> Also add an assert in devfreq_update_status to make it clear that lock
> must be held by caller.
>
> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> ---
> drivers/devfreq/devfreq.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> Changes since v1:
> * Split from series: low-priority bugfix not strictly required for PM QoS
> * Only keep lock during update, release before sprintf
> Link to v1: https://patchwork.kernel.org/patch/11149493/
>
> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> index 4c58fbf7d4e4..00fc23fea5b2 100644
> --- a/drivers/devfreq/devfreq.c
> +++ b/drivers/devfreq/devfreq.c
> @@ -206,10 +206,11 @@ int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)
> {
> int lev, prev_lev, ret = 0;
> unsigned long cur_time;
>
> cur_time = jiffies;
> + lockdep_assert_held(&devfreq->lock);
>
> /* Immediately exit if previous_freq is not initialized yet. */
> if (!devfreq->previous_freq)
> goto out;
>
> @@ -1507,16 +1508,22 @@ static ssize_t trans_stat_show(struct device *dev,
> struct devfreq *devfreq = to_devfreq(dev);
> ssize_t len;
> int i, j;
> unsigned int max_state = devfreq->profile->max_state;
>
> - if (!devfreq->stop_polling &&
> - devfreq_update_status(devfreq, devfreq->previous_freq))
> - return 0;
> if (max_state == 0)
> return sprintf(buf, "Not Supported.\n");
>
> + /* lock and update */
> + mutex_lock(&devfreq->lock);
> + if (!devfreq->stop_polling &&
> + devfreq_update_status(devfreq, devfreq->previous_freq)) {
> + mutex_unlock(&devfreq->lock);
> + return 0;
> + }
> + mutex_unlock(&devfreq->lock);
> +
> len = sprintf(buf, " From : To\n");
> len += sprintf(buf + len, " :");
> for (i = 0; i < max_state; i++)
> len += sprintf(buf + len, "%10lu",
> devfreq->profile->freq_table[i]);
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 2/6] PM / devfreq: Move more initialization before registration
From: Leonard Crestez @ 2019-09-23 18:56 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan,
linux-pm@vger.kernel.org, Viresh Kumar, dl-linux-imx,
Krzysztof Kozlowski, Lukasz Luba, Chanwoo Choi, Kyungmin Park,
MyungJoo Ham, Alexandre Bailon, Georgi Djakov,
linux-arm-kernel@lists.infradead.org, Jacky Bai
In-Reply-To: <20190923181057.GY133864@google.com>
On 23.09.2019 21:11, Matthias Kaehlcke wrote:
> On Mon, Sep 23, 2019 at 06:51:05PM +0300, Leonard Crestez wrote:
>> In general it is a better to initialize an object before making it
>> accessible externally (through device_register).
>>
>> This makes it possible to avoid relying on locking a partially
>> initialized object.
>>
>> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
>> ---
>> drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++----------------
>> 1 file changed, 25 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
>> index 323d43315d1e..b4d2bfebb140 100644
>> --- a/drivers/devfreq/devfreq.c
>> +++ b/drivers/devfreq/devfreq.c
>> @@ -587,10 +587,12 @@ static void devfreq_dev_release(struct device *dev)
>> mutex_unlock(&devfreq_list_lock);
>>
>> if (devfreq->profile->exit)
>> devfreq->profile->exit(devfreq->dev.parent);
>>
>> + kfree(devfreq->time_in_state);
>> + kfree(devfreq->trans_table);
>> mutex_destroy(&devfreq->lock);
>> kfree(devfreq);
>> }
>>
>> /**
>> @@ -670,44 +672,43 @@ struct devfreq *devfreq_add_device(struct device *dev,
>> devfreq->max_freq = devfreq->scaling_max_freq;
>>
>> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
>> atomic_set(&devfreq->suspend_count, 0);
>>
>> - dev_set_name(&devfreq->dev, "devfreq%d",
>> - atomic_inc_return(&devfreq_no));
>> - err = device_register(&devfreq->dev);
>> - if (err) {
>> - mutex_unlock(&devfreq->lock);
>> - put_device(&devfreq->dev);
>> - goto err_out;
>> - }
>> -
>> - devfreq->trans_table = devm_kzalloc(&devfreq->dev,
>> + devfreq->trans_table = kzalloc(
>> array3_size(sizeof(unsigned int),
>> devfreq->profile->max_state,
>> devfreq->profile->max_state),
>> GFP_KERNEL);
>> if (!devfreq->trans_table) {
>> mutex_unlock(&devfreq->lock);
>> err = -ENOMEM;
>> - goto err_devfreq;
>> + goto err_dev;
>> }
>>
>> - devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
>> - devfreq->profile->max_state,
>> - sizeof(unsigned long),
>> - GFP_KERNEL);
>> + devfreq->time_in_state = kcalloc(devfreq->profile->max_state,
>> + sizeof(unsigned long),
>> + GFP_KERNEL);
>> if (!devfreq->time_in_state) {
>> mutex_unlock(&devfreq->lock);
>> err = -ENOMEM;
>> - goto err_devfreq;
>> + goto err_dev;
>> }
>>
>> devfreq->last_stat_updated = jiffies;
>>
>> srcu_init_notifier_head(&devfreq->transition_notifier_list);
>>
>> + dev_set_name(&devfreq->dev, "devfreq%d",
>> + atomic_inc_return(&devfreq_no));
>> + err = device_register(&devfreq->dev);
>> + if (err) {
>> + mutex_unlock(&devfreq->lock);
>> + put_device(&devfreq->dev);
>> + goto err_out;
>
> As per my comment on v5 I think the goto needs to go to 'err_dev'. The
> device registration failed, hence devfreq_dev_release() won't be
> called to free allocated memory.
This code is not modified in the patch, it only shows up as +added
because diff got confused but there is an identical -removed chunk
higher up.
The device_register documentation mentions the following:
* NOTE: _Never_ directly free @dev after calling this function, even
* if it returned an error! Always use put_device() to give up the
* reference initialized in this function instead.
Cleanup path then goes like this (from a hacked error in device_add):
dump_stack+0xdc/0x144
devfreq_dev_release+0x38/0xc0
device_release+0x34/0x90
kobject_put+0x8c/0x1f0
put_device+0x24/0x30
devfreq_add_device+0x540/0x570
devm_devfreq_add_device+0x60/0xd0
imx_ddrc_probe+0x35c/0x4c8
Can I add your "Reviewed-By" for the rest of the series if I fix the nits?
--
Regards,
Leonard
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] Revert "ARM: bcm283x: Switch V3D over to using the PM driver instead of firmware."
From: Florian Fainelli @ 2019-09-23 18:56 UTC (permalink / raw)
To: Stefan Wahren, Eric Anholt, Florian Fainelli, Ray Jui,
Scott Branden, Paul Kocialkowski, boris.brezillon
Cc: stable, bcm-kernel-feedback-list, dri-devel, linux-arm-kernel
In-Reply-To: <1567957493-4567-1-git-send-email-wahrenst@gmx.net>
On 9/8/2019 8:44 AM, Stefan Wahren wrote:
> Since release of the new BCM2835 PM driver there has been several reports
> of V3D probing issues. This is caused by timeouts during powering-up the
> GRAFX PM domain:
>
> bcm2835-power: Timeout waiting for grafx power OK
>
> I was able to reproduce this reliable on my Raspberry Pi 3B+ after setting
> force_turbo=1 in the firmware configuration. Since there are no issues
> using the firmware PM driver with the same setup, there must be an issue
> in the BCM2835 PM driver.
>
> Unfortunately there hasn't been much progress in identifying the root cause
> since June (mostly in the lack of documentation), so i decided to switch
> back until the issue in the BCM2835 PM driver is fixed.
>
> Link: https://github.com/raspberrypi/linux/issues/3046
> Fixes: e1dc2b2e1bef (" ARM: bcm283x: Switch V3D over to using the PM driver instead of firmware.")
> Cc: stable@vger.kernel.org
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Applied to devicetree/fixes, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] ARM: dts: bcm2835-rpi-zero-w: Fix bus-width of sdhci
From: Florian Fainelli @ 2019-09-23 18:57 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Eric Anholt, Ray Jui,
Scott Branden
Cc: linux-arm-kernel
In-Reply-To: <1569262882-9955-1-git-send-email-wahrenst@gmx.net>
On Mon, 23 Sep 2019 20:21:22 +0200, Stefan Wahren <wahrenst@gmx.net> wrote:
> The commit e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at
> board level") accidently dropped the bus width for the sdhci on the
> RPi Zero W, because the board file was relying on the defaults
> from bcm2835-rpi.dtsi. So fix this performance regression by adding
> the bus width to the board file.
>
> Fixes: e7774049ff25 ("ARM: dts: bcm283x: Define MMC interfaces at board level")
> Reported-by: Phil Elwell <phil@raspberrypi.org>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---
Applied to devicetree/fixes, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 2/6] PM / devfreq: Move more initialization before registration
From: Matthias Kaehlcke @ 2019-09-23 19:11 UTC (permalink / raw)
To: Leonard Crestez
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan,
linux-pm@vger.kernel.org, Viresh Kumar, dl-linux-imx,
Krzysztof Kozlowski, Lukasz Luba, Chanwoo Choi, Kyungmin Park,
MyungJoo Ham, Alexandre Bailon, Georgi Djakov,
linux-arm-kernel@lists.infradead.org, Jacky Bai
In-Reply-To: <VI1PR04MB7023C94F93C4E0E6E229F80AEE850@VI1PR04MB7023.eurprd04.prod.outlook.com>
On Mon, Sep 23, 2019 at 06:56:28PM +0000, Leonard Crestez wrote:
> On 23.09.2019 21:11, Matthias Kaehlcke wrote:
> > On Mon, Sep 23, 2019 at 06:51:05PM +0300, Leonard Crestez wrote:
> >> In general it is a better to initialize an object before making it
> >> accessible externally (through device_register).
> >>
> >> This makes it possible to avoid relying on locking a partially
> >> initialized object.
> >>
> >> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
> >> ---
> >> drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++----------------
> >> 1 file changed, 25 insertions(+), 18 deletions(-)
> >>
> >> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
> >> index 323d43315d1e..b4d2bfebb140 100644
> >> --- a/drivers/devfreq/devfreq.c
> >> +++ b/drivers/devfreq/devfreq.c
> >> @@ -587,10 +587,12 @@ static void devfreq_dev_release(struct device *dev)
> >> mutex_unlock(&devfreq_list_lock);
> >>
> >> if (devfreq->profile->exit)
> >> devfreq->profile->exit(devfreq->dev.parent);
> >>
> >> + kfree(devfreq->time_in_state);
> >> + kfree(devfreq->trans_table);
> >> mutex_destroy(&devfreq->lock);
> >> kfree(devfreq);
> >> }
> >>
> >> /**
> >> @@ -670,44 +672,43 @@ struct devfreq *devfreq_add_device(struct device *dev,
> >> devfreq->max_freq = devfreq->scaling_max_freq;
> >>
> >> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
> >> atomic_set(&devfreq->suspend_count, 0);
> >>
> >> - dev_set_name(&devfreq->dev, "devfreq%d",
> >> - atomic_inc_return(&devfreq_no));
> >> - err = device_register(&devfreq->dev);
> >> - if (err) {
> >> - mutex_unlock(&devfreq->lock);
> >> - put_device(&devfreq->dev);
> >> - goto err_out;
> >> - }
> >> -
> >> - devfreq->trans_table = devm_kzalloc(&devfreq->dev,
> >> + devfreq->trans_table = kzalloc(
> >> array3_size(sizeof(unsigned int),
> >> devfreq->profile->max_state,
> >> devfreq->profile->max_state),
> >> GFP_KERNEL);
> >> if (!devfreq->trans_table) {
> >> mutex_unlock(&devfreq->lock);
> >> err = -ENOMEM;
> >> - goto err_devfreq;
> >> + goto err_dev;
> >> }
> >>
> >> - devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
> >> - devfreq->profile->max_state,
> >> - sizeof(unsigned long),
> >> - GFP_KERNEL);
> >> + devfreq->time_in_state = kcalloc(devfreq->profile->max_state,
> >> + sizeof(unsigned long),
> >> + GFP_KERNEL);
> >> if (!devfreq->time_in_state) {
> >> mutex_unlock(&devfreq->lock);
> >> err = -ENOMEM;
> >> - goto err_devfreq;
> >> + goto err_dev;
> >> }
> >>
> >> devfreq->last_stat_updated = jiffies;
> >>
> >> srcu_init_notifier_head(&devfreq->transition_notifier_list);
> >>
> >> + dev_set_name(&devfreq->dev, "devfreq%d",
> >> + atomic_inc_return(&devfreq_no));
> >> + err = device_register(&devfreq->dev);
> >> + if (err) {
> >> + mutex_unlock(&devfreq->lock);
> >> + put_device(&devfreq->dev);
> >> + goto err_out;
> >
> > As per my comment on v5 I think the goto needs to go to 'err_dev'. The
> > device registration failed, hence devfreq_dev_release() won't be
> > called to free allocated memory.
>
> This code is not modified in the patch, it only shows up as +added
> because diff got confused but there is an identical -removed chunk
> higher up.
>
> The device_register documentation mentions the following:
>
> * NOTE: _Never_ directly free @dev after calling this function, even
> * if it returned an error! Always use put_device() to give up the
> * reference initialized in this function instead.
>
> Cleanup path then goes like this (from a hacked error in device_add):
> dump_stack+0xdc/0x144
>
>
> devfreq_dev_release+0x38/0xc0
>
>
> device_release+0x34/0x90
>
>
> kobject_put+0x8c/0x1f0
>
>
> put_device+0x24/0x30
>
>
> devfreq_add_device+0x540/0x570
>
>
> devm_devfreq_add_device+0x60/0xd0
>
>
> imx_ddrc_probe+0x35c/0x4c8
Good to know, thanks for the pointer!
> Can I add your "Reviewed-By" for the rest of the series if I fix the nits?
By now you should have it for most patches. For this one:
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
There is one doubt I have left on "PM / devfreq: Add PM QoS support" that I
posted on v5:
"IIUC you rely on the notifiers being removed by devfreq_dev_release().
Does dev_pm_qos_remove_notifier() behave gracefully if the notifier is
not initialized/added or do we need to use BLOCKING_NOTIFIER_INIT() or
similar?"
Could you clarify this replying to the thread? Besides that and the
nits (which are optional to fix) the patch looks good to me.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH 0/3] arm64: Allow early timestamping of kernel log
From: Pavel Tatashin @ 2019-09-23 19:13 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Rutland, Petr Mladek, Catalin Marinas, Will Deacon, LKML,
Steven Rostedt, Sergey Senozhatsky, John Stultz, Thomas Gleixner,
Linux ARM
In-Reply-To: <86k1c9nrsa.wl-marc.zyngier@arm.com>
On Tue, Jul 23, 2019 at 3:17 AM Marc Zyngier <marc.zyngier@arm.com> wrote:
>
> On Mon, 22 Jul 2019 21:52:42 +0100,
> Pavel Tatashin <pasha.tatashin@soleen.com> wrote:
> >
> > On Mon, Jul 22, 2019 at 3:33 AM Marc Zyngier <marc.zyngier@arm.com> wrote:
> > >
> > > So far, we've let the arm64 kernel start its meaningful time stamping
> > > of the kernel log pretty late, which is caused by sched_clock() being
> > > initialised rather late compared to other architectures.
> > >
> > > Pavel Tatashin proposed[1] to move the initialisation of sched_clock
> > > much earlier, which I had objections to. The reason for initialising
> > > sched_clock late is that a number of systems have broken counters, and
> > > we need to apply all kind of terrifying workarounds to avoid time
> > > going backward on the affected platforms. Being able to identify the
> > > right workaround comes pretty late in the kernel boot, and providing
> > > an unreliable sched_clock, even for a short period of time, isn't an
> > > appealing prospect.
> > >
> > > To address this, I'm proposing that we allow an architecture to chose
> > > to (1) divorce time stamping and sched_clock during the early phase of
> > > booting, and (2) inherit the time stamping clock as the new epoch the
> > > first time a sched_sched clock gets registered.
Hi Marc,
I know we briefly discussed this at plumbers, but I want to bring it
up again, because I am still puzzled why it is not possible to
stabilize unstable clock early in boot.
Here is an example where clock is stabilized:
https://soleen.com/source/xref/linux/kernel/sched/clock.c?r=457c8996#265
It uses a value that is read at last ticks to normalize clock, and
because ticks are not available early in boot instead we can make sure
that early in boot sched_clock() never returns value smaller than
previously returned value, and if we want to be extra careful, we can
also make sure that sched_clock() early in boot does not jump ahead by
more than some fixed amount of time i.e. more than one hour.
If sched_clock() is available early we will get the benefit of having
other tracers that use it to debug early boot information.
Pasha
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH] seccomp: remove unused arg from secure_computing()
From: Borislav Petkov @ 2019-09-23 19:34 UTC (permalink / raw)
To: Andy Lutomirski
Cc: linux-s390, Will Drewry, Kees Cook, Parisc List, X86 ML, linux-um,
LKML, Oleg Nesterov, Christian Brauner, Thomas Gleixner,
linux-arm-kernel
In-Reply-To: <CALCETrU_fs_At-hTpr231kpaAd0z7xJN4ku-DvzhRU6cvcJA_w@mail.gmail.com>
On Mon, Sep 23, 2019 at 11:41:59AM -0700, Andy Lutomirski wrote:
> On Mon, Sep 23, 2019 at 2:49 AM Borislav Petkov <bp@alien8.de> wrote:
> >
> > On Fri, Sep 20, 2019 at 03:19:09PM +0200, Christian Brauner wrote:
> > > While touching seccomp code I realized that the struct seccomp_data
> > > argument to secure_computing() seems to be unused by all current
> > > callers. So let's remove it unless there is some subtlety I missed.
> > > Note, I only tested this on x86.
> >
> > What was amluto thinking in
> >
> > 2f275de5d1ed ("seccomp: Add a seccomp_data parameter secure_computing()")
>
> IIRC there was a period of time in which x86 used secure_computing()
> for normal syscalls, and it was a good deal faster to have the arch
> code supply seccomp_data. x86 no longer works like this, and syscalls
> aren't fast anymore ayway :(
Uhuh, thanks Andy.
Christian, pls add that piece of history to the commit message.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* Re: [PATCH v6 2/6] PM / devfreq: Move more initialization before registration
From: Leonard Crestez @ 2019-09-23 19:56 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Artur Świgoń, Abel Vesa, Saravana Kannan,
linux-pm@vger.kernel.org, Viresh Kumar, dl-linux-imx,
Krzysztof Kozlowski, Lukasz Luba, Chanwoo Choi, Kyungmin Park,
MyungJoo Ham, Alexandre Bailon, Georgi Djakov,
linux-arm-kernel@lists.infradead.org, Jacky Bai
In-Reply-To: <20190923191111.GE133864@google.com>
On 23.09.2019 22:11, Matthias Kaehlcke wrote:
> On Mon, Sep 23, 2019 at 06:56:28PM +0000, Leonard Crestez wrote:
>> On 23.09.2019 21:11, Matthias Kaehlcke wrote:
>>> On Mon, Sep 23, 2019 at 06:51:05PM +0300, Leonard Crestez wrote:
>>>> In general it is a better to initialize an object before making it
>>>> accessible externally (through device_register).
>>>>
>>>> This makes it possible to avoid relying on locking a partially
>>>> initialized object.
>>>>
>>>> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
>>>> ---
>>>> drivers/devfreq/devfreq.c | 43 +++++++++++++++++++++++----------------
>>>> 1 file changed, 25 insertions(+), 18 deletions(-)
>>>>
>>>> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
>>>> index 323d43315d1e..b4d2bfebb140 100644
>>>> --- a/drivers/devfreq/devfreq.c
>>>> +++ b/drivers/devfreq/devfreq.c
>>>> @@ -587,10 +587,12 @@ static void devfreq_dev_release(struct device *dev)
>>>> mutex_unlock(&devfreq_list_lock);
>>>>
>>>> if (devfreq->profile->exit)
>>>> devfreq->profile->exit(devfreq->dev.parent);
>>>>
>>>> + kfree(devfreq->time_in_state);
>>>> + kfree(devfreq->trans_table);
>>>> mutex_destroy(&devfreq->lock);
>>>> kfree(devfreq);
>>>> }
>>>>
>>>> /**
>>>> @@ -670,44 +672,43 @@ struct devfreq *devfreq_add_device(struct device *dev,
>>>> devfreq->max_freq = devfreq->scaling_max_freq;
>>>>
>>>> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
>>>> atomic_set(&devfreq->suspend_count, 0);
>>>>
>>>> - dev_set_name(&devfreq->dev, "devfreq%d",
>>>> - atomic_inc_return(&devfreq_no));
>>>> - err = device_register(&devfreq->dev);
>>>> - if (err) {
>>>> - mutex_unlock(&devfreq->lock);
>>>> - put_device(&devfreq->dev);
>>>> - goto err_out;
>>>> - }
>>>> -
>>>> - devfreq->trans_table = devm_kzalloc(&devfreq->dev,
>>>> + devfreq->trans_table = kzalloc(
>>>> array3_size(sizeof(unsigned int),
>>>> devfreq->profile->max_state,
>>>> devfreq->profile->max_state),
>>>> GFP_KERNEL);
>>>> if (!devfreq->trans_table) {
>>>> mutex_unlock(&devfreq->lock);
>>>> err = -ENOMEM;
>>>> - goto err_devfreq;
>>>> + goto err_dev;
>>>> }
>>>>
>>>> - devfreq->time_in_state = devm_kcalloc(&devfreq->dev,
>>>> - devfreq->profile->max_state,
>>>> - sizeof(unsigned long),
>>>> - GFP_KERNEL);
>>>> + devfreq->time_in_state = kcalloc(devfreq->profile->max_state,
>>>> + sizeof(unsigned long),
>>>> + GFP_KERNEL);
>>>> if (!devfreq->time_in_state) {
>>>> mutex_unlock(&devfreq->lock);
>>>> err = -ENOMEM;
>>>> - goto err_devfreq;
>>>> + goto err_dev;
>>>> }
>>>>
>>>> devfreq->last_stat_updated = jiffies;
>>>>
>>>> srcu_init_notifier_head(&devfreq->transition_notifier_list);
>>>>
>>>> + dev_set_name(&devfreq->dev, "devfreq%d",
>>>> + atomic_inc_return(&devfreq_no));
>>>> + err = device_register(&devfreq->dev);
>>>> + if (err) {
>>>> + mutex_unlock(&devfreq->lock);
>>>> + put_device(&devfreq->dev);
>>>> + goto err_out;
>>>
>>> As per my comment on v5 I think the goto needs to go to 'err_dev'. The
>>> device registration failed, hence devfreq_dev_release() won't be
>>> called to free allocated memory.
>>
>> This code is not modified in the patch, it only shows up as +added
>> because diff got confused but there is an identical -removed chunk
>> higher up.
>>
>> The device_register documentation mentions the following:
>>
>> * NOTE: _Never_ directly free @dev after calling this function, even
>> * if it returned an error! Always use put_device() to give up the
>> * reference initialized in this function instead.
>>
>> Cleanup path then goes like this (from a hacked error in device_add):
>> dump_stack+0xdc/0x144
>>
>>
>> devfreq_dev_release+0x38/0xc0
>>
>>
>> device_release+0x34/0x90
>>
>>
>> kobject_put+0x8c/0x1f0
>>
>>
>> put_device+0x24/0x30
>>
>>
>> devfreq_add_device+0x540/0x570
>>
>>
>> devm_devfreq_add_device+0x60/0xd0
>>
>>
>> imx_ddrc_probe+0x35c/0x4c8
>
> Good to know, thanks for the pointer!
>
>> Can I add your "Reviewed-By" for the rest of the series if I fix the nits?
>
> By now you should have it for most patches. For this one:
>
> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
>
> There is one doubt I have left on "PM / devfreq: Add PM QoS support" that I
> posted on v5:
>
> "IIUC you rely on the notifiers being removed by devfreq_dev_release().
> Does dev_pm_qos_remove_notifier() behave gracefully if the notifier is
> not initialized/added or do we need to use BLOCKING_NOTIFIER_INIT() or
> similar?"
Sorry for missing that.
> Could you clarify this replying to the thread? Besides that and the
> nits (which are optional to fix) the patch looks good to me.
The blocking_notifier_head structs are managed by PM QoS inside
dev_pm_qos_constraints_allocate and dev_pm_qos_constraints_destroy. The
devfreq subsystem only registers a notifier_block, that's a
NULL-terminated singly-linked list for which zero-initialization from
kzalloc should be sufficient.
But now that I look at this again I should warn and return NOTIFY_DONE
from devfreq_qos_notifier_call instead of propagating a negative errno.
--
Regards,
Leonard
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* [PATCH v5 01/17] kexec: quiet down kexec reboot
From: Pavel Tatashin @ 2019-09-23 20:34 UTC (permalink / raw)
To: pasha.tatashin, jmorris, sashal, ebiederm, kexec, linux-kernel,
corbet, catalin.marinas, will, linux-arm-kernel, marc.zyngier,
james.morse, vladimir.murzin, matthias.bgg, bhsharma, linux-mm,
mark.rutland
In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com>
Here is a regular kexec command sequence and output:
=====
$ kexec --reuse-cmdline -i --load Image
$ kexec -e
[ 161.342002] kexec_core: Starting new kernel
Welcome to Buildroot
buildroot login:
=====
Even when "quiet" kernel parameter is specified, "kexec_core: Starting
new kernel" is printed.
This message has KERN_EMERG level, but there is no emergency, it is a
normal kexec operation, so quiet it down to appropriate KERN_NOTICE.
Machines that have slow console baud rate benefit from less output.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
---
kernel/kexec_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index d5870723b8ad..2c5b72863b7b 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -1169,7 +1169,7 @@ int kernel_kexec(void)
* CPU hotplug again; so re-enable it here.
*/
cpu_hotplug_enable();
- pr_emerg("Starting new kernel\n");
+ pr_notice("Starting new kernel\n");
machine_shutdown();
}
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related
* [PATCH v5 00/17] arm64: MMU enabled kexec relocation
From: Pavel Tatashin @ 2019-09-23 20:34 UTC (permalink / raw)
To: pasha.tatashin, jmorris, sashal, ebiederm, kexec, linux-kernel,
corbet, catalin.marinas, will, linux-arm-kernel, marc.zyngier,
james.morse, vladimir.murzin, matthias.bgg, bhsharma, linux-mm,
mark.rutland
Changelog:
v5:
- Addressed comments from Matthias Brugger: added review-by's, improved
comments, and made cleanups to swsusp_arch_resume() in addition to
create_safe_exec_page().
- Synced with mainline tip.
v4:
- Addressed comments from James Morse.
- Split "check pgd table allocation" into two patches, and moved to
the beginning of series for simpler backport of the fixes.
Added "Fixes:" tags to commit logs.
- Changed "arm64, hibernate:" to "arm64: hibernate:"
- Added Reviewed-by's
- Moved "add PUD_SECT_RDONLY" earlier in series to be with other
clean-ups
- Added "Derived from:" to arch/arm64/mm/trans_pgd.c
- Removed "flags" from trans_info
- Changed .trans_alloc_page assumption to return zeroed page.
- Simplify changes to trans_pgd_map_page(), by keeping the old
code.
- Simplify changes to trans_pgd_create_copy, by keeping the old
code.
- Removed: "add trans_pgd_create_empty"
- replace init_mm with NULL, and keep using non "__" version of
populate functions.
v3:
- Split changes to create_safe_exec_page() into several patches for
easier review as request by Mark Rutland. This is why this series
has 3 more patches.
- Renamed trans_table to tans_pgd as agreed with Mark. The header
comment in trans_pgd.c explains that trans stands for
transitional page tables. Meaning they are used in transition
between two kernels.
v2:
- Fixed hibernate bug reported by James Morse
- Addressed comments from James Morse:
* More incremental changes to trans_table
* Removed TRANS_FORCEMAP
* Added kexec reboot data for image with 380M in size.
Enable MMU during kexec relocation in order to improve reboot performance.
If kexec functionality is used for a fast system update, with a minimal
downtime, the relocation of kernel + initramfs takes a significant portion
of reboot.
The reason for slow relocation is because it is done without MMU, and thus
not benefiting from D-Cache.
Performance data
----------------
For this experiment, the size of kernel plus initramfs is small, only 25M.
If initramfs was larger, than the improvements would be greater, as time
spent in relocation is proportional to the size of relocation.
Previously:
kernel shutdown 0.022131328s
relocation 0.440510736s
kernel startup 0.294706768s
Relocation was taking: 58.2% of reboot time
Now:
kernel shutdown 0.032066576s
relocation 0.022158152s
kernel startup 0.296055880s
Now: Relocation takes 6.3% of reboot time
Total reboot is x2.16 times faster.
With bigger userland (fitImage 380M), the reboot time is improved by 3.57s,
and is reduced from 3.9s down to 0.33s
Previous approaches and discussions
-----------------------------------
https://lore.kernel.org/lkml/20190909181221.309510-1-pasha.tatashin@soleen.com
version 4 of this series
https://lore.kernel.org/lkml/20190821183204.23576-1-pasha.tatashin@soleen.com
version 3 of this series
https://lore.kernel.org/lkml/20190817024629.26611-1-pasha.tatashin@soleen.com
version 2 of this series
https://lore.kernel.org/lkml/20190801152439.11363-1-pasha.tatashin@soleen.com
version 1 of this series
https://lore.kernel.org/lkml/20190709182014.16052-1-pasha.tatashin@soleen.com
reserve space for kexec to avoid relocation, involves changes to generic code
to optimize a problem that exists on arm64 only:
https://lore.kernel.org/lkml/20190716165641.6990-1-pasha.tatashin@soleen.com
The first attempt to enable MMU, some bugs that prevented performance
improvement. The page tables unnecessary configured idmap for the whole
physical space.
https://lore.kernel.org/lkml/20190731153857.4045-1-pasha.tatashin@soleen.com
No linear copy, bug with EL2 reboots.
Pavel Tatashin (17):
kexec: quiet down kexec reboot
arm64: hibernate: pass the allocated pgdp to ttbr0
arm64: hibernate: check pgd table allocation
arm64: hibernate: use get_safe_page directly
arm64: hibernate: remove gotos as they are not needed
arm64: hibernate: rename dst to page in create_safe_exec_page
arm64: hibernate: add PUD_SECT_RDONLY
arm64: hibernate: add trans_pgd public functions
arm64: hibernate: move page handling function to new trans_pgd.c
arm64: trans_pgd: make trans_pgd_map_page generic
arm64: trans_pgd: pass allocator trans_pgd_create_copy
arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions
kexec: add machine_kexec_post_load()
arm64: kexec: move relocation function setup and clean up
arm64: kexec: add expandable argument to relocation function
arm64: kexec: configure trans_pgd page table for kexec
arm64: kexec: enable MMU during kexec relocation
arch/arm64/Kconfig | 4 +
arch/arm64/include/asm/kexec.h | 51 ++++-
arch/arm64/include/asm/pgtable-hwdef.h | 1 +
arch/arm64/include/asm/trans_pgd.h | 34 ++++
arch/arm64/kernel/asm-offsets.c | 14 ++
arch/arm64/kernel/cpu-reset.S | 4 +-
arch/arm64/kernel/cpu-reset.h | 8 +-
arch/arm64/kernel/hibernate.c | 245 +++++--------------------
arch/arm64/kernel/machine_kexec.c | 196 ++++++++++++++++----
arch/arm64/kernel/relocate_kernel.S | 196 ++++++++++----------
arch/arm64/mm/Makefile | 1 +
arch/arm64/mm/trans_pgd.c | 244 ++++++++++++++++++++++++
kernel/kexec.c | 4 +
kernel/kexec_core.c | 8 +-
kernel/kexec_file.c | 4 +
kernel/kexec_internal.h | 2 +
16 files changed, 674 insertions(+), 342 deletions(-)
create mode 100644 arch/arm64/include/asm/trans_pgd.h
create mode 100644 arch/arm64/mm/trans_pgd.c
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply
* [PATCH v5 02/17] arm64: hibernate: pass the allocated pgdp to ttbr0
From: Pavel Tatashin @ 2019-09-23 20:34 UTC (permalink / raw)
To: pasha.tatashin, jmorris, sashal, ebiederm, kexec, linux-kernel,
corbet, catalin.marinas, will, linux-arm-kernel, marc.zyngier,
james.morse, vladimir.murzin, matthias.bgg, bhsharma, linux-mm,
mark.rutland
In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com>
ttbr0 should be set to the beginning of pgdp, however, currently
in create_safe_exec_page it is set to pgdp after pgd_offset_raw(),
which works by accident.
Fixes: 0194e760f7d2 ("arm64: hibernate: avoid potential TLB conflict")
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
arch/arm64/kernel/hibernate.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index e0a7fce0e01c..d52f69462c8f 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -201,6 +201,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
gfp_t mask)
{
int rc = 0;
+ pgd_t *trans_pgd;
pgd_t *pgdp;
pud_t *pudp;
pmd_t *pmdp;
@@ -215,7 +216,8 @@ static int create_safe_exec_page(void *src_start, size_t length,
memcpy((void *)dst, src_start, length);
__flush_icache_range(dst, dst + length);
- pgdp = pgd_offset_raw(allocator(mask), dst_addr);
+ trans_pgd = allocator(mask);
+ pgdp = pgd_offset_raw(trans_pgd, dst_addr);
if (pgd_none(READ_ONCE(*pgdp))) {
pudp = allocator(mask);
if (!pudp) {
@@ -262,7 +264,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
*/
cpu_set_reserved_ttbr0();
local_flush_tlb_all();
- write_sysreg(phys_to_ttbr(virt_to_phys(pgdp)), ttbr0_el1);
+ write_sysreg(phys_to_ttbr(virt_to_phys(trans_pgd)), ttbr0_el1);
isb();
*phys_dst_addr = virt_to_phys((void *)dst);
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related
* [PATCH v5 03/17] arm64: hibernate: check pgd table allocation
From: Pavel Tatashin @ 2019-09-23 20:34 UTC (permalink / raw)
To: pasha.tatashin, jmorris, sashal, ebiederm, kexec, linux-kernel,
corbet, catalin.marinas, will, linux-arm-kernel, marc.zyngier,
james.morse, vladimir.murzin, matthias.bgg, bhsharma, linux-mm,
mark.rutland
In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com>
There is a bug in create_safe_exec_page(), when page table is allocated
it is not checked that table is allocated successfully:
But it is dereferenced in: pgd_none(READ_ONCE(*pgdp)). Check that
allocation was successful.
Fixes: 82869ac57b5d ("arm64: kernel: Add support for hibernate/suspend-to-disk")
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
arch/arm64/kernel/hibernate.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index d52f69462c8f..ef46ce66d7e8 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -217,6 +217,11 @@ static int create_safe_exec_page(void *src_start, size_t length,
__flush_icache_range(dst, dst + length);
trans_pgd = allocator(mask);
+ if (!trans_pgd) {
+ rc = -ENOMEM;
+ goto out;
+ }
+
pgdp = pgd_offset_raw(trans_pgd, dst_addr);
if (pgd_none(READ_ONCE(*pgdp))) {
pudp = allocator(mask);
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related
* [PATCH v5 04/17] arm64: hibernate: use get_safe_page directly
From: Pavel Tatashin @ 2019-09-23 20:34 UTC (permalink / raw)
To: pasha.tatashin, jmorris, sashal, ebiederm, kexec, linux-kernel,
corbet, catalin.marinas, will, linux-arm-kernel, marc.zyngier,
james.morse, vladimir.murzin, matthias.bgg, bhsharma, linux-mm,
mark.rutland
In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com>
create_safe_exec_page() uses hibernate's allocator to create a set of page
table to map a single page that will contain the relocation code.
Remove the allocator related arguments, and use get_safe_page directly, as
it is done in other local functions in this file to simplify function
prototype.
Removing this function pointer makes it easier to refactor the code later.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
---
arch/arm64/kernel/hibernate.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index ef46ce66d7e8..34297716643f 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -196,9 +196,7 @@ EXPORT_SYMBOL(arch_hibernation_header_restore);
*/
static int create_safe_exec_page(void *src_start, size_t length,
unsigned long dst_addr,
- phys_addr_t *phys_dst_addr,
- void *(*allocator)(gfp_t mask),
- gfp_t mask)
+ phys_addr_t *phys_dst_addr)
{
int rc = 0;
pgd_t *trans_pgd;
@@ -206,7 +204,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
pud_t *pudp;
pmd_t *pmdp;
pte_t *ptep;
- unsigned long dst = (unsigned long)allocator(mask);
+ unsigned long dst = get_safe_page(GFP_ATOMIC);
if (!dst) {
rc = -ENOMEM;
@@ -216,7 +214,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
memcpy((void *)dst, src_start, length);
__flush_icache_range(dst, dst + length);
- trans_pgd = allocator(mask);
+ trans_pgd = (void *)get_safe_page(GFP_ATOMIC);
if (!trans_pgd) {
rc = -ENOMEM;
goto out;
@@ -224,7 +222,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
pgdp = pgd_offset_raw(trans_pgd, dst_addr);
if (pgd_none(READ_ONCE(*pgdp))) {
- pudp = allocator(mask);
+ pudp = (void *)get_safe_page(GFP_ATOMIC);
if (!pudp) {
rc = -ENOMEM;
goto out;
@@ -234,7 +232,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
pudp = pud_offset(pgdp, dst_addr);
if (pud_none(READ_ONCE(*pudp))) {
- pmdp = allocator(mask);
+ pmdp = (void *)get_safe_page(GFP_ATOMIC);
if (!pmdp) {
rc = -ENOMEM;
goto out;
@@ -244,7 +242,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
pmdp = pmd_offset(pudp, dst_addr);
if (pmd_none(READ_ONCE(*pmdp))) {
- ptep = allocator(mask);
+ ptep = (void *)get_safe_page(GFP_ATOMIC);
if (!ptep) {
rc = -ENOMEM;
goto out;
@@ -530,8 +528,7 @@ int swsusp_arch_resume(void)
*/
rc = create_safe_exec_page(__hibernate_exit_text_start, exit_size,
(unsigned long)hibernate_exit,
- &phys_hibernate_exit,
- (void *)get_safe_page, GFP_ATOMIC);
+ &phys_hibernate_exit);
if (rc) {
pr_err("Failed to create safe executable page for hibernate_exit code.\n");
goto out;
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox