Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ce2b2cac-2a18-ef23-7bdf-4040c28ffa24@amd.com>
Date:   Thu, 8 Dec 2022 17:11:26 +1100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.0
Subject: Re: [PATCH kernel 1/3] x86/amd/dr_addr_mask: Cache values in percpu
 variables
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>
Cc:     kvm@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org,
        Venu Busireddy <venu.busireddy@oracle.com>,
        Tony Luck <tony.luck@intel.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Sean Christopherson <seanjc@google.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Michael Sterritt <sterritt@google.com>,
        Michael Roth <michael.roth@amd.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Ingo Molnar <mingo@redhat.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Andrew Cooper <andrew.cooper3@citrix.com>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        "H. Peter Anvin" <hpa@zytor.com>
References: <20221201021948.9259-1-aik@amd.com>
 <20221201021948.9259-2-aik@amd.com> <Y5DhvRZX0Aizu1ya@zn.tnic>
From:   Alexey Kardashevskiy <aik@amd.com>
In-Reply-To: <Y5DhvRZX0Aizu1ya@zn.tnic>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MnNDcnZWV1V6OHlKNFhUcW5qTzQwcS9HOEgrNG1qd0FaOEwrN2JXSUo4OWdh?=
 =?utf-8?B?QWNFYXIrQnFUaURMWU9vZStMM0JZTHQ1RHZadmt2bUoxOE9yOUJzaGZJMjZO?=
 =?utf-8?B?M2xtYmx6cGtXVjNkRzlCQVdjemErK0E2cWlJT2ZvQ1RpOE5yM1pQV1dreTlF?=
 =?utf-8?B?ZmVGZk1OaGU5NVdwZlZCeGFkUlVzVVIwdG9QRnN1d1l2Tm9UTzRWeE1DcTBp?=
 =?utf-8?B?Q0YrV0hpaXRXZElBSEhSa1ZYZEZpak9CYnh6RW5lSVJNTWozKzJTMnNTN0hq?=
 =?utf-8?B?NGhGdDJONUl3N0dyWGR1MVNzY2l5cUZ0RW1wZHpZNmlSMHlmMWNSUnJEcGow?=
 =?utf-8?B?UUlIdS9aWFF1MHQvWi9HbnlKbEwwYVNDMkJ5Y0tOZGNkUDlGSGkyR0JFODZ4?=
 =?utf-8?B?UU5mWVpnUFpPQmk5NE1HbFJTS3RrSmgxQkZ1d29PYUxvMFVub0FvK3ZVcERG?=
 =?utf-8?B?VFVZL3lYWFp3QkJkL2dtdndUcTBQU2xiazJpNEJJSFo5SGFkTGJuQmNyOVI4?=
 =?utf-8?B?Tm9WYms2RGcwb3VBUGdaNGVuUUNnS2VzSFBDWXE2d1R2WjFQL3ZRZGFPbGdl?=
 =?utf-8?B?TFNLdWJOcWJ0RGNEKzJWaFlUWXZXUDNud2krY0tMZW5MMlBEeGViMTBGR1Ro?=
 =?utf-8?B?UGRhWmtIdU9LcEVrWkZLMEpHNko3ZlVxUEZDRGhGd3N5RjJDYnhESlVTYkpv?=
 =?utf-8?B?OGpML2lpWHRXSDJiY05JNncxbEdMa1F6K3NpcEJ1VC9XNGRGd01UOHEyTVBn?=
 =?utf-8?B?ei93S1poM29LVG1ZTGt4QzY2SzMwZUxNTEl4SklIOFFDNXMyVGJOd2ZBaExa?=
 =?utf-8?B?RFViVUc3Yk9KZlJKTGxIVjNHRmZEby9TNWE0a1BlbG1qeVNaZ1hybG5QdGk2?=
 =?utf-8?B?SUlsZEd5dVJjeHhxK0t3NjI1OTJCSkdReTBRM05Kb2pVRnFNcUQ0cDErYTBH?=
 =?utf-8?B?WHh3a2pDVGVFaS9icldrNkxBZlhGVGVSK0dWcjhPNDFZbWtKOGN0MmxYeG8r?=
 =?utf-8?B?SGZPZThSMS9RbU16d0o0V3lxbEhOa0VXUDFxaVNHRTJHaXFjSGt1UDBvdUJp?=
 =?utf-8?B?WFAvY1EySkV0YjNBQTY0TzFJN2NRNG04YWpmUWZiSHdyR09WMFdkd3JpaVVs?=
 =?utf-8?B?Zm5YL29KdXZtdkpnZmdoY2l5V1RGZWVoRERxT3U5YUF2N2hxRnZXQjYwUVFT?=
 =?utf-8?B?MS9BZWJ2MG9UNVY1RzZoSkVFRVBtQ05qY0hqSGlBNmIwOXg3aTkxOXRxZFY5?=
 =?utf-8?B?cXhoSVdEWGhPVlV2SENIQThFWm0zSXFCcVMzQ0M3ZkRwK1BBSk1weEhjLzZE?=
 =?utf-8?B?bXQ0Qmc0UEVnb1MyT1VtZ3hvc2J5OVRGdjhEMXhjMVlSS3YyUWh3NVBPWjhE?=
 =?utf-8?B?SXlLeFBwOEpwYjMzcTgvSStNakhGWTFQWXpPb2pmaHF4cVIzNHUvK0g4R2Fv?=
 =?utf-8?B?RC9DZ3IvU0pTeXROYWZHTFhhWEl3a1NnRWh4NHhiMDJIL0FXNCt3dmRzRloy?=
 =?utf-8?B?ck5lOU9LWmtqUjM0eS9BdDNuYVVPUC9LelZ1amd4NjQrWmZPWWNUd3ZETVdo?=
 =?utf-8?B?WXZEa25LemNWSmx4ODdKMTg0Qng5WEptTWl0MzZWZ29VVlpNZ0cwc3FhSGJQ?=
 =?utf-8?B?RE5DRnhLOGpnV2ZXUy9IQUdmRHVFbnlXZHlSVHFaV2oyeW9sQ2hSUE0xcG9i?=
 =?utf-8?B?dnNidUNvRkhaZTYzeHNFNXNoVkNZMlJkQmxKZ1YyS0wxdGVGbUtVTm95YXEy?=
 =?utf-8?B?ZUZaU2tGQ0ZINEhDanI1ek9xRnJ3Zi9sbWVPNzRkalFnYnZ4OGloTWRTcFla?=
 =?utf-8?B?Q0kwQ0QxbEYyeTZBM2RTQ0tHWmNWNmFCUUtXYXdsN05zWWw1SFp0WUdVRlJN?=
 =?utf-8?B?aTJ6dG82dTFLakxoNVp4eUhWZWVleVlsU090bGJONXBMZXA2QmdoVlRxdkF2?=
 =?utf-8?B?TXhJb3l3SEZXbEQ0TVJsakUwem10aXR3WjdXZ0VjaFpQQ1dNekxNY2dkdFZJ?=
 =?utf-8?B?eVNwMXordFAyUUR4Zlg5N1dla0FkS3BiL2RjdkRNakswWTBoWUEyVkVIZDVo?=
 =?utf-8?B?Y0FERWp4ZEtJRWpPeHM5QW03aUxKVGovb3VzNDNtRHVEOVdVUXJINEQvUzUv?=
 =?utf-8?Q?IfKO2wmk7DMshY9ETgLIDoTVD?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4fe20d7e-2ae2-4ffa-1d56-08dad8e31116
