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.3 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 0566DC43460 for ; Wed, 5 May 2021 17:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE7D961176 for ; Wed, 5 May 2021 17:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234713AbhEER4s (ORCPT ); Wed, 5 May 2021 13:56:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234685AbhEER4i (ORCPT ); Wed, 5 May 2021 13:56:38 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76D23C026CCE for ; Wed, 5 May 2021 10:27:21 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id 65-20020a9d03470000b02902808b4aec6dso2393711otv.6 for ; Wed, 05 May 2021 10:27:21 -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=7JIG5LLXWdpg9zojMMRRLnT8KwKVn0+Fa9SXUYjSITY=; b=Esk6Xw2grk6X5VGJLTGmLr63qYQtYzobA6l8CuObASYKlU6YZ8lT804xtGZpj3wpU4 m27XzBwahAWLIExjkHzfNqQ/GX3UNMN8IKeuVFRFWNF25hnglLOtgdLGK3ioAhHogNTo bHbLw8Imy6L1f+oBuAvpniTx4Z9gN4Jr41ZePmWBfa2u2ConWLPuB+ji7eAQfWsaVq3B wvzeL2tlOWwzQzLy5P/bdemfLByFfIv8ziQ9un4QdYQRvtYgm0y0S834OjuFLh5f0/lB Gl/b6R7LVW4gvdMNWQ5d8QeGyTtA+YkOcQe1cfRmfhdvehI7zXCv21T8ErpmUt0EG3+t plHA== 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=7JIG5LLXWdpg9zojMMRRLnT8KwKVn0+Fa9SXUYjSITY=; b=MFqZ7OGfQiq9Um03rReCDahAOZ3oWYQAX4rzhYtKp4XmUHze2vADnGDyCTIfTueaog nvffE46ZD8Na75NoqJLg+VXOHX1wH5ynrQCwXqJ+X8Yq1PP0LZV+/M2hS40XtSB4g5Br PYM7B+J76W1rpRwpHQhZItQlkf6FbBt7HLOVTve298jCvgny3s/eM9umhaWJbYRF8SW3 vSp6WPvPI2/CBYzKloSWl7XUiGxWu/n78an+XBDgCiLW9StRucxffNTRR9YmBI95/2V0 8NmEiHEgzTBhn0mmksTjatgUelcuHabL/SLwg40Kqai2R7t9UNdr9gJ18crvE8dlakPK JNHg== X-Gm-Message-State: AOAM530M0Z/s5DUrpj+xe1BKcZsPpCxeO+9YBuqfEnYyHrctxfYKXyph c7aPNS0BsRYhlQivPUMn2AemXjjvu8pSq0s5WuFAUA== X-Google-Smtp-Source: ABdhPJxa+srA1MRn+COtNridSRExFrfj34Zj1v6vHL47IJQ3reXFv8U1xAzQbEcZ2nfMlJKF/bzTAsL+4cJ/fmHsDp4= X-Received: by 2002:a9d:1ea9:: with SMTP id n38mr25558136otn.233.1620235640677; Wed, 05 May 2021 10:27:20 -0700 (PDT) MIME-Version: 1.0 References: <20210505141101.11519-1-ebiederm@xmission.com> <20210505141101.11519-10-ebiederm@xmission.com> In-Reply-To: <20210505141101.11519-10-ebiederm@xmission.com> From: Marco Elver Date: Wed, 5 May 2021 19:26:00 +0200 Message-ID: Subject: Re: [PATCH v3 10/12] signal: Factor force_sig_perf out of perf_sigtrap To: "Eric W. Beiderman" 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-arch@vger.kernel.org On Wed, 5 May 2021 at 16:11, Eric W. Beiderman wrote: > From: "Eric W. Biederman" > > Separate generating the signal from deciding it needs to be sent. > > v1: https://lkml.kernel.org/r/m17dkjqqxz.fsf_-_@fess.ebiederm.org > Signed-off-by: "Eric W. Biederman" Reviewed-by: Marco Elver > --- > 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 697c5fe58db8..49560ceac048 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 *addr, u32 type, u64 sig_data) > +{ > + struct kernel_siginfo info; > + > + clear_siginfo(&info); > + info.si_signo = SIGTRAP; > + info.si_errno = type; > + info.si_code = TRAP_PERF; > + info.si_addr = addr; > + info.si_perf = sig_data; > + return force_sig_info(&info); > +} > + > #if IS_ENABLED(CONFIG_SPARC) > int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno) > { > -- > 2.30.1 >