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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 ECB59C43381 for ; Wed, 27 Feb 2019 03:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA982218D0 for ; Wed, 27 Feb 2019 03:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I9oqjtrL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729274AbfB0DGE (ORCPT ); Tue, 26 Feb 2019 22:06:04 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:33184 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728942AbfB0DGE (ORCPT ); Tue, 26 Feb 2019 22:06:04 -0500 Received: by mail-qk1-f196.google.com with SMTP id x9so9052675qkf.0 for ; Tue, 26 Feb 2019 19:06:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pdJPrqGBjO2qtQlSLZdWCvJ0pNdayj7KUs+eR9Ng4Ko=; b=I9oqjtrLIjj/+CeeeRpUDTtiD3ulDb3c/gpSZhkNKagzMT/18jYLSLs44OBnr0vd8A VRNmG4kLC1ndyAV7FmdssLMpjjYA8sG0EZzFDnDXQd2/GcUwGqwDDCa4CP2HJdj9QhRq /dBxvbxm37XcAW/9sd4S6vUtsx7V3KpL9d7LL+z2+fDaL0gDdVVghtoExpoguRD9Q5Ai D23tZD+GPVOi2pxJvUDN7q5snfMls5p11DBSJUE7DxI8k6EpZ25XnXmRlfkp2LZlOqLw OEdYSxVtyZKeiHT7n18pKYaS7USY4qM05iPjVgHKavjRwfKhMjF74J/RtlpB2D28xH43 vC9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pdJPrqGBjO2qtQlSLZdWCvJ0pNdayj7KUs+eR9Ng4Ko=; b=cZsxR9pP631kYlI6o3UEtTlEqvoPG6Ygw8zzD3qygAqYymRa8B3jgUKl4+28mLHvCK hPIEKtu0vkAxjpzULQ4KxTqWXC3dRDXKXqPUbVYVgyOYKraCYdGaVGlsEipg3JrOuP8U 2mue+JfkmHhRLQ9IpcVMTnps1GEuO7YzrrLoxcpb7KC5BTs6ssaJAm8SAtjwuUxLHekc qnTUjXp5nf0RTB8sNwfbzqZpwI0K5KY2sertKl7tyrsHGe75rI0/ckOSb72Qo3LRHXUc Q/9SsByUYJ5PMB98u67yBMnG9PpfbZ180MBN2mCVU9+JP0uIRzGbmtpRkKweFxwMEzp8 SpxQ== X-Gm-Message-State: AHQUAuaQ7u9N6bG9FV7JhoeEybEQA7wg+nSX30o7XBESmIhWoY4ix7Mn Bxdy+ApRlCfvI2DwKaV6u3x2SPFW3umJ X-Google-Smtp-Source: AHgI3IbqIJQYCRRYm+bxgiWqirAumjIT/c7s/VYzrpR5m7tUwz9GMYyfIGyE2n3iOYUqSVeWG2scXQ== X-Received: by 2002:a37:674c:: with SMTP id b73mr566404qkc.184.1551236762971; Tue, 26 Feb 2019 19:06:02 -0800 (PST) Received: from Clair.colubris.lan (50-200-240-2-static.hfc.comcastbusiness.net. [50.200.240.2]) by smtp.gmail.com with ESMTPSA id 70sm17703687qkb.39.2019.02.26.19.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 19:06:02 -0800 (PST) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov Cc: netdev@vger.kernel.org Subject: [PATCH] samples: bpf: fix: broken sample regarding removed function Date: Tue, 26 Feb 2019 22:05:59 -0500 Message-Id: <20190227030559.19672-1-danieltimlee@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, running sample "task_fd_query" and "tracex3" occurs the following error. On kernel v5.0-rc* this sample will be unavailable due to the removal of function 'blk_start_request' at commit "a1ce35f". (function removed, as "Single Queue IO scheduler" no longer exists) $ sudo ./task_fd_query failed to create kprobe 'blk_start_request' error 'No such file or directory' This commit will change the function 'blk_start_request' to 'blk_mq_start_request' to fix the broken sample. Signed-off-by: Daniel T. Lee --- samples/bpf/task_fd_query_kern.c | 2 +- samples/bpf/task_fd_query_user.c | 2 +- samples/bpf/tracex3_kern.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/bpf/task_fd_query_kern.c b/samples/bpf/task_fd_query_kern.c index f4b0a9ea674d..5f1b2cdababd 100644 --- a/samples/bpf/task_fd_query_kern.c +++ b/samples/bpf/task_fd_query_kern.c @@ -4,7 +4,7 @@ #include #include "bpf_helpers.h" -SEC("kprobe/blk_start_request") +SEC("kprobe/blk_mq_start_requset") int bpf_prog1(struct pt_regs *ctx) { return 0; diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c index 8381d792f138..a6e6c76e50c9 100644 --- a/samples/bpf/task_fd_query_user.c +++ b/samples/bpf/task_fd_query_user.c @@ -311,7 +311,7 @@ int main(int argc, char **argv) } /* test two functions in the corresponding *_kern.c file */ - CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_start_request", + CHECK_AND_RET(test_debug_fs_kprobe(0, "blk_mq_start_requset", BPF_FD_TYPE_KPROBE)); CHECK_AND_RET(test_debug_fs_kprobe(1, "blk_account_io_completion", BPF_FD_TYPE_KRETPROBE)); diff --git a/samples/bpf/tracex3_kern.c b/samples/bpf/tracex3_kern.c index 9974c3d7c18b..4378492a970a 100644 --- a/samples/bpf/tracex3_kern.c +++ b/samples/bpf/tracex3_kern.c @@ -20,7 +20,7 @@ struct bpf_map_def SEC("maps") my_map = { /* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe * example will no longer be meaningful */ -SEC("kprobe/blk_start_request") +SEC("kprobe/blk_mq_start_requset") int bpf_prog1(struct pt_regs *ctx) { long rq = PT_REGS_PARM1(ctx); -- 2.17.1