From patchwork Fri Mar 11 03:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Mika_Penttil=C3=A4?= X-Patchwork-Id: 12777359 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 D9DCDC433F5 for ; Fri, 11 Mar 2022 03:31:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52B6A8D0002; Thu, 10 Mar 2022 22:31:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DB478D0001; Thu, 10 Mar 2022 22:31:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37EA68D0002; Thu, 10 Mar 2022 22:31:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id 228E08D0001 for ; Thu, 10 Mar 2022 22:31:16 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 21A8B120754 for ; Fri, 11 Mar 2022 03:31:16 +0000 (UTC) X-FDA: 79230679710.10.1C1F3D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 5911F40022 for ; Fri, 11 Mar 2022 03:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646969474; h=from:from: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; bh=J0OLr2mkUgo8W4yOelSoWk9dmjDH+khiCra/4OvgbRE=; b=TPoofZQIN5w+GY76axxX9Zmt+6stqxTPDwFR6CC6aRocFLBPUD3BUC7E4cktvpPTtxE5MP Q8aTVu1zVf41A5mtWX4o/E18CF3HU2MMbdG7bZytzfkZO5JOCog2QbN30aModuVn1sqgty WfSalwD+9FR+542jcgxW1h/XTiSmHXk= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-Aqsjrn1vNt6BWX8gzVKv6g-1; Thu, 10 Mar 2022 22:31:13 -0500 X-MC-Unique: Aqsjrn1vNt6BWX8gzVKv6g-1 Received: by mail-lf1-f71.google.com with SMTP id u2-20020a056512128200b004484c08894aso2585996lfs.12 for ; Thu, 10 Mar 2022 19:31:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J0OLr2mkUgo8W4yOelSoWk9dmjDH+khiCra/4OvgbRE=; b=f8+LxRmVT0+FTAEPXsXmG7erqfjvLEyeG/0RfEilqda+FrkV5i1EZPs4VgfcvjjzUi OtRDKgxc4chzkByM0CxG4uUvhF29W8EkgCHDIMKyxb895wjxzecUDnCdTbg/pUBPCirD OWfHa9Es9v0ybzegFtvnT8QtVaPNrSL67AJ1ie81vuhnaCn9RVxqwCOegHMzZs1Mvm3q o6ADltFEkdpk+4fpqVsHyYzzRJcdh4KmGWu+otEo8nm1KqKzQhkk3BHm4KtqnOQHBHxQ tZ6ul7ZJMal+Kg0ZqAoWE1hR5Eej+D3LTFmZh6MQCYQtwavqG8rOUvpaDNc378o0y66x y1cA== X-Gm-Message-State: AOAM532UYd3Ul5QSd50nikxUR4B6uFF3c7N6Qt1rGFreOSURfjD7T0Xz pgr3djAg3hYre0jWIu2iLUac24BXI3x9RLCvAQSIE34DrcpwTwYgtPJavO2C4gRmXIX0GKueyP2 SoRwO2anRsA== X-Received: by 2002:ac2:418c:0:b0:43e:8f98:98f0 with SMTP id z12-20020ac2418c000000b0043e8f9898f0mr5018276lfh.604.1646969471619; Thu, 10 Mar 2022 19:31:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNNZCyTIcpfkdac1X8Afin/J2k3HiOknmksttd95PiayQnmesQwStiDBhOUm+oIs2H1NNosg== X-Received: by 2002:ac2:418c:0:b0:43e:8f98:98f0 with SMTP id z12-20020ac2418c000000b0043e8f9898f0mr5018258lfh.604.1646969471310; Thu, 10 Mar 2022 19:31:11 -0800 (PST) Received: from localhost.localdomain (91-145-109-188.bb.dnainternet.fi. [91.145.109.188]) by smtp.gmail.com with ESMTPSA id u16-20020ac25190000000b004433b80c1d3sm1339700lfi.182.2022.03.10.19.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Mar 2022 19:31:10 -0800 (PST) From: mpenttil@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: apopple@nvidia.com, jhubbard@nvidia.com, rcampbell@nvidia.com, jgg@ziepe.ca, vbabka@suse.cz, =?utf-8?q?Mika_Penttil=C3=A4?= Subject: [PATCH v2] mm/hmm/test: simplify hmm test code: use miscdevice instead of char dev Date: Fri, 11 Mar 2022 05:30:50 +0200 Message-Id: <20220311033050.22724-1-mpenttil@redhat.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Stat-Signature: ft19kme56nknazoo1nfzjhusc7zgoesr Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TPoofZQI; spf=none (imf07.hostedemail.com: domain of mpenttil@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=mpenttil@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5911F40022 X-HE-Tag: 1646969475-789773 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: From: Mika Penttilä HMM selftests use an in-kernel pseudo device to emulate device private memory. The pseudo device registers a major device range for two pseudo device instances. User space has a script that reads /proc/devices in order to find the assigned major number, and sends that to mknod(1), once for each node. This duplicates a fair amount of boilerplate that misc device can do instead. Change this to use misc device, which makes the device node names appear for us. This also enables udev-like processing if desired. Delete the /proc/devices parsing from the user-space test script, now that it is unnecessary. v2: - Cleanups per review comments from John Hubbard - Added Tested-by and Ccs Signed-off-by: Mika Penttilä Tested-by: Alistair Popple Cc: John Hubbard Cc: Ralph Campbell Cc: Jason Gunthorpe Cc: Vlastimil Babka Reviewed-by: John Hubbard --- lib/test_hmm.c | 40 ++++++++++++-------------- tools/testing/selftests/vm/test_hmm.sh | 6 ---- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 767538089a62..0e1488e1bad8 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -25,18 +24,24 @@ #include #include #include +#include #include #include "test_hmm_uapi.h" -#define DMIRROR_NDEVICES 2 #define DMIRROR_RANGE_FAULT_TIMEOUT 1000 #define DEVMEM_CHUNK_SIZE (256 * 1024 * 1024U) #define DEVMEM_CHUNKS_RESERVE 16 +static const char *dmirror_device_names[] = { + "hmm_dmirror0", + "hmm_dmirror1" +}; + +#define DMIRROR_NDEVICES ARRAY_SIZE(dmirror_device_names) + static const struct dev_pagemap_ops dmirror_devmem_ops; static const struct mmu_interval_notifier_ops dmirror_min_ops; -static dev_t dmirror_dev; struct dmirror_device; @@ -82,7 +87,7 @@ struct dmirror_chunk { * Per device data. */ struct dmirror_device { - struct cdev cdevice; + struct miscdevice miscdevice; struct hmm_devmem *devmem; unsigned int devmem_capacity; @@ -118,7 +123,6 @@ static void dmirror_bounce_fini(struct dmirror_bounce *bounce) static int dmirror_fops_open(struct inode *inode, struct file *filp) { - struct cdev *cdev = inode->i_cdev; struct dmirror *dmirror; int ret; @@ -127,12 +131,13 @@ static int dmirror_fops_open(struct inode *inode, struct file *filp) if (dmirror == NULL) return -ENOMEM; - dmirror->mdevice = container_of(cdev, struct dmirror_device, cdevice); + dmirror->mdevice = container_of(filp->private_data, + struct dmirror_device, miscdevice); mutex_init(&dmirror->mutex); xa_init(&dmirror->pt); ret = mmu_interval_notifier_insert(&dmirror->notifier, current->mm, - 0, ULONG_MAX & PAGE_MASK, &dmirror_min_ops); + 0, ULONG_MAX & PAGE_MASK, &dmirror_min_ops); if (ret) { kfree(dmirror); return ret; @@ -1216,16 +1221,16 @@ static const struct dev_pagemap_ops dmirror_devmem_ops = { static int dmirror_device_init(struct dmirror_device *mdevice, int id) { - dev_t dev; int ret; - dev = MKDEV(MAJOR(dmirror_dev), id); mutex_init(&mdevice->devmem_lock); spin_lock_init(&mdevice->lock); - cdev_init(&mdevice->cdevice, &dmirror_fops); - mdevice->cdevice.owner = THIS_MODULE; - ret = cdev_add(&mdevice->cdevice, dev, 1); + mdevice->miscdevice.minor = MISC_DYNAMIC_MINOR; + mdevice->miscdevice.name = dmirror_device_names[id]; + mdevice->miscdevice.fops = &dmirror_fops; + + ret = misc_register(&mdevice->miscdevice); if (ret) return ret; @@ -1252,7 +1257,7 @@ static void dmirror_device_remove(struct dmirror_device *mdevice) kfree(mdevice->devmem_chunks); } - cdev_del(&mdevice->cdevice); + misc_deregister(&mdevice->miscdevice); } static int __init hmm_dmirror_init(void) @@ -1260,11 +1265,6 @@ static int __init hmm_dmirror_init(void) int ret; int id; - ret = alloc_chrdev_region(&dmirror_dev, 0, DMIRROR_NDEVICES, - "HMM_DMIRROR"); - if (ret) - goto err_unreg; - for (id = 0; id < DMIRROR_NDEVICES; id++) { ret = dmirror_device_init(dmirror_devices + id, id); if (ret) @@ -1277,8 +1277,7 @@ static int __init hmm_dmirror_init(void) err_chrdev: while (--id >= 0) dmirror_device_remove(dmirror_devices + id); - unregister_chrdev_region(dmirror_dev, DMIRROR_NDEVICES); -err_unreg: + return ret; } @@ -1288,7 +1287,6 @@ static void __exit hmm_dmirror_exit(void) for (id = 0; id < DMIRROR_NDEVICES; id++) dmirror_device_remove(dmirror_devices + id); - unregister_chrdev_region(dmirror_dev, DMIRROR_NDEVICES); } module_init(hmm_dmirror_init); diff --git a/tools/testing/selftests/vm/test_hmm.sh b/tools/testing/selftests/vm/test_hmm.sh index 0647b525a625..69f5889f8575 100755 --- a/tools/testing/selftests/vm/test_hmm.sh +++ b/tools/testing/selftests/vm/test_hmm.sh @@ -41,17 +41,11 @@ check_test_requirements() load_driver() { modprobe $DRIVER > /dev/null 2>&1 - if [ $? == 0 ]; then - major=$(awk "\$2==\"HMM_DMIRROR\" {print \$1}" /proc/devices) - mknod /dev/hmm_dmirror0 c $major 0 - mknod /dev/hmm_dmirror1 c $major 1 - fi } unload_driver() { modprobe -r $DRIVER > /dev/null 2>&1 - rm -f /dev/hmm_dmirror? } run_smoke()