From patchwork Mon Dec 3 23:35:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 10710913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26A1213BF for ; Mon, 3 Dec 2018 23:36:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1683229267 for ; Mon, 3 Dec 2018 23:36:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08E8D2B222; Mon, 3 Dec 2018 23:36:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDB0629267 for ; Mon, 3 Dec 2018 23:36:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7668E6B6BB7; Mon, 3 Dec 2018 18:36:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6CC606B6BB8; Mon, 3 Dec 2018 18:36:25 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 519716B6BB9; Mon, 3 Dec 2018 18:36:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by kanga.kvack.org (Postfix) with ESMTP id 24FA96B6BB7 for ; Mon, 3 Dec 2018 18:36:25 -0500 (EST) Received: by mail-qt1-f200.google.com with SMTP id b26so15290307qtq.14 for ; Mon, 03 Dec 2018 15:36:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YJeTGw3BudeygPm8Y6qm28IwTKcnnzbfv+AoDd8Lj6U=; b=e4vrTZahcBdsy/DtDNBQjN7f6aEsf9ZIw3lXr7pxiQfGMs5Ci7kGegfrk4wLAPN0c8 2AvS50DCgbupg+rC54Pbf2rZ3E4tSvnJTeGRY6X+hWfnEQoVeDlTKHE0Vo5e5ELp7di4 K7EvfoV+8pnwzCMxonaTpJ/Eobq1rX9odoy9QfgeC+FwhsU7AHn6HsNCukmc/M8byFXA 9QRwWDPyYItve0rY3qcDIm3oREvI1pAxJ0xm+IWvHzF9oawXKgn8Be0QvNHhy0foSCiS Ip599QBuhPK6Ec8rQ8JU4p4cDmngYMAal6E5b0rULuwxxWS8cMCNIREuKtMU4CzITg6W /Qiw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AA+aEWan/ut4ZCYOcVHP3jJaKDeWwHlLpHzlPWIs9f9uLV0I53y7akBK gpbpH4WtF/ehtMY1x2TcYJE5otsnrfvckkCWYvHiOUVoTtBsEx3FeGmDWRqWXboO6VoHZz+/uM4 v/xssddUykfOgs+o/GTWqrrRC3UpxfdiwM1LZf7if+YSSSrmBd/iZ3F6hAzdwp9zhXQ== X-Received: by 2002:ac8:270d:: with SMTP id g13mr17634274qtg.168.1543880184908; Mon, 03 Dec 2018 15:36:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/WwQo+4MkRH0K95PsOltV8DHGbsWfh8MD0VW1lFRrIt+9Y9hYhv1qDFdH6EkhD01cu6FPze X-Received: by 2002:ac8:270d:: with SMTP id g13mr17634241qtg.168.1543880184176; Mon, 03 Dec 2018 15:36:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543880184; cv=none; d=google.com; s=arc-20160816; b=v9yLJGKGhjX5gxF6N2ZEqQcFH6qByRQZsGy7NgWXbsMDaW87uUkTyoqUpbDhCJF5TX S+91BROMK3fErRrC3/HRAzNvt1oigahNJSdI2arWUjBKuPM4s2XQuN52BufrG5JwgNI0 0YD1dw8QWhdsflbaAGuGY4vCefAYX9UHoz4/nQbZ2AhNToS+JF4lqp/TlmgBtjlaATZF Xw3kdJEB3gXMHB1hm4cLratClHrAVjq/dk30Ob+fmC/OMErGbeVkqKGkihbaDObF8uXs VaUpYkeEum9pKUQj0P8wpUdRPtKYSUwRgbdzxI20I8RbKr4PX+whBVLAIw2lCDPQ94cB 8WqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=YJeTGw3BudeygPm8Y6qm28IwTKcnnzbfv+AoDd8Lj6U=; b=S9jzTLiN5k4YydMQh0DcZBMNpXWHmladxn2rcJeg9ZhlkRdB3yZ9XI2lgpJtkHHY54 gFxz9tfaJFf7SBUjCEf6d/SUlRyIjdEtz7xwoRjOvuQg1AK9CCs8hEAJt8K1snDXSUNl BG63rDm3TCYUr+tKjO9fgou5ieYZRI5zsufsk/zSkHHylwSA6xHTLjOZo2GHkSr868HY CXyVagRO+Z7SrLEZDdBhDrNc8+d12GAbLR/6zrqxwcOrclaSe1s8Rla3V5+pwEpWWKtS oIMByjWyKQDTlDiFWInLJYaQl5piRCmvF+uPcKxIKVjKAZJmH2IQJ7lOWmIP+2CNTT/S uLow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id u24si3487126qtc.86.2018.12.03.15.36.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 15:36:24 -0800 (PST) Received-SPF: pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6332C81F0F; Mon, 3 Dec 2018 23:36:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-188.rdu2.redhat.com [10.10.120.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id A192F600C7; Mon, 3 Dec 2018 23:36:22 +0000 (UTC) From: jglisse@redhat.com To: linux-mm@kvack.org Cc: Andrew Morton , linux-kernel@vger.kernel.org, =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= Subject: [RFC PATCH 13/14] drm/nouveau: register GPU under heterogeneous memory system Date: Mon, 3 Dec 2018 18:35:08 -0500 Message-Id: <20181203233509.20671-14-jglisse@redhat.com> In-Reply-To: <20181203233509.20671-1-jglisse@redhat.com> References: <20181203233509.20671-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 03 Dec 2018 23:36:23 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Jérôme Glisse This register NVidia GPU under heterogeneous memory system so that one can use the GPU memory with new syscall like hbind() for compute work load. Signed-off-by: Jérôme Glisse --- drivers/gpu/drm/nouveau/Kbuild | 1 + drivers/gpu/drm/nouveau/nouveau_hms.c | 80 +++++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_hms.h | 46 +++++++++++++++ drivers/gpu/drm/nouveau/nouveau_svm.c | 6 ++ 4 files changed, 133 insertions(+) create mode 100644 drivers/gpu/drm/nouveau/nouveau_hms.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_hms.h diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index a826a4df440d..9c1114b4d8a3 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -37,6 +37,7 @@ nouveau-y += nouveau_prime.o nouveau-y += nouveau_sgdma.o nouveau-y += nouveau_ttm.o nouveau-y += nouveau_vmm.o +nouveau-$(CONFIG_HMS) += nouveau_hms.o # DRM - modesetting nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o diff --git a/drivers/gpu/drm/nouveau/nouveau_hms.c b/drivers/gpu/drm/nouveau/nouveau_hms.c new file mode 100644 index 000000000000..52af9180e108 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_hms.c @@ -0,0 +1,80 @@ +/* + * Copyright 2018 Red Hat Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +#include "nouveau_dmem.h" +#include "nouveau_drv.h" +#include "nouveau_hms.h" + +#include + +static int nouveau_hms_migrate(struct hms_target *target, struct mm_struct *mm, + unsigned long start, unsigned long end, + unsigned natoms, uint32_t *atoms) +{ + struct nouveau_hms *hms = target->private; + struct nouveau_drm *drm = hms->drm; + unsigned long addr; + int ret = 0; + + down_read(&mm->mmap_sem); + + for (addr = start; addr < end;) { + struct vm_area_struct *vma; + unsigned long next; + + vma = find_vma_intersection(mm, addr, end); + if (!vma) + break; + + next = min(vma->vm_end, end); + ret = nouveau_dmem_migrate_vma(drm, vma, addr, next); + // FIXME ponder more on what to do + addr = next; + } + + up_read(&mm->mmap_sem); + + return ret; +} + +const static struct hms_target_hbind nouveau_hms_target_hbind = { + .migrate = nouveau_hms_migrate, +}; + + +void nouveau_hms_init(struct nouveau_drm *drm, struct nouveau_hms *hms) +{ + unsigned long vram_size = drm->gem.vram_available; + struct device *parent; + + hms->drm = drm; + parent = drm->dev->pdev ? &drm->dev->pdev->dev : drm->dev->dev; + hms_target_register(&hms->target, parent, drm->dev->dev->numa_node, + &nouveau_hms_target_hbind, vram_size, 0); + if (hms->target) { + hms->target->private = hms; + } +} + +void nouveau_hms_fini(struct nouveau_drm *drm, struct nouveau_hms *hms) +{ + hms_target_unregister(&hms->target); +} diff --git a/drivers/gpu/drm/nouveau/nouveau_hms.h b/drivers/gpu/drm/nouveau/nouveau_hms.h new file mode 100644 index 000000000000..cda111d7044b --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_hms.h @@ -0,0 +1,46 @@ +/* + * Copyright 2018 Red Hat Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +#ifndef __NOUVEAU_HMS_H__ +#define __NOUVEAU_HMS_H__ + +#if IS_ENABLED(CONFIG_HMS) + +#include + +struct nouveau_hms { + struct hms_target *target; + struct nouveau_drm *drm; +}; + +void nouveau_hms_init(struct nouveau_drm *drm, struct nouveau_hms *hms); +void nouveau_hms_fini(struct nouveau_drm *drm, struct nouveau_hms *hms); + +#else /* IS_ENABLED(CONFIG_HMS) */ + +struct nouveau_hms { +}; + +#define nouveau_hms_init(drm, hms) +#define nouveau_hms_fini(drm, hms) + +#endif /* IS_ENABLED(CONFIG_HMS) */ +#endif diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c index 23435ee27892..26daa6d50766 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.c +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c @@ -23,6 +23,7 @@ #include "nouveau_drv.h" #include "nouveau_chan.h" #include "nouveau_dmem.h" +#include "nouveau_hms.h" #include #include @@ -44,6 +45,8 @@ struct nouveau_svm { int refs; struct list_head inst; + struct nouveau_hms hms; + struct nouveau_svm_fault_buffer { int id; struct nvif_object object; @@ -766,6 +769,7 @@ nouveau_svm_suspend(struct nouveau_drm *drm) void nouveau_svm_fini(struct nouveau_drm *drm) { + nouveau_hms_fini(drm, &drm->svm->hms); kfree(drm->svm); } @@ -776,6 +780,8 @@ nouveau_svm_init(struct nouveau_drm *drm) drm->svm->drm = drm; mutex_init(&drm->svm->mutex); INIT_LIST_HEAD(&drm->svm->inst); + + nouveau_hms_init(drm, &drm->svm->hms); } }