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 4F604C2D0CE for ; Fri, 27 Dec 2019 18:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2210021775 for ; Fri, 27 Dec 2019 18:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469956; bh=w38RP9g4pVLYTTwff97CbeX434OGzPXQHxpZRwf5MVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sndstzf6bWZCPsXrHcylLISJsCcqx0YU6VA8jPDE+H/RVvhFc93CSJbqMt99JiyGJ JdMgDDqYDq1GoV9QaXFaPZzLBcStR7fQYD1YggxrRpsWCXtvW/Xq+4CXQVenuyZZVl yatjPRE250KHcciBE+QU9Czn9K/bunPkNgC5f2wI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728341AbfL0SC4 (ORCPT ); Fri, 27 Dec 2019 13:02:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:59904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728298AbfL0SCy (ORCPT ); Fri, 27 Dec 2019 13:02:54 -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 8CA8920CC7; Fri, 27 Dec 2019 18:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469773; bh=w38RP9g4pVLYTTwff97CbeX434OGzPXQHxpZRwf5MVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hBk7QFQDIKLeqLhbdEiV/j955+FA0Ulde4v8NoPb5ln74MFbuHw18+BvzoP7u97MY mwjxsI2QuX/Sfc8WX/3VIMq1gEvu0VnvttlpemfgNREptdo0IGpNnHijIRCcY4nhvK DhVkIM7yGtIBNuJH1XSu1NNUnOZ6cTmvx+yRz+y0= 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.14 24/57] samples: bpf: Replace symbol compare of trace_event Date: Fri, 27 Dec 2019 13:01:49 -0500 Message-Id: <20191227180222.7076-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227180222.7076-1-sashal@kernel.org> References: <20191227180222.7076-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 c7d525e5696e..8c7445874662 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -34,9 +34,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