From patchwork Tue Mar 22 04:35:43 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: 12788085 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 C43F5C433EF for ; Tue, 22 Mar 2022 04:36:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 041946B0072; Tue, 22 Mar 2022 00:36:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F320E6B0073; Tue, 22 Mar 2022 00:36:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF92F6B0074; Tue, 22 Mar 2022 00:36:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id CFFBA6B0072 for ; Tue, 22 Mar 2022 00:36:00 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6233AA230A for ; Tue, 22 Mar 2022 04:36:00 +0000 (UTC) X-FDA: 79270759680.23.23821B7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id C62C980008 for ; Tue, 22 Mar 2022 04:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647923759; 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=t3IGbOgUUewTBogYnzXEBJ4M/X0d13k762exbwwKFTM=; b=Mjs6IH3o8GOfPEtAFkP7RYZIXD2raLzzDVIVHaZtAWavevaWsObV4bUAjAD/dOCnxnbT3E 6fNXby5m3WVDEHHVQCkBZkR1V7Zc0OOUNMfSDChTsuCrL1NYTWB653z4jgxNuy02Fai5T8 6qeJ3bpzHZyXWm8SgeixSvW/kOya1as= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-364-JNkMbaOvOkS0-yr78_o_Zg-1; Tue, 22 Mar 2022 00:35:58 -0400 X-MC-Unique: JNkMbaOvOkS0-yr78_o_Zg-1 Received: by mail-lf1-f69.google.com with SMTP id bt40-20020a056512262800b004481fbe2d29so4290909lfb.16 for ; Mon, 21 Mar 2022 21:35:57 -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=t3IGbOgUUewTBogYnzXEBJ4M/X0d13k762exbwwKFTM=; b=oHm1gqs9CfJsYmSXWT99lP38fKHVSebJfPpaFddOf7lGk4byCUqYyFNddkeXvDWj7e zKflhga8wcOx9fdqf/oS0vO3+96VNGSQEJS2q0YYW6CUVwIYO7ee02Lgd1onFN2jT5QV vOohJe2wVa5bGWZRbIkCxJzOZ54Ibzh7r0SY8WWYFI3Xiw8a9ZvC2BOS8jKVe5SPT0Nv 1SKIipzEiqdRcojnlhWZGTlB5UmzhOU8pzSFSU0wqGemFxO+o4fBX9bQrSTDD7L541Pw 98wgpcpiXkTPnRXz+FOd8kEIPiIiKzGd4boh35HtjNb+agmYcTQg0QZB5XHFNmk1Zm/1 ofYw== X-Gm-Message-State: AOAM5309onnDpEMfr2LKPQcFyYXRj0K0sufCkHdWbchSmnQZ+yGgeofz EVsFg4pM40lwg/a0i0mYU6ABRMG/PCzQqFgh63/HVQvEf+A3VfCyFe99vJi60tbfvRexz3GV/Ui 4t9Xh+mXMMw== X-Received: by 2002:a05:6512:1151:b0:448:537b:1fab with SMTP id m17-20020a056512115100b00448537b1fabmr16553363lfg.422.1647923756733; Mon, 21 Mar 2022 21:35:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw4cz+Q7IEwWixdY2LJo1ZUVa1g8ngSQfImYT4hIY0nJUFe1GrdHDFFwy+WgLk/ZMPYb0GPg== X-Received: by 2002:a05:6512:1151:b0:448:537b:1fab with SMTP id m17-20020a056512115100b00448537b1fabmr16553346lfg.422.1647923756483; Mon, 21 Mar 2022 21:35:56 -0700 (PDT) Received: from mjp-Z390-AORUS-MASTER.redhat.com (91-145-109-188.bb.dnainternet.fi. [91.145.109.188]) by smtp.gmail.com with ESMTPSA id a13-20020a195f4d000000b00443a5302315sm2042069lfj.30.2022.03.21.21.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 21:35:56 -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 v5] mm/hmm/test: use char dev with struct device to get device node Date: Tue, 22 Mar 2022 06:35:43 +0200 Message-Id: <20220322043543.18424-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 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Mjs6IH3o; spf=none (imf30.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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C62C980008 X-Stat-Signature: d6946x67qh8i6wfoewt9tinn7shqj6h5 X-HE-Tag: 1647923759-328142 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. Change this to properly use cdev and struct device APIs. Delete the /proc/devices parsing from the user-space test script, now that it is unnecessary. Also, deleted an unused field in struct dmirror_device: devmem. Signed-off-by: Mika Penttilä Reviewed-by: John Hubbard Cc: Alistair Popple Cc: Ralph Campbell Cc: Jason Gunthorpe Cc: Vlastimil Babka --- v5: - fix whitespace . delete unused structure field v4: - fix commit log 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 | 18 ++++++++++++++---- tools/testing/selftests/vm/test_hmm.sh | 6 ------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 767538089a62..3c7f2a92b09e 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; @@ -83,7 +89,7 @@ struct dmirror_chunk { */ struct dmirror_device { struct cdev cdevice; - struct hmm_devmem *devmem; + struct device device; unsigned int devmem_capacity; unsigned int devmem_count; @@ -1225,7 +1231,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 +1262,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()