From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABE47C43460 for ; Mon, 19 Apr 2021 21:37:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0E359613AC for ; Mon, 19 Apr 2021 21:37:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E359613AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 47C936B0036; Mon, 19 Apr 2021 17:37:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42D776B006E; Mon, 19 Apr 2021 17:37:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31B806B0070; Mon, 19 Apr 2021 17:37:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0224.hostedemail.com [216.40.44.224]) by kanga.kvack.org (Postfix) with ESMTP id 18FF36B0036 for ; Mon, 19 Apr 2021 17:37:05 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B7ED4181AEF39 for ; Mon, 19 Apr 2021 21:37:04 +0000 (UTC) X-FDA: 78050427168.39.B78311E Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf11.hostedemail.com (Postfix) with ESMTP id CD92F200025E for ; Mon, 19 Apr 2021 21:36:51 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 70B3F6113C; Mon, 19 Apr 2021 21:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618868221; bh=YnVav9b2X8BK437Ycy2zQXeK5R1Vi6ULJV95mmEM4l4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EI1wBfo0xtdY0joSyyKzShYA0Pga5EG2LIV5/8DChIL9W2DIYzIi6029niHZHtnev 1qJydGLBDhqzO0dKt3C8s0bBy7bcHS/PAitfln3FrxJ4gWAPpuh/bNv1E6It1lyR3A uFqPAaBEM2ugQIAX8iFdBBolBgnRXtXiqffC7jse9KO8bEiuGwdEdG83mlnGqQlFlK im6hV+uNMfb3IwC8FDsTccbFFq01IsnwHJUwlsi/0z0pfwa1FywH3ixCCWtqSsKpJF jJOG5yXW1QcSEYOePKQa0E9s6yQLRP8MF4Gch+oTLjyfBUkO8sxGrJO0prT0dDPJa6 n2tSUH0/vXGAw== Date: Mon, 19 Apr 2021 14:36:57 -0700 From: Nathan Chancellor To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, johannes.berg@intel.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, ndesaulniers@google.com, torvalds@linux-foundation.org Subject: Re: [patch 11/12] gcov: clang: fix clang-11+ build Message-ID: References: <20210416154523.3f9794326e8e1db549873cf8@linux-foundation.org> <20210416224623.nZhisHrwM%akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210416224623.nZhisHrwM%akpm@linux-foundation.org> X-Rspamd-Queue-Id: CD92F200025E X-Stat-Signature: n5oeozfp4s8j75465dreqqxkog3i9im9 X-Rspamd-Server: rspam02 Received-SPF: none (kernel.org>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618868211-59823 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Apr 16, 2021 at 03:46:23PM -0700, Andrew Morton wrote: > From: Johannes Berg > 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 > Reviewed-by: Nick Desaulniers > Tested-by: Nick Desaulniers > Signed-off-by: Andrew Morton > --- > > 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