From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2978DC5519F for ; Fri, 20 Nov 2020 12:44:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97CEE22403 for ; Fri, 20 Nov 2020 12:44:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="1daLPaun"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="th+C0iUM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727994AbgKTMox (ORCPT ); Fri, 20 Nov 2020 07:44:53 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:40512 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727061AbgKTMov (ORCPT ); Fri, 20 Nov 2020 07:44:51 -0500 Date: Fri, 20 Nov 2020 12:44:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605876290; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aUevGj4SXsv9BZC05AUHz8YZO5bWtlYKzhjznNnYcrs=; b=1daLPaundw+noodYFy69kgenmpFqxpVUD06rDf5iMQVrhkZwCOLawJGvyYD1sD7UjMYv5B UcA1ESdrwo7L/7iSb+VWSswbGdVQlcnPjZlDKwaPGN+BnVmIVqqs7ub7vcerDVjc9GbQlA IVHRcg1TucVkH9hkc9afT3EGzpvabd9nQxXF5Z64UDLbKmy1jh+LDdFC9ohyEGpR+ImYrF p/K+NqG01gXfrExzTSpu36pqRRoDdbSknJ0IhLiKv5NaXoS0PS94aTOB+7cxdAt40vb24r Q5IBSBxHqs8iCzMWmZPClsK1XpUfY0BtLxFmkhGgGGFn1G4/9D3WQ2FUKRYPfg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605876290; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aUevGj4SXsv9BZC05AUHz8YZO5bWtlYKzhjznNnYcrs=; b=th+C0iUMr+fKq7q3RF/VJ3+W8mH6nzsn0YCWK9bFLI8iVQd/xULnqxVAcD9qz9d3QJnUa3 6p9AJh3b0XLZUnDw== From: "tip-bot2 for Frederic Weisbecker" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/entry] context_tracking: Only define schedule_user() on !HAVE_CONTEXT_TRACKING_OFFSTACK archs Cc: Frederic Weisbecker , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201117151637.259084-5-frederic@kernel.org> References: <20201117151637.259084-5-frederic@kernel.org> MIME-Version: 1.0 Message-ID: <160587628920.11244.3698496906243266018.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/entry branch of tip: Commit-ID: 6775de4984ea83ce39f19a40c09f8813d7423831 Gitweb: https://git.kernel.org/tip/6775de4984ea83ce39f19a40c09f8813d7423831 Author: Frederic Weisbecker AuthorDate: Tue, 17 Nov 2020 16:16:36 +01:00 Committer: Peter Zijlstra CommitterDate: Thu, 19 Nov 2020 11:25:42 +01:00 context_tracking: Only define schedule_user() on !HAVE_CONTEXT_TRACKING_OFFSTACK archs schedule_user() was traditionally used by the entry code's tail to preempt userspace after the call to user_enter(). Indeed the call to user_enter() used to be performed upon syscall exit slow path which was right before the last opportunity to schedule() while resuming to userspace. The context tracking state had to be saved on the task stack and set back to CONTEXT_KERNEL temporarily in order to safely switch to another task. Only a few archs use it now (namely sparc64 and powerpc64) and those implementing HAVE_CONTEXT_TRACKING_OFFSTACK definetly can't rely on it. Signed-off-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20201117151637.259084-5-frederic@kernel.org --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index c23d7cb..44426e5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4631,7 +4631,7 @@ void __sched schedule_idle(void) } while (need_resched()); } -#ifdef CONFIG_CONTEXT_TRACKING +#if defined(CONFIG_CONTEXT_TRACKING) && !defined(CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK) asmlinkage __visible void __sched schedule_user(void) { /*