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;
Subject: [PATCH 3/3] xen/privcmd: drop "pages" parameter from xen_remap_pfn()
From:   Jan Beulich <jbeulich@suse.com>
To:     Juergen Gross <jgross@suse.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc:     Stefano Stabellini <sstabellini@kernel.org>,
        "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
        lkml <linux-kernel@vger.kernel.org>
References: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com>
Message-ID: <036ad8a2-46f9-ac3d-6219-bdc93ab9e10b@suse.com>
Date:   Wed, 22 Sep 2021 12:18:25 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aXZGbFlML3R1c0xPU2o0cFYwb1llWE51RGlmRkxPNEpiRHhteUppRE14TWND?=
 =?utf-8?B?VS9iQm5UMnBraThkZ0tyS1N2VTNKemRQWVBTVitRVENYMDFEZG1meTlpempF?=
 =?utf-8?B?VnNhWEthT0FVdDI1QnlUcG5SYWdYZGFTZ05NNE1XKzRCUFQ5d3JwWVpiTHNQ?=
 =?utf-8?B?dXlnNTF0MENCMm5tY3V3M3A1UEtPelJsakhrdW9iaGxsOFNzTktnbHc3bDVK?=
 =?utf-8?B?QjR6UXRaNHd3NjRYNGlpT3BlYjB4bjByalo1RkNJc1p5bjhkRDJ1ZjZHZXFh?=
 =?utf-8?B?LzljYndBSUxRTWVrcnhZell1aTZ1bEJGL3dYUHNma1l5SElsbXR6YTlITVlF?=
 =?utf-8?B?U0ZOZVFqTk03RnltbWk4bE5oUHlMTVovQnBsUjZMcFVLNXd3TjZCL2d0cmtM?=
 =?utf-8?B?d0w3STNnNDdoL2FPYys0akJYLzBkdWFlZEdRRU01T2M0RGdBU0xTYXM1OVVx?=
 =?utf-8?B?S3owTWRmT1FJNDdWdWkvdWlFY2hrUkl3ZlJjNVdTcTBSNytYOElIRmJ0OFdp?=
 =?utf-8?B?aDJUY3Zjclg1My9oZzVvY3p2UGRYSmdRQXFZZnVwd1JheDZSdjdzcXVkTUdC?=
 =?utf-8?B?enJYcER2VmlKcXAzb29mUU8reVFpaVlHbkxTZitLTjBjcWpxR283MVl0WWlM?=
 =?utf-8?B?akNiVnpPRHkwRFJYWnFSOWIwZjd4bDg4azRmVisyMnJTME5HTjVLbGRIOGFD?=
 =?utf-8?B?SnMzbzZMbTlHaEtGTGhLdXI3b1BKV2h0M2w2azRNdlAzNE5acWRvM3V2bGV6?=
 =?utf-8?B?RnZMWDRWQjdwOUE5Y1lNcG4wN0RCblFSZjkyVFpXaFovY1pTNVgxY21qV3Vk?=
 =?utf-8?B?S3dSMm42M01jU3BhQ080bHhocGJldkNjSURjblN1M1N0NitjSDlXNE1lVHBI?=
 =?utf-8?B?ZkFFZndwTUgyeVJnc2RxbXc5THdZd1ZwbWU4ZkxNZHlqWTkzbmF3MHVyYUZR?=
 =?utf-8?B?OFNPakJjK3NkZWMxYjUvcVdYQ2lueEwrU2NDL0xQRk82Qm5PT2lBdkFXOWhm?=
 =?utf-8?B?ejgzV3V1TzVOVERrK01VWEJ2Mm5jMVlXc0tmWHNXZENFSGpmeHIzRDh4cEZF?=
 =?utf-8?B?N2QrTnZwdGZPKzRiVnBGcmlWZHRDbVRRSzB3NUpjaEtxMWh5M0tqMVZJZkZS?=
 =?utf-8?B?SE51ZUM5R2RidHpVRnBGYituQ05LZnI1QU8xMVY4ZDZwS3JweThEcGg0SnNC?=
 =?utf-8?B?R2Ftc1dTODVjbTZXV2NtREVXUUErOW5YN3ZBalpBemhBRTVhNVQxbjNqbmxu?=
 =?utf-8?B?K0xBZWI1VTI2bVdua2VGVDMzc3loSHlYOCtCZ2tYT291UjIzcnRvSzJNN3FV?=
 =?utf-8?B?aXF5c2tEK1RvY0QwNHk2MlVyRnY3Wmg0bnZoelViVnpPNVhyZGZzcldqM3Vy?=
 =?utf-8?B?L1BtZXlDcnR4eE1hSis0bFJFQXlhczN5eVc5UHBSVVp0djh5emhWT0tVTUZF?=
 =?utf-8?B?N3UzdmxIV0VFMlc4WVZ4YjJVUWM4S3V2MTB1RStkd3hzZHZPTE9LS3ZyUEQ4?=
 =?utf-8?B?QW43L2NrcVVYNzRyUDZZTTRJWTJqbDRZUzNTVEJ1djdYRStpSEs4czdmOG9l?=
 =?utf-8?B?LzNyM3h2dWNSM2pFb1hickttamRrMWdSMGsvSE5UYjRLa3ZyMGQ4UnRkczYy?=
 =?utf-8?B?SjFFc1lYZnNTeGFRN1ZVKytndktqQThaYlpnTm9kSVhsWU4xdXRvRG1TV1Jo?=
 =?utf-8?B?aHY0aExlQ0hjcVRqSXBlUVFlYTY2OWdUTGNudDNHeXVzQUE3eFlEZ1lFeVlq?=
 =?utf-8?Q?A/DKQNSH/EUA/TjxtX1kC01peWDaKxX0+vf6YHT?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fa92bbca-4f8f-4de0-4489-08d97db250a6
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2021 10:18:26.1589
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZX2I0VRntI1n/gqXn52Bnj1vW6lxkkAvmC7BCjfiQ2q+2qsEnebZ+1Fi1MmgH0JcNYvJKVGrE9vnsWvBRnncXA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4190
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The function doesn't use it and all of its callers say in a comment that
their respective arguments are to be non-NULL only in auto-translated
mode. Since xen_remap_domain_mfn_array() isn't supposed to be used by
non-PV, drop the parameter there as well. It was bogusly passed as non-
NULL (PRIV_VMA_LOCKED) by its only caller anyway. For
xen_remap_domain_gfn_range(), otoh, it's not clear at all why this
wouldn't want / might not need to gain auto-translated support down the
road, so the parameter is retained there despite now remaining unused
(and the only caller passing NULL); correct a respective comment as
well.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -2398,7 +2398,7 @@ static int remap_area_pfn_pte_fn(pte_t *
 
 int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
 		  xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot,
-		  unsigned int domid, bool no_translate, struct page **pages)
+		  unsigned int domid, bool no_translate)
 {
 	int err = 0;
 	struct remap_data rmd;
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -257,7 +257,7 @@ static long privcmd_ioctl_mmap(struct fi
 	LIST_HEAD(pagelist);
 	struct mmap_gfn_state state;
 
-	/* We only support privcmd_ioctl_mmap_batch for auto translated. */
+	/* We only support privcmd_ioctl_mmap_batch for non-auto-translated. */
 	if (xen_feature(XENFEAT_auto_translated_physmap))
 		return -ENOSYS;
 
@@ -810,8 +810,7 @@ static long privcmd_ioctl_mmap_resource(
 						 kdata.addr & PAGE_MASK,
 						 pfns, kdata.num, errs,
 						 vma->vm_page_prot,
-						 domid,
-						 vma->vm_private_data);
+						 domid);
 		if (num < 0)
 			rc = num;
 		else if (num != kdata.num) {
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -64,12 +64,12 @@ static inline void xen_destroy_contiguou
 #if defined(CONFIG_XEN_PV)
 int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
 		  xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot,
-		  unsigned int domid, bool no_translate, struct page **pages);
+		  unsigned int domid, bool no_translate);
 #else
 static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
 				xen_pfn_t *pfn, int nr, int *err_ptr,
 				pgprot_t prot,  unsigned int domid,
