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=-12.8 required=3.0 tests=BAYES_00,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, 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 CD6C3C55ABD for ; Fri, 13 Nov 2020 15:05:29 +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 852D522201 for ; Fri, 13 Nov 2020 15:05:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hDjDRmU9"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=nuviainc-com.20150623.gappssmtp.com header.i=@nuviainc-com.20150623.gappssmtp.com header.b="xPJmNs2C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 852D522201 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=nuviainc.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:References:In-Reply-To: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:List-Owner; bh=867fHe0ODBa1CTS/DUO5ch+jE2mJRx9+7aVkLizKaIk=; b=hDjDRmU91fXbqTIUBmcr7Zeps 9DOKj7rT7nobNB8N5VfHeBviFcwRen1QN6IEhvBIp/fuhckhqfoRxd8SF7zz9WVlUytyVWw6679tm qHtddSCBGfzzTZiVTTaXY3Gbw90TzGKD4cAjl5cjU2TC3GMsPE39MhLgIgrDMhJ8H5A6o/il4yAKV IBn6N/TVuUNnRofJzrnD+IjGbCwpDyaMUqTfb4rsXwspo0XfwHdRMQjDaTKMyJrNFeRn3oSZN/lJV io387TP8SgzAsBPgC4XyzJYxmDKKFHo7XD/Df8xIa6Qp/ntrFEvQjQAQjyBZzUkJrVbj60bm4Z/tZ i5Or8YcWg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdaca-0006wh-6W; Fri, 13 Nov 2020 15:04:16 +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 1kdacW-0006vS-AQ for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 15:04:14 +0000 Received: by mail-wr1-x444.google.com with SMTP id 23so10227985wrc.8 for ; Fri, 13 Nov 2020 07:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S9p5Vswa31QsmS/WiZyhz6KCI2LrYo1J/wWBLoHYoNA=; b=xPJmNs2CXEUWzceQnDfntoJImH/5SKT8p3CIBP1s5Fep/F9a95zpI/oQySF8Oo/P2r Kb1P04+mVecDdRPushKUS+lwi/HFlPrnysizKjD+X8flD28Cv7vxmgzQUpq3kuxZJdZS EiSyN+AoWNeumYCjQ/QW3zyF4WzKRFdVQ/Up6Dq9n+BiG+zM4yEyykGKX3w/wHG5aXPX ng2h05ybZ/5Fi1EK1zaYpZziFPRJLE7GV3qg2JhIWkqSMAQg5aJq4jKdGK5+YXX7qu1Y isaOaT5DBhxYSTchHDSC9A2YdPlm8Rjncy3AEzVVmm8EZh5kxXFRWttKWI1GfYzFh0mX qehA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=S9p5Vswa31QsmS/WiZyhz6KCI2LrYo1J/wWBLoHYoNA=; b=hMfE8CNq74DaRWhcHnkhe7iE8RUZVZ9pNXwbWpPNG9BE4HUKYOs/vkTrAbhlOb4Ieo hzugKL/VSw85lD5M+av8ziqnCsY0nreKLXEa1J9ZjsOUVB2Y1jzxGAyK9wVSJ6yMxkCz miQecfO8fhFVQ6kLhyIBpdsyZhJCNjPYZLJGZeGlH7GtAzCXEOU6TUWBu8MXY/zf4esC tQXw6E+sTNYuCpEmGjwFCso4FOwPVQxXYLfjzTakcFDZSYIVGW4fYXOVOafqUS4wcqNO mYjVZg1DxQrY99bcBS6EM5ao1I+K5qLrmXD8IrcLgqhsEauSqpwWeKK9vfwZgvLhMhKU I40g== X-Gm-Message-State: AOAM530+BX59cy98GbTJ/GwEW2et90xgiOzI6V94BIyjncBvTfL6pjOs HwTpyBE2nYvJDd0or9F+gWT4sYOQ1jYxm1Mcmi9W15sQMSJLFmm5aaeTNUDtNmZo6sb4jzPuiYh bngWgC2fypMVImqq94SH7V7+bYmYS/yKMXj2sqS1+AYa1bPbHSCUlSMN9PvP+RAxmnU15llV9// n1as5K6ZYA9MEbODE= X-Google-Smtp-Source: ABdhPJxUpw6KHZHolkDSNV8MdUZWSVkMM982UbrgKE0K3rSTqqthvbLHiQZOWPd6sePJ0oNCMOQurA== X-Received: by 2002:a5d:5308:: with SMTP id e8mr3937973wrv.299.1605279850739; Fri, 13 Nov 2020 07:04:10 -0800 (PST) Received: from localhost ([82.44.17.50]) by smtp.gmail.com with ESMTPSA id d8sm10103833wmb.11.2020.11.13.07.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 07:04:09 -0800 (PST) From: Jamie Iles To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] kvm: arm64: correctly align nVHE percpu data Date: Fri, 13 Nov 2020 15:04:06 +0000 Message-Id: <20201113150406.14314-1-jamie@nuviainc.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201113101227.zb6ckyriobjrlkc5@google.com> References: <20201113101227.zb6ckyriobjrlkc5@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_100412_508867_B26ACEDD X-CRM114-Status: GOOD ( 16.04 ) 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: Marc Zyngier , Jamie Iles , David Brazdil , Will Deacon Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The nVHE percpu data is partially linked but the nVHE linker script did not align the percpu section. The PERCPU_INPUT macro would then align the data to a page boundary: #define PERCPU_INPUT(cacheline) \ __per_cpu_start = .; \ *(.data..percpu..first) \ . = ALIGN(PAGE_SIZE); \ *(.data..percpu..page_aligned) \ . = ALIGN(cacheline); \ *(.data..percpu..read_mostly) \ . = ALIGN(cacheline); \ *(.data..percpu) \ *(.data..percpu..shared_aligned) \ PERCPU_DECRYPTED_SECTION \ __per_cpu_end = .; but then when the final vmlinux linking happens the hypervisor percpu data is included after page alignment and so the offsets potentially don't match. On my build I saw that the .hyp.data..percpu section was at address 0x20 and then the percpu data would begin at 0x1000 (because of the page alignment in PERCPU_INPUT), but when linked into vmlinux, everything would be shifted down by 0x20 bytes. This manifests as one of the CPUs getting lost when running kvm-unit-tests or starting any VM and subsequent soft lockup on a Cortex A72 device. Fixes: 30c953911c43 ("kvm: arm64: Set up hyp percpu data for nVHE") Cc: David Brazdil Cc: Marc Zyngier Cc: Will Deacon Signed-off-by: Jamie Iles --- v2: add clarifying commentary arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S index bb2d986ff696..a797abace13f 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S @@ -13,6 +13,11 @@ SECTIONS { HYP_SECTION(.text) + /* + * .hyp..data..percpu needs to be page aligned to maintain the same + * alignment for when linking into vmlinux. + */ + . = ALIGN(PAGE_SIZE); HYP_SECTION_NAME(.data..percpu) : { PERCPU_INPUT(L1_CACHE_BYTES) } -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel