Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alistair Popple <apopple@nvidia.com>
To:     bskeggs@redhat.com, rcampbell@nvidia.com
Cc:     kherbst@redhat.com, lyude@redhat.com, airlied@linux.ie,
        daniel@ffwll.ch, nouveau@lists.freedesktop.org,
        linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
        jhubbard@nvidia.com, Alistair Popple <apopple@nvidia.com>
Subject: [PATCH] nouveau/svm: Fix to migrate all requested pages
Date:   Wed, 20 Jul 2022 16:27:45 +1000
Message-Id: <20220720062745.960701-1-apopple@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8fSAOjDnphMfm2W/I0mF3qKzpuO6e07McDCeMpYXDwFctRJPFzfXZqCyiTdE?=
 =?us-ascii?Q?4oL+XSLyH0ceZRgArTLOMf+hXN7oTT+Rd5+jvOZMTLQbhU4HuViOAmpPRl3c?=
 =?us-ascii?Q?8SpoiJX3ax+Y7MVBR27p56jgHSPECphDLwG0HL6yQ5Ex6hHVaxV0k7i6zRja?=
 =?us-ascii?Q?oqVF4CtcuxWVyaC9uXHgdgENpcBBviP6dIqcI+fDDepEQn3MxHggcqtiUSWS?=
 =?us-ascii?Q?ir1MqYOs5zbEHiIUTu5/iYiTtBlSiOg0YBsot3KIBmC8R1Zpwb7hIYhTuMqc?=
 =?us-ascii?Q?yLkmh3Kj/WEPGBWw16w2Fk784Xz9UJVWLR7p5J4aWrNdBVzj9bgIfjnwwYMh?=
 =?us-ascii?Q?PyPHPFZET1uXBTR1bCB1YwPfIIY5k1dnpd//R7qx02zZHuM9E0arxckptgjO?=
 =?us-ascii?Q?/OlleyFZ/Lu/ecJUFrR45pX775H6NGFrl6D7QIaDp01laHy0ElVj7uOvn0Go?=
 =?us-ascii?Q?DOif5UCxHkOmRJWx6mM6vWyaRo2c0WU016VIa4CJQNjfKQXZfoGYreTpYCkF?=
 =?us-ascii?Q?lvbX2tEqcJIw1PNUhKpHe8+AgxRx+Qd3IFP3HNuSA13IYJxeoOi+Dhb7Llu5?=
 =?us-ascii?Q?zEzDDIkBp8vTkFyQbxGlqUXsh0dpX+zOA68llgJAcYXwyfDHAwLE3kseF4l0?=
 =?us-ascii?Q?/DFmcK7ili5+WacHPkwY/2toNHxWSJr+aQ7UMfxJHpvdVLqQcfFe9oiDqWlc?=
 =?us-ascii?Q?kdp54lQW5829YeJ8yN0XMR5yJedCWj83E0Fi8EfVMYXT05mxY8gOPZ+xGvV1?=
 =?us-ascii?Q?YUHuwm0BcqQDATkLsSgaAPWSXlkMKYG7cuT7WHe0ale8+eAh4heVyrwz2pMw?=
 =?us-ascii?Q?6gtSsrx7QknHKNOt0O3bv52OyAf5qaCwBhiCPCX4QBXb+nK/J7Xdp4RFx3Vk?=
 =?us-ascii?Q?kY2RJY22dhXeAMKEqRrzuupfOo9O+hrSqzF+sFHE3mCbmdSytKonWkP1qtGT?=
 =?us-ascii?Q?CLQnxJD9lo5iGF4mdJh1WOG8V4r7rtQQmJN4USoy8I2xMy/4GFJ7oB8UEfPx?=
 =?us-ascii?Q?BXNJw5FQLifHh2ySGOJsGZpm0rOaEFwAOBA22cmxDA7M75VcmEODdI+YViWp?=
 =?us-ascii?Q?C3yvSp7ILKv1Kjuu3aztdwioGiijn0k7C+um9WIw2VrtZJwRAAdKtPE1f4gq?=
 =?us-ascii?Q?ZHvKkLYaiLWm4JdWflC6LYjRNpiOb/c6s3dGKVRYrEKKedIdpLs7y534vkzr?=
 =?us-ascii?Q?33D14PIzDf+32U6xX45hQATHs7gOFJhZzW1GP6ZIeCUE9P6M4Wtb6rTQp0fW?=
 =?us-ascii?Q?Qp+4WeaWMlAxkIAmM2KVGWVRoTMqWzcjMIJRS+hEVVoXkc7pjaFktYmxyPoA?=
 =?us-ascii?Q?aPix/LnHe1Bl4ElZbSLMekMTgNQzppHs7gT+H0Z3UwJl4aN9k5BOWaCD0OVW?=
 =?us-ascii?Q?k58TkpW2Ku8RRgMgp+qAt6jtjk8YTvVtqzrVeB3OEmYDTFvC2FCmw/24Yyud?=
 =?us-ascii?Q?C1/SlM5u9YOKkWuFGxnfTWi9ABMeEDmlKyICO9KgfYB6WMuoFGxwAQZLe05v?=
 =?us-ascii?Q?I9pQ/o1UGKmJUtuQAF7IBTQsUotQLAUFbGFJkiZr+nZUpCEt+sNV/foIL9WU?=
 =?us-ascii?Q?EXV3NM6FW6/DXv7lXxP6CAlE06/qLUuxw60HFvxx?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56d01757-4cae-4745-ef24-08da6a1900a8
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 06:28:04.5081
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: l+LRQweV1wN+X5L3BJPbxZmmpngMaDtECHkXXyanXVLf3erN370CV2tWuYW9A8SObeMFjVKUoEiYY56DdGpJBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4753
X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Users may request that pages from an OpenCL SVM allocation be migrated
to the GPU with clEnqueueSVMMigrateMem(). In Nouveau this will call into
nouveau_dmem_migrate_vma() to do the migration. If the total range to be
migrated exceeds SG_MAX_SINGLE_ALLOC the pages will be migrated in
chunks of size SG_MAX_SINGLE_ALLOC. However a typo in updating the
starting address means that only the first chunk will get migrated.

Fix the calculation so that the entire range will get migrated if
possible.

Signed-off-by: Alistair Popple <apopple@nvidia.com>
Fixes: e3d8b0890469 ("drm/nouveau/svm: map pages after migration")
---
 drivers/gpu/drm/nouveau/nouveau_dmem.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 7ba66ad68a8a..16356611b5b9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -680,7 +680,11 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm,
 		goto out_free_dma;
 
 	for (i = 0; i < npages; i += max) {
-		args.end = start + (max << PAGE_SHIFT);
+		if (args.start + (max << PAGE_SHIFT) > end)
+			args.end = end;
+		else
+			args.end = args.start + (max << PAGE_SHIFT);
+
 		ret = migrate_vma_setup(&args);
 		if (ret)
 			goto out_free_pfns;
-- 
2.35.1