* Re: [patch 11/12] gcov: clang: fix clang-11+ build [not found] ` <20210416224623.nZhisHrwM%akpm@linux-foundation.org> @ 2021-04-19 21:36 ` Nathan Chancellor 2021-04-19 22:12 ` Linus Torvalds 0 siblings, 1 reply; 3+ messages in thread From: Nathan Chancellor @ 2021-04-19 21:36 UTC (permalink / raw) To: linux-kernel Cc: akpm, johannes.berg, linux-mm, mm-commits, ndesaulniers, torvalds On Fri, Apr 16, 2021 at 03:46:23PM -0700, Andrew Morton wrote: > From: Johannes Berg <johannes.berg@intel.com> > Subject: gcov: clang: fix clang-11+ build > > With clang-11+, the code is broken due to my kvmalloc() conversion (which > predated the clang-11 support code) leaving one vmalloc() in place. Fix > that. > > Link: https://lkml.kernel.org/r/20210412214210.6e1ecca9cdc5.I24459763acf0591d5e6b31c7e3a59890d802f79c@changeid > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > Tested-by: Nick Desaulniers <ndesaulniers@google.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > kernel/gcov/clang.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/kernel/gcov/clang.c~gcov-clang-fix-clang-11-build > +++ a/kernel/gcov/clang.c > @@ -369,7 +369,7 @@ static struct gcov_fn_info *gcov_fn_info > INIT_LIST_HEAD(&fn_dup->head); > > cv_size = fn->num_counters * sizeof(fn->counters[0]); > - fn_dup->counters = vmalloc(cv_size); > + fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL); > if (!fn_dup->counters) { > kfree(fn_dup); > return NULL; > _ This should not have been merged into mainline by itself. It was a fix for "gcov: use kvmalloc()", which is still in -mm/-next. Merging it alone has now broken the build: https://github.com/ClangBuiltLinux/continuous-integration2/runs/2384465683?check_suite_focus=true Could it please be reverted in mainline then added as a fix patch for the patch that is still in -mm: https://www.ozlabs.org/~akpm/mmotm/broken-out/gcov-use-kvmalloc.patch Cheers, Nathan ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 11/12] gcov: clang: fix clang-11+ build 2021-04-19 21:36 ` [patch 11/12] gcov: clang: fix clang-11+ build Nathan Chancellor @ 2021-04-19 22:12 ` Linus Torvalds 2021-04-20 14:12 ` Sasha Levin 0 siblings, 1 reply; 3+ messages in thread From: Linus Torvalds @ 2021-04-19 22:12 UTC (permalink / raw) To: Nathan Chancellor, stable, Sasha Levin Cc: Linux Kernel Mailing List, Andrew Morton, johannes.berg, Linux-MM, mm-commits, Nick Desaulniers On Mon, Apr 19, 2021 at 2:37 PM Nathan Chancellor <nathan@kernel.org> wrote: > > This should not have been merged into mainline by itself. It was a fix > for "gcov: use kvmalloc()", which is still in -mm/-next. Merging it > alone has now broken the build: > > https://github.com/ClangBuiltLinux/continuous-integration2/runs/2384465683?check_suite_focus=true > > Could it please be reverted in mainline [..] Now reverted in my tree. Sasha and stable cc'd too, since it was apparently auto-selected there.. Linus ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 11/12] gcov: clang: fix clang-11+ build 2021-04-19 22:12 ` Linus Torvalds @ 2021-04-20 14:12 ` Sasha Levin 0 siblings, 0 replies; 3+ messages in thread From: Sasha Levin @ 2021-04-20 14:12 UTC (permalink / raw) To: Linus Torvalds Cc: Nathan Chancellor, stable, Linux Kernel Mailing List, Andrew Morton, johannes.berg, Linux-MM, mm-commits, Nick Desaulniers On Mon, Apr 19, 2021 at 03:12:26PM -0700, Linus Torvalds wrote: >On Mon, Apr 19, 2021 at 2:37 PM Nathan Chancellor <nathan@kernel.org> wrote: >> >> This should not have been merged into mainline by itself. It was a fix >> for "gcov: use kvmalloc()", which is still in -mm/-next. Merging it >> alone has now broken the build: >> >> https://github.com/ClangBuiltLinux/continuous-integration2/runs/2384465683?check_suite_focus=true >> >> Could it please be reverted in mainline [..] > >Now reverted in my tree. > >Sasha and stable cc'd too, since it was apparently auto-selected there.. I'll drop it from my queue, thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-20 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210416154523.3f9794326e8e1db549873cf8@linux-foundation.org>
[not found] ` <20210416224623.nZhisHrwM%akpm@linux-foundation.org>
2021-04-19 21:36 ` [patch 11/12] gcov: clang: fix clang-11+ build Nathan Chancellor
2021-04-19 22:12 ` Linus Torvalds
2021-04-20 14:12 ` Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox