From patchwork Fri Mar 12 22:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 398704 Delivered-To: patch@linaro.org Received: by 2002:a17:906:a383:0:0:0:0 with SMTP id k3csp1743795ejz; Fri, 12 Mar 2021 14:42:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJx9uH9WBDW9Dmr9FRckyGivQceFktrnGgzD18cL909bWCSiGr3toQBAy9MV3Surp0KOGFWB X-Received: by 2002:a05:6402:10c9:: with SMTP id p9mr17022576edu.268.1615588967071; Fri, 12 Mar 2021 14:42:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615588967; cv=none; d=google.com; s=arc-20160816; b=t3pPMlVhi1ibHS54CcY0OjnGyT303/1dSg6F2H8fcm625a3AmI3kaAxcbctUHYFyRq +7FgkuyFup5e9GtpbFg1JBSnSLR0hF0NU8Pjja7qNxq2B28AgeM5NORPw916Ak8OFOMB 16+mMr4/IIDPBPG74OAlVTYVlR0X0oaJVvEFiUoFLxXsf68QOwzn+nMn+ghkeRiWGR6a LTG/S+iB8Czd+6R12oxNng0tYP4irDxAHZGw8sa8+0+EuQDTkmjEg8kdDFpBg9ur/CPf F8l6VDiSmPWKpbFwJ7UoTKs+KQjeXNrV0DQXDMc+QL8gKNQWTmj8yUYNVUA0PRnzqmhs I7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=HUxwt7fMNMSOl9TDVy0HKmyLht64Yf2wRDVakO/oeqM=; b=So/cnJuP/EDPY4dzXU6zooLbmPbEM4i7yeXyhVRrRn5m0dzDroPkdsGXLUmgkiDkf9 fQPQf33mlAjFK+OeNtyMDK+oumwdQOgJtOBCqFMsFcDd8U4krxmP+yptlntUnc/o2sAq Qin3LWuXVav2SQPac3FIQNLprUmG+yTIFm9kOtgFPBXErXoPgWzYZWPqqVVrSxnfEht6 1yUN/C/n+W+0ol9E7xNVvbXMmqzMrYRvNTMoMlJk2Ux/NOCRHJosRnGoW6vOU7zNbQcd 0UoZ7M5+NebLlYnZ0UBe8CA3xi0CLsLxEzwghFjBQICDvFCHJj9dc5q9XWAjayeZQNvn bz8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qBA3e1xb; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga15si5247330ejc.24.2021.03.12.14.42.46; Fri, 12 Mar 2021 14:42:47 -0800 (PST) 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=@google.com header.s=20161025 header.b=qBA3e1xb; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235618AbhCLWmO (ORCPT + 12 others); Fri, 12 Mar 2021 17:42:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235598AbhCLWlr (ORCPT ); Fri, 12 Mar 2021 17:41:47 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB37EC061574 for ; Fri, 12 Mar 2021 14:41:46 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 6so30956958ybq.7 for ; Fri, 12 Mar 2021 14:41:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=HUxwt7fMNMSOl9TDVy0HKmyLht64Yf2wRDVakO/oeqM=; b=qBA3e1xbPS3Zik4ZzgiUkY+MduWKZs+gydr/D5r/tgoSPqZk+akqK1ORjw6rzVcUko oQNrbswIITUeZfKBFZIYhpbOSpK4hRqd2QwYHcAM1EQaeV8HszvQTxFt4pJlE1StAEhy R/zFQWZGzZ4ZW8Vu4bRdXuKHdciUazcKQ1Bm7p44E+oaJ7vR3OPfLQuRPcM+0pj8kREC xSAMMOiKda+flTFurl1Ls/lIg4cebBECOzRmlv958GJXYLTjSAIC9mmg2kyZBOUzjhI2 6QjsPUWYzbQLVKLMjgNT4xPPq0CKAHwFVPQYYvdw5ScN64bNl/W92gZt/v39Qx8kCH6a B/XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=HUxwt7fMNMSOl9TDVy0HKmyLht64Yf2wRDVakO/oeqM=; b=DHCQ1nIQJsHMF7WVLme0BKMqSfgTRi/VyIuLU8h+AMBBDkxRw6I7WHd63y24KfIinZ mim5i19XJJ3Yf4AXIkRAFPGFp78yHusjSF07Wk0YveJPEKXHL16mxcqqNadtzlcc1pB4 6JaMlPPMWVafNmPYicf6BIT8BVIDWzmMOBpcDPTxhC5hBrp+xCO61vkN2++5kmys1Vbu fXbR/70CgPJNuLFL1Yrt2vLxJ+aR8Yfow9lk7coHkEHEArWgZqgfN6bFVdxbFN7D7ah4 PHFvxJeImHdvwXpBS+RmYBjzHPorKWhrMF5gsCF8/PLbbFPppPpz5QH0qacxPm7/eZ+Q aICg== X-Gm-Message-State: AOAM531lxg4CzODR10V3pc/GGz9tuRpY2yRBuNISp6TPNSBTqwoMLFcR Zhn5JmVtbCXoGqd/D8V1UI9lSSCs7myoEcIFz/w= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:f1f4:3252:5898:ad84]) (user=ndesaulniers job=sendgmr) by 2002:a25:ca8e:: with SMTP id a136mr22450826ybg.156.1615588906145; Fri, 12 Mar 2021 14:41:46 -0800 (PST) Date: Fri, 12 Mar 2021 14:41:31 -0800 In-Reply-To: <20210312224132.3413602-1-ndesaulniers@google.com> Message-Id: <20210312224132.3413602-2-ndesaulniers@google.com> Mime-Version: 1.0 References: <20210312220518.rz6cjh33bkwaumzz@archlinux-ax161> <20210312224132.3413602-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog Subject: [PATCH v2 1/2] gcov: fix clang-11+ support From: Nick Desaulniers To: Peter Oberparleiter , Andrew Morton Cc: Nathan Chancellor , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Fangrui Song , Prasad Sodagudi , Nick Desaulniers , stable@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 Cc: stable@vger.kernel.org # 5.4 Reported-by: Prasad Sodagudi Suggested-by: Nathan Chancellor Reviewed-by: Fangrui Song Signed-off-by: Nick Desaulniers Tested-by: Nathan Chancellor --- Changes V1 -> V2: * Use CONFIG_CLANG_VERSION instead of __clang_major__. * Pick up and retain Suggested-by, Tested-by, and Reviewed-by tags. * Drop note from commit message about `git blame`; I did what was sugguested in V1, but it still looks to git like I wrote those functions. Oh well. kernel/gcov/clang.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) base-commit: f78d76e72a4671ea52d12752d92077788b4f5d50 -- 2.31.0.rc2.261.g7f71774620-goog Acked-by: Peter Oberparleiter Reviewed-by: Nathan Chancellor diff --git a/kernel/gcov/clang.c b/kernel/gcov/clang.c index c94b820a1b62..8743150db2ac 100644 --- 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 writeout, llvm_gcov_callback flush) } 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 *orig_filename, const char version[4], 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, const char *function_name, 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, struct gcov_info *src) } } +#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 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn) 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 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info) * 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 *info) 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