From patchwork Thu Aug 20 09:20:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 248011 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp1205482ils; Thu, 20 Aug 2020 02:59:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfV3qCKuEujdbF+4J7EBurZaUsZW/8QJl2SCTJtPzYamEPeAIocfz2wl2xThtB0Ne9Ocoo X-Received: by 2002:a17:906:b294:: with SMTP id q20mr2341211ejz.223.1597917581689; Thu, 20 Aug 2020 02:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597917581; cv=none; d=google.com; s=arc-20160816; b=C+Sij4lpC820VmNzoVZhYCKAwqz2cGaG+8c3EHzSImAWZYa9NUUCXmYZIzOAOQtFLY Z8MdiGt70UYJOrFumPRdyIEZFnF8Z0SPNvVee/ug7HwTkaylVNUSX2vUiYX4YV10xiNb BhppWsgeT52826370aoHcnCAZfM68GPkU/c4E1lG9eSSedqw/EEUcF0dNZqP40TDzGkq Zv5aarp1j3uUFaXGZ82eKiZLhUYQOitP5OFwCltiQKRG9kLKQBv8aCzoz1MHq40Catmr g8BpBNX6J9WWiqJyXma0ry0BSkGPs+2IZWwLQr6SAuhvduYQv+n3jKtPCOYWQ1oW+Kmc ISLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0kg/jG/l3dpsyXbY/ymjW1gb5AMXuDrCUpHnyiDMyxw=; b=JbI1itHvluuLo2KqN0Eamnjw9vG/1NXzV9WVurHYpx2WQWY/1BbAu1KN61kugdUEL1 AdlTbaHD6pum8HOZ/+Ce635H6mtzDHc/OrP+lHHZ0GLSU4MJ2Q4VkdSmjLmB6TDdkQlH 1OTNpUXWZQ/OjhpqNb/RyHmPy/FWPYGV6oi8ISMrnnrQvAnBIVeEipbyHEKDDiiWQ3SC RtuVveaOPdN/aArH0rpi52EquZKxEj2LJQPLvPRnhyNhlZSGlDWUVZlnCfylRLLfvsPp 5fAe67mPu5W7ogzyZ3ROVdDEByx0giy7dQBTXZBIIu1YZFZ96wtRvyoZj4PPTMJVF26F 0okw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wAxfkEr8; 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=fail (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 nv4si925794ejb.737.2020.08.20.02.59.41; Thu, 20 Aug 2020 02:59:41 -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=@kernel.org header.s=default header.b=wAxfkEr8; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730362AbgHTJ7i (ORCPT + 15 others); Thu, 20 Aug 2020 05:59:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:46026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730431AbgHTJ7c (ORCPT ); Thu, 20 Aug 2020 05:59:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7F2320855; Thu, 20 Aug 2020 09:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917572; bh=G80p+F5PFv1MM5G7UpJnUbfT9H38kAuzrH119I2A4xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wAxfkEr8tj445c989i8ht2Iyty428a6Pqgi5lneD8Q97Q559wfIz3qxkUtjjp3mh5 1hK2spvi5knckOrXb21vTqzJ2uiSuFlvhZ6zfa+bm0LtRDe/vN9Kqfr3jujbqjXRoR xoW/2mtKKzIqdIGO63coqbdrdU+HoSarOXwLByxo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Miguel Ojeda , Tim Murray , Simon MacMullen , Greg Hackmann , Nick Desaulniers , "Steven Rostedt (VMware)" Subject: [PATCH 4.9 079/212] tracepoint: Mark __tracepoint_strings __used Date: Thu, 20 Aug 2020 11:20:52 +0200 Message-Id: <20200820091606.358577989@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091602.251285210@linuxfoundation.org> References: <20200820091602.251285210@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers commit f3751ad0116fb6881f2c3c957d66a9327f69cefb upstream. __tracepoint_string's have their string data stored in .rodata, and an address to that data stored in the "__tracepoint_str" section. Functions that refer to those strings refer to the symbol of the address. Compiler optimization can replace those address references with references directly to the string data. If the address doesn't appear to have other uses, then it appears dead to the compiler and is removed. This can break the /tracing/printk_formats sysfs node which iterates the addresses stored in the "__tracepoint_str" section. Like other strings stored in custom sections in this header, mark these __used to inform the compiler that there are other non-obvious users of the address, so they should still be emitted. Link: https://lkml.kernel.org/r/20200730224555.2142154-2-ndesaulniers@google.com Cc: Ingo Molnar Cc: Miguel Ojeda Cc: stable@vger.kernel.org Fixes: 102c9323c35a8 ("tracing: Add __tracepoint_string() to export string pointers") Reported-by: Tim Murray Reported-by: Simon MacMullen Suggested-by: Greg Hackmann Signed-off-by: Nick Desaulniers Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- include/linux/tracepoint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -314,7 +314,7 @@ extern void syscall_unregfunc(void); static const char *___tp_str __tracepoint_string = str; \ ___tp_str; \ }) -#define __tracepoint_string __attribute__((section("__tracepoint_str"))) +#define __tracepoint_string __attribute__((section("__tracepoint_str"), used)) #else /* * tracepoint_string() is used to save the string address for userspace