Subject: Re: [PATCH v2 4/5] x86/mm: Prepare sme_encrypt_kernel() for PAGE
 aligned encryption
To: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org, Brijesh Singh <brijesh.singh@amd.com>,
        linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Thomas Gleixner <tglx@linutronix.de>
References: <20171221220242.30632.5031.stgit@tlendack-t1.amdoffice.net>
 <20171221220321.30632.70405.stgit@tlendack-t1.amdoffice.net>
 <20180107182513.3bvw3xgrzaxi23m3@pd.tnic>
From: Tom Lendacky <thomas.lendacky@amd.com>
Message-ID: <e376cb45-7238-c818-93fe-34286a597ac1@amd.com>
Date: Mon, 8 Jan 2018 17:20:15 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.2
MIME-Version: 1.0
In-Reply-To: <20180107182513.3bvw3xgrzaxi23m3@pd.tnic>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2018 23:20:18.8571 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: ae9f4223-f386-49fc-b1d8-08d556ee6239
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

On 1/7/2018 12:25 PM, Borislav Petkov wrote:
> On Thu, Dec 21, 2017 at 04:03:21PM -0600, Tom Lendacky wrote:
>> @@ -568,17 +578,57 @@ static void __init sme_populate_pgd_large(struct sme_populate_pgd_data *ppd)
>>  		native_set_pud(pud_p, pud);
>>  	}
>>  
>> +	return pmd_p;
>> +}
>> +
>> +static void __init sme_populate_pgd_large(struct sme_populate_pgd_data *ppd)
>> +{
>> +	pmd_t *pmd_p;
>> +
>> +	pmd_p = sme_prepare_pgd(ppd);
>> +	if (!pmd_p)
>> +		return;
>> +
>>  	pmd_p += pmd_index(ppd->vaddr);
>>  	if (!native_pmd_val(*pmd_p) || !(native_pmd_val(*pmd_p) & _PAGE_PSE))
>>  		native_set_pmd(pmd_p,
>>  			       native_make_pmd(ppd->paddr | ppd->pmd_flags));
> 
> Ugly linebreak.

That one will be fixed in the previous patch.

> 
>>  }
>>  
>> -static void __init __sme_map_range(struct sme_populate_pgd_data *ppd,
>> -				   pmdval_t pmd_flags)
>> +static void __init sme_populate_pgd(struct sme_populate_pgd_data *ppd)
>>  {
>> -	ppd->pmd_flags = pmd_flags;
>> +	pmd_t *pmd_p;
>> +	pte_t *pte_p;
>> +
>> +	pmd_p = sme_prepare_pgd(ppd);
>> +	if (!pmd_p)
>> +		return;
>> +
>> +	pmd_p += pmd_index(ppd->vaddr);
>> +	if (native_pmd_val(*pmd_p)) {
>> +		if (native_pmd_val(*pmd_p) & _PAGE_PSE)
>> +			return;
>> +
>> +		pte_p = (pte_t *)(native_pmd_val(*pmd_p) & ~PTE_FLAGS_MASK);
>> +	} else {
>> +		pmd_t pmd;
>>  
>> +		pte_p = ppd->pgtable_area;
>> +		memset(pte_p, 0, sizeof(*pte_p) * PTRS_PER_PTE);
>> +		ppd->pgtable_area += sizeof(*pte_p) * PTRS_PER_PTE;
>> +
>> +		pmd = native_make_pmd((pteval_t)pte_p + PMD_FLAGS);
>> +		native_set_pmd(pmd_p, pmd);
>> +	}
>> +
>> +	pte_p += pte_index(ppd->vaddr);
>> +	if (!native_pte_val(*pte_p))
>> +		native_set_pte(pte_p,
>> +			       native_make_pte(ppd->paddr | ppd->pte_flags));
> 
> Ditto.

And this one will be fixed here.

Thanks,
Tom

>