From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751824AbcDUKcu (ORCPT ); Thu, 21 Apr 2016 06:32:50 -0400 Received: from mail-db3on0111.outbound.protection.outlook.com ([157.55.234.111]:12256 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751172AbcDUKcs (ORCPT ); Thu, 21 Apr 2016 06:32:48 -0400 Authentication-Results: google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=none action=none header.from=virtuozzo.com; From: Andrey Ryabinin To: Dmitry Vyukov , Andrew Morton CC: , , Andrey Ryabinin Subject: [PATCH] kcov: disable tracing and branch profiling in kcov Date: Thu, 21 Apr 2016 13:32:52 +0300 Message-ID: <1461234772-31832-1-git-send-email-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.7.3 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: VI1PR07CA0099.eurprd07.prod.outlook.com (10.165.229.153) To HE1PR0801MB1307.eurprd08.prod.outlook.com (10.167.247.149) X-MS-Office365-Filtering-Correlation-Id: fd3cd35c-5931-432b-6246-08d369d045e5 X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1307;2:ghJYCiwDKyc1OyXOU8m3GD89aG7yMUG6K4KZj+G0OYg+Ocxy6Ufgso4alyFSCNCZg43iblJn64QQpmqeUFhkAVna/xhqMWmpBHgrs55dKlJe7NFgzgEr7tqrEpfsb7HeIZ2YEWgKB9vVvz0csebfB7eMqbKzVPpjg06QFwsVbY1qLInFFaz1QukzmGf7T/h3;3:InW2H8vcjEVzvvn1e4c0nZfhbHccNwysm7V+/0eVj45cI5tDlFLL1pY+rwFb8h/cmKS5y/y/3xdFUWKeGzF2YvEklQY2S07FqDZ3zpkDkP0cR0NLMyWkjwG/ouHloD56 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1307; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1307;25:TIb9XMA53B4CeOMY5S0ZDq6HWfNwoYPXkuNscv+efCKAaRVuwRqLTCylXfk7qWFGQri4CwiGb2GPKYpkivdivdGdEIY4nt3eayuOPaNOUHlFqPyj0nfzRL0x4VRFZpSAKqJd9mjOS/kp9Pw2BaJwtefekEPQPikPbHXLXAAPNMCUExSctztz3pzfSnpc8M7Y3hYum0IL8IGfACMXNgY4ZeBDa0jHShaKrr+GQJ6FLWY30QUh1QjevOTxC4CqJvdw+kcI+WQs9fxJ/u6b8jQ34CP38HFAKxWj4VkLXlzyjeQf920oyUeWVCBFQq5bsICxXfoP1A/rqQS/71wISQoWi/XXJGqVVZIV2A6J1Ijkfc63c1qhJXjssdSPhRt8VWorlLZIJ2tWkeNd0jSXfg4X81EsWltA6pgovo2+gG0aZBdE1qJMXp+ywzcEuhjYmTHc5gNXUehvXJSMHZ4SiEWEyaeotJjBdfCpS8R0tIVJCaeTd0KaaUqSRLLPWLu0WbGnRh9l3ctl8X9cmRfGLME7uMMJUYx949HWFb1aP70FGfDz9cgJgz/YRt/KQbp2P5virD/KSCBTu5R1YwYxRPK5TEnLQMoIv5avJA1C3D80QrpCHTFibCu6wS02gv0ef4KnzLkR0rZh8h999bMMBAvvVpgDzn8yZGJ7K7oNRhl7lATkTz6f7OFAQscLtN3YawiZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521026)(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:HE1PR0801MB1307;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1307; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1307;4:56xNPqyqTvKno/bQGQIhfuUXEmBDumDxW7DrTPrhCUh7CmPcYIGoGKc2/lBywjDpB+1M6ugRvDl4MpUXKuxy35wLs3zUXPv+gfC172vneV+VeF0KfVa7oJUUvdkuVmICsFHir1e0vXV+ebX7jzWzJY7GCIVKqtevzr3rw+QfLcRGqEX03mWWNg1NOAWNtTLw4NYaiUlTu72Qr/+OQtftj8F8TDCR3NPeDpo7WIRUbblKvqzyXKKZy8A7S4tw7NrbFGwLd64Cc/pyGu7mVAEFUQm0FFqVjqXj7LJg2eF6e43XNsY06UkjG7a7UYLegaisI8IJo29RjwVHgNPhoj+D4VJVJ9xFoH0LWq4vJkEZbEdWCChJ9084MVSCCID+ygvFMV9BZpOvX5asCgl5lJYr4SzewltPhWVk6OOOoMoRsiXFWhx1P4pLibWMpjDFDE48B5+qNVhX9fOEmBOA69497Q== X-Forefront-PRVS: 091949432C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(5003940100001)(586003)(6116002)(3846002)(92566002)(81166005)(48376002)(86362001)(4001430100002)(2906002)(5004730100002)(107886002)(50986999)(50466002)(189998001)(4326007)(5008740100001)(47776003)(77096005)(5001770100001)(66066001)(229853001)(50226001)(76506005)(53416004)(1096002)(42186005)(36756003)(19580405001)(33646002)(19580395003);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0801MB1307;H:localhost.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1307;23:XxQLGRZmyhaVGk7IRjhwROn+NkIUdEfMMbDS8Dc/QDqJYfUbLcMZ1nuOUxmSu28V/IgK2vN4p0pqXuPpdHzxCBICeQAxkV/Yo2lMSf4WyKam9SNUYDMAW4rO9bSzryXLtsr5fIfPg+c1x+zasLwx06UusUUN1b+xJO1qi6UCv3nEu/gFhHiynmd6ziojkWiR5AVeVBHtDd88D01WOFMqguYheXKQxMTrI5QNOgTI5BvtkkjoEn/OYyQg/DvgtFVf8+tNJPaw9s5Brtgq8rV/S+2XGpfWt8ctLGLMuX7VLKze2xhMJVIRG6T3Q+3OsAI2ikaW44L/lI85C94tLEI3iuCzUTBWrOK61YoupciyVO4okOT7BdkDTTlvD0lNNEV/9bj0mBVDlJgq7exLE0hfgD/zd9v6UF0Z+odXSdwxUbLRfnHGWDyudLhluyI4JqXqHLMp5n+pc7Yar9/qods2cPbMmQ04bk/B40oqMYWEY2JAMuO2fZmQ4/YDe8SFGhlXVmpinvkBRphxujzdzEZsVZGjACLQotNQj+tc7xDOBSh2NiJ+arvRERnWfckcdkoPeuFohPSHJWRb5O/mG+UtldiyTDZuv67egyJ4PnTSDu517Rpb/GTVes5FigjSdHd2srZs3vdkDme13hXGz1kjwIwmAoYEyIRkPFKG0DejntY5I9C/EOuE7FRSPr6twaqdnKKzTdYgz3ZukOWDWWe0v/NlGGfBwSLjpKpM2viwWNCswtE7yRCCk0rZ0vWGBkEFiikmXCh3fo5pq4XSBei1yzIfJddfTD/N7IwiXxN8/hzHyF18r0cu2fUYhgklOTARHFq643t9VCNoior+pde+hmK4f/D/pg5/nGgJ6iclekdnxwhpMLHy5+QHyB8EMDX9xcdqWUEEsSCzC2s5/3S6FWql/eL0tFS4LQXkIkI8LrwcbeMC5XfLPT1xEUdt7ARJ X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1307;5:kEeKRjYstgcnVNyghMFioXJAiqyPPH5GKd+abJe31t7nXZ7OmBxPBN1G+fj/WAZazl4eGGy4SyG/0VDpPDp30WSvJSmJoGXoW1zKCfgDMju6Q6TmmyKw1b/Sn3zHiu0OcYJ8MzOcTsdfVxp+r3TxUemD2D2C1tt6OOO75KV9zd5JQwHi2boTfnUaVuubG36C;24:ghiMSFpBtUuCyZED/fCSWJx0K0zkjW1yN0slesaXr1v9ltRk5S4XxZ16kA53+fB6e8QtVhy5DDfFWcg9TNuH7/6AAfcYU2xShf3EsomkeXg=;7:mc4Ge52XY6u6tt8hQ7fHjLFoVVt8P8iTH51IJisWx5RM992HL/Krsm/pIcY504ySo89Rbw76TnEHKhAWsvOHr7RD24dkRrrpO2Vx7zAt+wUHkK3J1uPS66xLlzJYQmxls3ePKKGA+5u3R+Nga1o/orSPf5UXEnqZfMr7qDbVKI0RVpFUK/a2HUlfnr6lICvJCflOUeefTZ4SeXnYgKwEH3Z1GDwtcijxXXWE8mPLknU=;20:Vuu30YtbaIGGaezXymL4CbZ1sEfIUCp8bjx0buPKA4/Ez2XebTLYcT5yvQFxmSyAnU50GBlEzuIt13zByu8vST/I5pQ7gFH0IIhS8/7hePi9KJ4MGdv4Zo3WGCy86TG6bATMe8mEO4p+ik1Qo4HS0S4NMNZIwA49IWF8dDZRFvY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2016 10:32:42.8802 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1307 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tracing of __sanitizer_cov_trace_pc() causes unbound recursion and crash, because __sanitizer_cov_trace_pc() is also called from tracer code. For the same reason we need to disable profiling of 'if' branches. Signed-off-by: Andrey Ryabinin --- kernel/kcov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/kcov.c b/kernel/kcov.c index 3efbee0..7919253 100644 --- a/kernel/kcov.c +++ b/kernel/kcov.c @@ -1,5 +1,6 @@ #define pr_fmt(fmt) "kcov: " fmt +#define DISABLE_BRANCH_PROFILING #include #include #include @@ -43,7 +44,7 @@ struct kcov { * Entry point from instrumented code. * This is called once per basic-block/edge. */ -void __sanitizer_cov_trace_pc(void) +notrace void __sanitizer_cov_trace_pc(void) { struct task_struct *t; enum kcov_mode mode; -- 2.7.3