Received-SPF: pass (google.com: domain of linux-ext4-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:     akpm@linux-foundation.org, linux-mm@kvack.org
Cc:     Felix.Kuehling@amd.com, rcampbell@nvidia.com,
        linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        hch@lst.de, jgg@nvidia.com, jglisse@redhat.com,
        willy@infradead.org, alex.sierra@amd.com, jhubbard@nvidia.com,
        Alistair Popple <apopple@nvidia.com>
Subject: [PATCH 1/3] migrate.c: Remove vma check in migrate_vma_setup()
Date:   Tue,  1 Feb 2022 18:05:55 +1100
Message-Id: <02339ee87f428688336960d0403059b7af5834fe.1643698773.git-series.apopple@nvidia.com>
In-Reply-To: <cover.516a938ce97eb805791da6e2df508eb0dce413b8.1643698773.git-series.apopple@nvidia.com>
References: <cover.516a938ce97eb805791da6e2df508eb0dce413b8.1643698773.git-series.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?x18ZnB0Ni1bjxp8kuBxH+E6d9IJ8vlnftoSyjSs0By5M3fpl9HnFsubM61yB?=
 =?us-ascii?Q?faigWydnmrqP3ZGVBkRgjlFK7q4AewlhNYapwSc4AOpCVFNs1I7w9rPi0wnU?=
 =?us-ascii?Q?z7yTUN3mpiB95wgj1+ZNHtbHM66nmFU3cdt0voYKu/ym6yaqbDT33THbl1CC?=
 =?us-ascii?Q?CP3QnW/P0Ge9a7ZEfNRyhJTVDt64J0KVF68LJu2fc86/c24mciX1oLgFv5Hz?=
 =?us-ascii?Q?nsxY/zfxst7UM9zCDsgnxEFPyA6A4qEpCNubhydk9j7merDJLOdd7swqQdpU?=
 =?us-ascii?Q?HM9JWDgMTI5kTzNcaCkl41PQr+wh5gO+sPXrRYVlVefSS9VnuEI3BrMDXMP0?=
 =?us-ascii?Q?izH8sbwggaL+ZH9RydEo4XU0Xl3wjnFHlGDrVd0ccKXADX6gL105ys8lYd5s?=
 =?us-ascii?Q?y8e+0CA/QzYrD1YoWnF61j9Muoq6+g26fypWAEzgzCVaPd6kIqFLpVD1+h0D?=
 =?us-ascii?Q?P0ZgGbzi8bj3lazefAPQZkWNesbU+j1biALiWEZdEPTR0AVLqGE0SX3dVB8m?=
 =?us-ascii?Q?17X6j9acvmhG6BnOPYoFd8JGrH1YVMDEAXS24Is3EaFAbsNqUUp3ohz0QtuJ?=
 =?us-ascii?Q?YI+OW8DOr2dw02Du+X6LVXLnXMbzZfCsWYshBIxl+LL+dMC5bq6KkKF0Olph?=
 =?us-ascii?Q?NeZQZUCnb/tEDAIP6BrMaTD7Ydcflhkoxwsz+B7hTTpFQOP2MvGni2LaMC2B?=
 =?us-ascii?Q?DYZQPz+zGI221PvcAzzlmIdRYlCo4Hrli9FPbC/V0WFLwt5/cuvvHc1kcVJW?=
 =?us-ascii?Q?yOssgzZ00xKW5tfMjWHSKXjWgMA2VajWZ0mNgy+fI94qWMfVpSomFnkS/bLM?=
 =?us-ascii?Q?w3dhbX3ji3RilB1/8/xqXv57CcRoZyRehyg4Ku6dJYlPAu1GTj1rPUs1qTHO?=
 =?us-ascii?Q?Hr/m5GF8dk9UHMjLatAvP6LB4WfCqWF4LP0J3CvuNFuMdlDOvB5R9eY2xUwW?=
 =?us-ascii?Q?lz5yJ9ZGKTJ2LNSOB+jX8FdAXawukuq3ygsTbnDI1nPtxef3oRrdKENd8vgX?=
 =?us-ascii?Q?MdcR6htn8EIMgsNtpAdPrut08KMboo2U89xcZk68sDGb+vviTCSwNaapaYVA?=
 =?us-ascii?Q?+FP47iwixsW+oYLBwPeWkKe9I8GuMBgGqPWbIO/83aQWa03qwR4GDeiXbcm4?=
 =?us-ascii?Q?oyO6F5ep52IzdhVaf8cX58bO0LOmrbi8ynOsX5LoccS6uvx6nuwIRQYkEp2V?=
 =?us-ascii?Q?u/hE7muPyejO/ZECtVQ8W3GGbejR77bEgnWPjIVtfHx9Ban9srRoJBiJWMWh?=
 =?us-ascii?Q?eSfYQFhNEjWspKYJ34yyVblti5oIx5uSAs9GnqOkU6WGxYQrck/lYnl588Pm?=
 =?us-ascii?Q?NfjbiweetdY3ZSf7EjHJJY2wCFhDWZUs+7mohDImkQ3nEf2hbhtbwGH9/Z7g?=
 =?us-ascii?Q?Sgv7qcHlUa/b+zuiprmL0MlEyQZu+1itvBigMXPegUYk0MTAjJSdJXRGSZ3Z?=
 =?us-ascii?Q?VVttCFkp4ZM10UA3kAevywWHKWDaMcBap/LpFYbC7c9nqdc0bQIn0RSbdovL?=
 =?us-ascii?Q?ZvsoX0dJXQrIKXAWb1HC444v3Itgpqa3YHpBv6hg4++KgkE2/6OAzTAqeK2t?=
 =?us-ascii?Q?Z8/MS/yuUdHQQbyJ2RYYPuzGktPS0FEx3M1hgypZXg5tT6KUa+p7jvW/YWgQ?=
 =?us-ascii?Q?nILiOUgUQOPjcyKgD0Be/f4=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 273833b0-db72-497e-fd5f-08d9e5516982
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 07:06:47.6658
 (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: 9zS38548/NKGbLWh86kc/aXLfM+yb2E7n34p9uOoP7BxIK+EK3WJEd5qxJT0D4DnLanfazwsR3gM6Vvo+cATdQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3991
Precedence: bulk
List-ID: <linux-ext4.vger.kernel.org>
X-Mailing-List: linux-ext4@vger.kernel.org

migrate_vma_setup() checks that a valid vma is passed so that the page
tables can be walked to find the pfns associated with a given address
range. However in some cases the pfns are already known, such as when
migrating device coherent pages during pin_user_pages() meaning a valid
vma isn't required.

Signed-off-by: Alistair Popple <apopple@nvidia.com>
---
 mm/migrate.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index d3cc358..31ba8ca 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2581,24 +2581,24 @@ int migrate_vma_setup(struct migrate_vma *args)
 
 	args->start &= PAGE_MASK;
 	args->end &= PAGE_MASK;
-	if (!args->vma || is_vm_hugetlb_page(args->vma) ||
-	    (args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma))
-		return -EINVAL;
-	if (nr_pages <= 0)
-		return -EINVAL;
-	if (args->start < args->vma->vm_start ||
-	    args->start >= args->vma->vm_end)
-		return -EINVAL;
-	if (args->end <= args->vma->vm_start || args->end > args->vma->vm_end)
-		return -EINVAL;
 	if (!args->src || !args->dst)
 		return -EINVAL;
-
-	memset(args->src, 0, sizeof(*args->src) * nr_pages);
-	args->cpages = 0;
-	args->npages = 0;
-
-	migrate_vma_collect(args);
+	if (args->vma) {
+		if (is_vm_hugetlb_page(args->vma) ||
+			(args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma))
+			return -EINVAL;
+		if (args->start < args->vma->vm_start ||
+			args->start >= args->vma->vm_end)
+			return -EINVAL;
+		if (args->end <= args->vma->vm_start || args->end > args->vma->vm_end)
+			return -EINVAL;
+
+		memset(args->src, 0, sizeof(*args->src) * nr_pages);
+		args->cpages = 0;
+		args->npages = 0;
+
+		migrate_vma_collect(args);
+	}
 
 	if (args->cpages)
 		migrate_vma_unmap(args);
@@ -2783,7 +2783,7 @@ void migrate_vma_pages(struct migrate_vma *migrate)
 			continue;
 		}
 
-		if (!page) {
+		if (!page && migrate->vma) {
 			if (!(migrate->src[i] & MIGRATE_PFN_MIGRATE))
 				continue;
 			if (!notified) {
-- 
git-series 0.9.1