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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 D71EDC2D0C6 for ; Fri, 27 Dec 2019 17:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAFA2206CB for ; Fri, 27 Dec 2019 17:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468933; bh=eetheB3u83n9I/VdONtoQoCdmqijr+yPMsRlS6R5A9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ATcZP4hIQu2ItHWRfi7nZOyECWLEhd3kVdlbx5Kpd6u8MQTnqckmpO3kj8CzqjFjw hq/+TMuOQm0L8QtsccS4sTYVH1ox7N2tHkaJ3rNwWGWtVSwxo9yJY9ldzOx0dz1PXF yjqpsST1IemzakR2MEZbMXHMKi6icLEHc9oxipaQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728691AbfL0Rsn (ORCPT ); Fri, 27 Dec 2019 12:48:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:42894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbfL0Roj (ORCPT ); Fri, 27 Dec 2019 12:44:39 -0500 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 6F78C21927; Fri, 27 Dec 2019 17:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468678; bh=eetheB3u83n9I/VdONtoQoCdmqijr+yPMsRlS6R5A9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MhMnbGsnc/gEcfKbtkkn8/0ngTR+ZIxsihjdbWsa4qkFPHiOezTqP29ucZykVEEt5 ZwfZsY2eOc43tIBwy2bk826C3W2MLFTFFDQVaHRWqoyHJ1NzPQKE3HjBsg3CQXqAz5 gDXa4Grr68MDgiwf5jMh99Ty7Q3SHmzWu6tMtzvs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Daniel T. Lee" , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 37/84] samples: bpf: Replace symbol compare of trace_event Date: Fri, 27 Dec 2019 12:43:05 -0500 Message-Id: <20191227174352.6264-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227174352.6264-1-sashal@kernel.org> References: <20191227174352.6264-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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; } -- 2.20.1