From fdc6ecb82162bfcf7266067331f4ad8ea51568cf Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 10 Dec 2023 23:13:37 -0500 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- ...ct-the-amdgpu-runtime-dereference-us.patch | 45 ++++ ...-fix-error-handling-on-failed-export.patch | 61 ++++++ ...new-read-format-to-get-a-number-of-l.patch | 194 ++++++++++++++++++ .../perf-fix-perf_event_validate_size.patch | 135 ++++++++++++ queue-5.10/series | 4 + 5 files changed, 439 insertions(+) create mode 100644 queue-5.10/drm-amdgpu-correct-the-amdgpu-runtime-dereference-us.patch create mode 100644 queue-5.10/gpiolib-sysfs-fix-error-handling-on-failed-export.patch create mode 100644 queue-5.10/perf-core-add-a-new-read-format-to-get-a-number-of-l.patch create mode 100644 queue-5.10/perf-fix-perf_event_validate_size.patch diff --git a/queue-5.10/drm-amdgpu-correct-the-amdgpu-runtime-dereference-us.patch b/queue-5.10/drm-amdgpu-correct-the-amdgpu-runtime-dereference-us.patch new file mode 100644 index 00000000000..e0ee061bae1 --- /dev/null +++ b/queue-5.10/drm-amdgpu-correct-the-amdgpu-runtime-dereference-us.patch @@ -0,0 +1,45 @@ +From 8fae9c7036a52263fba683440a03981ef5992efc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 Nov 2023 14:38:29 +0800 +Subject: drm/amdgpu: correct the amdgpu runtime dereference usage count + +From: Prike Liang + +[ Upstream commit c6df7f313794c3ad41a49b9a7c95da369db607f3 ] + +Fix the amdgpu runpm dereference usage count. + +Signed-off-by: Prike Liang +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +index 7cc7af2a6822e..3671a700189d0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +@@ -299,13 +299,11 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, + adev->have_disp_power_ref = true; + return ret; + } +- /* if we have no active crtcs, then drop the power ref +- we got before */ +- if (!active && adev->have_disp_power_ref) { +- pm_runtime_put_autosuspend(dev->dev); ++ /* if we have no active crtcs, then go to ++ * drop the power ref we got before ++ */ ++ if (!active && adev->have_disp_power_ref) + adev->have_disp_power_ref = false; +- } +- + out: + /* drop the power reference we got coming in here */ + pm_runtime_put_autosuspend(dev->dev); +-- +2.42.0 + diff --git a/queue-5.10/gpiolib-sysfs-fix-error-handling-on-failed-export.patch b/queue-5.10/gpiolib-sysfs-fix-error-handling-on-failed-export.patch new file mode 100644 index 00000000000..56bfcdc8c0e --- /dev/null +++ b/queue-5.10/gpiolib-sysfs-fix-error-handling-on-failed-export.patch @@ -0,0 +1,61 @@ +From 36999e4e7d82d02baa4af4a951792b8052f73b22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Nov 2023 16:23:07 +0100 +Subject: gpiolib: sysfs: Fix error handling on failed export + +From: Boerge Struempfel + +[ Upstream commit 95dd1e34ff5bbee93a28ff3947eceaf6de811b1a ] + +If gpio_set_transitory() fails, we should free the GPIO again. Most +notably, the flag FLAG_REQUESTED has previously been set in +gpiod_request_commit(), and should be reset on failure. + +To my knowledge, this does not affect any current users, since the +gpio_set_transitory() mainly returns 0 and -ENOTSUPP, which is converted +to 0. However the gpio_set_transitory() function calles the .set_config() +function of the corresponding GPIO chip and there are some GPIO drivers in +which some (unlikely) branches return other values like -EPROBE_DEFER, +and -EINVAL. In these cases, the above mentioned FLAG_REQUESTED would not +be reset, which results in the pin being blocked until the next reboot. + +Fixes: e10f72bf4b3e ("gpio: gpiolib: Generalise state persistence beyond sleep") +Signed-off-by: Boerge Struempfel +Reviewed-by: Andy Shevchenko +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpiolib-sysfs.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c +index fa5d945b2f286..f45ba0f789d4f 100644 +--- a/drivers/gpio/gpiolib-sysfs.c ++++ b/drivers/gpio/gpiolib-sysfs.c +@@ -491,14 +491,17 @@ static ssize_t export_store(struct class *class, + } + + status = gpiod_set_transitory(desc, false); +- if (!status) { +- status = gpiod_export(desc, true); +- if (status < 0) +- gpiod_free(desc); +- else +- set_bit(FLAG_SYSFS, &desc->flags); ++ if (status) { ++ gpiod_free(desc); ++ goto done; + } + ++ status = gpiod_export(desc, true); ++ if (status < 0) ++ gpiod_free(desc); ++ else ++ set_bit(FLAG_SYSFS, &desc->flags); ++ + done: + if (status) + pr_debug("%s: status %d\n", __func__, status); +-- +2.42.0 + diff --git a/queue-5.10/perf-core-add-a-new-read-format-to-get-a-number-of-l.patch b/queue-5.10/perf-core-add-a-new-read-format-to-get-a-number-of-l.patch new file mode 100644 index 00000000000..835cd1e51cb --- /dev/null +++ b/queue-5.10/perf-core-add-a-new-read-format-to-get-a-number-of-l.patch @@ -0,0 +1,194 @@ +From d566cfea39002425788553bc19e24cc6efb62948 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Jun 2022 11:06:23 -0700 +Subject: perf/core: Add a new read format to get a number of lost samples + +From: Namhyung Kim + +[ Upstream commit 119a784c81270eb88e573174ed2209225d646656 ] + +Sometimes we want to know an accurate number of samples even if it's +lost. Currenlty PERF_RECORD_LOST is generated for a ring-buffer which +might be shared with other events. So it's hard to know per-event +lost count. + +Add event->lost_samples field and PERF_FORMAT_LOST to retrieve it from +userspace. + +Original-patch-by: Jiri Olsa +Signed-off-by: Namhyung Kim +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lkml.kernel.org/r/20220616180623.1358843-1-namhyung@kernel.org +Stable-dep-of: 382c27f4ed28 ("perf: Fix perf_event_validate_size()") +Signed-off-by: Sasha Levin +--- + include/linux/perf_event.h | 2 ++ + include/uapi/linux/perf_event.h | 5 ++++- + kernel/events/core.c | 21 ++++++++++++++++++--- + kernel/events/ring_buffer.c | 5 ++++- + 4 files changed, 28 insertions(+), 5 deletions(-) + +diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h +index 50557d903a059..3b038a2cc0071 100644 +--- a/include/linux/perf_event.h ++++ b/include/linux/perf_event.h +@@ -744,6 +744,8 @@ struct perf_event { + struct pid_namespace *ns; + u64 id; + ++ atomic64_t lost_samples; ++ + u64 (*clock)(void); + perf_overflow_handler_t overflow_handler; + void *overflow_handler_context; +diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h +index b95d3c485d27e..6ca63ab6bee5d 100644 +--- a/include/uapi/linux/perf_event.h ++++ b/include/uapi/linux/perf_event.h +@@ -279,6 +279,7 @@ enum { + * { u64 time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED + * { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING + * { u64 id; } && PERF_FORMAT_ID ++ * { u64 lost; } && PERF_FORMAT_LOST + * } && !PERF_FORMAT_GROUP + * + * { u64 nr; +@@ -286,6 +287,7 @@ enum { + * { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING + * { u64 value; + * { u64 id; } && PERF_FORMAT_ID ++ * { u64 lost; } && PERF_FORMAT_LOST + * } cntr[nr]; + * } && PERF_FORMAT_GROUP + * }; +@@ -295,8 +297,9 @@ enum perf_event_read_format { + PERF_FORMAT_TOTAL_TIME_RUNNING = 1U << 1, + PERF_FORMAT_ID = 1U << 2, + PERF_FORMAT_GROUP = 1U << 3, ++ PERF_FORMAT_LOST = 1U << 4, + +- PERF_FORMAT_MAX = 1U << 4, /* non-ABI */ ++ PERF_FORMAT_MAX = 1U << 5, /* non-ABI */ + }; + + #define PERF_ATTR_SIZE_VER0 64 /* sizeof first published struct */ +diff --git a/kernel/events/core.c b/kernel/events/core.c +index 5072635f0b0c1..f7ac1b24f93e0 100644 +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -1927,6 +1927,9 @@ static void __perf_event_read_size(struct perf_event *event, int nr_siblings) + if (event->attr.read_format & PERF_FORMAT_ID) + entry += sizeof(u64); + ++ if (event->attr.read_format & PERF_FORMAT_LOST) ++ entry += sizeof(u64); ++ + if (event->attr.read_format & PERF_FORMAT_GROUP) { + nr += nr_siblings; + size += sizeof(u64); +@@ -5283,11 +5286,15 @@ static int __perf_read_group_add(struct perf_event *leader, + values[n++] += perf_event_count(leader); + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(leader); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&leader->lost_samples); + + for_each_sibling_event(sub, leader) { + values[n++] += perf_event_count(sub); + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(sub); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&sub->lost_samples); + } + + unlock: +@@ -5341,7 +5348,7 @@ static int perf_read_one(struct perf_event *event, + u64 read_format, char __user *buf) + { + u64 enabled, running; +- u64 values[4]; ++ u64 values[5]; + int n = 0; + + values[n++] = __perf_event_read_value(event, &enabled, &running); +@@ -5351,6 +5358,8 @@ static int perf_read_one(struct perf_event *event, + values[n++] = running; + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(event); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&event->lost_samples); + + if (copy_to_user(buf, values, n * sizeof(u64))) + return -EFAULT; +@@ -6830,7 +6839,7 @@ static void perf_output_read_one(struct perf_output_handle *handle, + u64 enabled, u64 running) + { + u64 read_format = event->attr.read_format; +- u64 values[4]; ++ u64 values[5]; + int n = 0; + + values[n++] = perf_event_count(event); +@@ -6844,6 +6853,8 @@ static void perf_output_read_one(struct perf_output_handle *handle, + } + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(event); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&event->lost_samples); + + __output_copy(handle, values, n * sizeof(u64)); + } +@@ -6854,7 +6865,7 @@ static void perf_output_read_group(struct perf_output_handle *handle, + { + struct perf_event *leader = event->group_leader, *sub; + u64 read_format = event->attr.read_format; +- u64 values[5]; ++ u64 values[6]; + int n = 0; + + values[n++] = 1 + leader->nr_siblings; +@@ -6872,6 +6883,8 @@ static void perf_output_read_group(struct perf_output_handle *handle, + values[n++] = perf_event_count(leader); + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(leader); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&leader->lost_samples); + + __output_copy(handle, values, n * sizeof(u64)); + +@@ -6885,6 +6898,8 @@ static void perf_output_read_group(struct perf_output_handle *handle, + values[n++] = perf_event_count(sub); + if (read_format & PERF_FORMAT_ID) + values[n++] = primary_event_id(sub); ++ if (read_format & PERF_FORMAT_LOST) ++ values[n++] = atomic64_read(&sub->lost_samples); + + __output_copy(handle, values, n * sizeof(u64)); + } +diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c +index 01351e7e25435..ca27946fdaaf2 100644 +--- a/kernel/events/ring_buffer.c ++++ b/kernel/events/ring_buffer.c +@@ -172,8 +172,10 @@ __perf_output_begin(struct perf_output_handle *handle, + goto out; + + if (unlikely(rb->paused)) { +- if (rb->nr_pages) ++ if (rb->nr_pages) { + local_inc(&rb->lost); ++ atomic64_inc(&event->lost_samples); ++ } + goto out; + } + +@@ -254,6 +256,7 @@ __perf_output_begin(struct perf_output_handle *handle, + + fail: + local_inc(&rb->lost); ++ atomic64_inc(&event->lost_samples); + perf_output_put_handle(handle); + out: + rcu_read_unlock(); +-- +2.42.0 + diff --git a/queue-5.10/perf-fix-perf_event_validate_size.patch b/queue-5.10/perf-fix-perf_event_validate_size.patch new file mode 100644 index 00000000000..c9be43876e7 --- /dev/null +++ b/queue-5.10/perf-fix-perf_event_validate_size.patch @@ -0,0 +1,135 @@ +From 32d7b1deb9aeffdce0314dce9a7ad4d9d3434ffb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Nov 2023 15:24:52 +0100 +Subject: perf: Fix perf_event_validate_size() + +From: Peter Zijlstra + +[ Upstream commit 382c27f4ed28f803b1f1473ac2d8db0afc795a1b ] + +Budimir noted that perf_event_validate_size() only checks the size of +the newly added event, even though the sizes of all existing events +can also change due to not all events having the same read_format. + +When we attach the new event, perf_group_attach(), we do re-compute +the size for all events. + +Fixes: a723968c0ed3 ("perf: Fix u16 overflows") +Reported-by: Budimir Markovic +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Sasha Levin +--- + kernel/events/core.c | 61 +++++++++++++++++++++++++++----------------- + 1 file changed, 38 insertions(+), 23 deletions(-) + +diff --git a/kernel/events/core.c b/kernel/events/core.c +index f7ac1b24f93e0..0a6855d648031 100644 +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -1912,31 +1912,34 @@ static inline void perf_event__state_init(struct perf_event *event) + PERF_EVENT_STATE_INACTIVE; + } + +-static void __perf_event_read_size(struct perf_event *event, int nr_siblings) ++static int __perf_event_read_size(u64 read_format, int nr_siblings) + { + int entry = sizeof(u64); /* value */ + int size = 0; + int nr = 1; + +- if (event->attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) ++ if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) + size += sizeof(u64); + +- if (event->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) ++ if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) + size += sizeof(u64); + +- if (event->attr.read_format & PERF_FORMAT_ID) ++ if (read_format & PERF_FORMAT_ID) + entry += sizeof(u64); + +- if (event->attr.read_format & PERF_FORMAT_LOST) ++ if (read_format & PERF_FORMAT_LOST) + entry += sizeof(u64); + +- if (event->attr.read_format & PERF_FORMAT_GROUP) { ++ if (read_format & PERF_FORMAT_GROUP) { + nr += nr_siblings; + size += sizeof(u64); + } + +- size += entry * nr; +- event->read_size = size; ++ /* ++ * Since perf_event_validate_size() limits this to 16k and inhibits ++ * adding more siblings, this will never overflow. ++ */ ++ return size + nr * entry; + } + + static void __perf_event_header_size(struct perf_event *event, u64 sample_type) +@@ -1980,8 +1983,9 @@ static void __perf_event_header_size(struct perf_event *event, u64 sample_type) + */ + static void perf_event__header_size(struct perf_event *event) + { +- __perf_event_read_size(event, +- event->group_leader->nr_siblings); ++ event->read_size = ++ __perf_event_read_size(event->attr.read_format, ++ event->group_leader->nr_siblings); + __perf_event_header_size(event, event->attr.sample_type); + } + +@@ -2012,24 +2016,35 @@ static void perf_event__id_header_size(struct perf_event *event) + event->id_header_size = size; + } + ++/* ++ * Check that adding an event to the group does not result in anybody ++ * overflowing the 64k event limit imposed by the output buffer. ++ * ++ * Specifically, check that the read_size for the event does not exceed 16k, ++ * read_size being the one term that grows with groups size. Since read_size ++ * depends on per-event read_format, also (re)check the existing events. ++ * ++ * This leaves 48k for the constant size fields and things like callchains, ++ * branch stacks and register sets. ++ */ + static bool perf_event_validate_size(struct perf_event *event) + { +- /* +- * The values computed here will be over-written when we actually +- * attach the event. +- */ +- __perf_event_read_size(event, event->group_leader->nr_siblings + 1); +- __perf_event_header_size(event, event->attr.sample_type & ~PERF_SAMPLE_READ); +- perf_event__id_header_size(event); ++ struct perf_event *sibling, *group_leader = event->group_leader; + +- /* +- * Sum the lot; should not exceed the 64k limit we have on records. +- * Conservative limit to allow for callchains and other variable fields. +- */ +- if (event->read_size + event->header_size + +- event->id_header_size + sizeof(struct perf_event_header) >= 16*1024) ++ if (__perf_event_read_size(event->attr.read_format, ++ group_leader->nr_siblings + 1) > 16*1024) + return false; + ++ if (__perf_event_read_size(group_leader->attr.read_format, ++ group_leader->nr_siblings + 1) > 16*1024) ++ return false; ++ ++ for_each_sibling_event(sibling, group_leader) { ++ if (__perf_event_read_size(sibling->attr.read_format, ++ group_leader->nr_siblings + 1) > 16*1024) ++ return false; ++ } ++ + return true; + } + +-- +2.42.0 + diff --git a/queue-5.10/series b/queue-5.10/series index 2eacc379523..ef54a17ecb5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -62,3 +62,7 @@ misc-mei-client.c-fix-problem-of-return-eoverflow-in.patch ring-buffer-force-absolute-timestamp-on-discard-of-e.patch tracing-set-actual-size-after-ring-buffer-resize.patch tracing-stop-current-tracer-when-resizing-buffer.patch +perf-core-add-a-new-read-format-to-get-a-number-of-l.patch +perf-fix-perf_event_validate_size.patch +gpiolib-sysfs-fix-error-handling-on-failed-export.patch +drm-amdgpu-correct-the-amdgpu-runtime-dereference-us.patch -- 2.47.3