From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE87F4756C9 for ; Fri, 7 Aug 2026 16:43:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786121042; cv=none; b=auUhoL75nMuabC2/UMcZKFFCDyVKWzAjyPpSIY6qIePbIfrPy68CfPJwyTMIYNkG2548vTr5N0Vq7JYfz0ALtjQJUBRK57gape0YQbiTMZan/S2jRpMLT3+f1VogtDaDr4pDBITYn+Z6oLG6Skjr06j5xr7umju/Bj8TDxZAA2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786121042; c=relaxed/simple; bh=WJpZQ0SdOrH7RGvEvyDpMPhGUMqMI5kRtv8KfcRLpcY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dut9CIWdBeTNt2Qj4lqOefxE2Zk2TKG/Kg1rrPvRYOHqllPSRel3zurUM0SVeJM750LbfOm2yHNlfpwH0wmRn0jFR3ihhl1fT++ueYD7V7L/he85LOwKmsXYZvT4STwG0ePxGU0LIyUHtCIKLM6RL9oz0ReRpRjb45aXnj9gr1A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=d/1jx+7S; arc=none smtp.client-ip=209.85.208.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="d/1jx+7S" Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-39f72d86889so10742631fa.1 for ; Fri, 07 Aug 2026 09:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786121035; x=1786725835; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7TXLJIzu0sdUTbcYifBsweWW0qiwt6RC0AmUjCHWXcg=; b=d/1jx+7SP4m9918Xi55eshxB9isUi6qQkpw+sooQYQxyYh8jSL0cHMRokk/DFTK0gT vSsWJwqj+NEdXp4eEdGJybfL1qixVTz/lXp6JOKTPPnLg1GUUyA6ZwFU2AG/v53uM8oD W3PtbolOdGVKBGdQPotfgd6aON2/XEXdyQ+ojqJOOZy7ug4b8FAF5P8UNUdHXDQvj2ZT P+ywH6wVrEX3/QJDmJX24AhYAro1Og+1ekkZunghnFqzNqYAbkpBQ5mSYHyaMoz/jNw9 1xvp3df3JyEmLgXk9ei2OOMRu6ie3nwrQBkUQ2lacNoHJ0bYM56E7reYHhEhebITNc5t 6uvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786121035; x=1786725835; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7TXLJIzu0sdUTbcYifBsweWW0qiwt6RC0AmUjCHWXcg=; b=aNL/BLtSgAd3MVltEWx4oJ3qzW8gQyniwzJ0HdwOHMNOEoGA38eUbd9R7+Z35ok4PA iaLdou/CF5ZIkftXhhxJctIPY6prLgIKNks1lW4fBbmE4V7t15ajrqFnGHkYTZveSk+N kJkbjRgt1DAKtOmMwkfisTiO7aHYJCf3ujvewJY+4qB3nq48iphn+UIICfSlS8gT+hqr rangYhIRvglJAJXLPcwq12xms/k5Mh5eJUi3BIXpsTua+/lnlH22ffo8Q2wPTb6Vl/iP XWH0EieV16vAHFsIBpYzhUydqHfecE2i4sNOz2QrvvQHIiVG+pFhoJPMTy5VlsWSERHd V2Qg== X-Forwarded-Encrypted: i=1; AHgh+RpiKCVasE1UQ4e9nRIDNsgFeWUxTvq5dLjelI5srGK5+GGQF6emhqhR53J1QECqkIDkFttprLTXGqTg7t0=@vger.kernel.org X-Gm-Message-State: AOJu0YxMY+zNcdptAAHyZSdlKhi9QxQpreIIaKoFZPwZ85R4ecTwnRRN zAKpK9/2VFETI2hLiJdH+ZMNeQ+RKzVb82wKXCd0bikEvU8u7mGheNe08ngMKmfxD5zBbi5FCOa gknooCemOQtzyb9e5nkRTmEM+cYyBBg== X-Received: from ljik18.prod.google.com ([2002:a2e:8892:0:b0:397:f415:3317]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a2e:bc0d:0:b0:39b:f64:1af3 with SMTP id 38308e7fff4ca-39fe56728b1mr2004231fa.8.1786121034668; Fri, 07 Aug 2026 09:43:54 -0700 (PDT) Date: Fri, 7 Aug 2026 16:43:21 +0000 In-Reply-To: <20260807164322.2970811-2-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260807164322.2970811-2-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.654.g21b8a5bc05-goog Message-ID: <20260807164322.2970811-13-sebastianene@google.com> Subject: [PATCH v2 11/13] KVM: arm64: Prevent the host from specifying a different command queue From: Sebastian Ene To: catalin.marinas@arm.com, fuad.tabba@linux.dev, joey.gouly@arm.com, mark.rutland@arm.com, maz@kernel.org, oupton@kernel.org, rananta@google.com, Sascha.Bischoff@arm.com, suzuki.poulose@arm.com, will@kernel.org Cc: kvmarm@lists.linux.dev, android-kvm@google.com, bgrzesik@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, nathan@kernel.org, perlarsen@google.com, sebastianene@google.com, seiden@linux.ibm.com, smostafa@google.com, tglx@kernel.org, vdonnefort@google.com, vladimir.murzin@arm.com, yuzenghui@huawei.com, zenghui.yu@linux.dev Content-Type: text/plain; charset="UTF-8" Don't let a malicious host re-program the command queue register with a different address and size to bypass the commands sanitization. Prevent unpredictable hardware behavior and restrict updates to the GITS_CBASER while the ITS is enabled or not in a quiescent state. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/its_emulate.c | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/its_emulate.c b/arch/arm64/kvm/hyp/nvhe/its_emulate.c index b9b71aa18d48..97cfa31d90d1 100644 --- a/arch/arm64/kvm/hyp/nvhe/its_emulate.c +++ b/arch/arm64/kvm/hyp/nvhe/its_emulate.c @@ -429,9 +429,41 @@ static void ctlr_write(struct pkvm_protected_reg *region, u64 offset, u64 value) writel_relaxed(value, its->base + GITS_CTLR); } +static void cbaser_write(struct pkvm_protected_reg *region, u64 offset, u64 value) +{ + struct its_priv_state *its = region->priv; + int num_pages; + u64 ctlr; + + ctlr = readl_relaxed(its->base + GITS_CTLR); + if ((ctlr & GITS_CTLR_ENABLE) || !(ctlr & GITS_CTLR_QUIESCENT)) + return; + + num_pages = its->host_state->cmdq_len / SZ_4K; + + /* Don't let the host program a different command queue */ + value &= ~(GENMASK(7, 0) | GENMASK_ULL(51, 12)); + value |= (num_pages - 1) & GENMASK(7, 0); + value |= __hyp_pa(its->cmd_original) & GENMASK_ULL(51, 12); + its->needs_flush = (value & GITS_CBASER_SHAREABILITY_MASK) != GITS_CBASER_InnerShareable; + + writeq_relaxed(value, its->base + GITS_CBASER); + + /* Restart the CMDQ to read from 0 */ + its->cmd_offset = 0; + writeq_relaxed(0, its->base + GITS_CWRITER); +} + +static void cbaser_read(struct pkvm_protected_reg *region, u64 offset, u64 *read) +{ + struct its_priv_state *its = region->priv; + *read = readq_relaxed(its->base + GITS_CBASER); +} + static struct its_handler its_handlers[] = { ITS_HANDLER(GITS_CWRITER, sizeof(u64), cwriter_write, cwriter_read), ITS_HANDLER(GITS_CTLR, sizeof(u32), ctlr_write, ctlr_read), + ITS_HANDLER(GITS_CBASER, sizeof(u64), cbaser_write, cbaser_read), {}, }; -- 2.55.0.654.g21b8a5bc05-goog