Revision d92da1fbb72490f999b7d0e809d13d0d52dc78ac authored by Linus Torvalds on 21 March 2019, 18:48:06 UTC, committed by Linus Torvalds on 21 March 2019, 18:48:06 UTC
Pull arm64 fixes from Catalin Marinas: "Mostly fixes apart from the kprobe blacklist checking which was deferred because of conflicting with a fix merged after I pinned the arm64 for-next/core branch (f2b3d8566d81 "arm64: kprobe: Always blacklist the KVM world-switch code"). Summary: - Update the kprobe blacklist checking for arm64. This was supposed to be queued during the merging window but, due to conflicts, it was deferred post -rc1 - Extend the Fujitsu erratum 010001 workaround to A64FX v1r0 - Whitelist HiSilicon Taishan v110 CPUs as not susceptible to Meltdown - Export save_stack_trace_regs() - Remove obsolete selection of MULTI_IRQ_HANDLER" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: remove obsolete selection of MULTI_IRQ_HANDLER arm64: kpti: Whitelist HiSilicon Taishan v110 CPUs arm64: Add MIDR encoding for HiSilicon Taishan CPUs arm64/stacktrace: Export save_stack_trace_regs() arm64: apply workaround on A64FX v1r0 arm64: kprobes: Use arch_populate_kprobe_blacklist() arm64: kprobes: Move exception_text check in blacklist arm64: kprobes: Remove unneeded RODATA check arm64: kprobes: Move extable address check into arch_prepare_kprobe()
notifier-error-inject.c
#include <linux/module.h>
#include "notifier-error-inject.h"
static int debugfs_errno_set(void *data, u64 val)
{
*(int *)data = clamp_t(int, val, -MAX_ERRNO, 0);
return 0;
}
static int debugfs_errno_get(void *data, u64 *val)
{
*val = *(int *)data;
return 0;
}
DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set,
"%lld\n");
static struct dentry *debugfs_create_errno(const char *name, umode_t mode,
struct dentry *parent, int *value)
{
return debugfs_create_file(name, mode, parent, value, &fops_errno);
}
static int notifier_err_inject_callback(struct notifier_block *nb,
unsigned long val, void *p)
{
int err = 0;
struct notifier_err_inject *err_inject =
container_of(nb, struct notifier_err_inject, nb);
struct notifier_err_inject_action *action;
for (action = err_inject->actions; action->name; action++) {
if (action->val == val) {
err = action->error;
break;
}
}
if (err)
pr_info("Injecting error (%d) to %s\n", err, action->name);
return notifier_from_errno(err);
}
struct dentry *notifier_err_inject_dir;
EXPORT_SYMBOL_GPL(notifier_err_inject_dir);
struct dentry *notifier_err_inject_init(const char *name, struct dentry *parent,
struct notifier_err_inject *err_inject, int priority)
{
struct notifier_err_inject_action *action;
umode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
struct dentry *dir;
struct dentry *actions_dir;
err_inject->nb.notifier_call = notifier_err_inject_callback;
err_inject->nb.priority = priority;
dir = debugfs_create_dir(name, parent);
if (!dir)
return ERR_PTR(-ENOMEM);
actions_dir = debugfs_create_dir("actions", dir);
if (!actions_dir)
goto fail;
for (action = err_inject->actions; action->name; action++) {
struct dentry *action_dir;
action_dir = debugfs_create_dir(action->name, actions_dir);
if (!action_dir)
goto fail;
/*
* Create debugfs r/w file containing action->error. If
* notifier call chain is called with action->val, it will
* fail with the error code
*/
if (!debugfs_create_errno("error", mode, action_dir,
&action->error))
goto fail;
}
return dir;
fail:
debugfs_remove_recursive(dir);
return ERR_PTR(-ENOMEM);
}
EXPORT_SYMBOL_GPL(notifier_err_inject_init);
static int __init err_inject_init(void)
{
notifier_err_inject_dir =
debugfs_create_dir("notifier-error-inject", NULL);
if (!notifier_err_inject_dir)
return -ENOMEM;
return 0;
}
static void __exit err_inject_exit(void)
{
debugfs_remove_recursive(notifier_err_inject_dir);
}
module_init(err_inject_init);
module_exit(err_inject_exit);
MODULE_DESCRIPTION("Notifier error injection module");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...