From patchwork Fri Jan 15 09:53:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhukeqian X-Patchwork-Id: 12022073 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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,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 73415C433E6 for ; Fri, 15 Jan 2021 09:55:06 +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 1328923136 for ; Fri, 15 Jan 2021 09:55:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1328923136 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.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=nt/HKE/ULL8+yc9PJHsuvg4GjkQ6t6xlpC9bGBUkU3M=; b=d++DuKc5rDjq7dXxKYysqW7pof UBllsUweA9TGMlw+myzkMAj7BB9dlRRuWI3Ma50Rt9gxkT7D2z22DnCEh4OW+DAQwtljUoGe04jaP O+qudIhsunOTEsWCm0z5vLAZMfECVF6HZLSMpYwgO0a6X+IZ6nsmOoPhmXbcScyc+VZ4vwBG9QM01 otUgOdYPkZaswk0oLM+S6pD7ULFuv6kuJDkXW/oTUpg8yJFhjBCoLc3xHWAl8q3aVXAAyy5bUWAlU ApqyCAIioR+FmQjo02lWm//Ty9KFi+e5B8dVpNKaZOIM0Iv7Pha7CJh6rDbOBxJ4uCO7qFpTNRfiz 79zb9mBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0LnY-0007MV-2N; Fri, 15 Jan 2021 09:53:40 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0LnU-0007Lz-OU for linux-arm-kernel@lists.infradead.org; Fri, 15 Jan 2021 09:53:38 +0000 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DHGgC2fHkzMKkq; Fri, 15 Jan 2021 17:52:07 +0800 (CST) Received: from DESKTOP-5IS4806.china.huawei.com (10.174.184.42) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 17:53:16 +0800 From: Keqian Zhu To: , , , , Will Deacon , Marc Zyngier , Catalin Marinas Subject: [PATCH] kvm: arm64: Properly align the end address of table walk Date: Fri, 15 Jan 2021 17:53:07 +0800 Message-ID: <20210115095307.12912-1-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.184.42] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210115_045337_626831_528008FF X-CRM114-Status: GOOD ( 11.35 ) 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 , jiangkunkun@huawei.com, Suzuki K Poulose , Joerg Roedel , Daniel Lezcano , Alexios Zavras , James Morse , wanghaibin.wang@huawei.com, Thomas Gleixner , Robin Murphy , Andrew Morton , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When align the end address, ought to use its original value. Fixes: b1e57de62cfb ("KVM: arm64: Add stand-alone page-table walker infrastructure") Signed-off-by: Keqian Zhu --- arch/arm64/kvm/hyp/pgtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index bdf8e55ed308..670b0ef12440 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -296,7 +296,7 @@ int kvm_pgtable_walk(struct kvm_pgtable *pgt, u64 addr, u64 size, struct kvm_pgtable_walk_data walk_data = { .pgt = pgt, .addr = ALIGN_DOWN(addr, PAGE_SIZE), - .end = PAGE_ALIGN(walk_data.addr + size), + .end = PAGE_ALIGN(addr + size), .walker = walker, };