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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0965C433FE for ; Mon, 3 Oct 2022 21:10:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbiJCVKg (ORCPT ); Mon, 3 Oct 2022 17:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229852AbiJCVIf (ORCPT ); Mon, 3 Oct 2022 17:08:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 975064F664 for ; Mon, 3 Oct 2022 14:06:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0AE4FB811BF for ; Mon, 3 Oct 2022 21:06:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B394BC433D7; Mon, 3 Oct 2022 21:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1664831190; bh=eXMsi7GCRrpMvX5wjkj1m9AHhg/Ny/s2gFim8oy3uF4=; h=Date:To:From:Subject:From; b=ohSHsU9g5h11V8nXtav1iLqtr8wbaemP/MhDmHggoBC6esFBu8j5RIvlNVSaSka7t aM3kKBLXrx/GmeOylhjEDTAFTWod8TUF1NRiikn+CbUYaw8nxz3xMPGvdm0lR497AI EwGDPdOl0mstFq4NK1hmm0a8vIpV67sn7sRwaX3I= Date: Mon, 03 Oct 2022 14:06:30 -0700 To: mm-commits@vger.kernel.org, vbabka@suse.cz, rcampbell@nvidia.com, jhubbard@nvidia.com, jgg@nvidia.com, hch@lst.de, apopple@nvidia.com, mpenttil@redhat.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-hmm-test-use-char-dev-with-struct-device-to-get-device-node.patch removed from -mm tree Message-Id: <20221003210630.B394BC433D7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm/hmm/test: use char dev with struct device to get device node has been removed from the -mm tree. Its filename was mm-hmm-test-use-char-dev-with-struct-device-to-get-device-node.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Mika Penttilä Subject: mm/hmm/test: use char dev with struct device to get device node Date: Fri, 26 Aug 2022 08:06:31 +0300 HMM selftests use an in-kernel pseudo device to emulate device memory. The pseudo device registers a major device range for two or four 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, delete an unused field in struct dmirror_device: devmem. Link: https://lkml.kernel.org/r/20220826050631.25771-1-mpenttil@redhat.com Signed-off-by: Mika Penttilä Reviewed-by: John Hubbard Reviewed-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Cc: Alistair Popple Cc: Ralph Campbell Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- lib/test_hmm.c | 13 ++++++++++--- tools/testing/selftests/vm/test_hmm.sh | 10 ---------- 2 files changed, 10 insertions(+), 13 deletions(-) --- a/lib/test_hmm.c~mm-hmm-test-use-char-dev-with-struct-device-to-get-device-node +++ a/lib/test_hmm.c @@ -107,8 +107,8 @@ struct dmirror_chunk { */ struct dmirror_device { struct cdev cdevice; - struct hmm_devmem *devmem; unsigned int zone_device_type; + struct device device; unsigned int devmem_capacity; unsigned int devmem_count; @@ -1390,7 +1390,14 @@ static int dmirror_device_init(struct dm cdev_init(&mdevice->cdevice, &dmirror_fops); mdevice->cdevice.owner = THIS_MODULE; - ret = cdev_add(&mdevice->cdevice, dev, 1); + device_initialize(&mdevice->device); + mdevice->device.devt = dev; + + ret = dev_set_name(&mdevice->device, "hmm_dmirror%u", id); + if (ret) + return ret; + + ret = cdev_device_add(&mdevice->cdevice, &mdevice->device); if (ret) return ret; @@ -1416,7 +1423,7 @@ static void dmirror_device_remove(struct kfree(mdevice->devmem_chunks); } - cdev_del(&mdevice->cdevice); + cdev_device_del(&mdevice->cdevice, &mdevice->device); } static int __init hmm_dmirror_init(void) --- a/tools/testing/selftests/vm/test_hmm.sh~mm-hmm-test-use-char-dev-with-struct-device-to-get-device-node +++ a/tools/testing/selftests/vm/test_hmm.sh @@ -52,21 +52,11 @@ load_driver() usage fi fi - 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 - if [ $# -eq 2 ]; then - mknod /dev/hmm_dmirror2 c $major 2 - mknod /dev/hmm_dmirror3 c $major 3 - fi - fi } unload_driver() { modprobe -r $DRIVER > /dev/null 2>&1 - rm -f /dev/hmm_dmirror? } run_smoke() _ Patches currently in -mm which might be from mpenttil@redhat.com are