Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3153186ybt; Mon, 22 Jun 2020 16:45:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr4vw/6q4TPz7Jgl9dEHN4fvWBVF+QfkxFJ/Y0ALdVrktwm/sOlKdWigATOz6wI89nC24g X-Received: by 2002:a17:906:1a54:: with SMTP id j20mr5660754ejf.455.1592869536897; Mon, 22 Jun 2020 16:45:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592869536; cv=none; d=google.com; s=arc-20160816; b=eVQiXQKW0+mP2OJj1+3OnHXpcG3US0l0qbZNs87O/RjRu55cx0YaaJVoDylqT4H3zj jwxAHaLANqtndcjUduYm9VtzBSMtthwCQa8w6EO91HfyIdznhKDUpXS4ys30dn1a9qNu j7wv9ogw/ZRhma7HdtwxHyCx4yECRaFzew7IDWb59QWuPUb2Y00haLaEyAk+Zq7ZV80w q1fznO7mWEBcRjqF3A70v+4ErxucgMEcAamJOds6TxSm9j4qZ6RPYg1pOiJ777Oi7KXQ FdLsgOEG/OIuCUhcgn+zu+eCNT8H1x01dym/FFjUV0vfJNkSUC80qDD+Zlvs1cjG0yRt A9FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=aaU6roovY2dxLmV2cNcmX9CI+ssI/Uf3SDOsfiZQ3j8=; b=i8yMaxiyp49K8bK0BUqoFqvxUxjUEy8wAy0NNv9gewGTURjENR/J4ZBUmut/EOzqvv oXW5tLFTWRcBe/rZ7ThmQaln+GPHiCQU02UJ5Mhf6ThTk5D86PWraB/gsUlwZsmn0EK7 s19H9ocrI9ulWgntYYm3lJLQ+SMgby0K3Q0BPlzSqg9njDIxhqfgP2loghOOLNA5KOhv nrYEkGLRaQ+g7pUlPko0HHGKpHgbyYVcCTV0XOJFC2ZOZJGWjpQBfxtsNWC05HxOvE9w 5Gw5n68GJMLrzG7oRAgiyAae6tsLdpQdK6ietGAnbbR5LrsJd6cAJ8KgHxcCPGxwkopI OPNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=XwRBjtLV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cm1si10016180edb.235.2020.06.22.16.45.14; Mon, 22 Jun 2020 16:45:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=XwRBjtLV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730961AbgFVXjV (ORCPT + 99 others); Mon, 22 Jun 2020 19:39:21 -0400 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:18836 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730296AbgFVXjS (ORCPT ); Mon, 22 Jun 2020 19:39:18 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 22 Jun 2020 16:37:46 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 22 Jun 2020 16:39:17 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 22 Jun 2020 16:39:17 -0700 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 22 Jun 2020 23:39:09 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Mon, 22 Jun 2020 23:39:09 +0000 Received: from rcampbell-dev.nvidia.com (Not Verified[10.110.48.66]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Mon, 22 Jun 2020 16:39:09 -0700 From: Ralph Campbell To: , CC: Jerome Glisse , John Hubbard , Christoph Hellwig , Jason Gunthorpe , "Ben Skeggs" , Ralph Campbell Subject: [RESEND PATCH 1/3] nouveau: fix migrate page regression Date: Mon, 22 Jun 2020 16:38:52 -0700 Message-ID: <20200622233854.10889-2-rcampbell@nvidia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200622233854.10889-1-rcampbell@nvidia.com> References: <20200622233854.10889-1-rcampbell@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1592869066; bh=aaU6roovY2dxLmV2cNcmX9CI+ssI/Uf3SDOsfiZQ3j8=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=XwRBjtLVQcC1BQRXmuzfODaRHh8z2BxdWfUzWsQSEXIZs8mKBoikZmycdmR2+cpaX tbFNwyH4Q0mJcY8T6YasB97SPCXIoHssi/KXz2DsD1LZ9A0M90tUUgfNXVL9DnBKfD u1zV0BU7458Cgv08vMZiAfQUH+zOHtGvFF3oijKoj0k2mI6fhdFJ9BP7u/dUR21A2J V/8X2eUvRK2ImvmQ9RpPl6MJId+ftbM0Z9Bdn7v6eslH2m4UjvQScaJEFv3rgwm56u sjmr4ojlC+vuKA75ks7mF4PE+pIlZbX7mkOj6GXVIwFexzatUQBLiNvL3EiYG4LpEJ GYBz5KwyeEUUw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch to add zero page migration to GPU memory inadvertantly included part of a future change which broke normal page migration to GPU memory by copying too much data and corrupting GPU memory. Fix this by only copying one page instead of a byte count. Fixes: 9d4296a7d4b3 ("drm/nouveau/nouveau/hmm: fix migrate zero page to GPU= ") Signed-off-by: Ralph Campbell --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouve= au/nouveau_dmem.c index e5c230d9ae24..cc9993837508 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -550,7 +550,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(stru= ct nouveau_drm *drm, DMA_BIDIRECTIONAL); if (dma_mapping_error(dev, *dma_addr)) goto out_free_page; - if (drm->dmem->migrate.copy_func(drm, page_size(spage), + if (drm->dmem->migrate.copy_func(drm, 1, NOUVEAU_APER_VRAM, paddr, NOUVEAU_APER_HOST, *dma_addr)) goto out_dma_unmap; } else { --=20 2.20.1