* + error-injection-remove-ei_etype_none.patch added to mm-nonmm-unstable branch
@ 2022-12-15 23:01 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-12-15 23:01 UTC (permalink / raw)
To: mm-commits, rostedt, revest, peterz, mark.rutland, kpsingh,
keescook, jpoimboe, hch, gregkh, corbet, clm, bp,
alexei.starovoitov, mhiramat, akpm
The patch titled
Subject: error-injection: remove EI_ETYPE_NONE
has been added to the -mm mm-nonmm-unstable branch. Its filename is
error-injection-remove-ei_etype_none.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/error-injection-remove-ei_etype_none.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Subject: error-injection: remove EI_ETYPE_NONE
Date: Mon, 12 Dec 2022 11:46:44 +0900
Patch series "error-injection: Clarify the requirements of error
injectable functions".
Patches for clarifying the requirement of error injectable functions and
to remove the confusing EI_ETYPE_NONE.
This patch (of 2):
Since the EI_ETYPE_NONE is confusing type, replace it with appropriate
errno. The EI_ETYPE_NONE has been introduced for a dummy (error) value,
but it can mislead people that they can use ALLOW_ERROR_INJECTION(func,
NONE). So remove it from the EI_ETYPE and use appropriate errno instead.
Link: https://lkml.kernel.org/r/167081319306.387937.10079195394503045678.stgit@devnote3
Link: https://lkml.kernel.org/r/167081320421.387937.4259807348852421112.stgit@devnote3
Fixes: 663faf9f7bee ("error-injection: Add injectable error types")
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Chris Mason <clm@meta.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Florent Revest <revest@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/asm-generic/error-injection.h | 1 -
include/linux/error-injection.h | 2 +-
lib/error-inject.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
--- a/include/asm-generic/error-injection.h~error-injection-remove-ei_etype_none
+++ a/include/asm-generic/error-injection.h
@@ -4,7 +4,6 @@
#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
enum {
- EI_ETYPE_NONE, /* Dummy value for undefined case */
EI_ETYPE_NULL, /* Return NULL if failure */
EI_ETYPE_ERRNO, /* Return -ERRNO if failure */
EI_ETYPE_ERRNO_NULL, /* Return -ERRNO or NULL if failure */
--- a/include/linux/error-injection.h~error-injection-remove-ei_etype_none
+++ a/include/linux/error-injection.h
@@ -19,7 +19,7 @@ static inline bool within_error_injectio
static inline int get_injectable_error_type(unsigned long addr)
{
- return EI_ETYPE_NONE;
+ return -EOPNOTSUPP;
}
#endif
--- a/lib/error-inject.c~error-injection-remove-ei_etype_none
+++ a/lib/error-inject.c
@@ -40,7 +40,7 @@ bool within_error_injection_list(unsigne
int get_injectable_error_type(unsigned long addr)
{
struct ei_entry *ent;
- int ei_type = EI_ETYPE_NONE;
+ int ei_type = -EINVAL;
mutex_lock(&ei_mutex);
list_for_each_entry(ent, &error_injection_list, list) {
_
Patches currently in -mm which might be from mhiramat@kernel.org are
error-injection-remove-ei_etype_none.patch
docs-fault-injection-add-requirements-of-error-injectable-functions.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-15 23:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-15 23:01 + error-injection-remove-ei_etype_none.patch added to mm-nonmm-unstable branch Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.