From patchwork Mon Mar 21 02:44:00 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: 12786758 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 16047C433EF for ; Mon, 21 Mar 2022 02:45:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42DF16B0072; Sun, 20 Mar 2022 22:45:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DDA66B0073; Sun, 20 Mar 2022 22:45:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A54F6B0074; Sun, 20 Mar 2022 22:45:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 1ED386B0072 for ; Sun, 20 Mar 2022 22:45:05 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DCFCD23DA9 for ; Mon, 21 Mar 2022 02:45:04 +0000 (UTC) X-FDA: 79266851328.09.25AD8E1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 6B1921C000B for ; Mon, 21 Mar 2022 02:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647830704; 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=6ubxP4hFPwWxxv0omchK9xVZybEAI/r5w17ak6c2HDo=; b=MsyyzqLFsIU9xErUroRR04ouvKgvFYuzY8QVfS70wTqL7UfV7j9Yw+oc0I0PC+iFoHb8u3 vVc2nNfqqbxUaBpMi4PF0pzT3ZdKVRi878wJc0X8MqwBHiNdl4WS/6FfSwd+csGUZEQ1Vn v7Sohbd/knWATEAwxBtYkppjFPI0oPU= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-dU9M9BO9MwOqKjXLOV1UTQ-1; Sun, 20 Mar 2022 22:45:02 -0400 X-MC-Unique: dU9M9BO9MwOqKjXLOV1UTQ-1 Received: by mail-lf1-f72.google.com with SMTP id w13-20020ac25d4d000000b004488cf80eb1so3391753lfd.23 for ; Sun, 20 Mar 2022 19:45:02 -0700 (PDT) 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=6ubxP4hFPwWxxv0omchK9xVZybEAI/r5w17ak6c2HDo=; b=GksSpHrh26f9no0ruJLcVNHYEulp+5dCEcIuICgGD75hl3WLmjNEyDqS2ffLA/vu6x i/ceHu5MCA7YDeznSIgDeNEIA3W3BWlaDscSNpuPLUGM5siQVkr5dXZBRQUxU0/4YkTu r0iQz0ixhcC26fBWDT4RFITQJJnDCXHggrKKsr7s6JPc6d0/tYzfWFj1elGQuuMnd8jU WSMTz/OL5vx38VvwUWthSbEW7AE6MrwyaDFOgIw5glUHBrhh+JarLrTKMreaIZ3fPfh+ +mzu1aRSXmjfjoAv2ZSVSd7xFFkw5X2+tSSjPSpIw5Hkvy89fORNmL9t6CfqriCrZ9w5 xlLw== X-Gm-Message-State: AOAM533CO3t1LCAuhol9ytXLJemi8HkbZlx0ZMSpsFUD3I4a1s3N9fbf HRmjnxjO0xJnSBiuS2PX2MtqQMRaa4iSkN9AH1fi5CmbmRKyxNVw1w/40g7mHO4YqmoLR2dd98t a3ToFTJF6Ww== X-Received: by 2002:a05:6512:220c:b0:44a:2e21:e35c with SMTP id h12-20020a056512220c00b0044a2e21e35cmr1450076lfu.107.1647830701150; Sun, 20 Mar 2022 19:45:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFXUogRW93Ntm/8FmIFnPfkQTaFd15JoOAVpUH6T8ISpe1VzIYS3//Es/xS4cbZxgGHbVESw== X-Received: by 2002:a05:6512:220c:b0:44a:2e21:e35c with SMTP id h12-20020a056512220c00b0044a2e21e35cmr1450053lfu.107.1647830700856; Sun, 20 Mar 2022 19:45:00 -0700 (PDT) Received: from localhost.localdomain (91-145-109-188.bb.dnainternet.fi. [91.145.109.188]) by smtp.gmail.com with ESMTPSA id m8-20020a05651202e800b0044a2d45534fsm161250lfq.103.2022.03.20.19.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 19:45:00 -0700 (PDT) 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 v3] mm/hmm/test: use char dev with struct device to get device node Date: Mon, 21 Mar 2022 04:44:00 +0200 Message-Id: <20220321024400.20956-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-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6B1921C000B X-Stat-Signature: tyrkftqak3k8btk33wbwwk8apzbh3r8m Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MsyyzqLF; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf18.hostedemail.com: domain of mpenttil@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=mpenttil@redhat.com X-HE-Tag: 1647830704-751051 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. Signed-off-by: Mika Penttilä Cc: Alistair Popple Cc: John Hubbard Cc: Ralph Campbell Cc: Jason Gunthorpe Cc: Vlastimil Babka --- 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(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 767538089a62..d247e9c0fe94 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -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) 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()