From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Martin Subject: Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE Date: Fri, 11 Oct 2019 16:33:46 +0100 Message-ID: <20191011153346.GM27757@arm.com> References: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> <1570733080-21015-9-git-send-email-Dave.Martin@arm.com> <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: Richard Henderson Cc: linux-kernel@vger.kernel.org, Florian Weimer , "H.J. Lu" , Andrew Jones , Kees Cook , Arnd Bergmann , Jann Horn , Peter Zijlstra , Catalin Marinas , Will Deacon , Eugene Syromiatnikov , Kristina =?utf-8?Q?Mart=C5=A1enko?= , Szabolcs Nagy , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, Amit Kachhap , Paul Elliott , Vincenzo Frascino , Sudakshina Das , Thomas Gleixner List-Id: linux-arch.vger.kernel.org On Fri, Oct 11, 2019 at 11:31:02AM -0400, Richard Henderson wrote: > On 10/10/19 2:44 PM, Dave Martin wrote: > > #define PSR_IL_BIT (1 << 20) > > -#define PSR_BTYPE_CALL (2 << PSR_BTYPE_SHIFT) > > + > > +/* Convenience names for the values of PSTATE.BTYPE */ > > +#define PSR_BTYPE_NONE (0b00 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_JC (0b01 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_C (0b10 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_J (0b11 << PSR_BTYPE_SHIFT) > > It'd be nice to sort this patch earlier, so that ... > > > diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c > > index 4a3bd32..452ac5b 100644 > > --- a/arch/arm64/kernel/signal.c > > +++ b/arch/arm64/kernel/signal.c > > @@ -732,7 +732,7 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka, > > > > if (system_supports_bti()) { > > regs->pstate &= ~PSR_BTYPE_MASK; > > - regs->pstate |= PSR_BTYPE_CALL; > > + regs->pstate |= PSR_BTYPE_C; > > } > > > > if (ka->sa.sa_flags & SA_RESTORER) > > ... setup_return does not need to be adjusted a second time. > > I don't see any other conflicts vs patch 5. Ack, looks like I mis-split this during rebase. Will fix. Cheers ---Dave From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com ([217.140.110.172]:36002 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727682AbfJKPdw (ORCPT ); Fri, 11 Oct 2019 11:33:52 -0400 Date: Fri, 11 Oct 2019 16:33:46 +0100 From: Dave Martin Subject: Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE Message-ID: <20191011153346.GM27757@arm.com> References: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> <1570733080-21015-9-git-send-email-Dave.Martin@arm.com> <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Richard Henderson Cc: linux-kernel@vger.kernel.org, Florian Weimer , "H.J. Lu" , Andrew Jones , Kees Cook , Arnd Bergmann , Jann Horn , Peter Zijlstra , Catalin Marinas , Will Deacon , Eugene Syromiatnikov , Kristina =?utf-8?Q?Mart=C5=A1enko?= , Szabolcs Nagy , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, Amit Kachhap , Paul Elliott , Vincenzo Frascino , Sudakshina Das , Thomas Gleixner , Yu-cheng Yu Message-ID: <20191011153346.nXVwhBlqLFEJXXGu5UWpaOoJDjJjUIuPtkwzHgmvfPw@z> On Fri, Oct 11, 2019 at 11:31:02AM -0400, Richard Henderson wrote: > On 10/10/19 2:44 PM, Dave Martin wrote: > > #define PSR_IL_BIT (1 << 20) > > -#define PSR_BTYPE_CALL (2 << PSR_BTYPE_SHIFT) > > + > > +/* Convenience names for the values of PSTATE.BTYPE */ > > +#define PSR_BTYPE_NONE (0b00 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_JC (0b01 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_C (0b10 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_J (0b11 << PSR_BTYPE_SHIFT) > > It'd be nice to sort this patch earlier, so that ... > > > diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c > > index 4a3bd32..452ac5b 100644 > > --- a/arch/arm64/kernel/signal.c > > +++ b/arch/arm64/kernel/signal.c > > @@ -732,7 +732,7 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka, > > > > if (system_supports_bti()) { > > regs->pstate &= ~PSR_BTYPE_MASK; > > - regs->pstate |= PSR_BTYPE_CALL; > > + regs->pstate |= PSR_BTYPE_C; > > } > > > > if (ka->sa.sa_flags & SA_RESTORER) > > ... setup_return does not need to be adjusted a second time. > > I don't see any other conflicts vs patch 5. Ack, looks like I mis-split this during rebase. Will fix. Cheers ---Dave 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=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 99203C47404 for ; Fri, 11 Oct 2019 15:33:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 70A97206A1 for ; Fri, 11 Oct 2019 15:33:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lXH9oZnF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70A97206A1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ihmbMSoVn9Bp3uPM1WnRM0Ecb7ZGGLlbaBYX40xesEU=; b=lXH9oZnFZwx693 8BAaw7nRPZbFxbwbig0fN0Dso/AIfLJGUW40+bFXnmLPkE9rpvDgTY5ryjZz5m5uZvBQvdasiGLfX 1FsMLcH1VeD7529JEDI35L6Ks95OBYHwdM7500zX5KFLQtBpFAYFZsoHxCmA6mVdPKtgMFZHjBOmE 1/6sbVs9CHoDNFrVBWN5ttw40EQoQ73RfsILikc/ZDG5clLZI3mTXcsBupD9bYAUh6t6kZ6L88XJB RFfgHp/JwgQtUIM8Eepf36qYPUOKmbduxd9sOZ4H0oHmUT/4aAxloCucWy10gHNqXHUhWKNvgh1mM 8bmDFP6sMXplL2CFZfrw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iIwvT-0003m6-4o; Fri, 11 Oct 2019 15:33:55 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iIwvQ-0003la-1B for linux-arm-kernel@lists.infradead.org; Fri, 11 Oct 2019 15:33:53 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7B8EF142F; Fri, 11 Oct 2019 08:33:51 -0700 (PDT) Received: from arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B10853F68E; Fri, 11 Oct 2019 08:33:48 -0700 (PDT) Date: Fri, 11 Oct 2019 16:33:46 +0100 From: Dave Martin To: Richard Henderson Subject: Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE Message-ID: <20191011153346.GM27757@arm.com> References: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> <1570733080-21015-9-git-send-email-Dave.Martin@arm.com> <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191011_083352_119472_B38CAED9 X-CRM114-Status: GOOD ( 15.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Elliott , Peter Zijlstra , Catalin Marinas , Will Deacon , Yu-cheng Yu , Amit Kachhap , Vincenzo Frascino , linux-arch@vger.kernel.org, Eugene Syromiatnikov , Szabolcs Nagy , "H.J. Lu" , Andrew Jones , Kees Cook , Arnd Bergmann , Jann Horn , Kristina =?utf-8?Q?Mart=C5=A1enko?= , Mark Brown , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Florian Weimer , linux-kernel@vger.kernel.org, Sudakshina Das Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 11, 2019 at 11:31:02AM -0400, Richard Henderson wrote: > On 10/10/19 2:44 PM, Dave Martin wrote: > > #define PSR_IL_BIT (1 << 20) > > -#define PSR_BTYPE_CALL (2 << PSR_BTYPE_SHIFT) > > + > > +/* Convenience names for the values of PSTATE.BTYPE */ > > +#define PSR_BTYPE_NONE (0b00 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_JC (0b01 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_C (0b10 << PSR_BTYPE_SHIFT) > > +#define PSR_BTYPE_J (0b11 << PSR_BTYPE_SHIFT) > > It'd be nice to sort this patch earlier, so that ... > > > diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c > > index 4a3bd32..452ac5b 100644 > > --- a/arch/arm64/kernel/signal.c > > +++ b/arch/arm64/kernel/signal.c > > @@ -732,7 +732,7 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka, > > > > if (system_supports_bti()) { > > regs->pstate &= ~PSR_BTYPE_MASK; > > - regs->pstate |= PSR_BTYPE_CALL; > > + regs->pstate |= PSR_BTYPE_C; > > } > > > > if (ka->sa.sa_flags & SA_RESTORER) > > ... setup_return does not need to be adjusted a second time. > > I don't see any other conflicts vs patch 5. Ack, looks like I mis-split this during rebase. Will fix. Cheers ---Dave _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel