signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency

It helps to know which part of the siginfo structure the siginfo_layout
value is talking about.

v1: https://lkml.kernel.org/r/m18s4zs7nu.fsf_-_@fess.ebiederm.org
Link: https://lkml.kernel.org/r/20210505141101.11519-9-ebiederm@xmission.com
Acked-by: Marco Elver <elver@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/signalfd.c b/fs/signalfd.c
index e87e59581653cdd2cba5cea95f14e50c00351e4f..83130244f6530c5ef8d868a111433c545c209977 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -132,7 +132,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
                new.ssi_addr = (long) kinfo->si_addr;
                new.ssi_addr_lsb = (short) kinfo->si_addr_lsb;
                break;
-       case SIL_PERF_EVENT:
+       case SIL_FAULT_PERF_EVENT:
                new.ssi_addr = (long) kinfo->si_addr;
                new.ssi_perf = kinfo->si_perf;
                break;

diff --git a/include/linux/signal.h b/include/linux/signal.h
index 5160fd45e5cab878b2393b10ee7336f8a1a9fea9..ed896d790e466098c34fadf554d926d4a5388c8d 100644 (file)
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -44,7 +44,7 @@ enum siginfo_layout {
        SIL_FAULT_MCEERR,
        SIL_FAULT_BNDERR,
        SIL_FAULT_PKUERR,
-       SIL_PERF_EVENT,
+       SIL_FAULT_PERF_EVENT,
        SIL_CHLD,
        SIL_RT,
        SIL_SYS,

diff --git a/kernel/signal.c b/kernel/signal.c
index 7eaa8d84db4cb5cedcc567edd8305660611147ed..697c5fe58db86b154da204374c4bf30cda9ec3f0 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1198,7 +1198,7 @@ static inline bool has_si_pid_and_uid(struct kernel_siginfo *info)
        case SIL_FAULT_MCEERR:
        case SIL_FAULT_BNDERR:
        case SIL_FAULT_PKUERR:
-       case SIL_PERF_EVENT:
+       case SIL_FAULT_PERF_EVENT:
        case SIL_SYS:
                ret = false;
                break;
@@ -2553,7 +2553,7 @@ static void hide_si_addr_tag_bits(struct ksignal *ksig)
        case SIL_FAULT_MCEERR:
        case SIL_FAULT_BNDERR:
        case SIL_FAULT_PKUERR:
-       case SIL_PERF_EVENT:
+       case SIL_FAULT_PERF_EVENT:
                ksig->info.si_addr = arch_untagged_si_addr(
                        ksig->info.si_addr, ksig->sig, ksig->info.si_code);
                break;
@@ -3243,7 +3243,7 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code)
                                layout = SIL_FAULT_PKUERR;
 #endif
                        else if ((sig == SIGTRAP) && (si_code == TRAP_PERF))
-                               layout = SIL_PERF_EVENT;
+                               layout = SIL_FAULT_PERF_EVENT;
                }
                else if (si_code <= NSIGPOLL)
                        layout = SIL_POLL;
@@ -3365,7 +3365,7 @@ void copy_siginfo_to_external32(struct compat_siginfo *to,
                to->si_addr = ptr_to_compat(from->si_addr);
                to->si_pkey = from->si_pkey;
                break;
-       case SIL_PERF_EVENT:
+       case SIL_FAULT_PERF_EVENT:
                to->si_addr = ptr_to_compat(from->si_addr);
                to->si_perf = from->si_perf;
                break;
@@ -3441,7 +3441,7 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to,
                to->si_addr = compat_ptr(from->si_addr);
                to->si_pkey = from->si_pkey;
                break;
-       case SIL_PERF_EVENT:
+       case SIL_FAULT_PERF_EVENT:
                to->si_addr = compat_ptr(from->si_addr);
                to->si_perf = from->si_perf;
                break;