[AMD Official Use Only - General] >> >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). >That's the correct mask to grab the 2M-aligned address bits, e.g: > pfn_mask = 3fe00h = 11 1111 1110 0000 0000b > So the last 9 bits are ignored, e.g. anything PFNs that are multiples > of 512 (2^9), and the upper bits comes from the 1GB PTE entry. > But there is an open question of whether we actually want to index using 2M-aligned or specific 4K-aligned PFN indicated by the faulting address. >> >> >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. >If we actually want the 4K page, I think we would want to use the 0x3ffff mask as Marc suggested to get to the specific 4K RMP entry, which I don't think the current code is trying to do. But maybe that *should* be what we should be doing. Ok, I agree to get to the specific 4K RMP entry. >Based on your earlier explanation, if we index into the RMP table using 2M-aligned address, we might find that the entry does not have the page-size bit set (maybe it was PSMASH'd for some reason). I believe that PSMASH does update the 2M-aligned RMP table entry to the smashed page size. It sets all the 4K intermediate/smashed pages size to 4K and changes the page size of the base RMP table (2M-aligned) entry to 4K. >If that's the cause we'd then have to calculate the index for the specific RMP entry for the specific 4K address that caused the fault, and then check that instead. >If however we simply index directly in the 4K RMP entry from the start, >snp_lookup_rmpentry() should still tell us whether the page is private or not, because RMPUPDATE/PSMASH are both documented to also update the assigned bits for each 4K RMP entry even if you're using a 2M RMP entry and setting the page-size >bit to cover the whole 2M range. I think it does make sense to index directly into the 4K RMP entry, as we should be indexing into the most granular entry in the RMP table, and that will have the page "assigned" information as both RMPUPDATE/PSMASH would update the assigned bits for each 4K RMP entry even if we using a 2MB RMP entry (this is an important point to note). >Additionally, snp_lookup_rmpentry() already has logic to also go check the 2M-aligned RMP entry to provide an indication of what level it is mapped at in the RMP table, so we can still use that to determine if the host mapping needs to be split or >not. Yes. >One thing that could use some confirmation is what happens if you do an RMPUPDATE for a 2MB RMP entry, and then go back and try to RMPUPDATE a sub-page and change the assigned bit so it's not consistent with 2MB RMP entry. I would assume >that would fail the instruction, but we should confirm that before relying on this logic. I agree. Thanks, Ashish