From patchwork Thu Aug 15 15:11:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13764909 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 EC8DAC3DA7F for ; Thu, 15 Aug 2024 15:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E5F68D0003; Thu, 15 Aug 2024 11:13:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 897356B013E; Thu, 15 Aug 2024 11:13:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E8F48D0003; Thu, 15 Aug 2024 11:13:46 -0400 (EDT) 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 4A3EA6B013C for ; Thu, 15 Aug 2024 11:13:46 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F3CB11C0495 for ; Thu, 15 Aug 2024 15:13:45 +0000 (UTC) X-FDA: 82454824410.21.A6ADB03 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2070.outbound.protection.outlook.com [40.107.92.70]) by imf15.hostedemail.com (Postfix) with ESMTP id 1FC0DA002C for ; Thu, 15 Aug 2024 15:13:42 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Bc65Mgp8; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of jgg@nvidia.com designates 40.107.92.70 as permitted sender) smtp.mailfrom=jgg@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723734749; 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=qFj7xNRRHlQCtrNxbLIFFl5Astekl53+NqQ4R/I4deE=; b=tngf4dx7y22J1QVabdn34VIab9RblTboLJvsqCqMhldLq5pf7tIt7/f6Sp9pYg7AxLgeoK KBuym2gqAW7/6uCCf4L7VLTB+kn9a4ZsO34IwL9aUuvaSi28MccNK9CXF8nx5R7cc/s0tq QUYM/j3zHjFm2C+4dortU/ogInxUV88= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1723734749; a=rsa-sha256; cv=pass; b=XGVk4SkKBhmc9chnNgSTzYU6dM2b3K7OHfjni79MCRQDkvDyJu/4ik84thyGfuWRirFulL 5eK4zHjzSpELvgCUxoBa0C+0vGDRR9t2JlmyR47G8SGjlfxy4RZtmy/dIWrefXWP2OQD8H X6Yb1zbbCb5KQalXyWGxnHfrE5GpZ4c= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Bc65Mgp8; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of jgg@nvidia.com designates 40.107.92.70 as permitted sender) smtp.mailfrom=jgg@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XI1xVYjubtsxuOy3lzYwqbZx7uHBoPZ+7AlbBdl+v9t47szRRWEUAmXSI62B44oGtwjhOXd1w3T7o3af38Qg9ZyVJwy/ala2OB7/vYGVukW7aVobhX2YGvZ3j28YtOgDujbewShWk6QT4nBBcsHo2CpxgOiSn7zOgE1fabVowR8us/qU2mNExVADinRnsXjL33LfNCEPZapPG9VG4D+vmVL5Ef25FGLKyYonvdT4kTwYavQG2kAZnEt5tZcDwSquxGDp5ylwhIsWhJoCqpRzvHPpmuZp6vGZN6jnfzueRiWocqbE4SZyWP46sacju67npBHugtFVU0S3nfaYY2+x0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qFj7xNRRHlQCtrNxbLIFFl5Astekl53+NqQ4R/I4deE=; b=aWvOFuHRJRfX5x7Uw90xylcdiaoTFO1Cb/VPqVFo+9aH5w0o2aF/zVzui4ICVbmazaeTo8YvGWgiZyfAxCkDa2PCwJDRnk3Q6Su0jV7BaK46sQ0LcwR8QjQ41+UGBLJZyKJYJaGS0DrCnf/JBTv0fuJvACrCT1oxX7GaX+ueWim7iwpoXh6QJmceCETwXQVeHaZaUhM4rFNiDSOQKgLHq1UdSNDq04n4rkWNJxPgCd79Qp0w4aQpJyryiGk67tqX21KV/CL0ZshmOrT3A+BhWXIilhInVQruuP8h/E0449fmfQu+G5egekUEiZE6q/fq1LEoOEQ7VcB/LrrFaSLSkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qFj7xNRRHlQCtrNxbLIFFl5Astekl53+NqQ4R/I4deE=; b=Bc65Mgp8Xz2fRW5fN3Ea3VvmRvcXsTeRvM41Xg5PGVye1yku7nA06kG4f/3DIp/n3hcT9s9kLsiXqfBEe7jw9+Qx4jg4h4wUxqOTctoGsHIvX1TUGMoLh/MJoCkG4SFF7/gZNOpyT+amTSB3gNI6KCam0sS6m9Nz3mW3mOOrwWT0yGREj8OL2+iyBXYCvlST9dh0hk9i0XzaEnU9c3HqQyEYx6Sx848BtuIdaO6uI9KYxsvOfhLLlsvasosRKaDyHNuolcvCRw5hj3asnEGsx/EvG02K6rqfa0Z3/TJ3yZYM3IXFIka7TS0hszJnhS1xmKQsOYHX4V3jJIJwKJd/Ng== Received: from CH3PR12MB7763.namprd12.prod.outlook.com (2603:10b6:610:145::10) by SN7PR12MB8146.namprd12.prod.outlook.com (2603:10b6:806:323::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.17; Thu, 15 Aug 2024 15:11:37 +0000 Received: from CH3PR12MB7763.namprd12.prod.outlook.com ([fe80::8b63:dd80:c182:4ce8]) by CH3PR12MB7763.namprd12.prod.outlook.com ([fe80::8b63:dd80:c182:4ce8%3]) with mapi id 15.20.7875.016; Thu, 15 Aug 2024 15:11:37 +0000 From: Jason Gunthorpe To: Cc: Alejandro Jimenez , Lu Baolu , David Hildenbrand , Christoph Hellwig , iommu@lists.linux.dev, Joao Martins , Kevin Tian , kvm@vger.kernel.org, linux-mm@kvack.org, Pasha Tatashin , Peter Xu , Ryan Roberts , Sean Christopherson , Tina Zhang Subject: [PATCH 16/16] iommupt: Add the Intel VT-D second stage page table format Date: Thu, 15 Aug 2024 12:11:32 -0300 Message-ID: <16-v1-01fa10580981+1d-iommu_pt_jgg@nvidia.com> In-Reply-To: <0-v1-01fa10580981+1d-iommu_pt_jgg@nvidia.com> References: X-ClientProxiedBy: BLAPR05CA0037.namprd05.prod.outlook.com (2603:10b6:208:335::18) To CH3PR12MB7763.namprd12.prod.outlook.com (2603:10b6:610:145::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR12MB7763:EE_|SN7PR12MB8146:EE_ X-MS-Office365-Filtering-Correlation-Id: 73f6fd1d-1f60-41c1-c916-08dcbd3c8d6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: pz1rRhuegmyh0kVy+yP1TEpUjYHMDeyYggJ4+ch/WkuRAFnpwhcVmtuJyYGpc8fHlPTRGbH2bzl24GpUEfNVVXhWeA0gLzXgizNwxSQXmJyEs7v65J9VSpOsthZvtzrhBsJMpzPV8CQyFJKKiSQK1hxopX8cRMLRfzXBErPlQlYYQm0KxolDl8zBnZ7frZ8EISTSCcDEkLxfoQcoTAE3juEtfNEymT/LyqFEFbqphFRqwDpbvW/Mci8LiFZ5FzP6eDzvB9olh7eV3El8GniNx39ReuGNtL1pfo0AHk1+nQM5ZabkBhgKeYfk+AKaqvXOzHpObzztDkFHft3zd9RI7hzJbJrSJGE82qpcSutA3LMcrT7otwWE1uvv481c1R+QkE/AkZHtp5rQOiz8RBEP+87RvknID6mi2HOw4ZBKMffLTT3w1DYuRe0xHiA64LX2EGMqRBP9esrXZRV69RNoS7P/DQmZ4AN3zvrMjNuqWe8iVCjcMPZ+O+sCkYn4FuX9oSdgiHe4bagYDnxtI85RvyWVT6eyihbgjLRJ1o5ALjHceYnWLGbSIfIj8csLxXnCXS2vQEePE5E14cd5whRBCiMmN4BIBp8F9u1aHOyubRN60wlZNnr2YspGZxSXYKsQ/bOKnCKKwTrgoTJpQz+Mva4JMzabfxjmrdRLW8DHnSKsfcc4k61floTEq5sCxadO++keLgo8yJwXEeR0WnEzBkfAWJLokuOI58v0/7zIv+D0SEU3J1qfM2KGlrTVPpYP+4fQvpzaKRs6WkLFPIJDeDDSBMY1hCDE+hFfPmT2D5640XsxPx4ggaHfyBOXx7kqfw7JK6yv62ZMoOgXYTgc0W6Oa1dJCNSQMBvmlrzCluWh3nEJ+m4TzF/ZuZAmohvjuPlZq93lTWt6lmSAh8jxsmLCyt5/OuU4d3FaPIw6lDBcbzvuumdYR23ohGnOuw4zN2Of9mKzwPSHwqnqXMCX1Bv3et5nHko8C+oXtxQwMPUpJsZKOwm48iz1DiwAW1zgmd1z/IggmyhmXXS7lzsE8/ubDqTvSm8pEOrOzl90lnuZ/WaghcQj5CscIWpCdg3zvypND3h3+LP4/W8p7HPbaWPGjewvGWRhzmsEgjDLp13If9zZV4LOVskVb/idJviQQSgTdNPoLnvAptnWH8CTMKkPp+6oL09LX0qM6dSHG5Y7cTfD7pEA2kafCKwll30gvk/HCjxkdcrPvGIpnyHLJIGw5Y5Dd1tE8vjzeHTGX1aBXLf2Vj2rSlEE2cDwPlCkVRnqN7NEkKK6SIiL1IPjt/zf+Qjal5gOF+y0hetPsXt1WUDI76Lz7DVKD6ZWQWN9dt47uXAX+4SZFmapLThDuQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR12MB7763.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0k6DbcVAv+9L2wkPVIvDXQ/gbn0bG9n/4g+LodFDNaxJqEUH/e6lRXc2dUjQDIDxd5ozoBdmmOUBXkq6oKCHHKiiKl6UkRTOzhlMqhKDm4CSyyOY7uIUac8Gu5e6wxJEPvv52jCHWQ7CgiAAph6dy5WvzxsR5lt0p9tqxHzPEWhwhP6xQ5VYkrBwOAG9HyvoYqXv+PBD6dHAiBU5LDnEDQr/lZKzTNkuVf1Awyt6H5tYqSd6Y+8z2PRFV8fpFiEg0lwY5XOGNHw/YT9k5hyBp4l8Op/mmY2qQbT/pOLkeGOysStDEk1lDZ+tCZ+45TWtaOdebBlJJd6QmZOTRQLd1gnwZ9Wr96brejGIW2UQ/6dd8iSCKjUd5AgETMsFCNMEu2vf4P/LJcaqJq0m5eoZgOD8Vh5FvqtwSWdePVHByI3KjPCaufYiZrjZbiPVSxlsyG1Ujxjig7m+Gz0huf5Wlpaiu1Um4i3thZlxZZFFv5zpUCojlJgq40A00zUZs2zACxZB2Qg2cjPQjY6/1gIC/EGkkigSEXpUGKV6PyUhPhhGqUsGJVCmfxNslrh4l9+STyULvGLwhadBw06ExGxIy8uE4Ty/ITNvlhy19NUOE1Z/q/81wEkhRUqNs6jBrGV356U+lGUshzyRYxZPgbMKYlbLS5fUxeB1W1S9apmJYLD8EqIjhhK5o/lIPoUof9laY5VfxtA0u22PiRavT3zkQM4en+hCzyuLnyIV5RVPuUlNbBsdppdtAyQzC4J5lrUJjIOmSBy72FkY/Jp/6u/5JAwkeZfvS9+hyZ1u/NoSXfHuEq+7RtWpmg4xgmKCB6ZOH4rseO5SDhPrXKEamXvXsrYpOOtj02PvF4pQF+42AV3LmvQO/TY9uKBB/3eiTGLZSYYDnZnEHr4yDjxTYjWMd7UVGjXMJHlqAJ6vaBpvimJkQgI3hjt1gqRT/ogf8xBbyageR56UD2rvpJ1s/VvcZlqOWitNsUH91aV1UyBxU8Lue1sMKp+jA0t/u6IlFR+yPxH7qLlHr7nCBaJs1iqOz7rrKJ3LNqiDafam3dDCPT9+0NbOdVlAvoNbJrXbz2byN6dl5iIUokCoGn2s4p/ymLNmfhVcwR75Ia8AGOlWrmccho5ffs/PxM/+GDV20l4cJ1XYPCd1NKzlzFUvKdh92a3CQHbWvAS7AzubNufwlCmzlX6j0aVB/zxCHwX8oPmx5RppndzZzBCrZJcYIBpJx45lBmO7H5NpNQNf3DJwehqK9rPA9fpUyh+2gJKnmiq7A0n3c8+XGZ2Rw3hqCFQ3ufoMd2usqiFrCmtl7XhXWx8GlIpHddkI3M8pjZhCCkZz1INQAXf9qjP133W92yLVQMsGYIsktsJNsyeZKsimnXIZMyOjU3DvJvltOdmeMsCEmpwBGoN3UJ0PPcd6cFVCcbm62tIilYFce8qdsny4UDChzip4OUJbQ47XorA5uVw52WFFmOdlon3kxn+PzQTOuIKRuDCod/6QGRwJWl/huhDN5voDlS5qC0UwU+aW1JquwXNztBtlHKPdVkHs1UZ1yNPVcg7yUnTPVp0tkStQG84= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73f6fd1d-1f60-41c1-c916-08dcbd3c8d6b X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB7763.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2024 15:11:35.0962 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UEaFXZouKfoXY3YANYSTj9cU3jGNmRGDJ14bQBvQC0R9p5eFQV1DfLu0lb8Q7WWu X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8146 X-Stat-Signature: 8e7qqn61osiabk6inbtqkb44hzhpacxn X-Rspamd-Queue-Id: 1FC0DA002C X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1723734822-832271 X-HE-Meta: U2FsdGVkX1+ushEY+1XWo+mUZ3S20P9NFtskcjJY0I00pzJhA4RbZzonkznzOSKUq7qjSixNfNybdZmBmBmnuo6ewwAdkUYTVR1KsI1M80hPJdWNFtnTDrD664gFb0oIkbm9ja6u1PMwsjR9xrDynnuihxsKGBmVp+I8fPBjpUEOVctHhjpo1xRoyZ9IAg/l8FeqC23zksMI5JLYHj7/sfEnIVN/uKdR/n5U0TLmPMffD7E63q3v3GVyzm76vs6m0qISmkb/QZqDtiBL9DwbGxyTY6AGZ2qpJJylDFcuLvzvNU9szjd3YB4BZhTUiQbFVEyrYuO3o740NB16bQmjE95KlgUyw2AUO/Oh6ub47QePSAeI72EwJWonHk8ZhhkPd2+2NQrSWct8I6q0h1miA3zgSQTajyA8GHZIKkZDRum3qTrRiSSHPohofWK/Pza0FYJEP+CRrxQkooJ1XrC/TH/Sq0IsovUb2/eQDam0dyQuQzODRkxByBRD+2NursPm+rzYXUzLhOq37DGz3WLsReGcIFZF9/4J4gdrix51NfnTXfKyco8R9fegNfRTB23xTr4YltNBaZhmp7fWc0b8np+MY/QPDwk89F+lJppihaHWJ3OFz5p2+MnW3ZNfVGQrAScCVHiiYFuMkXJsAIDoLAb0Sk9cZtkBep2JuCVXpcHlje8nO83dXE6fI/ulMYUj5ObcbeliOll0vaC+rHXS/UHBtnNBxQv2s9yZyOehY7SHDZJz34vIRxToFh2tHXTn7tU1uhcaWEewxcuzf7iJIhT+XzNzKR26+LFK2kiAPYB6huikxEWV3KxcuU6Hu/tBaUEhbc7CYmM226D5TJTcysRR+yDQfRZ8nkXELzclKbVxlV35ck4YJ1v3K3eVMAPuSINr7dyYw1ogZ16hoTupMtlUDx2r5oRAloyIRg1XFWhQArImkjPlYgKlQzij08/E6pIMbRw9+xh8dHQV71U VSeLzL8w hEjP7Nx0NXWvUrVbImMlLY1068wDmL4C6cTTzEan9fATCP6+fRdGjpSv3oDfelC6nSWcBBkPMuLxL7FZ0VvBZA7HbeKD4nKXFbsJDsMFXcrXIY91vc2nVmY2uxKIg74FYyzRms932aQzn4h69RPtWqIXu3fHT01OX32TaTXHlThF2zpa7iVP8nEcAbo8QeDnjp5OmoD0uYOxjhhuNCjFMYE3Y24ClmWPloRwApqmxVfOnK1a/QMfJjneArLd9FQWKflxd9ERT1KciQthGYs1LErqEqQRo5o6SmclH7cf8ZmtCJynxCs5qoYOefJ48wBiKpLS7fDHeUZNa9hXGCkpYdmZT6N/B513nQ1tQFKovnccOM0VQ+e5aqx5ShRnyXTCJTXVt3xAYRGDPPfiwx3GUgnFTIFD4wxb5U4Cp 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: The VT-D second stage format is almost the same as the x86 PAE format, except the bit encodings in the PTE are different and a few new PTE features, like force coherency are present. Among all the formats it is unique in not having a designated present bit. Cc: Tina Zhang Cc: Kevin Tian Cc: Lu Baolu Signed-off-by: Jason Gunthorpe --- drivers/iommu/generic_pt/Kconfig | 6 + drivers/iommu/generic_pt/fmt/Makefile | 2 + drivers/iommu/generic_pt/fmt/defs_vtdss.h | 21 ++ drivers/iommu/generic_pt/fmt/iommu_vtdss.c | 8 + drivers/iommu/generic_pt/fmt/vtdss.h | 276 +++++++++++++++++++++ include/linux/generic_pt/common.h | 4 + include/linux/generic_pt/iommu.h | 12 + 7 files changed, 329 insertions(+) create mode 100644 drivers/iommu/generic_pt/fmt/defs_vtdss.h create mode 100644 drivers/iommu/generic_pt/fmt/iommu_vtdss.c create mode 100644 drivers/iommu/generic_pt/fmt/vtdss.h diff --git a/drivers/iommu/generic_pt/Kconfig b/drivers/iommu/generic_pt/Kconfig index 2d08b58e953e4d..c17e09e2d03025 100644 --- a/drivers/iommu/generic_pt/Kconfig +++ b/drivers/iommu/generic_pt/Kconfig @@ -90,6 +90,11 @@ config IOMMU_PT_DART If unsure, say N here. +config IOMMU_PT_VTDSS + tristate "IOMMU page table for Intel VT-D IOMMU Second Stage" + depends on !GENERIC_ATOMIC64 # for cmpxchg64 + default n + config IOMMU_PT_X86PAE tristate "IOMMU page table for x86 PAE" depends on !GENERIC_ATOMIC64 # for cmpxchg64 @@ -105,6 +110,7 @@ config IOMMUT_PT_KUNIT_TEST depends on IOMMU_PT_ARMV8_16K || !IOMMU_PT_ARMV8_16K depends on IOMMU_PT_ARMV8_64K || !IOMMU_PT_ARMV8_64K depends on IOMMU_PT_DART || !IOMMU_PT_DART + depends on IOMMU_PT_VTDSS || !IOMMU_PT_VTDSS depends on IOMMU_PT_X86PAE || !IOMMU_PT_X86PAE default KUNIT_ALL_TESTS endif diff --git a/drivers/iommu/generic_pt/fmt/Makefile b/drivers/iommu/generic_pt/fmt/Makefile index 1e10be24758fef..5a77c64d432534 100644 --- a/drivers/iommu/generic_pt/fmt/Makefile +++ b/drivers/iommu/generic_pt/fmt/Makefile @@ -10,6 +10,8 @@ iommu_pt_fmt-$(CONFIG_IOMMU_PT_ARMV8_64K) += armv8_64k iommu_pt_fmt-$(CONFIG_IOMMU_PT_DART) += dart +iommu_pt_fmt-$(CONFIG_IOMMU_PT_VTDSS) += vtdss + iommu_pt_fmt-$(CONFIG_IOMMU_PT_X86PAE) += x86pae IOMMU_PT_KUNIT_TEST := diff --git a/drivers/iommu/generic_pt/fmt/defs_vtdss.h b/drivers/iommu/generic_pt/fmt/defs_vtdss.h new file mode 100644 index 00000000000000..4a239bcaae2a90 --- /dev/null +++ b/drivers/iommu/generic_pt/fmt/defs_vtdss.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES + * + */ +#ifndef __GENERIC_PT_FMT_DEFS_VTDSS_H +#define __GENERIC_PT_FMT_DEFS_VTDSS_H + +#include +#include + +typedef u64 pt_vaddr_t; +typedef u64 pt_oaddr_t; + +struct vtdss_pt_write_attrs { + u64 descriptor_bits; + gfp_t gfp; +}; +#define pt_write_attrs vtdss_pt_write_attrs + +#endif diff --git a/drivers/iommu/generic_pt/fmt/iommu_vtdss.c b/drivers/iommu/generic_pt/fmt/iommu_vtdss.c new file mode 100644 index 00000000000000..12e7829815047b --- /dev/null +++ b/drivers/iommu/generic_pt/fmt/iommu_vtdss.c @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES + */ +#define PT_FMT vtdss +#define PT_SUPPORTED_FEATURES 0 + +#include "iommu_template.h" diff --git a/drivers/iommu/generic_pt/fmt/vtdss.h b/drivers/iommu/generic_pt/fmt/vtdss.h new file mode 100644 index 00000000000000..233731365ac62d --- /dev/null +++ b/drivers/iommu/generic_pt/fmt/vtdss.h @@ -0,0 +1,276 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES + * + * Intel VT-D Second Stange 5/4 level page table + * + * This is described in + * Section "3.7 Second-Stage Translation" + * Section "9.8 Second-Stage Paging Entries" + * + * Of the "Intel Virtualization Technology for Directed I/O Architecture + * Specification". + * + * The named levels in the spec map to the pts->level as: + * Table/SS-PTE - 0 + * Directory/SS-PDE - 1 + * Directory Ptr/SS-PDPTE - 2 + * PML4/SS-PML4E - 3 + * PML5/SS-PML5E - 4 + * FIXME: + * force_snooping + * 1g optional + * forbid read-only + * Use of direct clflush instead of DMA API + */ +#ifndef __GENERIC_PT_FMT_VTDSS_H +#define __GENERIC_PT_FMT_VTDSS_H + +#include "defs_vtdss.h" +#include "../pt_defs.h" + +#include +#include +#include + +enum { + PT_MAX_OUTPUT_ADDRESS_LG2 = 52, + PT_MAX_VA_ADDRESS_LG2 = 57, + PT_ENTRY_WORD_SIZE = sizeof(u64), + PT_MAX_TOP_LEVEL = 4, + PT_GRANUAL_LG2SZ = 12, + PT_TABLEMEM_LG2SZ = 12, +}; + +/* Shared descriptor bits */ +enum { + VTDSS_FMT_R = BIT(0), + VTDSS_FMT_W = BIT(1), + VTDSS_FMT_X = BIT(2), + VTDSS_FMT_A = BIT(8), + VTDSS_FMT_D = BIT(9), + VTDSS_FMT_SNP = BIT(11), + VTDSS_FMT_OA = GENMASK_ULL(51, 12), +}; + +/* PDPTE/PDE */ +enum { + VTDSS_FMT_PS = BIT(7), +}; + +#define common_to_vtdss_pt(common_ptr) \ + container_of_const(common_ptr, struct pt_vtdss, common) +#define to_vtdss_pt(pts) common_to_vtdss_pt((pts)->range->common) + +static inline pt_oaddr_t vtdss_pt_table_pa(const struct pt_state *pts) +{ + return log2_mul(FIELD_GET(VTDSS_FMT_OA, pts->entry), PT_TABLEMEM_LG2SZ); +} +#define pt_table_pa vtdss_pt_table_pa + +static inline pt_oaddr_t vtdss_pt_entry_oa(const struct pt_state *pts) +{ + return log2_mul(FIELD_GET(VTDSS_FMT_OA, pts->entry), PT_GRANUAL_LG2SZ); +} +#define pt_entry_oa vtdss_pt_entry_oa + +static inline bool vtdss_pt_can_have_leaf(const struct pt_state *pts) +{ + return pts->level <= 2; +} +#define pt_can_have_leaf vtdss_pt_can_have_leaf + +static inline unsigned int vtdss_pt_table_item_lg2sz(const struct pt_state *pts) +{ + return PT_GRANUAL_LG2SZ + + (PT_TABLEMEM_LG2SZ - ilog2(sizeof(u64))) * pts->level; +} +#define pt_table_item_lg2sz vtdss_pt_table_item_lg2sz + +static inline unsigned int vtdss_pt_num_items_lg2(const struct pt_state *pts) +{ + return PT_TABLEMEM_LG2SZ - ilog2(sizeof(u64)); +} +#define pt_num_items_lg2 vtdss_pt_num_items_lg2 + +static inline enum pt_entry_type vtdss_pt_load_entry_raw(struct pt_state *pts) +{ + const u64 *tablep = pt_cur_table(pts, u64); + u64 entry; + + pts->entry = entry = READ_ONCE(tablep[pts->index]); + if (!entry) + return PT_ENTRY_EMPTY; + if (pts->level == 0 || + (vtdss_pt_can_have_leaf(pts) && (pts->entry & VTDSS_FMT_PS))) + return PT_ENTRY_OA; + return PT_ENTRY_TABLE; +} +#define pt_load_entry_raw vtdss_pt_load_entry_raw + +static inline void +vtdss_pt_install_leaf_entry(struct pt_state *pts, pt_oaddr_t oa, + unsigned int oasz_lg2, + const struct pt_write_attrs *attrs) +{ + u64 *tablep = pt_cur_table(pts, u64); + u64 entry; + + entry = FIELD_PREP(VTDSS_FMT_OA, log2_div(oa, PT_GRANUAL_LG2SZ)) | + attrs->descriptor_bits; + if (pts->level != 0) + entry |= VTDSS_FMT_PS; + + WRITE_ONCE(tablep[pts->index], entry); + pts->entry = entry; +} +#define pt_install_leaf_entry vtdss_pt_install_leaf_entry + +static inline bool vtdss_pt_install_table(struct pt_state *pts, + pt_oaddr_t table_pa, + const struct pt_write_attrs *attrs) +{ + u64 *tablep = pt_cur_table(pts, u64); + u64 entry; + + /* + * FIXME according to the SDM D is ignored by HW on table pointers? + * io_pgtable_v2 sets it + */ + entry = VTDSS_FMT_R | VTDSS_FMT_W | + FIELD_PREP(VTDSS_FMT_OA, log2_div(table_pa, PT_GRANUAL_LG2SZ)); + return pt_table_install64(&tablep[pts->index], entry, pts->entry); +} +#define pt_install_table vtdss_pt_install_table + +static inline void vtdss_pt_attr_from_entry(const struct pt_state *pts, + struct pt_write_attrs *attrs) +{ + attrs->descriptor_bits = pts->entry & (VTDSS_FMT_R | VTDSS_FMT_W | + VTDSS_FMT_X | VTDSS_FMT_SNP); +} +#define pt_attr_from_entry vtdss_pt_attr_from_entry + +static inline void vtdss_pt_clear_entry(struct pt_state *pts, + unsigned int num_contig_lg2) +{ + u64 *tablep = pt_cur_table(pts, u64); + + WRITE_ONCE(tablep[pts->index], 0); +} +#define pt_clear_entry vtdss_pt_clear_entry + +/* --- iommu */ +#include +#include + +#define pt_iommu_table pt_iommu_vtdss + +/* The common struct is in the per-format common struct */ +static inline struct pt_common *common_from_iommu(struct pt_iommu *iommu_table) +{ + return &container_of(iommu_table, struct pt_iommu_table, iommu) + ->vtdss_pt.common; +} + +static inline struct pt_iommu *iommu_from_common(struct pt_common *common) +{ + return &container_of(common, struct pt_iommu_table, vtdss_pt.common) + ->iommu; +} + +static inline int vtdss_pt_iommu_set_prot(struct pt_common *common, + struct pt_write_attrs *attrs, + unsigned int iommu_prot) +{ + u64 pte = 0; + + /* + * VTDSS does not have a present bit, so we tell if any entry is present + * by checking for R or W. + */ + if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE))) + return -EINVAL; + + /* + * FIXME: The VTD driver has a bug setting DMA_FL_PTE_PRESENT on the SS + * table, which forces R on always. + */ + pte |= VTDSS_FMT_R; + + if (iommu_prot & IOMMU_READ) + pte |= VTDSS_FMT_R; + if (iommu_prot & IOMMU_WRITE) + pte |= VTDSS_FMT_W; +/* FIXME if (dmar_domain->set_pte_snp) + pte |= VTDSS_FMT_SNP; */ + + attrs->descriptor_bits = pte; + return 0; +} +#define pt_iommu_set_prot vtdss_pt_iommu_set_prot + +static inline int vtdss_pt_iommu_fmt_init(struct pt_iommu_vtdss *iommu_table, + struct pt_iommu_vtdss_cfg *cfg) +{ + struct pt_vtdss *table = &iommu_table->vtdss_pt; + + /* FIXME configurable */ + pt_top_set_level(&table->common, 3); + return 0; +} +#define pt_iommu_fmt_init vtdss_pt_iommu_fmt_init + +#if defined(GENERIC_PT_KUNIT) +static void vtdss_pt_kunit_setup_cfg(struct pt_iommu_vtdss_cfg *cfg) +{ +} +#define pt_kunit_setup_cfg vtdss_pt_kunit_setup_cfg +#endif + +/* + * Requires Tina's series: + * https://patch.msgid.link/r/20231106071226.9656-3-tina.zhang@intel.com + * See my github for an integrated version + */ +#if defined(GENERIC_PT_KUNIT) && IS_ENABLED(CONFIG_CONFIG_IOMMU_IO_PGTABLE_VTD) +#include + +static struct io_pgtable_ops * +vtdss_pt_iommu_alloc_io_pgtable(struct pt_iommu_vtdss_cfg *cfg, + struct device *iommu_dev, + struct io_pgtable_cfg **unused_pgtbl_cfg) +{ + struct io_pgtable_cfg pgtbl_cfg = {}; + + pgtbl_cfg.ias = 48; + pgtbl_cfg.oas = 52; + pgtbl_cfg.vtd_cfg.cap_reg = 4 << 8; + pgtbl_cfg.vtd_cfg.ecap_reg = BIT(26) | BIT(60) | BIT_ULL(48) | BIT_ULL(56); + pgtbl_cfg.pgsize_bitmap = SZ_4K; + pgtbl_cfg.coherent_walk = true; + return alloc_io_pgtable_ops(INTEL_IOMMU, &pgtbl_cfg, NULL); +} +#define pt_iommu_alloc_io_pgtable vtdss_pt_iommu_alloc_io_pgtable + +static void vtdss_pt_iommu_setup_ref_table(struct pt_iommu_vtdss *iommu_table, + struct io_pgtable_ops *pgtbl_ops) +{ + struct io_pgtable_cfg *pgtbl_cfg = + &io_pgtable_ops_to_pgtable(pgtbl_ops)->cfg; + struct pt_common *common = &iommu_table->vtdss_pt.common; + + pt_top_set(common, __va(pgtbl_cfg->vtd_cfg.pgd), 3); +} +#define pt_iommu_setup_ref_table vtdss_pt_iommu_setup_ref_table + +static u64 vtdss_pt_kunit_cmp_mask_entry(struct pt_state *pts) +{ + if (pts->type == PT_ENTRY_TABLE) + return pts->entry & (~(u64)(VTDSS_FMT_OA)); + return pts->entry; +} +#define pt_kunit_cmp_mask_entry vtdss_pt_kunit_cmp_mask_entry +#endif + +#endif diff --git a/include/linux/generic_pt/common.h b/include/linux/generic_pt/common.h index 558302fe1e0324..a3469132db7dda 100644 --- a/include/linux/generic_pt/common.h +++ b/include/linux/generic_pt/common.h @@ -145,6 +145,10 @@ enum { PT_FEAT_DART_V2 = PT_FEAT_FMT_START, }; +struct pt_vtdss { + struct pt_common common; +}; + struct pt_x86pae { struct pt_common common; }; diff --git a/include/linux/generic_pt/iommu.h b/include/linux/generic_pt/iommu.h index 351a69fe62dd1d..b9ecab07b0223d 100644 --- a/include/linux/generic_pt/iommu.h +++ b/include/linux/generic_pt/iommu.h @@ -317,6 +317,18 @@ struct pt_iommu_dart_cfg { int pt_iommu_dart_init(struct pt_iommu_dart *table, struct pt_iommu_dart_cfg *cfg, gfp_t gfp); +struct pt_iommu_vtdss { + struct pt_iommu iommu; + struct pt_vtdss vtdss_pt; +}; + +struct pt_iommu_vtdss_cfg { + struct device *iommu_device; + unsigned int features; +}; +int pt_iommu_vtdss_init(struct pt_iommu_vtdss *table, + struct pt_iommu_vtdss_cfg *cfg, gfp_t gfp); + struct pt_iommu_x86pae { struct pt_iommu iommu; struct pt_x86pae x86pae_pt;