share_pool: Clear the usage of node_id and device_id

ascend inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4SON8
CVE: NA

-------------------------------------------------

Device_id is used for DVPP to select the correct virtual address space
and node_id is used to specify the node where we want to alloc physical
memory from. Those two don't have to be the same in theory.

Actually, the process runs always on the numa nodes corresponding to the
device the process used and the node with the same id as the device is
always belongs the the device. So using device_id as node_id to alloc
memory could work.

However the number of numa nodes belongs to a specified device is not
always one and we cannot use other numa nodes of the device.

Here we introduce a new flag SP_SPEC_NODE_ID and add a bit-region in
sp_flags for those who want to use other nodes belongs to a device. That
is, if one want to specify the node_id, the new flag and the node_id
should be both added to the sp_flags when calling sp_alloc() or
sp_make_share_k2u(), otherwise the node with the same id as the device
would be in use.
Signed-off-by: NWang Wensheng <wangwensheng4@huawei.com>
Reviewed-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

include/linux/share_pool.h

@@ -7,14 +7,27 @@
 #include <linux/vmalloc.h>
 #include <linux/printk.h>
 #include <linux/hashtable.h>
+#include <linux/numa.h>
 
 #define SP_HUGEPAGE		(1 << 0)
 #define SP_HUGEPAGE_ONLY	(1 << 1)
 #define SP_DVPP			(1 << 2)
-#define DEVICE_ID_MASK		0x3ff
-#define DEVICE_ID_SHIFT		32
+#define SP_SPEC_NODE_ID		(1 << 3)
+
+#define DEVICE_ID_BITS		4UL
+#define DEVICE_ID_MASK		((1UL << DEVICE_ID_BITS) - 1UL)
+#define DEVICE_ID_SHIFT		32UL
+#define NODE_ID_BITS		NODES_SHIFT
+#define NODE_ID_MASK		((1UL << NODE_ID_BITS) - 1UL)
+#define NODE_ID_SHIFT		(DEVICE_ID_SHIFT + DEVICE_ID_BITS)
+
 #define SP_FLAG_MASK		(SP_HUGEPAGE | SP_HUGEPAGE_ONLY | SP_DVPP | \
-				(_AC(DEVICE_ID_MASK, UL) << DEVICE_ID_SHIFT))
+				 SP_SPEC_NODE_ID | \
+				(DEVICE_ID_MASK << DEVICE_ID_SHIFT) | \
+				(NODE_ID_MASK << NODE_ID_SHIFT))
+
+#define sp_flags_device_id(flags) (((flags) >> DEVICE_ID_SHIFT) & DEVICE_ID_MASK)
+#define sp_flags_node_id(flags) (((flags) >> NODE_ID_SHIFT) & NODE_ID_MASK)
 
 #define SPG_ID_NONE	(-1)	/* not associated with sp_group, only for specified thread */
 #define SPG_ID_DEFAULT	0	/* use the spg id of current thread */

mm/share_pool.c

@@ -522,6 +522,7 @@ struct sp_area {
 	unsigned long kva;		/* shared kva */
 	pid_t applier;			/* the original applier process */
 	int node_id;			/* memory node */
+	int device_id;
 };
 static DEFINE_SPINLOCK(sp_area_lock);
 static struct rb_root sp_area_root = RB_ROOT;
@@ -934,13 +935,7 @@ EXPORT_SYMBOL_GPL(mg_sp_group_id_by_pid);
 
 static bool is_online_node_id(int node_id)
 {
-	pg_data_t *pgdat;
-
-	for_each_online_pgdat(pgdat) {
-		if (node_id == pgdat->node_id)
-			return true;
-	}
-	return false;
+	return node_id >= 0 && node_id < MAX_NUMNODES && node_online(node_id);
 }
 
 static bool is_device_addr(unsigned long addr)
@@ -968,7 +963,7 @@ static loff_t addr_offset(struct sp_area *spa)
 	if (!is_device_addr(addr))
 		return (loff_t)(addr - MMAP_SHARE_POOL_START);
 
-	return (loff_t)(addr - sp_dev_va_start[spa->node_id]);
+	return (loff_t)(addr - sp_dev_va_start[spa->device_id]);
 }
 
 static struct sp_group *create_spg(int spg_id)
@@ -1623,22 +1618,24 @@ static struct sp_area *sp_alloc_area(unsigned long size, unsigned long flags,
 	unsigned long vend = MMAP_SHARE_POOL_16G_START;
 	unsigned long addr;
 	unsigned long size_align = PMD_ALIGN(size); /* va aligned to 2M */
-	int node_id = (flags >> DEVICE_ID_SHIFT) & DEVICE_ID_MASK;
+	int device_id, node_id;
+
+	device_id = sp_flags_device_id(flags);
+	node_id = flags & SP_SPEC_NODE_ID ? sp_flags_node_id(flags) : device_id;
 
-	if (!is_online_node_id(node_id) ||
-	    node_id < 0 || node_id >= sp_device_number) {
+	if (!is_online_node_id(node_id)) {
 		pr_err_ratelimited("invalid numa node id %d\n", node_id);
 		return ERR_PTR(-EINVAL);
 	}
 
 	if ((flags & SP_DVPP)) {
-		if (!is_sp_dev_addr_enabled(node_id)) {
+		if (!is_sp_dev_addr_enabled(device_id)) {
 			vstart = MMAP_SHARE_POOL_16G_START +
-				node_id * MMAP_SHARE_POOL_16G_SIZE;
+				device_id * MMAP_SHARE_POOL_16G_SIZE;
 			vend = vstart + MMAP_SHARE_POOL_16G_SIZE;
 		} else {
-			vstart = sp_dev_va_start[node_id];
-			vend = vstart + sp_dev_va_size[node_id];
+			vstart = sp_dev_va_start[device_id];
+			vend = vstart + sp_dev_va_size[device_id];
 		}
 	}
 
@@ -1737,6 +1734,7 @@ static struct sp_area *sp_alloc_area(unsigned long size, unsigned long flags,
 	spa->kva = 0;   /* NULL pointer */
 	spa->applier = applier;
 	spa->node_id = node_id;
+	spa->device_id = device_id;
 
 	spa_inc_usage(spa);
 	__insert_sp_area(spa);