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=-23.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 846D4C433B4 for ; Sat, 1 May 2021 10:46:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F0F5613E8 for ; Sat, 1 May 2021 10:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231833AbhEAKqw (ORCPT ); Sat, 1 May 2021 06:46:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbhEAKqv (ORCPT ); Sat, 1 May 2021 06:46:51 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD27DC06138D for ; Sat, 1 May 2021 03:46:01 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id w6-20020a4a9d060000b02901f9175244e7so191534ooj.9 for ; Sat, 01 May 2021 03:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dER8WYp4YE8meKl/Etoz17guMOCTTHD//33hX1fp/nc=; b=IMwXPYTHlYOoD5VsAO4X3ijzUYSqjzTkipTMXSJAa4Ec/Z91vBXmKGZpM1LZjGeTfi A2o8QHkEc0HHPO6HcyVHnWNCcxhjLYl8fWYOkaGxOeT4X9gjXlrseEIRapNH06M1B6X4 qgtgd/nxRmuOBVpKTW2uycdyqLuBlpjyjlEjbIeY+HjuqazrkOFRppFAukWodMJjucbM bS37OSIMjLyekZH3aBAYORVOonEqHQJMQIxfJsX8ODMCx0YvN3l6Kgrsb+eVbO+XZehq 2cPOsLocLN9qX2CesXNgiS8rbKeuUPpSsvSo9ixyAf/4Fgs9AhVmnYqvR6B5Spba4fhd hucQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dER8WYp4YE8meKl/Etoz17guMOCTTHD//33hX1fp/nc=; b=jOPbriMKvFcodnuzlcilz06dlyaS3l88VYaxB2bGUm/gHiB0LsE9WZFj/LWo3I2yBu hcu1nb3L33k3UoWOkbER4qkJDdNVUI+NZP6Ij2W8UYkzrPyKAJ3TYtFsvXNBrCxIQS6j SBc55tM9GQUI98bcUde7vFtvWthGjxgenOV3Jt8Z3/Gm4Uxoi4vbPI5RdfY/NypPYE7x WChtcHKV0Gi8aP7RnKVZl45CUAQkcg/fDhIlGEntoXry7drkHbL48k+7Z0tsQnlA+/yF 36/zBMfXZntK/1OhSMP7FLO6ktBw/UcbH/FxDoK+BBcYY73KCiv5iF5Tv9VzOBF9lkNd 4pVg== X-Gm-Message-State: AOAM5301CIEfX0leArDe/tZmEGMAdCVld/0kXh+K+L5Vv7wxqo0v3JLW j0gQ3KzF7+aUWdOixQRwEsxuDOcrbrjbnJO7TnPTUw== X-Google-Smtp-Source: ABdhPJwyZTajujDBWMyTAvPK3N6DFZiw8JB3v4N76NVXdHr3uBrbQQQI6dyNnFx9xWQBWMw406Q9oqavmAutfHaQ36Q= X-Received: by 2002:a4a:3511:: with SMTP id l17mr7963113ooa.36.1619865960952; Sat, 01 May 2021 03:46:00 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Marco Elver Date: Sat, 1 May 2021 12:45:49 +0200 Message-ID: Subject: Re: [PATCH 6/3] signal: Factor force_sig_perf out of perf_sigtrap To: "Eric W. Biederman" Cc: Arnd Bergmann , Florian Weimer , "David S. Miller" , Peter Zijlstra , Ingo Molnar , Thomas Gleixner , Peter Collingbourne , Dmitry Vyukov , Alexander Potapenko , sparclinux , linux-arch , Linux Kernel Mailing List , Linux API , kasan-dev Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Sat, 1 May 2021 at 01:43, Eric W. Biederman wrote: > > Separate generating the signal from deciding it needs to be sent. > > Signed-off-by: "Eric W. Biederman" > --- > include/linux/sched/signal.h | 1 + > kernel/events/core.c | 11 ++--------- > kernel/signal.c | 13 +++++++++++++ > 3 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h > index 7daa425f3055..1e2f61a1a512 100644 > --- a/include/linux/sched/signal.h > +++ b/include/linux/sched/signal.h > @@ -318,6 +318,7 @@ int send_sig_mceerr(int code, void __user *, short, struct task_struct *); > > int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper); > int force_sig_pkuerr(void __user *addr, u32 pkey); > +int force_sig_perf(void __user *addr, u32 type, u64 sig_data); > > int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno); > int send_sig_fault_trapno(int sig, int code, void __user *addr, int trapno, > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 928b166d888e..48ea8863183b 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -6394,8 +6394,6 @@ void perf_event_wakeup(struct perf_event *event) > > static void perf_sigtrap(struct perf_event *event) > { > - struct kernel_siginfo info; > - > /* > * We'd expect this to only occur if the irq_work is delayed and either > * ctx->task or current has changed in the meantime. This can be the > @@ -6410,13 +6408,8 @@ static void perf_sigtrap(struct perf_event *event) > if (current->flags & PF_EXITING) > return; > > - clear_siginfo(&info); > - info.si_signo = SIGTRAP; > - info.si_code = TRAP_PERF; > - info.si_errno = event->attr.type; > - info.si_perf = event->attr.sig_data; > - info.si_addr = (void __user *)event->pending_addr; > - force_sig_info(&info); > + force_sig_perf((void __user *)event->pending_addr, > + event->attr.type, event->attr.sig_data); > } > > static void perf_pending_event_disable(struct perf_event *event) > diff --git a/kernel/signal.c b/kernel/signal.c > index 690921960d8b..5b1ad7f080ab 100644 > --- a/kernel/signal.c > +++ b/kernel/signal.c > @@ -1753,6 +1753,19 @@ int force_sig_pkuerr(void __user *addr, u32 pkey) > } > #endif > > +int force_sig_perf(void __user *pending_addr, u32 type, u64 sig_data) s/pending_addr/addr/ to match force_sig_perf() declaration. > +{ > + struct kernel_siginfo info; > + > + clear_siginfo(&info); > + info.si_signo = SIGTRAP; > + info.si_errno = type; > + info.si_code = TRAP_PERF; > + info.si_addr = pending_addr; > + info.si_perf = sig_data; > + return force_sig_info(&info); > +} > + > #if IS_ENABLED(SPARC) > int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno) > { > -- > 2.30.1