From patchwork Tue May 24 19:06:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sierra Guiza, Alejandro (Alex)" X-Patchwork-Id: 12860494 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 123A4C4321E for ; Tue, 24 May 2022 19:08:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240985AbiEXTIH (ORCPT ); Tue, 24 May 2022 15:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240983AbiEXTHf (ORCPT ); Tue, 24 May 2022 15:07:35 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2052.outbound.protection.outlook.com [40.107.220.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 936553C738; Tue, 24 May 2022 12:07:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VjDER+jK5CBevpHDtXk5Q/3aJFcDLtLBCfihC4lCkNIprUR2XNORbH2HE3jZVtK0aY1G3Iw3mKfdaoggbOtlgKcZcvC74UgXsmqUSAR4GiE/9I1CkMw2uunSYxlKUcEE1RvLXfcHd3AEXeyLFfGe7hVINf1xEHOPfTfWZ3nUS7XUyGVO2urtzYLwEL2MboJe1FVOaROY9D8OIZ8sh7TdjYZFDskAxSaM8Krn2HlhonRE/SvgQAaxFOtLSm0Wa0pwE4zhcajswMzYmoF9xYVGbTSl1LT5/U01tiuvAsga2T1+QzjslgDtZ6+u+YXT81/LBz+mgE3KuRUCBtGHngvpOw== 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=BO1XgdLChGhcmXQYgQRlktGItGh1h3zZzS9U0EV0V6A=; b=JAdYs9J57gXwjmVF10dedQEInD8bXW3uKR7Beq9rtc4B/jsIa/EFfR0y0T5VsuwLMVGx11iu6oniky8SvGqRPZonGUQm++NdoNV0qqXItR4nqyo2e0FH8xVyhqGGjfu81Fo4wldMOG+lpOdhgHaZyIsHaDf3+dCA9NuTBdDeBpoxZRBTAPiSP4u5KTSqePjpjrDa2vJ3vHtb569JAVeG3Ye9CNxCgANSljx6VwyICuQCz/MWppNGS8mU5J4YhY7SvrGJzCsaMrNNMFnKVHkXMU3dcUFNsWM3sbIAxvYCQiWzNv2kVd3c4soOGAUZRku9dbI5apScDPOFvGA4hOuPhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nvidia.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 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=BO1XgdLChGhcmXQYgQRlktGItGh1h3zZzS9U0EV0V6A=; b=lOHVT5E8U0Sgm1hXKo57MEYX4RfGoLKNS3yKvtZXlkE9yYYs8UxnXMdc3ARJ4o4iVeDnXHpe4BCVWi5scUVtH3vsdQHdxvtq7USCvN4XEmtfzYJxgcPtpTkJf38tJZUfHqQ0fFb82+iBbDYiBMfxksBBOnG4bg//QYNZ7JGctWw= Received: from DM5PR19CA0025.namprd19.prod.outlook.com (2603:10b6:3:9a::11) by BYAPR12MB2855.namprd12.prod.outlook.com (2603:10b6:a03:12c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Tue, 24 May 2022 19:07:26 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:3:9a:cafe::1c) by DM5PR19CA0025.outlook.office365.com (2603:10b6:3:9a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Tue, 24 May 2022 19:07:26 +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 DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5293.13 via Frontend Transport; Tue, 24 May 2022 19:07:25 +0000 Received: from alex-MS-7B09.amd.com (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.2375.24; Tue, 24 May 2022 14:07:21 -0500 From: Alex Sierra To: CC: , , , , , , , , , , , , Subject: [PATCH v3 07/13] lib: test_hmm add ioctl to get zone device type Date: Tue, 24 May 2022 14:06:26 -0500 Message-ID: <20220524190632.3304-8-alex.sierra@amd.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220524190632.3304-1-alex.sierra@amd.com> References: <20220524190632.3304-1-alex.sierra@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0d5e536-efe4-475d-3b0b-08da3db8a3f6 X-MS-TrafficTypeDiagnostic: BYAPR12MB2855:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KYuQLHIoQKqz09V3TRykMjBj1KOorD+mTe5v3NVYK5Lkfp2LLerhqYvN+3LH6GxKHmksXOD8bnbQSCpeD4jvV+ZEF8EliFd78wL9ceQhPCBAwwXS3zIK5RE6XsxSyzux9tj/YGVY0DKV6zzFFaEQPPE2V76zihevTkl0dpySmOcGgwHNvzoKdIRyWb+FN2J527XQPK4sF2ej4NgzF+TQjy1peVk+vccU3n+Rskgu6ZY04fy3Et8NGwBa87c4SJwhlpaKh3A3k/V12dysOTzgv/bHboQKmkkLWP8c39wMuMXU7+vEQ/+eYbzcmuOb46uWSMin8mAhckdQEgNFolahkMofPnA5m0c9jVhQXVc6u7Py8NscjoYaZ9EumR+htYRUf9Ex103l1pzcfOGRvo4NELrpX9Hfh6TT0zrrxtJHRbHw+n99LU7SABZkeBmBQ/HD8ecCOT6pVa9+wM3lvx5PN3TRWC59tJBZesns+I0F9SvRhOKEmSIHMCE3kJidZQ3Muoo8a6RyFloAG4xIz3Vdl593yuymbpr4Ah3icgty8rO0ZpO6wWjEekdNCHdOuKad1nbhOEATt4qbXQHndYw8r+IbJiUCuZH8Fd6mS6XWEX+5Hl5GFbNMZOB/sBy8u4KMh6Fr2hpLrXRlgXYctWrLtQs1tnLcMVYRVFs8Y/szWXp39o5+xoBz+D1ubap/31tTm75fVhJfc8YC1+ngmcrKlg== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(86362001)(81166007)(6916009)(54906003)(336012)(186003)(82310400005)(36756003)(36860700001)(426003)(4326008)(70206006)(8676002)(70586007)(7416002)(356005)(316002)(16526019)(83380400001)(26005)(5660300002)(47076005)(44832011)(40460700003)(8936002)(1076003)(2616005)(2906002)(7696005)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2022 19:07:25.9352 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f0d5e536-efe4-475d-3b0b-08da3db8a3f6 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: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2855 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org new ioctl cmd added to query zone device type. This will be used once the test_hmm adds zone device coherent type. Signed-off-by: Alex Sierra Acked-by: Felix Kuehling Reviewed-by: Alistair Poppple Signed-off-by: Christoph Hellwig --- lib/test_hmm.c | 23 +++++++++++++++++++++-- lib/test_hmm_uapi.h | 8 ++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index cfe632047839..7a27584484ce 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -87,6 +87,7 @@ struct dmirror_chunk { struct dmirror_device { struct cdev cdevice; struct hmm_devmem *devmem; + unsigned int zone_device_type; unsigned int devmem_capacity; unsigned int devmem_count; @@ -1026,6 +1027,15 @@ static int dmirror_snapshot(struct dmirror *dmirror, return ret; } +static int dmirror_get_device_type(struct dmirror *dmirror, + struct hmm_dmirror_cmd *cmd) +{ + mutex_lock(&dmirror->mutex); + cmd->zone_device_type = dmirror->mdevice->zone_device_type; + mutex_unlock(&dmirror->mutex); + + return 0; +} static long dmirror_fops_unlocked_ioctl(struct file *filp, unsigned int command, unsigned long arg) @@ -1076,6 +1086,9 @@ static long dmirror_fops_unlocked_ioctl(struct file *filp, ret = dmirror_snapshot(dmirror, &cmd); break; + case HMM_DMIRROR_GET_MEM_DEV_TYPE: + ret = dmirror_get_device_type(dmirror, &cmd); + break; default: return -EINVAL; } @@ -1260,14 +1273,20 @@ static void dmirror_device_remove(struct dmirror_device *mdevice) static int __init hmm_dmirror_init(void) { int ret; - int id; + int id = 0; + int ndevices = 0; ret = alloc_chrdev_region(&dmirror_dev, 0, DMIRROR_NDEVICES, "HMM_DMIRROR"); if (ret) goto err_unreg; - for (id = 0; id < DMIRROR_NDEVICES; id++) { + memset(dmirror_devices, 0, DMIRROR_NDEVICES * sizeof(dmirror_devices[0])); + dmirror_devices[ndevices++].zone_device_type = + HMM_DMIRROR_MEMORY_DEVICE_PRIVATE; + dmirror_devices[ndevices++].zone_device_type = + HMM_DMIRROR_MEMORY_DEVICE_PRIVATE; + for (id = 0; id < ndevices; id++) { ret = dmirror_device_init(dmirror_devices + id, id); if (ret) goto err_chrdev; diff --git a/lib/test_hmm_uapi.h b/lib/test_hmm_uapi.h index f14dea5dcd06..17f842f1aa02 100644 --- a/lib/test_hmm_uapi.h +++ b/lib/test_hmm_uapi.h @@ -19,6 +19,7 @@ * @npages: (in) number of pages to read/write * @cpages: (out) number of pages copied * @faults: (out) number of device page faults seen + * @zone_device_type: (out) zone device memory type */ struct hmm_dmirror_cmd { __u64 addr; @@ -26,6 +27,7 @@ struct hmm_dmirror_cmd { __u64 npages; __u64 cpages; __u64 faults; + __u64 zone_device_type; }; /* Expose the address space of the calling process through hmm device file */ @@ -35,6 +37,7 @@ struct hmm_dmirror_cmd { #define HMM_DMIRROR_SNAPSHOT _IOWR('H', 0x03, struct hmm_dmirror_cmd) #define HMM_DMIRROR_EXCLUSIVE _IOWR('H', 0x04, struct hmm_dmirror_cmd) #define HMM_DMIRROR_CHECK_EXCLUSIVE _IOWR('H', 0x05, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_GET_MEM_DEV_TYPE _IOWR('H', 0x06, struct hmm_dmirror_cmd) /* * Values returned in hmm_dmirror_cmd.ptr for HMM_DMIRROR_SNAPSHOT. @@ -62,4 +65,9 @@ enum { HMM_DMIRROR_PROT_DEV_PRIVATE_REMOTE = 0x30, }; +enum { + /* 0 is reserved to catch uninitialized type fields */ + HMM_DMIRROR_MEMORY_DEVICE_PRIVATE = 1, +}; + #endif /* _LIB_TEST_HMM_UAPI_H */