From patchwork Sat Jan 11 09:50:08 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: 234102 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 1ADA6C33C9E for ; Sat, 11 Jan 2020 10:16:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E406A2084D for ; Sat, 11 Jan 2020 10:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737807; bh=pIeuKxBRNWzEaQmzxMydhump/5ZTA/GnZiBi09gGPqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Wn8z2zoIVvZG/oQr8UA0Uzos364efZNKTWHphGucSUTwbuwVjoeVG2PnrZSXilMP/ hgDFe1XPg8l3sj4LTGojdFlRE4YnJ5cnbKdHx633Jn34oPWP0w91wP/J4PBa2uc1Da Bz3rVmD0JwEbu+M9Jo8UO0TmH0gZQzT/P/PtfDoE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729253AbgAKKQp (ORCPT ); Sat, 11 Jan 2020 05:16:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:60232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbgAKKQp (ORCPT ); Sat, 11 Jan 2020 05:16:45 -0500 Received: from localhost (unknown [62.119.166.9]) (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 A7F442084D; Sat, 11 Jan 2020 10:16:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737804; bh=pIeuKxBRNWzEaQmzxMydhump/5ZTA/GnZiBi09gGPqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1ng/yEpDyMS9GE5v8iQ7cb9Btm+V6PqsV6rGMqHZXxe9QGdNmonQ33BLeWZKPnRct uNTzjdYQxHeKZz7OlcwVWsaK3wckg4eGlEBEOiP7Xn64zScrIsrMPXRrroY/nM9fnw lSd/Xcx57c5ZlY/6jnESEzWmfE5+9emDZQWfJGLw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Daniel T. Lee" , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.19 31/84] samples: bpf: Replace symbol compare of trace_event Date: Sat, 11 Jan 2020 10:50:08 +0100 Message-Id: <20200111094857.969838944@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094845.328046411@linuxfoundation.org> References: <20200111094845.328046411@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: Daniel T. Lee [ Upstream commit bba1b2a890253528c45aa66cf856f289a215bfbc ] Previously, when this sample is added, commit 1c47910ef8013 ("samples/bpf: add perf_event+bpf example"), a symbol 'sys_read' and 'sys_write' has been used without no prefixes. But currently there are no exact symbols with these under kallsyms and this leads to failure. This commit changes exact compare to substring compare to keep compatible with exact symbol or prefixed symbol. Fixes: 1c47910ef8013 ("samples/bpf: add perf_event+bpf example") Signed-off-by: Daniel T. Lee Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20191205080114.19766-2-danieltimlee@gmail.com Signed-off-by: Sasha Levin --- samples/bpf/trace_event_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c index d08046ab81f0..d33022447d6b 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -35,9 +35,9 @@ static void print_ksym(__u64 addr) return; sym = ksym_search(addr); printf("%s;", sym->name); - if (!strcmp(sym->name, "sys_read")) + if (!strstr(sym->name, "sys_read")) sys_read_seen = true; - else if (!strcmp(sym->name, "sys_write")) + else if (!strstr(sym->name, "sys_write")) sys_write_seen = true; }