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=-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=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 15489C33C9E for ; Sat, 11 Jan 2020 10:04:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D20A520848 for ; Sat, 11 Jan 2020 10:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737078; bh=Xw8zjt2sT0vXa8UdImVNyoZlzgzedmmBGyzOUTYEu3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vykl7iVFwvXW3PQPq2iCIs2Ep9rNtSWJ1SY9I7MZ/ZZJoY0WKXDE7iPMnQdJ9HOwF eYGu+eAm0/wsteJoXbwrub2GE6LSNGMl51AQm0FAJu1b/oxl8ywNLwW33fy3GXkXxe nzJSA6Xyla6ZI1v2TkChDTXsH2N2u1RtW3IlGoCo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729059AbgAKKEh (ORCPT ); Sat, 11 Jan 2020 05:04:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:37064 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729140AbgAKKEg (ORCPT ); Sat, 11 Jan 2020 05:04:36 -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 92AA420848; Sat, 11 Jan 2020 10:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737075; bh=Xw8zjt2sT0vXa8UdImVNyoZlzgzedmmBGyzOUTYEu3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2CeMdZBdOWF8aj2Mq4cEp0Wh0By+55KBHZ6CDR/pdNkswlc4rhKJJ0O7oromPnO0r IWeGFKQio77B3qtx0D7N41+gJU0YlZgbM/WVWItifySMBL8k7M+Plv8tVvonhvMjL5 KC52cx9cgX4PnN8F481OO356aYbMaSCYcs8FJFB4= 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.9 66/91] samples: bpf: Replace symbol compare of trace_event Date: Sat, 11 Jan 2020 10:49:59 +0100 Message-Id: <20200111094909.563374695@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 9a130d31ecf2..6fbb5eb9daf3 100644 --- a/samples/bpf/trace_event_user.c +++ b/samples/bpf/trace_event_user.c @@ -33,9 +33,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