kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/mm/vmalloc.c
..
..
@@ -1549,7 +1549,7 @@
1549
1549
 	struct vmap_block *vb;
1550
1550
 	struct vmap_area *va;
1551
1551
 	unsigned long vb_idx;
1552
-	int node, err, cpu;
1552
+	int node, err;
1553
1553
 	void *vaddr;
1554
1554
 
1555
1555
 	node = numa_node_id();
..
..
@@ -1586,12 +1586,11 @@
1586
1586
 		return ERR_PTR(err);
1587
1587
 	}
1588
1588
 
1589
-	cpu = get_cpu_light();
1590
-	vbq = this_cpu_ptr(&vmap_block_queue);
1589
+	vbq = &get_cpu_var(vmap_block_queue);
1591
1590
 	spin_lock(&vbq->lock);
1592
1591
 	list_add_tail_rcu(&vb->free_list, &vbq->free);
1593
1592
 	spin_unlock(&vbq->lock);
1594
-	put_cpu_light();
1593
+	put_cpu_var(vmap_block_queue);
1595
1594
 
1596
1595
 	return vaddr;
1597
1596
 }
..
..
@@ -1656,7 +1655,6 @@
1656
1655
 	struct vmap_block *vb;
1657
1656
 	void *vaddr = NULL;
1658
1657
 	unsigned int order;
1659
-	int cpu;
1660
1658
 
1661
1659
 	BUG_ON(offset_in_page(size));
1662
1660
 	BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
..
..
@@ -1671,8 +1669,7 @@
1671
1669
 	order = get_order(size);
1672
1670
 
1673
1671
 	rcu_read_lock();
1674
-	cpu = get_cpu_light();
1675
-	vbq = this_cpu_ptr(&vmap_block_queue);
1672
+	vbq = &get_cpu_var(vmap_block_queue);
1676
1673
 	list_for_each_entry_rcu(vb, &vbq->free, free_list) {
1677
1674
 		unsigned long pages_off;
1678
1675
 
..
..
@@ -1695,7 +1692,7 @@
1695
1692
 		break;
1696
1693
 	}
1697
1694
 
1698
-	put_cpu_light();
1695
+	put_cpu_var(vmap_block_queue);
1699
1696
 	rcu_read_unlock();
1700
1697
 
1701
1698
 	/* Allocate new block if nothing was found */