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=-26.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, USER_AGENT_GIT,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 1DE9AC433ED for ; Thu, 22 Apr 2021 19:18:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D8F3C613FB for ; Thu, 22 Apr 2021 19:18:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238817AbhDVTTP (ORCPT ); Thu, 22 Apr 2021 15:19:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238768AbhDVTTJ (ORCPT ); Thu, 22 Apr 2021 15:19:09 -0400 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0708EC06138B for ; Thu, 22 Apr 2021 12:18:34 -0700 (PDT) Received: by mail-wr1-x44a.google.com with SMTP id 65-20020adf82c70000b0290107593a42c3so2594831wrc.5 for ; Thu, 22 Apr 2021 12:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Sugwskr8rXy42pZ1xDG6/Yn9grQzLU2kaW/tniDjvCM=; b=N0/i2Z5Ah+iH6G2EkCovNrk2mBQPzeAFd1m1GTNwITesl1LuHaJiptjsZe5b00INE0 ryeY0Z6v39pUAKaMEgkBjhW9/H/F8x/EC1yO/tKfGc8ZaoNHTpOR9kAM3kK/NKb9i4Pi FlpKg43hd6FHxaowCZWxZ85B0Wp9kl8rUBQYQCuPGlvNV3qeM451H99iVqhHIVlfUK9m lepgeHJbEFEyQ7zPZRBJfT+zBUJiByw7ElIIWWkDTdmMULFDO6JX+UcPAAyUlDsTmZvS /4YCAC5rfJyuBzED+h/5nhWMGtXI7GGykXofz5B7Eq49UNx9nLFJt6fGKSXmdCAZS3la Aamw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Sugwskr8rXy42pZ1xDG6/Yn9grQzLU2kaW/tniDjvCM=; b=ejeH91kbxPXWuMfIXZuCkydKC21c1F+aP0byMc+OXNjM7+mVeVIR6H764oxXxSqtgg 0ErN5RdQntC4Qx4/n/B9xZmr61q6D1e8PCSjWge1doaTXzEgFvpNmLdZQDCYmPg9VNjN 1IymnGO+cUvHUPmC/fZK2po7HE6TFzLoRxkHL7fguQ/ha9s+IZ6PlYOYseU9UW9uks2O oVGhOzJqspEqwNhJ1ypOdi+DQbvyQRNRhDX+F8XoYDeoQMDavd1Hl5Y9g6Tg/L7bSHT7 9Ur9lyLPh1xyCk4789ze8IWHmFWuL6hqNFR16kSb9gLyJ3HKuu9q35otdQQVPrDFnB3f b5dw== X-Gm-Message-State: AOAM532Yow5ZGopVg4ORq8+oATZ7d3z4sqc50NrqpCiGtfya/IWP9mj4 i4IvwMgonN0uz4xYHpNzmCheH9SNkQ== X-Google-Smtp-Source: ABdhPJwl+q5WjR5zsegf/9T50JzWO1+p0hZUP1HC7HBRkSIEzansnudeZv6f3dYlA7JH8yzgTt1aNJBYgQ== X-Received: from elver.muc.corp.google.com ([2a00:79e0:15:13:145c:dc52:6539:7ac5]) (user=elver job=sendgmr) by 2002:a1c:c246:: with SMTP id s67mr312123wmf.86.1619119112369; Thu, 22 Apr 2021 12:18:32 -0700 (PDT) Date: Thu, 22 Apr 2021 21:18:23 +0200 In-Reply-To: <20210422191823.79012-1-elver@google.com> Message-Id: <20210422191823.79012-2-elver@google.com> Mime-Version: 1.0 References: <20210422191823.79012-1-elver@google.com> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog Subject: [PATCH tip v2 2/2] signal, perf: Add missing TRAP_PERF case in siginfo_layout() From: Marco Elver To: elver@google.com, peterz@infradead.org, mingo@redhat.com, tglx@linutronix.de Cc: m.szyprowski@samsung.com, jonathanh@nvidia.com, dvyukov@google.com, glider@google.com, arnd@arndb.de, christian@brauner.io, axboe@kernel.dk, pcc@google.com, oleg@redhat.com, David.Laight@aculab.com, kasan-dev@googlegroups.com, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the missing TRAP_PERF case in siginfo_layout() for interpreting the layout correctly as SIL_PERF_EVENT instead of just SIL_FAULT. This ensures the si_perf field is copied and not just the si_addr field. This was caught and tested by running the perf_events/sigtrap_threads kselftest as a 32-bit binary with a 64-bit kernel. Fixes: fb6cc127e0b6 ("signal: Introduce TRAP_PERF si_code and si_perf to siginfo") Signed-off-by: Marco Elver --- kernel/signal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/signal.c b/kernel/signal.c index 9ed81ee4ff17..b354655a0e57 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3251,6 +3251,8 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code) else if ((sig == SIGSEGV) && (si_code == SEGV_PKUERR)) layout = SIL_FAULT_PKUERR; #endif + else if ((sig == SIGTRAP) && (si_code == TRAP_PERF)) + layout = SIL_PERF_EVENT; } else if (si_code <= NSIGPOLL) layout = SIL_POLL; -- 2.31.1.498.g6c1eba8ee3d-goog 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 3232EC433ED for ; Thu, 22 Apr 2021 19:21:08 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A033613FB for ; Thu, 22 Apr 2021 19:21:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A033613FB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:References:Mime-Version: Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=INqWa/17fvzzgWBFNf4w+46dgEmXZXpekyxFkvXLi8Y=; b=aAhUe1fzlzC23K e+c74rWxXJzSyIOQ3PNizIlISS5MeKFDT7iiiVTpD/6GWeGFLtPK7ZZFbXQxfUIKDVpt8rExLKcD0 WhOypMYcTojxYLtcIy7t8YHscNUGT+LfAR9ES3rICW1ue2JbDMLAAOjR9WEMZo3PM7wuNnwdWdMfr Xj2J5a49Rr1tFHC9w400RjakTk4M6PBIUZhsohqxOxwTmWXHLZOYI5ODmPtYsO57Fl/qdp99g75Tt V6SHBLKIErlQQr8RW2R3doIV2iTHpsZXfi+NPQ53seTbDHqfdGFn1fGGY+We1mLNntypb83XFRIpO jmRAVcYSe1wH6zCx3MWA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZeqn-00HJaA-MR; Thu, 22 Apr 2021 19:18:58 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZeqT-00HJXe-MW for linux-arm-kernel@desiato.infradead.org; Thu, 22 Apr 2021 19:18:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Sugwskr8rXy42pZ1xDG6/Yn9grQzLU2kaW/tniDjvCM=; b=eEN9ArZ7U7fRpdIvsUYV1tQRfe rKge0QSVtFJNwlMgSCfxcZkNwPBYw1s34sthachPyuQ3J/0on9i21XHn+REtcxsDhxKerM7+RVsQe r9GZL7FkPqTqGxywQxzlf0HLXH8uSU4LmduSIUbkmhoQ7mL2X3neY65N8s2upNied86dpFmcT5hwX jrAqB0owIeD8H5QwPFj2L85djJkgZadij30o1W6w8iqDqwdvS/C1W7D30cXu3dDZzAtKN8qfEkuYv ANgAuSR+DZTjobSAYdprnDa65+xteub0Dx7pN7nLsSRvB3bPwvt13fOBH/MQoqzB7zeEjCl3H0j4/ ZIquoM1w==; Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZeqR-00DwVE-8h for linux-arm-kernel@lists.infradead.org; Thu, 22 Apr 2021 19:18:36 +0000 Received: by mail-wm1-x349.google.com with SMTP id c124-20020a1c9a820000b0290136c7a94cf3so1993087wme.3 for ; Thu, 22 Apr 2021 12:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Sugwskr8rXy42pZ1xDG6/Yn9grQzLU2kaW/tniDjvCM=; b=N0/i2Z5Ah+iH6G2EkCovNrk2mBQPzeAFd1m1GTNwITesl1LuHaJiptjsZe5b00INE0 ryeY0Z6v39pUAKaMEgkBjhW9/H/F8x/EC1yO/tKfGc8ZaoNHTpOR9kAM3kK/NKb9i4Pi FlpKg43hd6FHxaowCZWxZ85B0Wp9kl8rUBQYQCuPGlvNV3qeM451H99iVqhHIVlfUK9m lepgeHJbEFEyQ7zPZRBJfT+zBUJiByw7ElIIWWkDTdmMULFDO6JX+UcPAAyUlDsTmZvS /4YCAC5rfJyuBzED+h/5nhWMGtXI7GGykXofz5B7Eq49UNx9nLFJt6fGKSXmdCAZS3la Aamw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Sugwskr8rXy42pZ1xDG6/Yn9grQzLU2kaW/tniDjvCM=; b=PqCiQAxtB1sTr/lnW1XTlGKyOGvFeLgrn/68RFkjCqKsD2PRmOmsnAaTzKUt3zA9Ph nLOscPRwSiDerUmXp54+m4OUyhaQA8adHEfhjxS+WXjQLPRPq7eVT2QTPqRmpYeEsOiP 5AdslLINahiMqyuLfr8OUJ5tiMQyBgdbo4WxCcrsDvijOHit1BKm7zHJiiUndX8BTiMH HEBAt8iAVkdBkLMr92Sh7+Rl5NMtOVi4gf/eoUWbJVLuHJ4g/bSbxk5nX/2CsP3msdtm NNb3sjUfipGB4JxuuaN9A/QnkqVBlq8tVnOn0OVoxXjEgyKRyh8gEqQbaR6OTJ/LJ1Qu zuzw== X-Gm-Message-State: AOAM532sUEqTB2t0+PqeX1ULueLWSFYiAjjjRwQQXBJhvN0rRH6jCP+1 akutHkOdo1OXfMs5SPxH/4CSWf8ZfQ== X-Google-Smtp-Source: ABdhPJwl+q5WjR5zsegf/9T50JzWO1+p0hZUP1HC7HBRkSIEzansnudeZv6f3dYlA7JH8yzgTt1aNJBYgQ== X-Received: from elver.muc.corp.google.com ([2a00:79e0:15:13:145c:dc52:6539:7ac5]) (user=elver job=sendgmr) by 2002:a1c:c246:: with SMTP id s67mr312123wmf.86.1619119112369; Thu, 22 Apr 2021 12:18:32 -0700 (PDT) Date: Thu, 22 Apr 2021 21:18:23 +0200 In-Reply-To: <20210422191823.79012-1-elver@google.com> Message-Id: <20210422191823.79012-2-elver@google.com> Mime-Version: 1.0 References: <20210422191823.79012-1-elver@google.com> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog Subject: [PATCH tip v2 2/2] signal, perf: Add missing TRAP_PERF case in siginfo_layout() From: Marco Elver To: elver@google.com, peterz@infradead.org, mingo@redhat.com, tglx@linutronix.de Cc: m.szyprowski@samsung.com, jonathanh@nvidia.com, dvyukov@google.com, glider@google.com, arnd@arndb.de, christian@brauner.io, axboe@kernel.dk, pcc@google.com, oleg@redhat.com, David.Laight@aculab.com, kasan-dev@googlegroups.com, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_121835_327822_65FED2DD X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the missing TRAP_PERF case in siginfo_layout() for interpreting the layout correctly as SIL_PERF_EVENT instead of just SIL_FAULT. This ensures the si_perf field is copied and not just the si_addr field. This was caught and tested by running the perf_events/sigtrap_threads kselftest as a 32-bit binary with a 64-bit kernel. Fixes: fb6cc127e0b6 ("signal: Introduce TRAP_PERF si_code and si_perf to siginfo") Signed-off-by: Marco Elver --- kernel/signal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/signal.c b/kernel/signal.c index 9ed81ee4ff17..b354655a0e57 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3251,6 +3251,8 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code) else if ((sig == SIGSEGV) && (si_code == SEGV_PKUERR)) layout = SIL_FAULT_PKUERR; #endif + else if ((sig == SIGTRAP) && (si_code == TRAP_PERF)) + layout = SIL_PERF_EVENT; } else if (si_code <= NSIGPOLL) layout = SIL_POLL; -- 2.31.1.498.g6c1eba8ee3d-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel