From patchwork Thu Jan 11 00:48:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 858663 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zH6hr39kcz9s7M for ; Thu, 11 Jan 2018 11:49:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752902AbeAKAtV (ORCPT ); Wed, 10 Jan 2018 19:49:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:49546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827AbeAKAtT (ORCPT ); Wed, 10 Jan 2018 19:49:19 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 D1A852173D; Thu, 11 Jan 2018 00:49:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1A852173D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: Alexei Starovoitov , Josef Bacik Cc: rostedt@goodmis.org, mingo@redhat.com, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ast@kernel.org, kernel-team@fb.com, daniel@iogearbox.net, linux-btrfs@vger.kernel.org, darrick.wong@oracle.com, mhiramat@kernel.org, Josef Bacik , Akinobu Mita Subject: [PATCH bpf-next v4 0/5] Separate error injection table from kprobes Date: Thu, 11 Jan 2018 09:48:54 +0900 Message-Id: <151563173430.628.5070705610243278195.stgit@devbox> X-Mailer: git-send-email 2.13.6 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, Here are the 4th version of patches to moving error injection table from kprobes. This series changes error-injection.h including points for ALLOW_ERROR_INJECTION macro and add Reviewed-by from Josef Bacik (except [3/5]). Here is the previous version: https://patchwork.ozlabs.org/cover/858176/ Changes in v3: - [3/5] Change error-injection.h including points to each file which uses ALLOW_ERROR_INJECTION instead of bpf.h - Add Reviewed-by from Josef Bacik except [3/5] Thank you, --- Masami Hiramatsu (5): tracing/kprobe: bpf: Check error injectable event is on function entry tracing/kprobe: bpf: Compare instruction pointer with original one error-injection: Separate error-injection from kprobe error-injection: Add injectable error types error-injection: Support fault injection framework Documentation/fault-injection/fault-injection.txt | 62 +++++ arch/Kconfig | 2 arch/x86/Kconfig | 2 arch/x86/include/asm/error-injection.h | 13 + arch/x86/include/asm/kprobes.h | 4 arch/x86/kernel/kprobes/ftrace.c | 14 - arch/x86/lib/Makefile | 1 arch/x86/lib/error-inject.c | 19 ++ fs/btrfs/disk-io.c | 4 fs/btrfs/free-space-cache.c | 4 include/asm-generic/error-injection.h | 35 +++ include/asm-generic/vmlinux.lds.h | 14 + include/linux/bpf.h | 11 - include/linux/error-injection.h | 27 ++ include/linux/kprobes.h | 1 include/linux/module.h | 7 - kernel/Makefile | 1 kernel/fail_function.c | 217 +++++++++++++++++++ kernel/kprobes.c | 163 -------------- kernel/module.c | 8 - kernel/trace/Kconfig | 4 kernel/trace/bpf_trace.c | 11 - kernel/trace/trace_kprobe.c | 33 +-- kernel/trace/trace_probe.h | 12 + lib/Kconfig.debug | 14 + lib/Makefile | 1 lib/error-inject.c | 242 +++++++++++++++++++++ 27 files changed, 681 insertions(+), 245 deletions(-) create mode 100644 arch/x86/include/asm/error-injection.h create mode 100644 arch/x86/lib/error-inject.c create mode 100644 include/asm-generic/error-injection.h create mode 100644 include/linux/error-injection.h create mode 100644 kernel/fail_function.c create mode 100644 lib/error-inject.c -- Masami Hiramatsu (Linaro)