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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14FBBC6FA82 for ; Wed, 28 Sep 2022 21:38:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5277E6B0072; Wed, 28 Sep 2022 17:38:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50A5A6B0074; Wed, 28 Sep 2022 17:38:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39E716B0075; Wed, 28 Sep 2022 17:38:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2A1A76B0072 for ; Wed, 28 Sep 2022 17:38:09 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D959EAB7EB for ; Wed, 28 Sep 2022 21:38:08 +0000 (UTC) X-FDA: 79962807456.15.19259D6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 669C7100007 for ; Wed, 28 Sep 2022 21:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664401087; 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: in-reply-to:in-reply-to:references:references; bh=NW+hPnc8ltRRyw1JoLCHvkVBxa3HbmO0cDA/9HFGDws=; b=VcS1jRkqQnP7i1k7/zgm50diuysiXRY+3Ldae4/BMyD6vf/R/F2P5MTgbwba9fA2tndf+y OmSl3VrKOiolZ7hFW1PM5oYNP2/NkySr/Hzc9KdYHTi/soVSEL4VVERYDl4yxXOpmZZjbw akNm6+jUk/dYY3NxzBG8O2WncwTu1S0= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-592-P8KZ7KgmODGHQCuxEKQ2WA-1; Wed, 28 Sep 2022 17:37:57 -0400 X-MC-Unique: P8KZ7KgmODGHQCuxEKQ2WA-1 Received: by mail-qv1-f71.google.com with SMTP id lw1-20020a05621457c100b004afa258209aso866214qvb.21 for ; Wed, 28 Sep 2022 14:37:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:organization :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date; bh=NW+hPnc8ltRRyw1JoLCHvkVBxa3HbmO0cDA/9HFGDws=; b=j7S829CfThDRk7/7Uv7sXxZp5TDlmgu9FO2fku1VZnzrvF9E6iijwBo7pSfER+C+V/ J1o9MiO1XWvZ5IKvFawW8lCk9Tbcz3ChRX7JIW/p6ie30RWLGDu6myIJk4rHpQeY84uI MdnXtKIn4M0l1AtzSVI+sJRnAt+dXn4oYzkXlh2x8gMc2UA898yVeiRJoUuby8Jj73ja nMPVc/uwLwiLxI391XPqNnjrkF48FU1Ck+AIbnwDkIfCffEQvjEhUrSa3YOAkajBbodq Q+IoHaak8pxZ0N+RATDrwuPDhLJ72Sovrpi8Wu0+33PBqpIf5ZyL1n6l/++WGdcDnNez /TyA== X-Gm-Message-State: ACrzQf1n9X834k+KV8YdqDQDEcr/ikv2mYTEjfEnmAJRcZffdeenS7re XfyzCXwsez3B9PV+6lQUF0IF1PgGdNnAln4sVxGraOmjOBHbY+v3U3fUkYmLuQYgfp67INahK3A BOzyWIOvjKCI= X-Received: by 2002:a05:620a:21c7:b0:6cd:52bc:b578 with SMTP id h7-20020a05620a21c700b006cd52bcb578mr74195qka.385.1664401076815; Wed, 28 Sep 2022 14:37:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM471Bcus/IrN+YWIeg7hqlJQkYwhfHMIbXHdbGFr95JT37FsXUZuIl2USVC2745pqscAFNiTQ== X-Received: by 2002:a05:620a:21c7:b0:6cd:52bc:b578 with SMTP id h7-20020a05620a21c700b006cd52bcb578mr74177qka.385.1664401076544; Wed, 28 Sep 2022 14:37:56 -0700 (PDT) Received: from ?IPv6:2600:4040:5c48:e00::feb? ([2600:4040:5c48:e00::feb]) by smtp.gmail.com with ESMTPSA id c25-20020a05620a269900b006cea2984c9bsm4340202qkp.100.2022.09.28.14.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 14:37:54 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2 7/8] nouveau/dmem: Evict device private memory during release From: Lyude Paul To: Alistair Popple , Andrew Morton , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Ralph Campbell , John Hubbard Date: Wed, 28 Sep 2022 17:37:52 -0400 In-Reply-To: <66277601fb8fda9af408b33da9887192bf895bda.1664366292.git-series.apopple@nvidia.com> References: <66277601fb8fda9af408b33da9887192bf895bda.1664366292.git-series.apopple@nvidia.com> Organization: Red Hat Inc. User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VcS1jRkq; spf=pass (imf14.hostedemail.com: domain of lyude@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=lyude@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664401088; a=rsa-sha256; cv=none; b=QdcdPW7gFjteFZn+m4UZTRZO95SSL8YmPethg/daEesBmB/aWnLeT/DoZgA9d1alBHSNJ2 QGQgqICGMiV+Rri7v6HeNK1f2flnLRhAlC9o0GzhFVZvwGnzNcD2wetP3YWeLdlw+gwbue ptdEh2jE6mnvpW2Uxf/HCZc+PuuRsV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664401088; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NW+hPnc8ltRRyw1JoLCHvkVBxa3HbmO0cDA/9HFGDws=; b=CfLwAiwGtkLrLBsF/GTlats0FL44vJA45NBdLoPr+KagiTVHUjO23vWb1Y2j30GzjiBZU9 KcY+CoX+Pr/CJuUSO0Mgbw+EKKYkU64MC4Pri0rAZ1XIBKEnjU/0BmGERMlAwtq+Qkut4r V7PpfQW2fd046v1dFHs8ieUeXohHpOk= Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VcS1jRkq; spf=pass (imf14.hostedemail.com: domain of lyude@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=lyude@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Stat-Signature: m8cauna7m78h5x7wphsqnfrgeiimeyso X-Rspamd-Queue-Id: 669C7100007 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1664401088-718386 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: Reviewed-by: Lyude Paul On Wed, 2022-09-28 at 22:01 +1000, Alistair Popple wrote: > When the module is unloaded or a GPU is unbound from the module it is > possible for device private pages to still be mapped in currently > running processes. This can lead to a hangs and RCU stall warnings when > unbinding the device as memunmap_pages() will wait in an uninterruptible > state until all device pages have been freed which may never happen. > > Fix this by migrating device mappings back to normal CPU memory prior to > freeing the GPU memory chunks and associated device private pages. > > Signed-off-by: Alistair Popple > Cc: Lyude Paul > Cc: Ben Skeggs > Cc: Ralph Campbell > Cc: John Hubbard > --- > drivers/gpu/drm/nouveau/nouveau_dmem.c | 48 +++++++++++++++++++++++++++- > 1 file changed, 48 insertions(+) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c > index 65f51fb..5fe2091 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c > +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c > @@ -367,6 +367,52 @@ nouveau_dmem_suspend(struct nouveau_drm *drm) > mutex_unlock(&drm->dmem->mutex); > } > > +/* > + * Evict all pages mapping a chunk. > + */ > +static void > +nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) > +{ > + unsigned long i, npages = range_len(&chunk->pagemap.range) >> PAGE_SHIFT; > + unsigned long *src_pfns, *dst_pfns; > + dma_addr_t *dma_addrs; > + struct nouveau_fence *fence; > + > + src_pfns = kcalloc(npages, sizeof(*src_pfns), GFP_KERNEL); > + dst_pfns = kcalloc(npages, sizeof(*dst_pfns), GFP_KERNEL); > + dma_addrs = kcalloc(npages, sizeof(*dma_addrs), GFP_KERNEL); > + > + migrate_device_range(src_pfns, chunk->pagemap.range.start >> PAGE_SHIFT, > + npages); > + > + for (i = 0; i < npages; i++) { > + if (src_pfns[i] & MIGRATE_PFN_MIGRATE) { > + struct page *dpage; > + > + /* > + * _GFP_NOFAIL because the GPU is going away and there > + * is nothing sensible we can do if we can't copy the > + * data back. > + */ > + dpage = alloc_page(GFP_HIGHUSER | __GFP_NOFAIL); > + dst_pfns[i] = migrate_pfn(page_to_pfn(dpage)); > + nouveau_dmem_copy_one(chunk->drm, > + migrate_pfn_to_page(src_pfns[i]), dpage, > + &dma_addrs[i]); > + } > + } > + > + nouveau_fence_new(chunk->drm->dmem->migrate.chan, false, &fence); > + migrate_device_pages(src_pfns, dst_pfns, npages); > + nouveau_dmem_fence_done(&fence); > + migrate_device_finalize(src_pfns, dst_pfns, npages); > + kfree(src_pfns); > + kfree(dst_pfns); > + for (i = 0; i < npages; i++) > + dma_unmap_page(chunk->drm->dev->dev, dma_addrs[i], PAGE_SIZE, DMA_BIDIRECTIONAL); > + kfree(dma_addrs); > +} > + > void > nouveau_dmem_fini(struct nouveau_drm *drm) > { > @@ -378,8 +424,10 @@ nouveau_dmem_fini(struct nouveau_drm *drm) > mutex_lock(&drm->dmem->mutex); > > list_for_each_entry_safe(chunk, tmp, &drm->dmem->chunks, list) { > + nouveau_dmem_evict_chunk(chunk); > nouveau_bo_unpin(chunk->bo); > nouveau_bo_ref(NULL, &chunk->bo); > + WARN_ON(chunk->callocated); > list_del(&chunk->list); > memunmap_pages(&chunk->pagemap); > release_mem_region(chunk->pagemap.range.start, -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat