2019-09-26 09:25:44

by Baolin Wang

[permalink] [raw]
Subject: [BACKPORT 4.19.y 0/3] Candidates from Spreadtrum 4.14 product kernel

With Arnd's script [1] help, I found some bugfixes in Spreadtrum 4.14 product
kernel, but missing in v4.19.75:

513e1073d52e locking/lockdep: Add debug_locks check in __lock_downgrade()
957063c92473 pinctrl: sprd: Use define directive for sprd_pinconf_params values
87a2b65fc855 power: supply: sysfs: ratelimit property read error message

[1] https://lore.kernel.org/lkml/[email protected]/T/

David Lechner (1):
power: supply: sysfs: ratelimit property read error message

Nathan Chancellor (1):
pinctrl: sprd: Use define directive for sprd_pinconf_params values

Waiman Long (1):
locking/lockdep: Add debug_locks check in __lock_downgrade()

drivers/pinctrl/sprd/pinctrl-sprd.c | 6 ++----
drivers/power/supply/power_supply_sysfs.c | 3 ++-
kernel/locking/lockdep.c | 3 +++
3 files changed, 7 insertions(+), 5 deletions(-)

--
1.7.9.5


2019-09-26 09:25:51

by Baolin Wang

[permalink] [raw]
Subject: [BACKPORT 4.19.y 1/3] locking/lockdep: Add debug_locks check in __lock_downgrade()

From: Waiman Long <[email protected]>

[Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf]

Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
warning right after a previous lockdep warning. It is likely that the
previous warning turned off lock debugging causing the lockdep to have
inconsistency states leading to the lock downgrade warning.

Fix that by add a check for debug_locks at the beginning of
__lock_downgrade().

Reported-by: Tetsuo Handa <[email protected]>
Reported-by: [email protected]
Signed-off-by: Waiman Long <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Paul E. McKenney <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Will Deacon <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Baolin Wang <[email protected]>
---
kernel/locking/lockdep.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e810e8c..1e272f6 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3605,6 +3605,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
unsigned int depth;
int i;

+ if (unlikely(!debug_locks))
+ return 0;
+
depth = curr->lockdep_depth;
/*
* This function is about (re)setting the class of a held lock,
--
1.7.9.5

2019-09-26 09:25:53

by Baolin Wang

[permalink] [raw]
Subject: [BACKPORT 4.19.y 2/3] pinctrl: sprd: Use define directive for sprd_pinconf_params values

From: Nathan Chancellor <[email protected]>

[Upstream commit 957063c924736d4341e5d588757b9f31e8f6fa24]

Clang warns when one enumerated type is implicitly converted to another:

drivers/pinctrl/sprd/pinctrl-sprd.c:845:19: warning: implicit conversion
from enumeration type 'enum sprd_pinconf_params' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"sprd,control", SPRD_PIN_CONFIG_CONTROL, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/sprd/pinctrl-sprd.c:846:22: warning: implicit conversion
from enumeration type 'enum sprd_pinconf_params' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"sprd,sleep-mode", SPRD_PIN_CONFIG_SLEEP_MODE, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~

It is expected that pinctrl drivers can extend pin_config_param because
of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
isn't an issue. Most drivers that take advantage of this define the
PIN_CONFIG variables as constants, rather than enumerated values. Do the
same thing here so that Clang no longer warns.

Link: https://github.com/ClangBuiltLinux/linux/issues/138
Signed-off-by: Nathan Chancellor <[email protected]>
Reviewed-by: Baolin Wang <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Baolin Wang <[email protected]>
---
drivers/pinctrl/sprd/pinctrl-sprd.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c
index 78c2f54..8f3468d 100644
--- a/drivers/pinctrl/sprd/pinctrl-sprd.c
+++ b/drivers/pinctrl/sprd/pinctrl-sprd.c
@@ -159,10 +159,8 @@ struct sprd_pinctrl {
struct sprd_pinctrl_soc_info *info;
};

-enum sprd_pinconf_params {
- SPRD_PIN_CONFIG_CONTROL = PIN_CONFIG_END + 1,
- SPRD_PIN_CONFIG_SLEEP_MODE = PIN_CONFIG_END + 2,
-};
+#define SPRD_PIN_CONFIG_CONTROL (PIN_CONFIG_END + 1)
+#define SPRD_PIN_CONFIG_SLEEP_MODE (PIN_CONFIG_END + 2)

static int sprd_pinctrl_get_id_by_name(struct sprd_pinctrl *sprd_pctl,
const char *name)
--
1.7.9.5

2019-09-26 09:25:59

by Baolin Wang

[permalink] [raw]
Subject: [BACKPORT 4.19.y 3/3] power: supply: sysfs: ratelimit property read error message

From: David Lechner <[email protected]>

[Upstream commit 87a2b65fc855e6be50f791c2ebbb492541896827]

This adds rate limiting to the message that is printed when reading a
power supply property via sysfs returns an error. This will prevent
userspace applications from unintentionally dDOSing the system by
continuously reading a property that returns an error.

Signed-off-by: David Lechner <[email protected]>
Signed-off-by: Sebastian Reichel <[email protected]>
Signed-off-by: Baolin Wang <[email protected]>
---
drivers/power/supply/power_supply_sysfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index 5a2757a..5358a80 100644
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -131,7 +131,8 @@ static ssize_t power_supply_show_property(struct device *dev,
dev_dbg(dev, "driver has no data for `%s' property\n",
attr->attr.name);
else if (ret != -ENODEV && ret != -EAGAIN)
- dev_err(dev, "driver failed to report `%s' property: %zd\n",
+ dev_err_ratelimited(dev,
+ "driver failed to report `%s' property: %zd\n",
attr->attr.name, ret);
return ret;
}
--
1.7.9.5

2019-09-28 20:04:18

by Sasha Levin

[permalink] [raw]
Subject: Re: [BACKPORT 4.19.y 0/3] Candidates from Spreadtrum 4.14 product kernel

On Wed, Sep 25, 2019 at 05:52:26PM +0800, Baolin Wang wrote:
>With Arnd's script [1] help, I found some bugfixes in Spreadtrum 4.14 product
>kernel, but missing in v4.19.75:
>
>513e1073d52e locking/lockdep: Add debug_locks check in __lock_downgrade()
>957063c92473 pinctrl: sprd: Use define directive for sprd_pinconf_params values
>87a2b65fc855 power: supply: sysfs: ratelimit property read error message
>
>[1] https://lore.kernel.org/lkml/[email protected]/T/
>
>David Lechner (1):
> power: supply: sysfs: ratelimit property read error message
>
>Nathan Chancellor (1):
> pinctrl: sprd: Use define directive for sprd_pinconf_params values
>
>Waiman Long (1):
> locking/lockdep: Add debug_locks check in __lock_downgrade()
>
> drivers/pinctrl/sprd/pinctrl-sprd.c | 6 ++----
> drivers/power/supply/power_supply_sysfs.c | 3 ++-
> kernel/locking/lockdep.c | 3 +++
> 3 files changed, 7 insertions(+), 5 deletions(-)

I've queued these up for 4.19, 4.14 and some for 4.9 and 4.4. Thank you.

--
Thanks,
Sasha