Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp866304pxf; Thu, 18 Mar 2021 13:30:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmJQdymme2kfhBJfxWzHpF+Uy7MYV1Hxrl21QirWSFWNeSmvkw2tSWUale5lLRa1uQZEr8 X-Received: by 2002:a17:907:75c7:: with SMTP id jl7mr415020ejc.191.1616099457192; Thu, 18 Mar 2021 13:30:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616099457; cv=none; d=google.com; s=arc-20160816; b=taIlEoR+vWVbk8kLkvxHbfOTZgk+i41ShrZXsRfKgJOAw2toiN1SW/eJL1uAEO4+R+ AlHO1A+3MB7rhAjZ5iT55N6GM0HUd7MxTmkue3qxiSgTKXcBWYtYhzSK2WYruQIgR4Qr Loxr0nX2yBx7yV+T1TCrxvjNuNysPh4iv7SwIZFsSdZOCPLfNGRosgUPshye1uiZTe2I AnPbYFYcQycVN/vSM9UMWzdzhIyipz+Xay/4WtaZrZyNWl9NpX6li8+NuEQqXo+6BqEn BLCYYCN9tiBJ+7mIr4KnKsj346cWsZ4YPWDCdfI2Se9LjAV5jjKBy3YWFvvPZBmmFQ7U 7X/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=zPzfbvSdI1HyaV5JZpMZrFia1b7ZbochJKGN960BLRs=; b=cqfbjBqG+bppFS5QGf7y7/i/9V5ezxldFzhQnPMqyrhP5yxY15H2tK01Ov6aV5qyun 74VCldxKlZZTy80lfO2VIN5XOCWpM8izVLIb6krhKNs2VXxQl0rvAkxQ33MP/tH98jmX Z+8lDI7tM5JSnPl6G1SNuexEwOYvsGEyiluu34R7lNql2RSB9a4m3m9IB7fZmer+7eJ9 vfcFGOJigTinPAtifuW9J7zc8hQhZBqHWUEPY3pOR+hZOk8R2ErTk/cvN57hWd4PFLDb OJGiX2Z7m8Xnt5/nFKgvjsPGQ6cfqowfwjQom+yvBBqGLaXWX7h0YbL34Wf0s7AszY/1 osZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f7si2284754edu.503.2021.03.18.13.30.34; Thu, 18 Mar 2021 13:30:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbhCRU3g (ORCPT + 99 others); Thu, 18 Mar 2021 16:29:36 -0400 Received: from mga04.intel.com ([192.55.52.120]:4540 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230495AbhCRU3S (ORCPT ); Thu, 18 Mar 2021 16:29:18 -0400 IronPort-SDR: M4v4oLC0Q2PZdrAAgXc1VKnEnNFD43o/WM0Ji65ly/baar/XmGj82SOmFK5RIk2zdM4ngogvDL xqrHRmj78Y4w== X-IronPort-AV: E=McAfee;i="6000,8403,9927"; a="187405824" X-IronPort-AV: E=Sophos;i="5.81,259,1610438400"; d="scan'208";a="187405824" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2021 13:29:17 -0700 IronPort-SDR: /duqs8LGb1pcam6TOOuo19fqDJYUwNc3hTdWoFo9woYvJCgHvkQNd2dWAyB9/xu0nlbiViaHpk Q4MW+VaaU5iA== X-IronPort-AV: E=Sophos;i="5.81,259,1610438400"; d="scan'208";a="602864941" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2021 13:29:17 -0700 From: Isaku Yamahata To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: brijesh.singh@amd.com, tglx@linutronix.de, bp@alien8.de, isaku.yamahata@gmail.com, thomas.lendacky@amd.com, Isaku Yamahata , "Kirill A . Shutemov" Subject: [PATCH] X86: __set_clr_pte_enc() miscalculates physical address Date: Thu, 18 Mar 2021 13:26:57 -0700 Message-Id: <81abbae1657053eccc535c16151f63cd049dcb97.1616098294.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __set_clr_pte_enc() miscalculates physical address to operate. pfn is in unit of PG_LEVEL_4K, not PGL_LEVEL_{2M, 1G}. Shift size to get physical address should be PAGE_SHIFT, not page_level_shift(). Fixes: dfaaec9033b8 ("x86: Add support for changing memory encryption attribute in early boot") Reviewed-by: Kirill A. Shutemov Signed-off-by: Isaku Yamahata --- arch/x86/mm/mem_encrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index 4b01f7dbaf30..ae78cef79980 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -262,7 +262,7 @@ static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc) if (pgprot_val(old_prot) == pgprot_val(new_prot)) return; - pa = pfn << page_level_shift(level); + pa = pfn << PAGE_SHIFT; size = page_level_size(level); /* -- 2.25.1