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=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 561D6C433E2 for ; Mon, 14 Sep 2020 14:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E63C320829 for ; Mon, 14 Sep 2020 14:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600093786; bh=TSERMVPe5FcxNl+ZLqZISa/5CBgHyN8CLmWjOe4/Avg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k8ytxWVpiKDkSNkefavjUC4qfOV3eeNgnw7w0t/+b+GROdOvjUbopKQb7Zg2e79wa mOvo3p5rvFfSlxR4MZ5z9ZAb+CNuqncQkU6bUmjltidWlBB8+6k9WIdnEAy0CF1TCU KtDgWa1kbqpZN87BJWKAVzc1oBnLV5ZWuBbAT1vs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbgINO3o (ORCPT ); Mon, 14 Sep 2020 10:29:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:60296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726661AbgINNGD (ORCPT ); Mon, 14 Sep 2020 09:06:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3F2D22272; Mon, 14 Sep 2020 13:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088724; bh=TSERMVPe5FcxNl+ZLqZISa/5CBgHyN8CLmWjOe4/Avg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GN2UdXdAqGgybUDNALUhoae5f/QAIcsp9HFjwNVtmXvDtafba+9v2jZdiQOoEENSN 3Pv/+CQg71k34yUGtFGHYLiOFUQ7mCPwNX4NIHdLNnmjRDfrVr/fqlu4JXk9dfqSKz kBxZnaYLV3QxfF93iIcUHvNVpPf5oj/PhNF5hXwc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Oberparleiter , Colin Ian King , Leon Romanovsky , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.19 18/19] gcov: add support for GCC 10.1 Date: Mon, 14 Sep 2020 09:05:01 -0400 Message-Id: <20200914130502.1804708-18-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130502.1804708-1-sashal@kernel.org> References: <20200914130502.1804708-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Oberparleiter [ Upstream commit 40249c6962075c040fd071339acae524f18bfac9 ] Using gcov to collect coverage data for kernels compiled with GCC 10.1 causes random malfunctions and kernel crashes. This is the result of a changed GCOV_COUNTERS value in GCC 10.1 that causes a mismatch between the layout of the gcov_info structure created by GCC profiling code and the related structure used by the kernel. Fix this by updating the in-kernel GCOV_COUNTERS value. Also re-enable config GCOV_KERNEL for use with GCC 10. Reported-by: Colin Ian King Reported-by: Leon Romanovsky Signed-off-by: Peter Oberparleiter Tested-by: Leon Romanovsky Tested-and-Acked-by: Colin Ian King Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/gcov/gcc_4_7.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index ca5e5c0ef8536..5b9e76117ded1 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -19,7 +19,9 @@ #include #include "gcov.h" -#if (__GNUC__ >= 7) +#if (__GNUC__ >= 10) +#define GCOV_COUNTERS 8 +#elif (__GNUC__ >= 7) #define GCOV_COUNTERS 9 #elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #define GCOV_COUNTERS 10 -- 2.25.1