-				bool no_translate, struct page **pages)
+				bool no_translate)
 {
 	BUG();
 	return 0;
@@ -146,7 +146,7 @@ static inline int xen_remap_domain_gfn_a
 	 */
 	BUG_ON(err_ptr == NULL);
 	return xen_remap_pfn(vma, addr, gfn, nr, err_ptr, prot, domid,
-			     false, pages);
+			     false);
 }
 
 /*
@@ -158,7 +158,6 @@ static inline int xen_remap_domain_gfn_a
  * @err_ptr: Returns per-MFN error status.
  * @prot:    page protection mask
  * @domid:   Domain owning the pages
- * @pages:   Array of pages if this domain has an auto-translated physmap
  *
  * @mfn and @err_ptr may point to the same buffer, the MFNs will be
  * overwritten by the error codes after they are mapped.
@@ -169,14 +168,13 @@ static inline int xen_remap_domain_gfn_a
 static inline int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
 					     unsigned long addr, xen_pfn_t *mfn,
 					     int nr, int *err_ptr,
-					     pgprot_t prot, unsigned int domid,
-					     struct page **pages)
+					     pgprot_t prot, unsigned int domid)
 {
 	if (xen_feature(XENFEAT_auto_translated_physmap))
 		return -EOPNOTSUPP;
 
 	return xen_remap_pfn(vma, addr, mfn, nr, err_ptr, prot, domid,
-			     true, pages);
+			     true);
 }
 
 /* xen_remap_domain_gfn_range() - map a range of foreign frames
@@ -200,8 +198,7 @@ static inline int xen_remap_domain_gfn_r
 	if (xen_feature(XENFEAT_auto_translated_physmap))
 		return -EOPNOTSUPP;
 
-	return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false,
-			     pages);
+	return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false);
 }
 
 int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,