From patchwork Mon Mar 29 07:56:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 410815 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3432835jai; Mon, 29 Mar 2021 01:35:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyA/hswnRcQbjEtHkhoNND9JeDsZ1PxbwyhfU3hFFxGf0XdSCne2eE0JJ9fvbUOof90Qdd7 X-Received: by 2002:a05:6402:510b:: with SMTP id m11mr27671479edd.103.1617006923904; Mon, 29 Mar 2021 01:35:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617006923; cv=none; d=google.com; s=arc-20160816; b=DoUTE7CUtLPGru6Gu5lvcM2lf6wfcSPCxwO4bBYVlD5FGsOY/Ttxm/xZsMmZx+G71C BxpbqMsBKrfR8ktExaHxXFEoKbjIFqBo0+w2PkSUJ50HAHsX9UxN/ztoRgL+8siUKyih WIn1hOdN73hKBtD3vYmV9fUoEPtOJ0wlvQvrtLxmUq5r/xMfWcVPuNwGXZ8x9TZpE+3K mcjPLzz18lR9p1mg/zaYQeE/RTajQUSaqHDnyVYgxW/DHOKvAays1TYefnnrbcMKUWPI PqThD8Nu3LZy3IGDHtbrCTUkR8Tx9WpPLkb8DrChJ9wcxLCJtFdX/k0KP/Kt/140IrGx 0bjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ern/Ke2VOyhdplvj0BV8Gpd9rYvPwwfc//9Ds+0VWbI=; b=kl6XnZkYsoP9eYq8KS1lNUjdJ8ijiTez+UaAmzpADX50QFcVk95SBIMvDbDqmv3J4W 03nxArnYMRBCHpeU2OkeSv3pq94YwO4CGo205kAfv9AqSYE7yP/JswRu+Z8zwMpUhjpX pn1l+tQ1tuj+YcAg7BbjZtu7Q0DQjIwY7jat/smSYQcYI2lC/GBLNWogj+FS5iDNUZkc JbXfwxkRdKjj8BXmmGFFcAuIYTyETe0/KXfQFwXQknco4KGIJouQ4+YqL0xuGlD6Cxu4 2jFQN0u8U+Uv3AsMi3Kzw84KWFfKYqBclCdCPDN+MGkxGmPlbD25Oof1KFha0boGEy/0 iH2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vJn0nChE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u10si7882036ejg.204.2021.03.29.01.35.23; Mon, 29 Mar 2021 01:35:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vJn0nChE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234228AbhC2Iew (ORCPT + 12 others); Mon, 29 Mar 2021 04:34:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:53532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234810AbhC2Idj (ORCPT ); Mon, 29 Mar 2021 04:33:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C44C6193B; Mon, 29 Mar 2021 08:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617006819; bh=TQSv2BXvLW+3o1IcqsLwhZpUcIGkmdd0YbR3yohtGzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vJn0nChEWSzbJXZ9wdj2MDeONBvx/KIXnnc9cU1Mcc66PF0/pUqdtp5E2Xc0SNwRI bElPxlsTUHmgFhEu9QhoeoZIbSBzdXUaW5RAyGGQhihc9eF+Dm+HwnvKhR/SNtTkil gIR+Jdg+4VyudPNdohsfDL2prwIHnmQkc8BO+aYw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , Prasad Sodagudi , Nathan Chancellor , Fangrui Song , Peter Oberparleiter , Andrew Morton , Linus Torvalds Subject: [PATCH 5.11 083/254] gcov: fix clang-11+ support Date: Mon, 29 Mar 2021 09:56:39 +0200 Message-Id: <20210329075635.882214640@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210329075633.135869143@linuxfoundation.org> References: <20210329075633.135869143@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers commit 60bcf728ee7c60ac2a1f9a0eaceb3a7b3954cd2b upstream. LLVM changed the expected function signatures for llvm_gcda_start_file() and llvm_gcda_emit_function() in the clang-11 release. Users of clang-11 or newer may have noticed their kernels failing to boot due to a panic when enabling CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y. Fix up the function signatures so calling these functions doesn't panic the kernel. Link: https://reviews.llvm.org/rGcdd683b516d147925212724b09ec6fb792a40041 Link: https://reviews.llvm.org/rG13a633b438b6500ecad9e4f936ebadf3411d0f44 Link: https://lkml.kernel.org/r/20210312224132.3413602-2-ndesaulniers@google.com Signed-off-by: Nick Desaulniers Reported-by: Prasad Sodagudi Suggested-by: Nathan Chancellor Reviewed-by: Fangrui Song Tested-by: Nathan Chancellor Acked-by: Peter Oberparleiter Reviewed-by: Nathan Chancellor Cc: [5.4+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- kernel/gcov/clang.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) --- a/kernel/gcov/clang.c +++ b/kernel/gcov/clang.c @@ -75,7 +75,9 @@ struct gcov_fn_info { u32 num_counters; u64 *counters; +#if CONFIG_CLANG_VERSION < 110000 const char *function_name; +#endif }; static struct gcov_info *current_info; @@ -105,6 +107,7 @@ void llvm_gcov_init(llvm_gcov_callback w } EXPORT_SYMBOL(llvm_gcov_init); +#if CONFIG_CLANG_VERSION < 110000 void llvm_gcda_start_file(const char *orig_filename, const char version[4], u32 checksum) { @@ -113,7 +116,17 @@ void llvm_gcda_start_file(const char *or current_info->checksum = checksum; } EXPORT_SYMBOL(llvm_gcda_start_file); +#else +void llvm_gcda_start_file(const char *orig_filename, u32 version, u32 checksum) +{ + current_info->filename = orig_filename; + current_info->version = version; + current_info->checksum = checksum; +} +EXPORT_SYMBOL(llvm_gcda_start_file); +#endif +#if CONFIG_CLANG_VERSION < 110000 void llvm_gcda_emit_function(u32 ident, const char *function_name, u32 func_checksum, u8 use_extra_checksum, u32 cfg_checksum) { @@ -133,6 +146,24 @@ void llvm_gcda_emit_function(u32 ident, list_add_tail(&info->head, ¤t_info->functions); } EXPORT_SYMBOL(llvm_gcda_emit_function); +#else +void llvm_gcda_emit_function(u32 ident, u32 func_checksum, + u8 use_extra_checksum, u32 cfg_checksum) +{ + struct gcov_fn_info *info = kzalloc(sizeof(*info), GFP_KERNEL); + + if (!info) + return; + + INIT_LIST_HEAD(&info->head); + info->ident = ident; + info->checksum = func_checksum; + info->use_extra_checksum = use_extra_checksum; + info->cfg_checksum = cfg_checksum; + list_add_tail(&info->head, ¤t_info->functions); +} +EXPORT_SYMBOL(llvm_gcda_emit_function); +#endif void llvm_gcda_emit_arcs(u32 num_counters, u64 *counters) { @@ -295,6 +326,7 @@ void gcov_info_add(struct gcov_info *dst } } +#if CONFIG_CLANG_VERSION < 110000 static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn) { size_t cv_size; /* counter values size */ @@ -322,6 +354,28 @@ err_name: kfree(fn_dup); return NULL; } +#else +static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn) +{ + size_t cv_size; /* counter values size */ + struct gcov_fn_info *fn_dup = kmemdup(fn, sizeof(*fn), + GFP_KERNEL); + if (!fn_dup) + return NULL; + INIT_LIST_HEAD(&fn_dup->head); + + cv_size = fn->num_counters * sizeof(fn->counters[0]); + fn_dup->counters = vmalloc(cv_size); + if (!fn_dup->counters) { + kfree(fn_dup); + return NULL; + } + + memcpy(fn_dup->counters, fn->counters, cv_size); + + return fn_dup; +} +#endif /** * gcov_info_dup - duplicate profiling data set @@ -362,6 +416,7 @@ err: * gcov_info_free - release memory for profiling data set duplicate * @info: profiling data set duplicate to free */ +#if CONFIG_CLANG_VERSION < 110000 void gcov_info_free(struct gcov_info *info) { struct gcov_fn_info *fn, *tmp; @@ -375,6 +430,20 @@ void gcov_info_free(struct gcov_info *in kfree(info->filename); kfree(info); } +#else +void gcov_info_free(struct gcov_info *info) +{ + struct gcov_fn_info *fn, *tmp; + + list_for_each_entry_safe(fn, tmp, &info->functions, head) { + vfree(fn->counters); + list_del(&fn->head); + kfree(fn); + } + kfree(info->filename); + kfree(info); +} +#endif #define ITER_STRIDE PAGE_SIZE