From patchwork Tue Mar 8 01:57:05 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: 12772882 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 E57F7C433F5 for ; Tue, 8 Mar 2022 01:57:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DC4E8D0002; Mon, 7 Mar 2022 20:57:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 465488D0001; Mon, 7 Mar 2022 20:57:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B7E38D0002; Mon, 7 Mar 2022 20:57:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 198518D0001 for ; Mon, 7 Mar 2022 20:57:34 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id C7A84AA062 for ; Tue, 8 Mar 2022 01:57:33 +0000 (UTC) X-FDA: 79219557186.17.8C910D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 14792120005 for ; Tue, 8 Mar 2022 01:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646704652; 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=gYfNI0SlCX9BJv99j/ZRqXDOZZLf2eh0xV+TKVixGaM=; b=GcepaS74MlQ6p1f0efAuFJhmfaTbYj6ffQ0vzSxxG8JBp0GBpwJKHNkmov6xsNuQNfRy1A djYSYIroX8iKy/eYYZRuNMCflx83eUXRBUgyWsZbn4Tr72yxZfRHXW+59Il2ZSURrV3fIl //QHWTJwdOiLm8J459+nQ8frGwAH6os= 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-42-7Bs8li9KNY2NpwO9hfaM1g-1; Mon, 07 Mar 2022 20:57:31 -0500 X-MC-Unique: 7Bs8li9KNY2NpwO9hfaM1g-1 Received: by mail-lf1-f71.google.com with SMTP id cf41-20020a056512282900b00445c0a8069bso3427146lfb.8 for ; Mon, 07 Mar 2022 17:57:31 -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=gYfNI0SlCX9BJv99j/ZRqXDOZZLf2eh0xV+TKVixGaM=; b=OjBvhP56qcn9OGbKg7TFrLfmD5QolF9zMCx+B/MB2cDRe29n9hQt0vsfyNUzadqOB2 ptPPycv1iIM1Hdp8AgevYaDs/ueK1/hqpzNkTbXBwHBEGDR/R7JdERvzaSm6LmRTXX4c JbdU0ZxPPL24TuH59wBZgrnhB3nmIWy4HJUA+IOz7nIiYUfk/+76fWtoSa3jt5CszJir Pu/+LHsTjUsg7Inc8x1aUjTYcmUXmjRrdDcoDyKhzC5x/n9hJ9tK06jNEgwy/OX/d79I kbdRIuK+c0F8yVvFbXvCvMWmDrQpJ5oC75n84VmVrQTnaFQrDdp62l6uzOTD5okN0heY luqA== X-Gm-Message-State: AOAM530Fu6dHSftskeTZjcohScuSLKx2rOFe6lm+mpYtGdQlOuD2W2fJ 44NAFaZdI2vNe64gGUwYgckktIindx4o4vAw/yR4Esu6sbG2/Gddqkzf0bIngX1MJbBB26eznMd ths6bSAU6IA== X-Received: by 2002:a05:6512:1585:b0:445:908b:ad71 with SMTP id bp5-20020a056512158500b00445908bad71mr9360474lfb.200.1646704649792; Mon, 07 Mar 2022 17:57:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxb2RXluRI1Hpj/9y4Y0GFufnMFAoHcfOUmQ8jV3BJTpXjAxd2/VxZ6/jn3y9OutltE4sLVNA== X-Received: by 2002:a05:6512:1585:b0:445:908b:ad71 with SMTP id bp5-20020a056512158500b00445908bad71mr9360455lfb.200.1646704649490; Mon, 07 Mar 2022 17:57:29 -0800 (PST) Received: from localhost.localdomain (91-145-109-188.bb.dnainternet.fi. [91.145.109.188]) by smtp.gmail.com with ESMTPSA id p1-20020ac246c1000000b004482062656bsm1983758lfo.294.2022.03.07.17.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 17:57:29 -0800 (PST) From: mpenttil@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: =?utf-8?q?Mika_Penttil=C3=A4?= Subject: [PATCH] HMM selftests changes Date: Tue, 8 Mar 2022 03:57:05 +0200 Message-Id: <20220308015705.8424-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-Rspamd-Server: rspam10 X-Rspam-User: X-Stat-Signature: rkfmuwee1ae19ro6hob7y9afup456c9s Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GcepaS74; spf=none (imf29.hostedemail.com: domain of mpenttil@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=mpenttil@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Queue-Id: 14792120005 X-HE-Tag: 1646704652-900402 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 a in-kernel pseudo device to emulate device private memory. For now, the pseudo device registers a major device range for two pseudo device instances. User space has a script that goes figures out from /proc/devices the assigned major and mknods the device nodes. Change this use to a more standard device framework, like misc device, which makes the device node names to appear right under any decent user space. This also makes it possible for udev- like processing if wanted, and the /proc/devices parsing is not needed any more. Signed-off-by: Mika Penttilä Tested-by: Alistair Popple --- lib/test_hmm.c | 46 +++++++++++++++----------- tools/testing/selftests/vm/test_hmm.sh | 6 ---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 767538089a62..76f6129e1f1f 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,25 @@ #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 +88,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,16 +124,20 @@ 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_device *dd = container_of(filp->private_data, + struct dmirror_device, miscdevice + ); struct dmirror *dmirror; int ret; + /* Mirror this process address space */ dmirror = kzalloc(sizeof(*dmirror), GFP_KERNEL); if (dmirror == NULL) return -ENOMEM; - dmirror->mdevice = container_of(cdev, struct dmirror_device, cdevice); + dmirror->mdevice = dd; mutex_init(&dmirror->mutex); xa_init(&dmirror->pt); @@ -1216,16 +1226,18 @@ 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 +1264,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 +1272,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 +1284,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 +1294,7 @@ 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()