change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/fpga/dfl-afu-dma-region.c
..
..
@@ -12,69 +12,15 @@
12
12
 #include <linux/dma-mapping.h>
13
13
 #include <linux/sched/signal.h>
14
14
 #include <linux/uaccess.h>
15
+#include <linux/mm.h>
15
16
 
16
17
 #include "dfl-afu.h"
17
-
18
-static void put_all_pages(struct page **pages, int npages)
19
-{
20
-	int i;
21
-
22
-	for (i = 0; i < npages; i++)
23
-		if (pages[i])
24
-			put_page(pages[i]);
25
-}
26
18
 
27
19
 void afu_dma_region_init(struct dfl_feature_platform_data *pdata)
28
20
 {
29
21
 	struct dfl_afu *afu = dfl_fpga_pdata_get_private(pdata);
30
22
 
31
23
 	afu->dma_regions = RB_ROOT;
32
-}
33
-
34
-/**
35
- * afu_dma_adjust_locked_vm - adjust locked memory
36
- * @dev: port device
37
- * @npages: number of pages
38
- * @incr: increase or decrease locked memory
39
- *
40
- * Increase or decrease the locked memory size with npages input.
41
- *
42
- * Return 0 on success.
43
- * Return -ENOMEM if locked memory size is over the limit and no CAP_IPC_LOCK.
44
- */
45
-static int afu_dma_adjust_locked_vm(struct device *dev, long npages, bool incr)
46
-{
47
-	unsigned long locked, lock_limit;
48
-	int ret = 0;
49
-
50
-	/* the task is exiting. */
51
-	if (!current->mm)
52
-		return 0;
53
-
54
-	down_write(&current->mm->mmap_sem);
55
-
56
-	if (incr) {
57
-		locked = current->mm->locked_vm + npages;
58
-		lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
59
-
60
-		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
61
-			ret = -ENOMEM;
62
-		else
63
-			current->mm->locked_vm += npages;
64
-	} else {
65
-		if (WARN_ON_ONCE(npages > current->mm->locked_vm))
66
-			npages = current->mm->locked_vm;
67
-		current->mm->locked_vm -= npages;
68
-	}
69
-
70
-	dev_dbg(dev, "[%d] RLIMIT_MEMLOCK %c%ld %ld/%ld%s\n", current->pid,
71
-		incr ? '+' : '-', npages << PAGE_SHIFT,
72
-		current->mm->locked_vm << PAGE_SHIFT, rlimit(RLIMIT_MEMLOCK),
73
-		ret ? "- execeeded" : "");
74
-
75
-	up_write(&current->mm->mmap_sem);
76
-
77
-	return ret;
78
24
 }
79
25
 
80
26
 /**
..
..
@@ -92,7 +38,7 @@
92
38
 	struct device *dev = &pdata->dev->dev;
93
39
 	int ret, pinned;
94
40
 
95
-	ret = afu_dma_adjust_locked_vm(dev, npages, true);
41
+	ret = account_locked_vm(current->mm, npages, true);
96
42
 	if (ret)
97
43
 		return ret;
98
44
 
..
..
@@ -102,26 +48,26 @@
102
48
 		goto unlock_vm;
103
49
 	}
104
50
 
105
-	pinned = get_user_pages_fast(region->user_addr, npages, 1,
51
+	pinned = pin_user_pages_fast(region->user_addr, npages, FOLL_WRITE,
106
52
 				     region->pages);
107
53
 	if (pinned < 0) {
108
54
 		ret = pinned;
109
55
 		goto free_pages;
110
56
 	} else if (pinned != npages) {
111
57
 		ret = -EFAULT;
112
-		goto put_pages;
58
+		goto unpin_pages;
113
59
 	}
114
60
 
115
61
 	dev_dbg(dev, "%d pages pinned\n", pinned);
116
62
 
117
63
 	return 0;
118
64
 
119
-put_pages:
120
-	put_all_pages(region->pages, pinned);
65
+unpin_pages:
66
+	unpin_user_pages(region->pages, pinned);
121
67
 free_pages:
122
68
 	kfree(region->pages);
123
69
 unlock_vm:
124
-	afu_dma_adjust_locked_vm(dev, npages, false);
70
+	account_locked_vm(current->mm, npages, false);
125
71
 	return ret;
126
72
 }
127
73
 
..
..
@@ -139,9 +85,9 @@
139
85
 	long npages = region->length >> PAGE_SHIFT;
140
86
 	struct device *dev = &pdata->dev->dev;
141
87
 
142
-	put_all_pages(region->pages, npages);
88
+	unpin_user_pages(region->pages, npages);
143
89
 	kfree(region->pages);
144
-	afu_dma_adjust_locked_vm(dev, npages, false);
90
+	account_locked_vm(current->mm, npages, false);
145
91
 
146
92
 	dev_dbg(dev, "%ld pages unpinned\n", npages);
147
93
 }
..
..
@@ -367,10 +313,6 @@
367
313
 
368
314
 	/* Check overflow */
369
315
 	if (user_addr + length < user_addr)
370
-		return -EINVAL;
371
-
372
-	if (!access_ok(VERIFY_WRITE, (void __user *)(unsigned long)user_addr,
373
-		       length))
374
316
 		return -EINVAL;
375
317
 
376
318
 	region = kzalloc(sizeof(*region), GFP_KERNEL);