mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-19 07:39:54 +02:00
This is the 6.6.56 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmcHsXAACgkQONu9yGCS aT6FThAAqOhFcs+MXw3o4lI0uLgXHiYUDCgxDYpj6SFGPUITG5wyQw/W7+0zHOd5 fhonjIz8KJTKjTKw0MS3SW0pqVsVtTsX7o5Klk+zbQXJX3Gc9wnVIz8Jz5F83QNv NIclbnLzaInypUzXsDOmaEfLtqCIX/IZwY6x+wX9Ld5lijxNGi7qBdzWYA/AddCF vUZNnkoREG369iv7MJDC+sXfq9CnuCaLxAvDvSFAmHZr5YshGONhSRmUWzPf/csm mOO85JfAoZyaY0ICLN2VLum1IJHVaXL67o4cmofDpQkl5kVcx0zTMUeiO8FJ9arx uMXQdWYhrR6yndjYXxiIAab4yEWmFhQFN/0r9+pnakjzeK4syD+74uIfKPWfUiQB iG1SCjJdOhZ3ptfj8nYSslEKu3l6noJhKfsyvgqbckekWAE4a1Asb7Xg5Qd2WRKW ruvBBRkNHyK24Vi9KNBdv4n0/+ExVhPM5B3XfQ/PJNMvzhWNDZ3E40N83nDF4aGR B0E01yhWXBv/yNOWnlLh0vbTa0F03KXOqcJPxds35nfEPMDAXAHOE5Uqr89zH4II aVx7UpzFAl+KVTCLMk6Pq/adMWDWBKPx+HZJk4Fo8jK88d2hUND4pN0+byL4XBOm goPzOjzY+g9/Fk+306T5PuisF9MQObcggYbfRTvPC/fb8u5bDhw= =ftpF -----END PGP SIGNATURE----- Merge 6.6.56 into android15-6.6-lts Changes in 6.6.56 Revert "perf callchain: Fix stitch LBR memory leaks" Linux 6.6.56 Change-Id: I950d85b2d0d3df435f7d2edb4f6840b5d5cab248 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
3228553f91
4
Makefile
4
Makefile
|
@ -1,9 +1,9 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 6
|
||||
PATCHLEVEL = 6
|
||||
SUBLEVEL = 55
|
||||
SUBLEVEL = 56
|
||||
EXTRAVERSION =
|
||||
NAME = Hurr durr I'ma ninja sloth
|
||||
NAME = Pinguïn Aangedreven
|
||||
|
||||
# *DOCUMENTATION*
|
||||
# To see a list of typical targets execute "make help"
|
||||
|
|
|
@ -2536,12 +2536,8 @@ static void save_lbr_cursor_node(struct thread *thread,
|
|||
cursor->curr = cursor->first;
|
||||
else
|
||||
cursor->curr = cursor->curr->next;
|
||||
|
||||
map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);
|
||||
memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,
|
||||
sizeof(struct callchain_cursor_node));
|
||||
lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);
|
||||
lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);
|
||||
|
||||
lbr_stitch->prev_lbr_cursor[idx].valid = true;
|
||||
cursor->pos++;
|
||||
|
@ -2752,9 +2748,6 @@ static bool has_stitched_lbr(struct thread *thread,
|
|||
memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],
|
||||
sizeof(struct callchain_cursor_node));
|
||||
|
||||
stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);
|
||||
stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);
|
||||
|
||||
if (callee)
|
||||
list_add(&stitch_node->node, &lbr_stitch->lists);
|
||||
else
|
||||
|
@ -2778,8 +2771,6 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr)
|
|||
if (!thread__lbr_stitch(thread)->prev_lbr_cursor)
|
||||
goto free_lbr_stitch;
|
||||
|
||||
thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;
|
||||
|
||||
INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);
|
||||
INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
|
||||
|
||||
|
@ -2835,12 +2826,8 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
|
|||
max_lbr, callee);
|
||||
|
||||
if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {
|
||||
struct stitch_list *stitch_node;
|
||||
|
||||
list_for_each_entry(stitch_node, &lbr_stitch->lists, node)
|
||||
map_symbol__exit(&stitch_node->cursor.ms);
|
||||
|
||||
list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);
|
||||
list_replace_init(&lbr_stitch->lists,
|
||||
&lbr_stitch->free_lists);
|
||||
}
|
||||
memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));
|
||||
}
|
||||
|
|
|
@ -478,7 +478,6 @@ void thread__free_stitch_list(struct thread *thread)
|
|||
return;
|
||||
|
||||
list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {
|
||||
map_symbol__exit(&pos->cursor.ms);
|
||||
list_del_init(&pos->node);
|
||||
free(pos);
|
||||
}
|
||||
|
@ -488,9 +487,6 @@ void thread__free_stitch_list(struct thread *thread)
|
|||
free(pos);
|
||||
}
|
||||
|
||||
for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)
|
||||
map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);
|
||||
|
||||
zfree(&lbr_stitch->prev_lbr_cursor);
|
||||
free(thread__lbr_stitch(thread));
|
||||
thread__set_lbr_stitch(thread, NULL);
|
||||
|
|
|
@ -28,7 +28,6 @@ struct lbr_stitch {
|
|||
struct list_head free_lists;
|
||||
struct perf_sample prev_sample;
|
||||
struct callchain_cursor_node *prev_lbr_cursor;
|
||||
unsigned int prev_lbr_cursor_size;
|
||||
};
|
||||
|
||||
struct thread_rb_node {
|
||||
|
|
Loading…
Reference in New Issue
Block a user