From patchwork Tue Dec 8 14:24:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brazdil X-Patchwork-Id: 11958731 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=-11.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 2117EC4361B for ; Tue, 8 Dec 2020 14:26:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 B384D23A33 for ; Tue, 8 Dec 2020 14:26:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B384D23A33 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FSfqCSx6iODFwhpSgQDqPdtb9ea85IrSyZETiO+Goyc=; b=gmlMdjfCgbyuzjUI8Dj2FFwAs/ bu+pSdovpLCWNuAPsquEBwgg27e5ZwP0elCbLkq8nRxpNNuVhj3ToALkDAUKB6mwcQQ+kymgT+jW+ qMozK9eMsFtUGgEQpfkZFIsJEeoFca5/P20FGBXBnju6wLxP+Arh50oWWB+nD9G4Usk7uj8upedXH Q+vYbGaIp0i1//kubSP5L1Rfq7czrsEoSGhKcxass4NknWr3YzKLJ33XK4mwy8y61eM/b2w1dBj+H G9tmx516MU5M+tPtD+hnNVBwQDZG0mE0Nl6LNzNaxooXsxdkFe1KmjpgHHqUVnou+I1HFpWs1K8wU UIU5QrCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmdvJ-0006jB-SX; Tue, 08 Dec 2020 14:25:01 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmdvH-0006il-Nt for linux-arm-kernel@lists.infradead.org; Tue, 08 Dec 2020 14:25:00 +0000 Received: by mail-wr1-x444.google.com with SMTP id m5so6790990wrx.9 for ; Tue, 08 Dec 2020 06:24:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bkCxpWePsFfevlDcUEyEPGxcsnjzxasA1OIQEvsNU/o=; b=UH8R3RfyY4sPynLquFWkpqy2WTWXSSzIuSAp+rSQhizic1tnp9KlTS7Y7efZGAqAMw MuWmN0VcSOE7Y1ATcEcSGkT9NY58W2weDYlFHdCmmJ+OvSiaDfwuiKRe3Gt4FFvbiP64 4azh0WSYbt0mS/zs2fxByv6me6YjHQQj4xGUXsYsFovPpv6vD+gk1npQf9zndpaXWfnx 1TmuF62lTL29fBChAox+JnPUBpEgrxEK6x4ocItr0OEy88xJz+tpcpolNsKsxYkdFY3u w+oVXT2DBgxcBjpOIk2J4+Gj7R721q8NZdsa5uC9Q61VagBrwHxgA+J86j3TUZNUQPG8 4FaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bkCxpWePsFfevlDcUEyEPGxcsnjzxasA1OIQEvsNU/o=; b=M7A2JAIf1Xt1NB0OOFvO9vtJ2oh5HaYoKTbxbLhLKZfmDdn+WqLtfj2ef4xVBTuJ3e VESwMd/PQBHAXYthWkEjCOY7gN4LNRON3VUTiW52ctm+ph25j9qnrGenkT/1Zfurl9N0 RBUkHYc9pwgyno+vWM47/C26l5Xuvdt6eIMkowyhBuNwlPHi/W4t3mYepKKr3gSPO1e3 0S92TquG3r3p2cuAPYDGj1vl9uyPXv68aKNvuS7UyFwNmOo+LYN6KMmgdKib+VR8ve3a UYHh5VPSdLlfv9RxuuR58dXO1YYKCcj1wanhlhD7RMyMTX1DwKa41e60eBC6/rZzeXUp CuWg== X-Gm-Message-State: AOAM531T+fqen75I3vfIqfMWkTVIIcZhU9axGic/SUJdAfZLZJxzyypO NpxtfCXhhfs0ThBGp44uhHtjUQ== X-Google-Smtp-Source: ABdhPJwsb7RVuNDV5tHluPT3itlJhGZvi8mvDtVcsmCOFtJE87agLeOo3053LrTTOxV3LtILOYbdww== X-Received: by 2002:a5d:6ccb:: with SMTP id c11mr7906522wrc.224.1607437498694; Tue, 08 Dec 2020 06:24:58 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:258e:cb26:cef:a620]) by smtp.gmail.com with ESMTPSA id w10sm20739956wra.34.2020.12.08.06.24.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Dec 2020 06:24:57 -0800 (PST) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Subject: [PATCH 0/6] Fixes and cleanups of PSCI relay for kvmarm/next Date: Tue, 8 Dec 2020 14:24:46 +0000 Message-Id: <20201208142452.87237-1-dbrazdil@google.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201208_092459_823622_EC7E03C7 X-CRM114-Status: GOOD ( 11.73 ) 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 , kernel-team@android.com, Suzuki K Poulose , Marc Zyngier , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Catalin Marinas , David Brazdil , Will Deacon , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Small batch of improvements for the 'Opt-in always-on nVHE hypervisor' series, now merged in kvmarm/next. Patch #1 fixes potential use of invalid v0.1 functions IDs reported by Mark Rutland, patch #2 fixes a warning reported by Qian Cai. Patch #3 avoids a code path not used in VHE, can be dropped if any concerns arise. The remaining patches are minor cleanups from review. -David David Brazdil (6): kvm: arm64: Prevent use of invalid PSCI v0.1 function IDs kvm: arm64: Use lm_alias in nVHE-only VA conversion kvm: arm64: Skip computing hyp VA layout for VHE kvm: arm64: Minor cleanup of hyp variables used in host kvm: arm64: Remove unused includes in psci-relay.c kvm: arm64: Move skip_host_instruction to adjust_pc.h arch/arm64/include/asm/kvm_host.h | 26 ++++++++++ arch/arm64/kernel/smp.c | 2 +- arch/arm64/kvm/arm.c | 18 ++++--- arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 9 ++++ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 12 +---- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 +-- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 56 +++++++++++++++------- arch/arm64/kvm/va_layout.c | 7 ++- 8 files changed, 95 insertions(+), 41 deletions(-) --- 2.29.2.576.ga3fc446d84-goog