Skip to contentSkip to conversation

powerpc/vas: do not set uses_vas for kernel windows

PATCH Applied Nicholas Piggin 3 participants 3 messages Feb 8, 2018 – Feb 14, 2018 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc/vas: do not set uses_vas for kernel windows

cp_abort is only required or user windows, because kernel context must not be preempted between a copy/paste pair.

Without this patch, the init task gets used_vas set when it runs the nx842_powernv_init initcall, which opens windows for kernel usage.

used_vas is then never cleared anywhere, so it gets propagated into all other tasks. It's a property of the address space, so it should really be cleared when a new mm is created (or in dup_mmap if the mmaps are marked as VM_DONTCOPY). For now we seem to have no such driver, so leave that for another patch.

Cc Sukadev Bhattiprolu <[email protected]>
---
 arch/powerpc/platforms/powernv/vas-window.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/platforms/powernv/vas-window.c +8 -8
index 2b3eb01ab110..b7c53a51c31b 100644
@@ -1063,16 +1063,16 @@ struct vas_window *vas_tx_win_open(int vasid, enum vas_cop_type cop,
 			rc = PTR_ERR(txwin->paste_kaddr);
 			goto free_window;
 		}
+	} else {
+		/*
+		 * A user mapping must ensure that context switch issues
+		 * CP_ABORT for this thread.
+		 */
+		rc = set_thread_uses_vas();
+		if (rc)
+			goto free_window;
 	}
 
-	/*
-	 * Now that we have a send window, ensure context switch issues
-	 * CP_ABORT for this thread.
-	 */
-	rc = -EINVAL;
-	if (set_thread_uses_vas() < 0)
-		goto free_window;
-
 	set_vinst_win(vinst, txwin);
 
 	return txwin;
Signature · 1 line
2.15.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Nicholas Piggin [[email protected]] wrote:

cp_abort is only required or user windows, because kernel context must not be preempted between a copy/paste pair.

Yes, that is a good optimization.

Quoted 10 lines

Without this patch, the init task gets used_vas set when it runs the nx842_powernv_init initcall, which opens windows for kernel usage.

used_vas is then never cleared anywhere, so it gets propagated into all other tasks. It's a property of the address space, so it should really be cleared when a new mm is created (or in dup_mmap if the mmaps are marked as VM_DONTCOPY). For now we seem to have no such driver, so leave that for another patch.

If the parent process has the paste address mapped, the child inherits those mappings - so we can't clear the ->used_vas in a process until it has unmapped all the send windows right?

If VM_DONCOPY is set, then we can clear it.

Quoted 3 lines
Cc Sukadev Bhattiprolu <[email protected]>
#2 lore raw
In reply to Nicholas Piggin
Quoted 13 lines · Nicholas Piggin

cp_abort is only required or user windows, because kernel context must not be preempted between a copy/paste pair.

Without this patch, the init task gets used_vas set when it runs the nx842_powernv_init initcall, which opens windows for kernel usage.

used_vas is then never cleared anywhere, so it gets propagated into all other tasks. It's a property of the address space, so it should really be cleared when a new mm is created (or in dup_mmap if the mmaps are marked as VM_DONTCOPY). For now we seem to have no such driver, so leave that for another patch.

Quoted 3 lines

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/b00b62898631b756c3e123542bbb04

cheers