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 698A3C43381 for ; Wed, 27 Feb 2019 07:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37F4E21852 for ; Wed, 27 Feb 2019 07:52:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AsWCcH4j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729412AbfB0Hwd (ORCPT ); Wed, 27 Feb 2019 02:52:33 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:39772 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726702AbfB0Hwc (ORCPT ); Wed, 27 Feb 2019 02:52:32 -0500 Received: by mail-qk1-f196.google.com with SMTP id x6so9302420qki.6 for ; Tue, 26 Feb 2019 23:52:31 -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=vNI7ezdM0+eSMr6xWM4JzzhVELYR4OJC3RY8nkxlPQE=; b=AsWCcH4jUrN1UA1p7bvnAfVbhkq7+LhuRFyLUrNzkgBf7+RXlNIsOyxV4mi3i4ArUz zNRiZbQQncvw+pKqMMmpvJJnUfzxxY7Ze3sUZWXu+P2nm4sNWS5GgWPAYQz+raqFMN7O /7gO7VrIktB/SJXA5FNPe242dhGkslEzyjM+Ct50vEPrVLmSuvhcmfGn8JOfUVtNoMHO pq6XoYsrB9kDSKRbqyXQRv4gf+0cLYlQ+7ZoRSTB1VXQSfIJqUpx6C3vsam0UuW2R2EP 9bIF0N55UV/Pddc0QRVd03Pvj7SJcAwQghvB7eDzmDaMw6LyriRmlgJF7kalvOi+Vapm N03w== 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=vNI7ezdM0+eSMr6xWM4JzzhVELYR4OJC3RY8nkxlPQE=; b=nT8fQzOnR4tuEQBxsgD/V8+vyi26yplxOAWt+jnGJ504aQAhiDeWq7vUFLGYPw+SS3 j472mIlqK8E92fUn+XJq6P5lclu+rWWd2PYoHNeh6YezIB5mHFXn1xhg/jZEpClTdiLp +dxLzdK1F6cAXRS4atkLVYsGk+oEHvustmBqjdou9WAmoo+CjbAHwq4WMhJNP823bKwk iKNpkdyG7vAOg+GbM7HWvc4m+0PITrwUKYHlrekd4FBSvjI6GmJtPSI/+fYSoAiw9Ogp kHHbZqZvAuJblnPuSeECDvkTsrgJ6Lo442b9Y9GyQZBiFOBxhaEHna4xgnlhKz3C/1tR naPg== X-Gm-Message-State: AHQUAuaIExpewfI4fBGA43dekPbJtxSqaD+0mzAYoz7SV4hicHSfH5ED 3Aq0AtqXgd5e19buAhJC2u0hNnD+5hp8 X-Google-Smtp-Source: APXvYqxWnURRpwdnXn9HX6QDGOzrX72+2FTRZgvEn/gQk1hprW6YC7opE4Uw+eV8UxAIpqkYiSPaAg== X-Received: by 2002:a37:4d52:: with SMTP id a79mr1209694qkb.75.1551253950980; Tue, 26 Feb 2019 23:52:30 -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 o3sm9214751qte.55.2019.02.26.23.52.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 23:52:30 -0800 (PST) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov Cc: netdev@vger.kernel.org Subject: [PATCH V2] samples: bpf: fix: broken sample regarding removed function Date: Wed, 27 Feb 2019 02:52:26 -0500 Message-Id: <20190227075226.4409-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 --- V2 : typo fixed --- 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_request") 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_request", 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_request") int bpf_prog1(struct pt_regs *ctx) { long rq = PT_REGS_PARM1(ctx); -- 2.17.1