Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To:     linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Cc:     joro@8bytes.org, Jon.Grimm@amd.com, brijesh.singh@amd.com,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [PATCH v2] iommu/amd: Enforce 4k mapping for certain IOMMU data structures
Date:   Thu,  5 Nov 2020 14:58:32 +0000
Message-Id: <20201105145832.3065-1-suravee.suthikulpanit@amd.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from ethanolx5673host.amd.com (165.204.78.2) by SN4PR0201CA0007.namprd02.prod.outlook.com (2603:10b6:803:2b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 5 Nov 2020 14:59:29 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: b966af3a-8acb-4f70-0b4e-08d8819b6615
X-MS-TrafficTypeDiagnostic: BY5PR12MB4888:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BY5PR12MB488854473B9DD32029715C65F3EE0@BY5PR12MB4888.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:923;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 9YPHqZrrVr0TxKpodZmVd4ANUZAUCrQLeAaOo9ZxeEDK3ndcf/L/T1sYSafU4KBbjZ1EgYwqBAS+gsZsJV1trdsIsGO6CcBVHinH2YBLlero9kw0I+LQnsX5TjS0+Bh+dPl/mVE11yakRDi1u4uz0yrE3dCei6jRTeZ/zJEJCyDcwruMC3hJhiRukkDARf2cFXsWdf1tGyibn7AswHMopO7ZWPUKMxf4ps+/IKR05FgCqL4w2LZmidpsSv3+00QC0BL9herQjb88XurVPOlDRFw6oXYC9+C7VpTPw/VetYkvPNcNvckAML8TQBU5646K
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB4597.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(376002)(136003)(39860400002)(346002)(478600001)(26005)(44832011)(8936002)(16526019)(8676002)(83380400001)(5660300002)(186003)(6486002)(4326008)(36756003)(2616005)(956004)(7696005)(2906002)(316002)(1076003)(66946007)(86362001)(66556008)(52116002)(66476007)(6666004);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: s07BuAeP04/Gojyq1zrBEccQjA0O4fIiGkO2B1WdQiB48bf1oTpMKQqSZvOFgtpmF3CpfvgX9mHB3ZjYLndwpqmCcWSPihSJ+2K/iST+3a84DLKGGFb676xQFwTdNYek1KG8yBaJcM0z/JqJ4uNRUdVNbyRt8aOCR7BxjmL4C6ipcSA0VOzkKMfnH61eSxch0L6FdoQVSizXSjKdCBFnB9ziQ/vXo+jwiNmADTf8tJUddM3QupwHfgk21/PJqtpZVKPVteYPjtIevfnMJRtSKdaWMHOUZkLEnLZA6a3RQm20yJBR9P7iZ2YTxpJVZ8sln0FY/3FF1PqloGxt36/oecyQeHpbd/qJYoVnTaEk/hOuoPHpdiCmLsK2Gn7XD0wGSZLVtBYrNWwaMVKQ3ZKqaN5jyzXAMw7sVPUmNIOrFIk95Pun7gwp7hjXa3lheO6cbjiNZU/pn/l8TifY2tNnrzf+aJ5LjBPRSw+af/wzOpzot2fhQASWU9IiEGVI2SOT483Ek6nQ0TbnCJmCPqpfiOX3a7v9nPxlfinx1fofarYyw2TTtl8n/e5JsgIfCei3geqffbKcK9LkQSfmN6GqaltVieGxR3EIq6YgY0O2xcHXBxBNIqaglKIPHt9eeMqFcwVL4qu8GZZgbP/zgS8IYw==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b966af3a-8acb-4f70-0b4e-08d8819b6615
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB4597.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 14:59:30.6783
 (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: 4xALL6+sBRe1pQZvNySv3Ejpn1QGOQfFj0ws1Q2Bh9JsIsH4tm96cLr13VSUS2uwuViEv63jaQsVaZj/LmOVgw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4888
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

AMD IOMMU requires 4k-aligned pages for the event log, the PPR log,
and the completion wait write-back regions. However, when allocating
the pages, they could be part of large mapping (e.g. 2M) page.
This causes #PF due to the SNP RMP hardware enforces the check based
on the page level for these data structures.

So, fix by calling set_memory_4k() on the allocated pages.

Fixes: commit c69d89aff393 ("iommu/amd: Use 4K page for completion wait write-back semaphore")
Cc: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/init.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 82e4af8f09bb..23a790f8f550 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -29,6 +29,7 @@
 #include <asm/iommu_table.h>
 #include <asm/io_apic.h>
 #include <asm/irq_remapping.h>
+#include <asm/set_memory.h>
 
 #include <linux/crash_dump.h>
 
@@ -672,11 +673,27 @@ static void __init free_command_buffer(struct amd_iommu *iommu)
 	free_pages((unsigned long)iommu->cmd_buf, get_order(CMD_BUFFER_SIZE));
 }
 
+static void *__init iommu_alloc_4k_pages(struct amd_iommu *iommu,
+					 gfp_t gfp, size_t size)
+{
+	int order = get_order(size);
+	void *buf = (void *)__get_free_pages(gfp, order);
+
+	if (buf &&
+	    iommu_feature(iommu, FEATURE_SNP) &&
+	    set_memory_4k((unsigned long)buf, (1 << order))) {
+		free_pages((unsigned long)buf, order);
+		buf = NULL;
+	}
+
+	return buf;
+}
+
 /* allocates the memory where the IOMMU will log its events to */
 static int __init alloc_event_buffer(struct amd_iommu *iommu)
 {
-	iommu->evt_buf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-						  get_order(EVT_BUFFER_SIZE));
+	iommu->evt_buf = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO,
+					      EVT_BUFFER_SIZE);
 
 	return iommu->evt_buf ? 0 : -ENOMEM;
 }
@@ -715,8 +732,8 @@ static void __init free_event_buffer(struct amd_iommu *iommu)
 /* allocates the memory where the IOMMU will log its events to */
 static int __init alloc_ppr_log(struct amd_iommu *iommu)
 {
-	iommu->ppr_log = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-						  get_order(PPR_LOG_SIZE));
+	iommu->ppr_log = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO,
+					      PPR_LOG_SIZE);
 
 	return iommu->ppr_log ? 0 : -ENOMEM;
 }
@@ -838,7 +855,7 @@ static int iommu_init_ga(struct amd_iommu *iommu)
 
 static int __init alloc_cwwb_sem(struct amd_iommu *iommu)
 {
-	iommu->cmd_sem = (void *)get_zeroed_page(GFP_KERNEL);
+	iommu->cmd_sem = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO, 1);
 
 	return iommu->cmd_sem ? 0 : -ENOMEM;
 }
-- 
2.17.1