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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 65870CA9EC9 for ; Fri, 1 Nov 2019 03:48:22 +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 3C577208CB for ; Fri, 1 Nov 2019 03:48:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MAqgZTGJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="PO/SPgBc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C577208CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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=cNvBIJvnULlkRaP96R9JjF85SNJerPLg/YmuPW34I0o=; b=MAqgZTGJaqatsP ao6u6eprcCqX4gRH8TAXIRWFOhVFsC7tbzR5TfxmYgCpUpBQaTd0Z3G83AdA1d8/FU5XPz27Mwx1l K052vlo4wnhG3ywUIxYreZ42LkLV4Je1st+H+kpuByiyozu3yC7t6LK1sAUZymW2eiCkHH1vPavZN c91WrYK1GempWjmI5vNLvQlIX6UPOxYSVc2x850dOIGjSh/AddVcBX/ozBzQm/c4KYmy0s97Uujp7 325ZlwlYez6gd/FX+Fb+GOCXci7xNrFyVDXj6HLyaJimekWFMoo22wp+mlSkI0QKpM5ac81AKv7I/ glDr24tj3CHCiCAHna/w==; 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 1iQNvB-0005FH-O6; Fri, 01 Nov 2019 03:48:21 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iQNv8-0005Ef-9m for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2019 03:48:19 +0000 Received: by mail-pg1-x543.google.com with SMTP id f19so5566277pgn.13 for ; Thu, 31 Oct 2019 20:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=GhXfR7uwF/t0mkUfEqnIPkdytpbCM5CP4Tc8kyPipqM=; b=PO/SPgBcR3vsqL2cCZd3TET4ogLQXaHiXZ2hcfCwBHr9u6N+W0TFF4q5qSB2E1alsu zp3gjp/pNjLPKVUHsce3pNebyv6+8gDnrezCEDWd8LT/CaF/mmKSpZfBJkCoE7sLooyt A/2tgY3lAuTAU+cgxiWQG106tjcOPBH8rTzI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=GhXfR7uwF/t0mkUfEqnIPkdytpbCM5CP4Tc8kyPipqM=; b=CjYGYvZWo5rFluWS2DcZS5dJ3Y2rlLjmypStIGGqvIlYH5F3cj+5qCNUsBy2q01dUa 7aLTXJ9k4EJ/KxXENeAc3cd8m2d47h0Fa84U/N2xdyEMwSA6eM/Nd3ArwhbJHguhXNJu IDUmzcL26EcWz/EbJoLbp5V8r+i4mrITMYOxHZXCEaOhIEgdaLyu9gKnayRokyQwNIRl ZL+WcAiGs1/O4vLxG9Pe7ChDktJa6TbQWpfeFEUvSf6sf1plhkFwsxcQDtfE9Jw1ASUG RXppCJS7EcPcNa8xMslHci8qwr0Pkeaw+fEynej68XCkBGyiIDbI9Tif623tM1MIQmlt t+VQ== X-Gm-Message-State: APjAAAVdpdO9JyCHU9LStx3/4pvg/lX2GaIKQrp0dNysFfPZx9gT/sQq Sqrh3t7hxDtV5TaZrK5k6/d9ZA== X-Google-Smtp-Source: APXvYqzDBnYONi7/0HCkReVgNKcasH/OGtafBYZqbmUFf2iJDoGJ+0/FCmFdlAnNml4k+yVv0pZLkQ== X-Received: by 2002:a17:90a:6584:: with SMTP id k4mr12615865pjj.43.1572580097650; Thu, 31 Oct 2019 20:48:17 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y144sm4637001pfb.188.2019.10.31.20.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2019 20:48:16 -0700 (PDT) Date: Thu, 31 Oct 2019 20:48:15 -0700 From: Kees Cook To: samitolvanen@google.com Subject: Re: [PATCH v3 03/17] arm64: kvm: stop treating register x18 as caller save Message-ID: <201910312048.3B34452@keescook> References: <20191018161033.261971-1-samitolvanen@google.com> <20191031164637.48901-1-samitolvanen@google.com> <20191031164637.48901-4-samitolvanen@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191031164637.48901-4-samitolvanen@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191031_204818_338651_CE2CD8A8 X-CRM114-Status: GOOD ( 18.27 ) 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: Mark Rutland , clang-built-linux@googlegroups.com, Ard Biesheuvel , Masahiro Yamada , Catalin Marinas , Jann Horn , Nick Desaulniers , linux-kernel@vger.kernel.org, Steven Rostedt , Miguel Ojeda , Masami Hiramatsu , kernel-hardening@lists.openwall.com, Laura Abbott , Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org 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 Thu, Oct 31, 2019 at 09:46:23AM -0700, samitolvanen@google.com wrote: > In preparation of reserving x18, stop treating it as caller save in > the KVM guest entry/exit code. Currently, the code assumes there is > no need to preserve it for the host, given that it would have been > assumed clobbered anyway by the function call to __guest_enter(). > Instead, preserve its value and restore it upon return. > > Link: https://patchwork.kernel.org/patch/9836891/ > Co-developed-by: Ard Biesheuvel > [ updated commit message, switched from x18 to x29 for the guest context ] > Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook -Kees > --- > arch/arm64/kvm/hyp/entry.S | 41 +++++++++++++++++++------------------- > 1 file changed, 20 insertions(+), 21 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S > index e5cc8d66bf53..c3c2d842c609 100644 > --- a/arch/arm64/kvm/hyp/entry.S > +++ b/arch/arm64/kvm/hyp/entry.S > @@ -23,6 +23,7 @@ > .pushsection .hyp.text, "ax" > > .macro save_callee_saved_regs ctxt > + str x18, [\ctxt, #CPU_XREG_OFFSET(18)] > stp x19, x20, [\ctxt, #CPU_XREG_OFFSET(19)] > stp x21, x22, [\ctxt, #CPU_XREG_OFFSET(21)] > stp x23, x24, [\ctxt, #CPU_XREG_OFFSET(23)] > @@ -32,6 +33,8 @@ > .endm > > .macro restore_callee_saved_regs ctxt > + // We assume \ctxt is not x18-x28 > + ldr x18, [\ctxt, #CPU_XREG_OFFSET(18)] > ldp x19, x20, [\ctxt, #CPU_XREG_OFFSET(19)] > ldp x21, x22, [\ctxt, #CPU_XREG_OFFSET(21)] > ldp x23, x24, [\ctxt, #CPU_XREG_OFFSET(23)] > @@ -48,7 +51,7 @@ ENTRY(__guest_enter) > // x0: vcpu > // x1: host context > // x2-x17: clobbered by macros > - // x18: guest context > + // x29: guest context > > // Store the host regs > save_callee_saved_regs x1 > @@ -67,31 +70,28 @@ alternative_else_nop_endif > ret > > 1: > - add x18, x0, #VCPU_CONTEXT > + add x29, x0, #VCPU_CONTEXT > > // Macro ptrauth_switch_to_guest format: > // ptrauth_switch_to_guest(guest cxt, tmp1, tmp2, tmp3) > // The below macro to restore guest keys is not implemented in C code > // as it may cause Pointer Authentication key signing mismatch errors > // when this feature is enabled for kernel code. > - ptrauth_switch_to_guest x18, x0, x1, x2 > + ptrauth_switch_to_guest x29, x0, x1, x2 > > // Restore guest regs x0-x17 > - ldp x0, x1, [x18, #CPU_XREG_OFFSET(0)] > - ldp x2, x3, [x18, #CPU_XREG_OFFSET(2)] > - ldp x4, x5, [x18, #CPU_XREG_OFFSET(4)] > - ldp x6, x7, [x18, #CPU_XREG_OFFSET(6)] > - ldp x8, x9, [x18, #CPU_XREG_OFFSET(8)] > - ldp x10, x11, [x18, #CPU_XREG_OFFSET(10)] > - ldp x12, x13, [x18, #CPU_XREG_OFFSET(12)] > - ldp x14, x15, [x18, #CPU_XREG_OFFSET(14)] > - ldp x16, x17, [x18, #CPU_XREG_OFFSET(16)] > - > - // Restore guest regs x19-x29, lr > - restore_callee_saved_regs x18 > - > - // Restore guest reg x18 > - ldr x18, [x18, #CPU_XREG_OFFSET(18)] > + ldp x0, x1, [x29, #CPU_XREG_OFFSET(0)] > + ldp x2, x3, [x29, #CPU_XREG_OFFSET(2)] > + ldp x4, x5, [x29, #CPU_XREG_OFFSET(4)] > + ldp x6, x7, [x29, #CPU_XREG_OFFSET(6)] > + ldp x8, x9, [x29, #CPU_XREG_OFFSET(8)] > + ldp x10, x11, [x29, #CPU_XREG_OFFSET(10)] > + ldp x12, x13, [x29, #CPU_XREG_OFFSET(12)] > + ldp x14, x15, [x29, #CPU_XREG_OFFSET(14)] > + ldp x16, x17, [x29, #CPU_XREG_OFFSET(16)] > + > + // Restore guest regs x18-x29, lr > + restore_callee_saved_regs x29 > > // Do not touch any register after this! > eret > @@ -114,7 +114,7 @@ ENTRY(__guest_exit) > // Retrieve the guest regs x0-x1 from the stack > ldp x2, x3, [sp], #16 // x0, x1 > > - // Store the guest regs x0-x1 and x4-x18 > + // Store the guest regs x0-x1 and x4-x17 > stp x2, x3, [x1, #CPU_XREG_OFFSET(0)] > stp x4, x5, [x1, #CPU_XREG_OFFSET(4)] > stp x6, x7, [x1, #CPU_XREG_OFFSET(6)] > @@ -123,9 +123,8 @@ ENTRY(__guest_exit) > stp x12, x13, [x1, #CPU_XREG_OFFSET(12)] > stp x14, x15, [x1, #CPU_XREG_OFFSET(14)] > stp x16, x17, [x1, #CPU_XREG_OFFSET(16)] > - str x18, [x1, #CPU_XREG_OFFSET(18)] > > - // Store the guest regs x19-x29, lr > + // Store the guest regs x18-x29, lr > save_callee_saved_regs x1 > > get_host_ctxt x2, x3 > -- > 2.24.0.rc0.303.g954a862665-goog > -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel