From patchwork Fri Apr 9 20:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 418190 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1874662jai; Fri, 9 Apr 2021 13:27:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFHU19ZSELxIrdIl8Mn/tnSCTNDiPFXKy8TwbsvTSzrK+S/2ISnCdTqkbWmSPwkPm1ITM7 X-Received: by 2002:a05:6a00:138e:b029:204:422e:a87e with SMTP id t14-20020a056a00138eb0290204422ea87emr13974874pfg.24.1618000048765; Fri, 09 Apr 2021 13:27:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618000048; cv=none; d=google.com; s=arc-20160816; b=ZRy75kIppqt5UeFqk71aipvASB/Nm7bgiOc+FdFMPDOueRwgdfJUZUHpCvVXi+Wlnb KbJwRXeiafspiRWV13MED1TIbE8Io1tuOxu+5p0B2w2JojU9Rp0bbdYK0OQK84FrWvGA 3X3+EFrdIW1VjY4qe67Y0u0dwXWzjjdjz9Pf9u83ff0UuyBaby/HJVzX5VcxSW8vfT19 V1i7uNJ76Kl+0M6IZts9+wXs5n+CHz9fpWLg0EQalfUynqK4UaPM7xYpqO2uwdW+QutM jkku5QNwdwGU59DLx8y2lG71HLzez9n8R6xj8N49RQuBWvwOpr8CmuunD4aPpxDavXQY Y+5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:message-id:subject:to :from:date:dkim-signature; bh=y91DNzpZKN8fwflqSND2OXPKDktF8NpmUmFxMJ6hxw8=; b=hZ0xFvsItAN2aAgz+WzXDFMalVzgjVLBQ1n2D7Wj2o1d0iLGA4w/sJ3O1UssbWITp7 LUulY9IuK9/Jfe/BTd+gBRaeIgVKd4c9OjRrZYT+9QwmTK74tF5odxWjjCDAABztv8h8 vxGZKV4ZewygSo6MsuWYX10gyM6IblQ08hoH+E6xfu9b2d5EEb08BTxUCh4sdSbSJjld Jh+NgwYArIx7nCqP0VjfaFA7GERFvjxJ2GJQxtwN/UaRU+OpCEAj9PbPBkTzwUC5Zk4T WXpDFe6/6/b6lTy30EAnor2QW21f+ZDseKrMp1isOMXKaVMXiagjoTCJj1CMcTAc5T1B qSeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=YbZ2Y0Ph; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f5si3915161plo.201.2021.04.09.13.27.28; Fri, 09 Apr 2021 13:27:28 -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=@linux-foundation.org header.s=korg header.b=YbZ2Y0Ph; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234183AbhDIU1k (ORCPT + 12 others); Fri, 9 Apr 2021 16:27:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:51562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233824AbhDIU1k (ORCPT ); Fri, 9 Apr 2021 16:27:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6F2A86113A; Fri, 9 Apr 2021 20:27:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1618000046; bh=MC5rJIiACHa4l6pT6GTWaov4H6yXZ+j3/ppxa3BO3ts=; h=Date:From:To:Subject:In-Reply-To:From; b=YbZ2Y0PhHjNGMsgKJT+4ep/68sV/XRY+Q1U8Afv6NBLkO7LAZEr3SRzyiSNVE9M/u KdmXO4N6aEER1uTe3WrKBsg6kkbqsV+fQUoRfweRT2WtytxHzo+Dc9dU1yl8EUQSuH Cdl4hj4hgV/mpozo2iqbJ1W68uNk9WpZpsMxVm0A= Date: Fri, 09 Apr 2021 13:27:26 -0700 From: Andrew Morton To: akpm@linux-foundation.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, nathan@kernel.org, ndesaulniers@google.com, psodagud@quicinc.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 09/16] gcov: re-fix clang-11+ support Message-ID: <20210409202726.UGh0KJFgU%akpm@linux-foundation.org> In-Reply-To: <20210409132633.6855fc8fea1b3905ea1bb4be@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers Subject: gcov: re-fix clang-11+ support LLVM changed the expected function signature for llvm_gcda_emit_function() in the clang-11 release. Users of clang-11 or newer may have noticed their kernels producing invalid coverage information: $ llvm-cov gcov -a -c -u -f -b .gcda -- gcno=.gcno 1 : checksum mismatch, \ (, ) != (, ) 2 Invalid .gcda File! ... Fix up the function signatures so calling this function interprets its parameters correctly and computes the correct cfg checksum. In particular, in clang-11, the additional checksum is no longer optional. Link: https://reviews.llvm.org/rG25544ce2df0daa4304c07e64b9c8b0f7df60c11d Link: https://lkml.kernel.org/r/20210408184631.1156669-1-ndesaulniers@google.com Reported-by: Prasad Sodagudi Tested-by: Prasad Sodagudi Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Cc: [5.4+] Signed-off-by: Andrew Morton --- kernel/gcov/clang.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) --- a/kernel/gcov/clang.c~gcov-re-fix-clang-11-support +++ a/kernel/gcov/clang.c @@ -70,7 +70,9 @@ struct gcov_fn_info { u32 ident; u32 checksum; +#if CONFIG_CLANG_VERSION < 110000 u8 use_extra_checksum; +#endif u32 cfg_checksum; u32 num_counters; @@ -145,10 +147,8 @@ 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) +void llvm_gcda_emit_function(u32 ident, u32 func_checksum, u32 cfg_checksum) { struct gcov_fn_info *info = kzalloc(sizeof(*info), GFP_KERNEL); @@ -158,12 +158,11 @@ void llvm_gcda_emit_function(u32 ident, 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 +EXPORT_SYMBOL(llvm_gcda_emit_function); void llvm_gcda_emit_arcs(u32 num_counters, u64 *counters) { @@ -293,11 +292,16 @@ int gcov_info_is_compatible(struct gcov_ !list_is_last(&fn_ptr2->head, &info2->functions)) { if (fn_ptr1->checksum != fn_ptr2->checksum) return false; +#if CONFIG_CLANG_VERSION < 110000 if (fn_ptr1->use_extra_checksum != fn_ptr2->use_extra_checksum) return false; if (fn_ptr1->use_extra_checksum && fn_ptr1->cfg_checksum != fn_ptr2->cfg_checksum) return false; +#else + if (fn_ptr1->cfg_checksum != fn_ptr2->cfg_checksum) + return false; +#endif fn_ptr1 = list_next_entry(fn_ptr1, head); fn_ptr2 = list_next_entry(fn_ptr2, head); } @@ -529,17 +533,22 @@ static size_t convert_to_gcda(char *buff list_for_each_entry(fi_ptr, &info->functions, head) { u32 i; - u32 len = 2; - - if (fi_ptr->use_extra_checksum) - len++; pos += store_gcov_u32(buffer, pos, GCOV_TAG_FUNCTION); - pos += store_gcov_u32(buffer, pos, len); +#if CONFIG_CLANG_VERSION < 110000 + pos += store_gcov_u32(buffer, pos, + fi_ptr->use_extra_checksum ? 3 : 2); +#else + pos += store_gcov_u32(buffer, pos, 3); +#endif pos += store_gcov_u32(buffer, pos, fi_ptr->ident); pos += store_gcov_u32(buffer, pos, fi_ptr->checksum); +#if CONFIG_CLANG_VERSION < 110000 if (fi_ptr->use_extra_checksum) pos += store_gcov_u32(buffer, pos, fi_ptr->cfg_checksum); +#else + pos += store_gcov_u32(buffer, pos, fi_ptr->cfg_checksum); +#endif pos += store_gcov_u32(buffer, pos, GCOV_TAG_COUNTER_BASE); pos += store_gcov_u32(buffer, pos, fi_ptr->num_counters * 2);