From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D767C04EBF for ; Mon, 3 Dec 2018 23:36:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E79E2087F for ; Mon, 3 Dec 2018 23:36:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E79E2087F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726290AbeLCXg3 (ORCPT ); Mon, 3 Dec 2018 18:36:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56750 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726261AbeLCXgX (ORCPT ); Mon, 3 Dec 2018 18:36:23 -0500 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?q?J=C3=A9r=C3=B4me=20Glisse?= 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); } } -- 2.17.2