From: Chris Metcalf <cmetcalf@ezchip.com>
To: Gilad Ben Yossef <giladb@ezchip.com>, Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@kernel.org>, Peter Zijlstra <peterz@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "Rik van Riel" <riel@redhat.com>, Tejun Heo <tj@kernel.org>,
        Frederic Weisbecker <fweisbec@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
        Christoph Lameter <cl@linux.com>,
        Viresh Kumar <viresh.kumar@linaro.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will.deacon@arm.com>, <linux-doc@vger.kernel.org>,
        <linux-api@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC: Chris Metcalf <cmetcalf@ezchip.com>
Subject: [PATCH v5 4/6] cpu_isolated: provide strict mode configurable signal
Date: Tue, 28 Jul 2015 15:49:38 -0400
Message-ID: <1438112980-9981-5-git-send-email-cmetcalf@ezchip.com>
In-Reply-To: <1438112980-9981-1-git-send-email-cmetcalf@ezchip.com>
References: <1438112980-9981-1-git-send-email-cmetcalf@ezchip.com>
MIME-Version: 1.0
Content-Type: text/plain
DB3PR02MB0426: X-MS-Exchange-Organization-RulesExecuted
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2015 19:50:08.4681
 (UTC)
X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3;Ip=[12.216.194.146];Helo=[ld-1.internal.tilera.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR02MB0426
X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB122;2:Mwy2id896/POwlrSB93r3w1b6bmUaQGOOP+0Zgm6IQselzhQWs7itASsaOA6uBYcEw7RV689oSYekuFonLIlvjWEnci1vFSkesw0ACl0fyDObVPcg+QOnDFqetFaTCtzI8nu/8SQwE8DaEre9/iI5yGpHfTnYhQRUxkN4e11l8w=;3:5CKfYP8fhDTY0RNirMbmXktf3br+vFluy9GIRd/e8ns8QI/I1BMV4T/wJKoFfHTeOfL9WvFfbLf7dzkfKdc2LdLXpY6EDkB0C5dnChPlT0s+7qtB510hFPC7hXP/cKIq0ZxsLEwlINXyrnCiOwvCR7Ph2aMXu5dKZerysqchfaUK2+DMKMiQAWSft6b6y/q3rv17nlRteNYEcXcjsv0YWA6rVwqOjsFx66vPHqpgUjWTIwSEM4U57n4H5vxX4Iuy;25:lfM+tGQAttMeBgNbEM0tHod1BFOWa/rOtdzhoTqBJ96EAteEmt5QiyFnmy64vJ/JuAV2zj8UHUR1EfsgUNwDcyUu/QChE2q8yeUGTQNZyjVZUy0dMFO0NYzZcxNfIpfk3Ipb97mYz1awGE7u559zzom/4THLKga1hi6hAAZ4hjGp1nphP1BUdUYgw5oarE7wjNg7g115AAS/QKyL1CkXDXSQmE60AnCk3zyt8KXqDmFTAREtcwlB97mrdDAA23C5UEnlqmwE03Bm3lU1Xl+5iw==;20:7sVA5InI556J8s2PoBzCMTFh5Btpr6CMkp1r6oRsKqWbLr0FHvJGrnmidiG/KSvtQYpC79X/iOI9Daj95cRFCQ==
DB3PR02MB122: X-MS-Exchange-Organization-RulesExecuted
X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB122;23:XXvWyQFVhf4qVuLHjcCD93H+C2NzyH9C2REvJR5Hs7ofIpnViVY1Lol8FwaJmFdeZ9YruBVo825pqhOkhSCEJy5jeWwmTMsFDrVHOw/LoxpDPNLGCf5B3HPTwxI+DintGyc239fyimR5iE6AFkuCwZxvWQSpOm9b/sIbG2rJRnTMycqmUCoO8FxtfxgPz70JQ6uAm7IV90c6B/PyDFbdKWgJCxk1Z3LpdPNw0Za6iOCt3WkS9DywJ7pptYOf/rT8
X-OriginatorOrg: ezchip.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2404
Lines: 76

Allow userspace to override the default SIGKILL delivered
when a cpu_isolated process in STRICT mode does a syscall
or otherwise synchronously enters the kernel.

In addition to being able to set the signal, we now also
pass whether or not the interruption was from a syscall in
the si_code field of the siginfo.

Signed-off-by: Chris Metcalf <cmetcalf@ezchip.com>
---
 include/uapi/linux/prctl.h |  2 ++
 kernel/time/cpu_isolated.c | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index 0c11238a84fb..ab45bd3d5799 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -195,5 +195,7 @@ struct prctl_mm_map {
 #define PR_GET_CPU_ISOLATED	48
 # define PR_CPU_ISOLATED_ENABLE	(1 << 0)
 # define PR_CPU_ISOLATED_STRICT	(1 << 1)
+# define PR_CPU_ISOLATED_SET_SIG(sig)  (((sig) & 0x7f) << 8)
+# define PR_CPU_ISOLATED_GET_SIG(bits) (((bits) >> 8) & 0x7f)
 
 #endif /* _LINUX_PRCTL_H */
diff --git a/kernel/time/cpu_isolated.c b/kernel/time/cpu_isolated.c
index d30bf3852897..9f8fcbd97770 100644
--- a/kernel/time/cpu_isolated.c
+++ b/kernel/time/cpu_isolated.c
@@ -71,11 +71,18 @@ void cpu_isolated_enter(void)
 	}
 }
 
-static void kill_cpu_isolated_strict_task(void)
-{
+static void kill_cpu_isolated_strict_task(int is_syscall)
+ {
+	siginfo_t info = {};
+	int sig;
+
 	dump_stack();
 	current->cpu_isolated_flags &= ~PR_CPU_ISOLATED_ENABLE;
-	send_sig(SIGKILL, current, 1);
+
+	sig = PR_CPU_ISOLATED_GET_SIG(current->cpu_isolated_flags) ?: SIGKILL;
+	info.si_signo = sig;
+	info.si_code = is_syscall;
+	send_sig_info(sig, &info, current);
 }
 
 /*
@@ -94,7 +101,7 @@ void cpu_isolated_syscall(int syscall)
 
 	pr_warn("%s/%d: cpu_isolated strict mode violated by syscall %d\n",
 		current->comm, current->pid, syscall);
-	kill_cpu_isolated_strict_task();
+	kill_cpu_isolated_strict_task(1);
 }
 
 /*
@@ -105,5 +112,5 @@ void cpu_isolated_exception(void)
 {
 	pr_warn("%s/%d: cpu_isolated strict mode violated by exception\n",
 		current->comm, current->pid);
-	kill_cpu_isolated_strict_task();
+	kill_cpu_isolated_strict_task(0);
 }
-- 
2.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/