X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2843.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2022 06:11:38.3434
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tJtHURjYyQmO/Go4qAosk2iAbPfosMzyut3JaezcUxoYmeFAhOmcU8JsEdj1MfFOsQ2Eng1l1yObwN/NrPDlAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5765
X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 8/12/22 05:55, Borislav Petkov wrote:
> On Thu, Dec 01, 2022 at 01:19:46PM +1100, Alexey Kardashevskiy wrote:
>> Subject: Re: [PATCH kernel 1/3] x86/amd/dr_addr_mask: Cache values in percpu variables
> 
> "x86/amd: " is perfectly fine as a prefix.
> 
>> Reading DR[0-3]_ADDR_MASK MSRs takes about 250 cycles which is going to
>> be noticeable when the AMD KVM SEV-ES's DebugSwap feature is enabled and
> 
> which does what? I.e., a sort of lazy DR regs swapping...
> 
>> KVM needs to store these before switching to a guest; the DebugSwitch
>> hardware support restores them as type B swap.
> 
> I know this is all clear to you but you should explain what type B
> register swap is.
> 
>> This stores MSR values from set_dr_addr_mask() in percpu values and
> 
> s/This stores/Store/
> 
>  From Documentation/process/submitting-patches.rst:
> 
>   "Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
>    instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
>    to do frotz", as if you are giving orders to the codebase to change
>    its behaviour."
> 
> Also, do not talk about what your patch does - that should hopefully be
> visible in the diff itself. Rather, talk about *why* you're doing what
> you're doing.
> 
>> returns them via new get_dr_addr_mask(). The gain here is about 10x.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@amd.com>
>> ---
>>   arch/x86/include/asm/debugreg.h |  1 +
>>   arch/x86/kernel/cpu/amd.c       | 32 ++++++++++++++++++++
>>   2 files changed, 33 insertions(+)
>>
>> diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h
>> index cfdf307ddc01..c4324d0205b5 100644
>> --- a/arch/x86/include/asm/debugreg.h
>> +++ b/arch/x86/include/asm/debugreg.h
>> @@ -127,6 +127,7 @@ static __always_inline void local_db_restore(unsigned long dr7)
>>   
>>   #ifdef CONFIG_CPU_SUP_AMD
>>   extern void set_dr_addr_mask(unsigned long mask, int dr);
>> +extern unsigned long get_dr_addr_mask(int dr);
>>   #else
>>   static inline void set_dr_addr_mask(unsigned long mask, int dr) { }
>>   #endif
>> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
>> index c75d75b9f11a..ec7efcef4e14 100644
>> --- a/arch/x86/kernel/cpu/amd.c
>> +++ b/arch/x86/kernel/cpu/amd.c
>> @@ -1158,6 +1158,11 @@ static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
>>   	return false;
>>   }
>>   
>> +DEFINE_PER_CPU_READ_MOSTLY(unsigned long, dr0_addr_mask);
>> +DEFINE_PER_CPU_READ_MOSTLY(unsigned long, dr1_addr_mask);
>> +DEFINE_PER_CPU_READ_MOSTLY(unsigned long, dr2_addr_mask);
>> +DEFINE_PER_CPU_READ_MOSTLY(unsigned long, dr3_addr_mask);
> 
> This BPEXT thing is AMD-only, right?
> 
> I guess those should be called amd_drX_addr_mask where X in [0-3].
> 
> Yeah yeah, they are used in AMD-only code - svm* - but still.
> 
>>   void set_dr_addr_mask(unsigned long mask, int dr)
>>   {
>>   	if (!boot_cpu_has(X86_FEATURE_BPEXT))
>> @@ -1166,17 +1171,44 @@ void set_dr_addr_mask(unsigned long mask, int dr)
>>   	switch (dr) {
>>   	case 0:
>>   		wrmsr(MSR_F16H_DR0_ADDR_MASK, mask, 0);
>> +		per_cpu(dr0_addr_mask, smp_processor_id()) = mask;
>>   		break;
>>   	case 1:
>> +		wrmsr(MSR_F16H_DR1_ADDR_MASK - 1 + dr, mask, 0);
>> +		per_cpu(dr1_addr_mask, smp_processor_id()) = mask;
>> +		break;
>>   	case 2:
>> +		wrmsr(MSR_F16H_DR1_ADDR_MASK - 1 + dr, mask, 0);
>> +		per_cpu(dr2_addr_mask, smp_processor_id()) = mask;
>> +		break;
>>   	case 3:
>>   		wrmsr(MSR_F16H_DR1_ADDR_MASK - 1 + dr, mask, 0);
>> +		per_cpu(dr3_addr_mask, smp_processor_id()) = mask;
>>   		break;
>>   	default:
>>   		break;
>>   	}
>>   }
>>   
>> +unsigned long get_dr_addr_mask(int dr)
> 
> This function name is too generic for an exported function.
> 
> amd_get_dr_addr_mask() I'd say.
> 
>> +	if (!boot_cpu_has(X86_FEATURE_BPEXT))
> 
> check_for_deprecated_apis: WARNING: arch/x86/kernel/cpu/amd.c:1195: Do not use boot_cpu_has() - use cpu_feature_enabled() instead.
> 
> You could fix the above one too, while at it.
> 
>> +		return 0;
>> +
>> +	switch (dr) {
>> +	case 0:
>> +		return per_cpu(dr0_addr_mask, smp_processor_id());
>> +	case 1:
>> +		return per_cpu(dr1_addr_mask, smp_processor_id());
>> +	case 2:
>> +		return per_cpu(dr2_addr_mask, smp_processor_id());
>> +	case 3:
>> +		return per_cpu(dr3_addr_mask, smp_processor_id());
> 
> 	default:	
> 		WARN_ON_ONCE(1);
> 		break;
> 
> Just in case.
> 
> And as a matter of fact, make that short and succinct:
> 
>          switch (dr) {
>          case 0: return per_cpu(dr0_addr_mask, smp_processor_id());
>          case 1: return per_cpu(dr1_addr_mask, smp_processor_id());
>          case 2: return per_cpu(dr2_addr_mask, smp_processor_id());
>          case 3: return per_cpu(dr3_addr_mask, smp_processor_id());
>          default: WARN_ON_ONCE(1); break;
>          }


Not an array, as Sean suggested? Uff...


> 
> Thx.
> 

-- 
Alexey