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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B2C2ECAAD5 for ; Thu, 8 Sep 2022 07:57:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0ABE76B0072; Thu, 8 Sep 2022 03:57:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 035046B0073; Thu, 8 Sep 2022 03:57:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF1D76B0074; Thu, 8 Sep 2022 03:57:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CD5826B0072 for ; Thu, 8 Sep 2022 03:57:50 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B14881C600E for ; Thu, 8 Sep 2022 07:57:50 +0000 (UTC) X-FDA: 79888164300.26.C36BC30 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf11.hostedemail.com (Postfix) with ESMTP id 1004340075 for ; Thu, 8 Sep 2022 07:57:49 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1AC4AB8203E; Thu, 8 Sep 2022 07:57:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B4A3C433D6; Thu, 8 Sep 2022 07:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662623866; bh=14RGdwf+G17sAtxszOYpeygph7MCRQUU6OID7/uHLEs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rPrrL/kCuuWnPdI/Y2fRRysK/5YEA9EgtLZ8+whFBuVwMBS4ai28EmGc5qFMLZwlY jCabc715nObJb6976nr2r1J/pmu5q5DxoqJZQYxA4TAVxthDV5qGuExz00aAIrHlph ciE1tjg1Pc4jdrjJ3w2jf17oRFtOk4fWI4ISa7EA3wyW6Woh443tnUdHZvWelReYNS qdsCSzN0Dhn3pjRLB5LrSRtL/EpiC83jxD6oe+05AxtQqbnhfdHOpXqnP3qjJNvKKK XQrIXGmmx2TQipDNrEpSMTyFFDoV0vSEsvg+OxXPvJaBuvxhzRZpKaeDDqU+PdTelg zh/9kRH44pQEg== Date: Thu, 8 Sep 2022 10:57:40 +0300 From: Jarkko Sakkinen To: "Kalra, Ashish" Cc: Marc Orr , Borislav Petkov , x86 , LKML , kvm list , "linux-coco@lists.linux.dev" , Linux Memory Management List , Linux Crypto Mailing List , Thomas Gleixner , Ingo Molnar , Joerg Roedel , "Lendacky, Thomas" , "H. Peter Anvin" , Ard Biesheuvel , Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Jim Mattson , Andy Lutomirski , Dave Hansen , Sergio Lopez , Peter Gonda , Peter Zijlstra , Srinivas Pandruvada , David Rientjes , Dov Murik , Tobin Feldman-Fitzthum , "Roth, Michael" , Vlastimil Babka , "Kirill A . Shutemov" , Andi Kleen , Tony Luck , Sathyanarayanan Kuppuswamy , Alper Gun , "Dr . David Alan Gilbert" Subject: Re: [PATCH Part2 v6 09/49] x86/fault: Add support to handle the RMP fault for user address Message-ID: References: <0ecb0a4781be933fcadeb56a85070818ef3566e7.1655761627.git.ashish.kalra@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="rPrrL/kC"; spf=pass (imf11.hostedemail.com: domain of jarkko@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662623870; a=rsa-sha256; cv=none; b=elRgWPO7N9oxe6v8CtfkFyMVYkcxkusYhtYyyt/dmcs61n+DHkzFLbG5N84uAOX+9ZN4e9 zs/2r1AMat50wVVO+UUJw4ZU73T5PiPccQTFWdJ8vLETJBht9uMSb+0YvG0ZjFfzQQEhYX aRG8JV6pvWOmPT5PPQrAElZllYbLiVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662623870; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=n9znYBSY84FGsSauEOpgPAe00IaKmt06cOWmXOzfJ3g=; b=GNZu2CdeJDv+BYE/MeX0mnUuLRrdHDvEBAy/fsUpcLfFuvdom3C46mtJ2R+XHe0BRYe1iL i161skLWtUIBQvTRJ8o9Ux6Oo/FVuJjcmh5AC88JJsi0UKOUqKYuYYKFsEY3CnIM0sFEqZ soQdy+VTxj1nZBQVtUNu1ehpINZCdco= X-Rspamd-Queue-Id: 1004340075 X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="rPrrL/kC"; spf=pass (imf11.hostedemail.com: domain of jarkko@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam01 X-Stat-Signature: x37698acnjruq45jeer7bazzf7x3oqg7 X-HE-Tag: 1662623869-122424 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Sep 08, 2022 at 10:46:51AM +0300, Jarkko Sakkinen wrote: > On Tue, Sep 06, 2022 at 06:44:23PM +0300, Jarkko Sakkinen wrote: > > On Tue, Sep 06, 2022 at 02:17:15PM +0000, Kalra, Ashish wrote: > > > [AMD Official Use Only - General] > > > > > > >> On Tue, Aug 09, 2022 at 06:55:43PM +0200, Borislav Petkov wrote: > > > >> > On Mon, Jun 20, 2022 at 11:03:43PM +0000, Ashish Kalra wrote: > > > >> > > + pfn = pte_pfn(*pte); > > > >> > > + > > > >> > > + /* If its large page then calculte the fault pfn */ > > > >> > > + if (level > PG_LEVEL_4K) { > > > >> > > + unsigned long mask; > > > >> > > + > > > >> > > + mask = pages_per_hpage(level) - pages_per_hpage(level - 1); > > > >> > > + pfn |= (address >> PAGE_SHIFT) & mask; > > > >> > > > > >> > Oh boy, this is unnecessarily complicated. Isn't this > > > >> > > > > >> > pfn |= pud_index(address); > > > >> > > > > >> > or > > > >> > pfn |= pmd_index(address); > > > >> > > > >> I played with this a bit and ended up with > > > >> > > > >> pfn = pte_pfn(*pte) | PFN_DOWN(address & page_level_mask(level > > > >> - 1)); > > > >> > > > >> Unless I got something terribly wrong, this should do the same (see > > > >> the attached patch) as the existing calculations. > > > > > > >Actually, I don't think they're the same. I think Jarkko's version is correct. Specifically: > > > >- For level = PG_LEVEL_2M they're the same. > > > >- For level = PG_LEVEL_1G: > > > >The current code calculates a garbage mask: > > > >mask = pages_per_hpage(level) - pages_per_hpage(level - 1); translates to: > > > >>> hex(262144 - 512) > > > >'0x3fe00' > > > > > > No actually this is not a garbage mask, as I explained in earlier responses we need to capture the address bits > > > to get to the correct 4K index into the RMP table. > > > Therefore, for level = PG_LEVEL_1G: > > > mask = pages_per_hpage(level) - pages_per_hpage(level - 1) => 0x3fe00 (which is the correct mask). > > > > > > >But I believe Jarkko's version calculates the correct mask (below), incorporating all 18 offset bits into the 1G page. > > > >>> hex(262144 -1) > > > >'0x3ffff' > > > > > > We can get this simply by doing (page_per_hpage(level)-1), but as I mentioned above this is not what we need. > > > > I think you're correct, so I'll retry: > > > > (address / PAGE_SIZE) & (pages_per_hpage(level) - pages_per_hpage(level - 1)) = > > > > (address / PAGE_SIZE) & ((page_level_size(level) / PAGE_SIZE) - (page_level_size(level - 1) / PAGE_SIZE)) = > > > > [ factor out 1 / PAGE_SIZE ] > > > > (address & (page_level_size(level) - page_level_size(level - 1))) / PAGE_SIZE = > > > > [ Substitute with PFN_DOWN() ] > > > > PFN_DOWN(address & (page_level_size(level) - page_level_size(level - 1))) > > > > So you can just: > > > > pfn = pte_pfn(*pte) | PFN_DOWN(address & (page_level_size(level) - page_level_size(level - 1))); > > > > Which is IMHO way better still what it is now because no branching > > and no ad-hoc helpers (the current is essentially just page_level_size > > wrapper). > > I created a small test program: > > $ cat test.c > #include > int main(void) > { > unsigned long arr[] = {0x8, 0x1000, 0x200000, 0x40000000, 0x8000000000}; > int i; > > for (i = 1; i < sizeof(arr)/sizeof(unsigned long); i++) { > printf("%048b\n", arr[i] - arr[i - 1]); > printf("%048b\n", (arr[i] - 1) ^ (arr[i - 1] - 1)); > } > } > > kultaheltta in linux on  host-snp-v7 [?] > $ gcc -o test test.c > > kultaheltta in linux on  host-snp-v7 [?] > $ ./test > 000000000000000000000000000000000000111111111000 > 000000000000000000000000000000000000111111111000 > 000000000000000000000000000111111111000000000000 > 000000000000000000000000000111111111000000000000 > 000000000000000000111111111000000000000000000000 > 000000000000000000111111111000000000000000000000 > 000000000000000011000000000000000000000000000000 > 000000000000000011000000000000000000000000000000 > > So the operation could be described as: > > pfn = PFN_DOWN(address & (~page_level_mask(level) ^ ~page_level_mask(level - 1))); > > Which IMHO already documents itself quite well: index > with the granularity of PGD by removing bits used for > PGD's below it. I mean: pfn = pte_pfn(*pte) | PFN_DOWN(address & (~page_level_mask(level) ^ ~page_level_mask(level - 1))); Note that PG_LEVEL_4K check is unnecessary as the result will be zero after PFN_DOWN(). BR, Jarkko