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 72A97C48297 for ; Mon, 12 Feb 2024 17:04:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4CBE6B0093; Mon, 12 Feb 2024 12:04:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DFABB6B009D; Mon, 12 Feb 2024 12:04:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9DB46B009E; Mon, 12 Feb 2024 12:04:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BB5E56B0093 for ; Mon, 12 Feb 2024 12:04:00 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8BA25C0A48 for ; Mon, 12 Feb 2024 17:04:00 +0000 (UTC) X-FDA: 81783774240.13.E8CF4B6 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2058.outbound.protection.outlook.com [40.107.93.58]) by imf11.hostedemail.com (Postfix) with ESMTP id 6CBA24001C for ; Mon, 12 Feb 2024 17:03:56 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b="Qhdu/GRQ"; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf11.hostedemail.com: domain of Michael.Roth@amd.com designates 40.107.93.58 as permitted sender) smtp.mailfrom=Michael.Roth@amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707757436; 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=amNcMs5Lgijt4IOF8Lqf21S6M19aiimiHeLgME974Ug=; b=qHLhGfOcr+QmOikwaq+m56iEzK++SkK58mRZ+O+pmpfv22E40YVH75hGI9KEtfrKvM3gbe W6iK8zaNNpt6LaHuth4xyHgIi7CVWoTaWKH/tKYj6Zc9uAqGLF8YO/0/iI5sWz5gUClF0x 3DtmrfT31Fk2YXblsLn8CTaumMnvuJk= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b="Qhdu/GRQ"; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf11.hostedemail.com: domain of Michael.Roth@amd.com designates 40.107.93.58 as permitted sender) smtp.mailfrom=Michael.Roth@amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1707757436; a=rsa-sha256; cv=pass; b=lieKL61Eyc4r+3p1dIa8SeJohn2Gh983TClKJJUCtCNdarOEb6htdvKkpwzlrxZP7JoObi jBOwdKYrPX8n825tso+EadiGBypH0H/bE3oZe58Fj/JDMcDjyWN6nv5YpuwOshgcKyZKzF Hiv3/r/ASI1i+gl0SD4JUZAlBgamYOU= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AizATzjVBhJQfsbfWiBjMX3VXrLOmgecAwjVpT73DmritP4ItaXq5JwUKVZ65lmTdnWEmap+x0vqhOxFPJyzClEcVMF4RXETlIECjXxTn9X7e26rnMxrlL85/JwcU0rbZlPZEQHYOwHZw0htb9ZubiOQn0GwiJOEQsVDO8OSkr3a0eXGzHJm3Pe8MQjXsm3+0Ts2BvCHh87oDn0SfPre1fFhJWGeJo7gJMY7HrX4K6qozZyJ1OdfAUUAargoFyPSnS/3xzrsn0dmUOQ6mKSen/u0hKEgvxIgbtAGFrwihnK1zUTPy2X9YGXXHK6zUPKIoEzxco69fVQ7QtQGQkGtEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=amNcMs5Lgijt4IOF8Lqf21S6M19aiimiHeLgME974Ug=; b=U66ZLrPr92NO2LFzX3OgLgQn+RL6BNNcyGP7KZVq8UqtZFtVLhMJEvNgaeBmwaw4yJDX0tEv3ElpxwgKe9c8vLRc1wDxJ2avpGHM2QUes+/PjcFbC8u8Jk57jk8YAKAHuStgYRtTWMxGYczNJP0hT+4Vq3LH18DeUyTPovIvYiomTIdw9BiTBIkr9QA7VK9+HYwZH/OVwjUxeCe9ci1B7dh1A24ECGgig/R3UDu+LDhrasAql/7uwkU9XKAQ21rk7MYhtl6k85OhOHn9/Im2r44k+6TM2Ual4XCcia3WV/Ds9T6jvy/U5w9WZruwTPuAl8Gcbp8tRc50TTlpmwaJFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=amNcMs5Lgijt4IOF8Lqf21S6M19aiimiHeLgME974Ug=; b=Qhdu/GRQQrV7sdzQV/1NB1C0yInpPa/YfWGJSSxEtWllq/VtcTe7UrtTTcLvdHpGlhXahf6WSbQkHyG37fEVXvJxtQfdcmQrAxs55KauYzV7JF/CxUbPXyvPBlU/6QiKx/38zsfd9lh6a47n5y8KoGePFlJireCT0SltLr1evm0= Received: from SA0PR11CA0201.namprd11.prod.outlook.com (2603:10b6:806:1bc::26) by CYXPR12MB9386.namprd12.prod.outlook.com (2603:10b6:930:de::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25; Mon, 12 Feb 2024 17:03:53 +0000 Received: from SA2PEPF00001505.namprd04.prod.outlook.com (2603:10b6:806:1bc:cafe::23) by SA0PR11CA0201.outlook.office365.com (2603:10b6:806:1bc::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.38 via Frontend Transport; Mon, 12 Feb 2024 17:03:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001505.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Mon, 12 Feb 2024 17:03:52 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 12 Feb 2024 11:03:51 -0600 Date: Mon, 12 Feb 2024 11:03:38 -0600 From: Michael Roth To: Paolo Bonzini CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH v11 30/35] KVM: x86: Add gmem hook for determining max NPT mapping level Message-ID: <20240212170338.7rp2mutmg7hbtxr5@amd.com> References: <20231230172351.574091-1-michael.roth@amd.com> <20231230172351.574091-31-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001505:EE_|CYXPR12MB9386:EE_ X-MS-Office365-Filtering-Correlation-Id: a2d53b2b-f6f4-4ac3-96d1-08dc2bec972f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pTdP4DUoDTkWCldh544oNPWDyVX19cFved0gdVxLxeYdTfRWHxAExN6OWsoMMaH8dcYQV+MZvUyKufcdcOADNawx8bmkrxnvBz0pZIJX6hJQMI1rreErP47IeIB6p+SYXrEfOzCa/w7HjTWJKv6NabLc8ViTKCZUY77K4cXhzFDwum+EZ8BoI4I2zvkDqYVXNs78J1YHO4UwX8ireBh69Lg1pKvAr+qd2NMwswMwRVTRXDQeQ0L8ttcGeFzkJU98UTVw53KLDqE6rA6PZoqTyu7nSWe6Sefa/ItKkENT5eKPo2x52KTZOIhV7gyNRHWHBuS55Ch76wnjQPgqDNo/4ioxhJuG1wLv4Ig1GPfi+CFUb0NOLI5raQIyt1YUkiqd2k6LWkvaNKahSLl+7nmu64gKeeDSNB5bexCxxOwsAxTl6mXLWnR+TJAD2svmrAXwpbsg/DzxFQAIX3qM/+NS0w9CHld6vWuLhzVX2g/UySzTLfTpxjYELMveyHf85aSgHu5Y7Y8dqvRIK2woN2Zd9JzaIREZsP8hLjHXcNTd9KXW9r2e0wdyGRoY2c+5Y4QqwiUeP/lotEA377DI1BvLcrSOOKVxCZkeKFWrspAygGA= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(136003)(396003)(39860400002)(346002)(230922051799003)(1800799012)(186009)(82310400011)(451199024)(64100799003)(36840700001)(40470700004)(46966006)(4326008)(44832011)(8676002)(41300700001)(8936002)(2906002)(5660300002)(7416002)(7406005)(356005)(81166007)(83380400001)(86362001)(36756003)(26005)(1076003)(16526019)(2616005)(70586007)(70206006)(426003)(53546011)(6666004)(336012)(82740400003)(316002)(54906003)(6916009)(478600001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 17:03:52.7741 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2d53b2b-f6f4-4ac3-96d1-08dc2bec972f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001505.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9386 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6CBA24001C X-Stat-Signature: 6qrawiskpxhpbnbxxx66gr57o5arpj9s X-HE-Tag: 1707757436-999836 X-HE-Meta: U2FsdGVkX18hvDzuKzSscjGy2vC9zN+36y2QPStI3mMXWiYL0C8LCrAhT4BHZ8zaw+kDAHU+1TyQhR0YckzkEy7yyOqLwM9LuUD/QKuvSsC5gDqiZ/NGSI/LKIUyLYTGKb29f+yQzOXwqEigzJXn0xSJCITySx/Vlrn3Tjn4U09uc1kiOjUbyF1lWgiHl45utnRsNmzTDstG7bZhC2Kuf5H7Qqsrjf6H9s00phSjD2NTsYizDXtgyDYueX4VfMSPfKWpAB07g7pJOlzMRvjmeQwsnMjifYEe/R6e5uxDQ38nLXHjNTZ94tAO0EPyvL2dPCOEeEkrvPmy4BtdH18a3yZ0dscoENPGItN8d0tM9A5Ipe/2rGkyMJxR7hq/01X/u78m1fCxNlGz6ObSF9hmAYSou72LLBZsCagRZo1ZRgSJbrdJo4ID6Ol+k4++cH7ZsXyR7naIP/KM576lzV6oHOBwNnz/o+NuxwM+4KKZeDIzRt3nUwvIoEvsnVslfgIec1RV9kS6Hkhqv4P3L8Fsj8ULABdjcZMWg0KrNoH+LP0ZIxTvDoBpCHNtW6DeLya5zhCYlAUFW9uMBnZU2ymjKO7PbTyrz4lUQwSLh06o1OlR+abGrfQ2hRr3wHqZeMrs/S/4RCIT/oA5HBAKXgTqm2+Gcmybvoo5nDyRHUyajpj8Y89Idmo7Fb4YuXkprBuVt13Tc2B5xitanWBT2Y62oAWeIzdYc+NPvyYAGzSWydLE/MOl9W2rKYWeEtJ5rSg07fNSFmvtJk34aG1mEvoryJm+gHK1cVsDHZWtyfUx324b1d4Q61ApJ6IuvH54vPo+6sfPfyrYSMyNUOPtEi3a+4UWuQHjuOFgsFxraDdZjVtYyrl+1pgaMUL+4qIvsrxDHOUgYlDfARlJthTvteLeu+iKcU2ym2wcPZ5k+hL6idjpc5dGwNe+i85JY2FMu8rR3Qhm7WDdE+lM5Dg2eCn L9Kb77w5 x0BH2t2oymfeaslnNj3kZgM21n7pJq8QRuL8wg+58sfDxEvlb2KSUDdHcYpkxcCDHvwm2j2iAcHFuREflH4xAx6RDs5tVV5YshOqp0wMDeGoPA0u2bPqpfpQ9JhOeGpigobZyWwJrltf3OX5ALwtwaSjtsAMqcvTFY25yWDHqn3B/elVcYxoC1vQtA9836LavA+m6f4ABcXilGl3uL1570mHW7X4fBzAo8M5TBEpiJ5tJkeY7In+rcwFTqNHtLxWDfvpSEHoGyM39AKLOwjO2wmrbeRNP4mmjWDGF91Cbb+nUkog0m41Nrd0/C76BWw950f4kJ4sBBLCNlqUXLTPRzZwdk/ABExVm5Msg 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: List-Subscribe: List-Unsubscribe: On Mon, Feb 12, 2024 at 11:50:26AM +0100, Paolo Bonzini wrote: > On Sat, Dec 30, 2023 at 6:32 PM Michael Roth wrote: > > int max_order, r; > > + u8 max_level; > > > > if (!kvm_slot_can_be_private(fault->slot)) { > > kvm_mmu_prepare_memory_fault_exit(vcpu, fault); > > @@ -4321,8 +4322,15 @@ static int kvm_faultin_pfn_private(struct kvm_vcpu *vcpu, > > return r; > > } > > > > - fault->max_level = min(kvm_max_level_for_order(max_order), > > - fault->max_level); > > + max_level = kvm_max_level_for_order(max_order); > > + r = static_call(kvm_x86_gmem_max_level)(vcpu->kvm, fault->pfn, > > + fault->gfn, &max_level); > > Might as well pass &fault->max_level directly to the callback, with no > change to the vendor-specific code. > > I'll include the MMU part in a generic series to be the base for both > Intel TDX and AMD SEV-SNP, and will do that change. Sounds good. I'm not sure why I did it that way originally, but what you're suggesting does seem like it should be equivalent. -Mike > > Paolo > > > + if (r) { > > + kvm_release_pfn_clean(fault->pfn); > > + return r; > > + } > > + > > + fault->max_level = min(max_level, fault->max_level); > > fault->map_writable = !(fault->slot->flags & KVM_MEM_READONLY); > > > > return RET_PF_CONTINUE; > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > > index 85f63b6842b6..5eb836b73131 100644 > > --- a/arch/x86/kvm/svm/sev.c > > +++ b/arch/x86/kvm/svm/sev.c > > @@ -4315,3 +4315,30 @@ void sev_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) > > pfn += use_2m_update ? PTRS_PER_PMD : 1; > > } > > } > > + > > +int sev_gmem_max_level(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, u8 *max_level) > > +{ > > + int level, rc; > > + bool assigned; > > + > > + if (!sev_snp_guest(kvm)) > > + return 0; > > + > > + rc = snp_lookup_rmpentry(pfn, &assigned, &level); > > + if (rc) { > > + pr_err_ratelimited("SEV: RMP entry not found: GFN %llx PFN %llx level %d error %d\n", > > + gfn, pfn, level, rc); > > + return -ENOENT; > > + } > > + > > + if (!assigned) { > > + pr_err_ratelimited("SEV: RMP entry is not assigned: GFN %llx PFN %llx level %d\n", > > + gfn, pfn, level); > > + return -EINVAL; > > + } > > + > > + if (level < *max_level) > > + *max_level = level; > > + > > + return 0; > > +} > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > > index f26b8c2a8be4..f745022f7454 100644 > > --- a/arch/x86/kvm/svm/svm.c > > +++ b/arch/x86/kvm/svm/svm.c > > @@ -5067,6 +5067,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { > > .alloc_apic_backing_page = svm_alloc_apic_backing_page, > > > > .gmem_prepare = sev_gmem_prepare, > > + .gmem_max_level = sev_gmem_max_level, > > .gmem_invalidate = sev_gmem_invalidate, > > }; > > > > -- > > 2.25.1 > > >