mm/hmm/test: use char dev with struct device to get device node
PATCH v3 1/1 mm/hmm/test: use char dev with struct device to get device node
From: Mika Penttilä <[email protected]>
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.
---
v3:
- use cdev_device_add() instead of miscdevice
v2:
- Cleanups per review comments from John Hubbard
- Added Tested-by and Ccs
lib/test_hmm.c | 25 ++++++++++++++++++------- tools/testing/selftests/vm/test_hmm.sh | 6 ------ 2 files changed, 18 insertions(+), 13 deletions(-)
lib/test_hmm.c +18 -7
@@ -29,11 +29,17 @@#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;
@@ -74,7 +80,7 @@ struct dmirror {* ZONE_DEVICE pages for migration and simulating device memory. */ struct dmirror_chunk { -struct dev_pagemap pagemap; +struct dev_pagemap pagemap;struct dmirror_device *mdevice; };
@@ -82,8 +88,9 @@ struct dmirror_chunk {* Per device data. */ struct dmirror_device { -struct cdev cdevice; -struct hmm_devmem *devmem; +struct cdev cdevice; +struct device device; +struct hmm_devmem *devmem;unsigned int devmem_capacity;unsigned int devmem_count;
@@ -132,7 +139,7 @@ static int dmirror_fops_open(struct inode *inode, struct file *filp)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;
@@ -1225,7 +1232,11 @@ static int dmirror_device_init(struct dmirror_device *mdevice, int id)cdev_init (&mdevice->cdevice, &dmirror_fops); mdevice->cdevice.owner =THIS_MODULE ; - ret =cdev_add (&mdevice->cdevice, dev,1 ); +device_initialize (&mdevice->device); +dev_set_name (&mdevice->device,"%s" , dmirror_device_names[id]); + mdevice->device.devt = dev; + + ret =cdev_device_add (&mdevice->cdevice, &mdevice->device);if (ret)return ret;
@@ -1252,7 +1263,7 @@ static void dmirror_device_remove(struct dmirror_device *mdevice)kfree (mdevice->devmem_chunks); } -cdev_del (&mdevice->cdevice); +cdev_device_del (&mdevice->cdevice, &mdevice->device); }static int __init hmm_dmirror_init (void )
tools/testing/selftests/vm/test_hmm.sh +0 -6
@@ -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()
Signature · 1 line
2.17.1
Sorry ignore this one, see v4
Quoted 131 lines · On 21.3.2022 4.44, [email protected] wrote:
From: Mika Penttilä <[email protected]>
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/devicesin 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/devicesparsing from the user-space test script, now that it is unnecessary.Signed-off-by Mika Penttilä <[email protected]>Cc Alistair Popple <[email protected]>Cc John Hubbard <[email protected]>Cc Ralph Campbell <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Vlastimil Babka <[email protected]>---
v3:
- usecdev_device_add()instead of miscdevice
v2:
- Cleanups per review comments from John Hubbard
- Added Tested-by and Ccslib/test_hmm.c | 25 ++++++++++++++++++------- tools/testing/selftests/vm/test_hmm.sh | 6 ------ 2 files changed, 18 insertions(+), 13 deletions(-)lib/test_hmm.c +18
-7@@ -29,11 +29,17 @@#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;@@ -74,7 +80,7 @@ struct dmirror {* ZONE_DEVICE pages for migration and simulating device memory. */ struct dmirror_chunk { -struct dev_pagemap pagemap; +struct dev_pagemap pagemap;struct dmirror_device *mdevice; };@@ -82,8 +88,9 @@ struct dmirror_chunk {* Per device data. */ struct dmirror_device { -struct cdev cdevice; -struct hmm_devmem *devmem; +struct cdev cdevice; +struct device device; +struct hmm_devmem *devmem;unsigned int devmem_capacity;unsigned int devmem_count;@@ -132,7 +139,7 @@ static int dmirror_fops_open(struct inode *inode, struct file *filp)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;@@ -1225,7 +1232,11 @@ static int dmirror_device_init(struct dmirror_device *mdevice, int id)cdev_init (&mdevice->cdevice, &dmirror_fops); mdevice->cdevice.owner =THIS_MODULE ; - ret =cdev_add (&mdevice->cdevice, dev,1 ); +device_initialize (&mdevice->device); +dev_set_name (&mdevice->device,"%s" , dmirror_device_names[id]); + mdevice->device.devt = dev; + + ret =cdev_device_add (&mdevice->cdevice, &mdevice->device);if (ret)return ret;@@ -1252,7 +1263,7 @@ static void dmirror_device_remove(struct dmirror_device *mdevice)kfree (mdevice->devmem_chunks); } -cdev_del (&mdevice->cdevice); +cdev_device_del (&mdevice->cdevice, &mdevice->device); }static int __init hmm_dmirror_init (void )tools/testing/selftests/vm/test_hmm.sh +0
-6@@ -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()