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.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 E8F16ECE58C for ; Fri, 11 Oct 2019 15:31:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCD8221D71 for ; Fri, 11 Oct 2019 15:31:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ufYqM9IQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbfJKPbG (ORCPT ); Fri, 11 Oct 2019 11:31:06 -0400 Received: from mail-yw1-f68.google.com ([209.85.161.68]:38108 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726705AbfJKPbG (ORCPT ); Fri, 11 Oct 2019 11:31:06 -0400 Received: by mail-yw1-f68.google.com with SMTP id s6so3619245ywe.5 for ; Fri, 11 Oct 2019 08:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:openpgp:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=mxX6ZfMEu9UblL7e3DTkotuZrSFsmDbCoebjzwcL8h0=; b=ufYqM9IQiYWJXmizW9EncXRMAuDKV9ixLq/HSNFNpNZkGyWPmgPmKChqyOWtlvaJz2 g171+ritEahrlLdJp1/aQUN77kRibcDDDwNCbo1kCC7dMbYiIJm8FjDvrXt0BigYOpqM vxCWKhAfox0ET7SmICRFSnzf1UwkwSa/pULtSsJlSPL1imZcNtZ2ZxNcvzlubz3Fio+i Z0+zDzeaG/fXw9rtujEMs1vg88g+XvC0vcVF7sOA8Flf5dsgLysz9Xi/cfy0IzepX0wX tZ7vvGrcZJ6cA8xJ5YMjLE1j0APNWiCpGkJ7Ter0ruivx4Mva/2M1NJ4EF66JZS06BLC 4/cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=mxX6ZfMEu9UblL7e3DTkotuZrSFsmDbCoebjzwcL8h0=; b=KuMf1P3gv+alpkZiCdGXIBYZmm+hWwioMvW0CyMQMBOyA0S/f2oajBVEKG9yuhzjEz cOTQeDWUW+AnNB7WT2fd9JtzD+a6XowRaP3e6FcE2sUdPIyEc2ekOJ4UfgE433dUvt2k ooZ86RWaB1DyfaO9vPOB3OTbVbiqQXru1SiwBXFzeMlsN46s7crpwLpaPe0RirV+jzcp rhTciU5MZiG+vQkPuhyLZcVXDX1ynvRyiVbprvJ+sedfn+7PMV9HcPgt7sNnAi1sWZ7y 8VvYdv4L+C/v1YjAJ8g5KIItVbvs227MiAUQ2bZ4af9AIOAtK/TL8wSnh14lFYL7af8L R7IQ== X-Gm-Message-State: APjAAAVf7TQHrJv/uuX6u9WAaE5fTd15WEZJOAVpwsD0RJrfLV2xI1uc JDAOs1+rz8+FtuK5QNHFT/m8ig== X-Google-Smtp-Source: APXvYqz6suOMvjy8hdUWKuD9/89Nspymjqm4b1UZYQ8wE1NHnKF8NkD1PtR18YIcumQ9lLTUYrRm2w== X-Received: by 2002:a81:a30d:: with SMTP id a13mr2662067ywh.278.1570807865387; Fri, 11 Oct 2019 08:31:05 -0700 (PDT) Received: from [192.168.1.44] (67.216.151.25.pool.hargray.net. [67.216.151.25]) by smtp.gmail.com with ESMTPSA id d63sm2313883ywe.55.2019.10.11.08.31.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 08:31:04 -0700 (PDT) Subject: Re: [PATCH v2 08/12] arm64: BTI: Decode BYTPE bits when printing PSTATE To: Dave Martin , linux-kernel@vger.kernel.org Cc: Andrew Jones , Arnd Bergmann , Catalin Marinas , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Kees Cook , =?UTF-8?Q?Kristina_Mart=c5=a1enko?= , Mark Brown , Paul Elliott , Peter Zijlstra , Sudakshina Das , Szabolcs Nagy , Thomas Gleixner , Will Deacon , Yu-cheng Yu , Amit Kachhap , Vincenzo Frascino , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> <1570733080-21015-9-git-send-email-Dave.Martin@arm.com> From: Richard Henderson Openpgp: preference=signencrypt Message-ID: <18c9318c-d122-b534-b526-318935d9e2cc@linaro.org> Date: Fri, 11 Oct 2019 11:31:02 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1570733080-21015-9-git-send-email-Dave.Martin@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. r~