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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 06E13C48BE5 for ; Tue, 15 Jun 2021 15:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9EFC61476 for ; Tue, 15 Jun 2021 15:55:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232103AbhFOP5d (ORCPT ); Tue, 15 Jun 2021 11:57:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:46690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232073AbhFOPxx (ORCPT ); Tue, 15 Jun 2021 11:53:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE09061923; Tue, 15 Jun 2021 15:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623772237; bh=75QOmzZ2WHi66otbhJhNLCqY4ljB65yP/nH5y2KuAjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fFyabZIFZMd0YX2R5AkgfoYYo2e2ZwhmPzd603o+zUHNwGautDscAdUkCjtdh94fY mIbK1goiLOfA69pNJg0YJa+7vzS9CU+ZqsWZs4L94Mu4/wQAYii93Hb71sxcY/BRa+ dFrSSE5NrfNSS4ny6jCdKrd57GenR88ZtivFgYdGTzVUrXJ2sW0kFGgNSSxJBWKjY5 a8RWhsArR81Vp3mkTP/04dG3TB/HphNFvry//22I3pIsENzgXt/TtReYp//m+r8FgX 7Lm2kyaek/i2OMpyujn5mFhuPlsk84C/56+DPelTeAJCbVnkzqTGm81J6TUsr9wMfJ DIBOdy7IEenTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 7/8] kvm: fix previous commit for 32-bit builds Date: Tue, 15 Jun 2021 11:50:26 -0400 Message-Id: <20210615155027.63048-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615155027.63048-1-sashal@kernel.org> References: <20210615155027.63048-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Bonzini [ Upstream commit 4422829e8053068e0225e4d0ef42dc41ea7c9ef5 ] array_index_nospec does not work for uint64_t on 32-bit builds. However, the size of a memory slot must be less than 20 bits wide on those system, since the memory slot must fit in the user address space. So just store it in an unsigned long. Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- include/linux/kvm_host.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index a28a5c80f117..d5e38ebcfa47 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -969,8 +969,8 @@ __gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn) * table walks, do not let the processor speculate loads outside * the guest's registered memslots. */ - unsigned long offset = array_index_nospec(gfn - slot->base_gfn, - slot->npages); + unsigned long offset = gfn - slot->base_gfn; + offset = array_index_nospec(offset, slot->npages); return slot->userspace_addr + offset * PAGE_SIZE; } -- 2.30.2