This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Sun Apr 28 15:49:29 2024 >From mailfetcher Mon Aug 6 11:19:02 2018 Envelope-to: lkml@grols.ch Delivery-date: Mon, 06 Aug 2018 11:19:02 +0200 Received: from stout.grols.ch [195.201.141.146] by 72459556e3a9 with IMAP (fetchmail-6.3.26) for (single-drop); Mon, 06 Aug 2018 11:19:02 +0200 (CEST) Received: from vger.kernel.org ([209.132.180.67]) by stout.grols.ch with esmtp (Exim 4.89) (envelope-from ) id 1fmbfJ-00045F-59 for lkml@grols.ch; Mon, 06 Aug 2018 11:19:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730003AbeHFL0l (ORCPT ); Mon, 6 Aug 2018 07:26:41 -0400 Received: from mx0a-00010702.pphosted.com ([148.163.156.75]:48158 "EHLO mx0b-00010702.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728147AbeHFL0l (ORCPT ); Mon, 6 Aug 2 Received: from pps.filterd (m0098781.ppops.net [127.0.0.1]) by mx0a-00010702.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w769BGSD009132; Mon, 6 Aug 2018 04:17:48 -0500 Authentication-Results: ppops.net; dkim=pass header.d=nio365.onmicrosoft.com header.s=selector1-ni-com Received: from nam05-dm3-obe.outbound.protection.outlook.com (mail-dm3nam05lp0115.outbound.protection.outlook.com [216.32.181.115]) by mx0a-00010702.pphosted.com with ESMTP id 2kn85wc4uj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 veri DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nio365.onmicrosoft.com; s=selector1-ni-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YoM4secehgxyPTnPO1khW1Tz2/hQO23iKwpZtliMQf0=; b=RUZD1Sr/6FMpzS4+3NaZ1rTIjLzSVMgRL Received: from jcartwri.amer.corp.natinst.com (130.164.62.116) by CY4PR04MB0968.namprd04.prod.outlook.com (2603:10b6:910:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Mon, 6 Aug 2018 09:17:45 +0 Received: by jcartwri.amer.corp.natinst.com (Postfix, from userid 1000) id E2B3F302D77; Mon, 6 Aug 2018 04:17:38 -0500 (CDT) From: Julia Cartwright To: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Cc: Thomas Gleixner , Steven Rostedt , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [130.164.62.116] X-ClientProxiedBy: CY4PR1201CA0023.namprd12.prod.outlook.com (2603:10b6:910:16::33) To CY4PR04MB0968.namprd04.prod.outlook.com (2603:10b6:910:55::24) x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d442414f-e96f-4f39-a4c4-08d5fb7d785b X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:CY4PR04MB0968; X-Microsoft-Exchange-Diagnostics: 1;CY4PR04MB0968;3:18lzH2p7UxsALeQ+p4DxhPGmH6LfNxxZq+PeZ4FDy/LEkeqkg9aACnOkps3xtpy9FOunujv58/KaWlXUbP+CJcuIRNNJDExlIDpQdp2oXaQCuJ/STezB9OfJpILLgQXXL7v5LjOfxxFfahpdYa1j8zFWmEUjf5JLRZCwxeLBzVd9QChQD4fJshpT0/33pEbUKI0h0Ib1mA7qkwIsiPnsDf1RGG8+V7kGKkYjoKMLDK8K x-ms-traffictypediagnostic: CY4PR04MB0968: X-Microsoft-Exchange-Diagnostics: 1;CY4PR04MB0968;20:xbuOaK3msiJ35WhtE7UOFhTjdHDVWFYVf+D/1lIQnkh/joGOUe9kQvBP+RTkskH/7qIRUHnDnsFYUj0bIOaGJv5jABw3NA6XRpUTNhhVEiC15o91c0BlJtBtpjt9/qT64sB4jW+cU2/uI/KBlpl9AZFHgiPjhjcu8JefcaKnynADG5CUY1V/q3H34mhUxsV9/9OlC9d+IFbSkn3KVgEx4C2NHkImaZ6cFPHe6/+kv6V X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42068640409301)(145744241990776); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20 X-Microsoft-Exchange-Diagnostics: 1;CY4PR04MB0968;4:uCNFi0LNx4ln4YOGgF1Z4bC+9oFDU3XKbEWs/OIKz7kS/qPj6Aosv7kyzHmjuu39LjwOnUWWyby/t6bZ682g0OMtZw1DHVCibVKQFbHLzoRSMAQWVt/1szZeFm6Jy8fTDvCVh/BjZKEWW1jzmBGSvgUQIbVgLE+NJ5nZDcBpy+vSKYub3Iwp7tbwz1+t63Klzu+MWev2kL5aEfjP42dCVI8PX0455YkONxvLZUFZOBt0 X-Forefront-PRVS: 07562C22DA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(396003)(366004)(39850400004)(136003)(346002)(376002)(199004)(189003)(6266002)(47776003)(14444005)(66066001)(54906003)(966005)(478600001)(476003)(386003)(97736004)(26005)(6666003)(3846002)(42186006)(6116002)(122856001)(50226002)(63 Received-SPF: None (protection.outlook.com: ni.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjA0TUIwOTY4OzIzOmRLVk1lU0xLS2J5Qy9qdGZOcktFbFdOSm03?= =?utf-8?B?NFg4cjN0alJNZG9kSXc1RnNKL25Fd010V3piM2tGd0FzeTQxNmpaVEhKVXZ6?= =?utf-8?B?UlIyYXNtN3N4UkxWWUdOQ0tIZkI1dHFtVEFFRjdmNDhTenArRy9OYld4amxj?= =?utf-8?B?SmpYRENZV2pzR0swMVduRmt0d X-Microsoft-Antispam-Message-Info: gZ6DScZg0Yp+5N9+80FtjBdafdMiRbO79YvO+d4OL58XIDGACmMzPx4RmB7NDAG7gOErGGJWphz0dbfUfnR+3WrWDKkzx7XcdeInk6Xl0Km5YUldJ2qhHgrPBQizL2/V1hCAgl1fHfjpqZBENtP6x364WE0T2M9mkxfWPHVfNMO0AsMZ4Wpe8yIf/GqjOlb0gK50k8SV40FG8swxsIZ/H1WGWCnqcz7IAr6e6TPTzDs+hlgCWaliGHTYYIbpTU X-Microsoft-Exchange-Diagnostics: 1;CY4PR04MB0968;6:b0zALhQzx0rgbCy6Y4kGyuJBI0HCQQNir29yJAPAsMCut+UNsQm4hldnLE7w7mR0Odks+s2sFWZIb5h6Vga8y+s/E06gjYCIB5fU8fG+Beh82npDQLWoaXKKRny1/64bnmYmOyCZFaMRsPwAITNRmKvJcWOeM8UUFEW347t8l3QJycrwGKRkbVESP6bdhVZnmEHmN1nW1Mb4qFrg7h4GL0FRs6oORaCT4AktjTeYVSzO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ni.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2018 09:17:45.1188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d442414f-e96f-4f39-a4c4-08d5fb7d785b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 87ba1f9a-44cd-43a6-b008-6fdb45a5204e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0968 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-06_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=inbound_policy_notspam policy=inbound_policy score=30 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adju Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-Id: X-Mailing-List: linux-kernel@vger.kernel.org Received-SPF: none client-ip=209.132.180.67; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org X-Spam-Score: -2.5 X-Spam-Score-Bar: -- X-Spam-Action: no action X-Spam-Report: Action: no action Symbol: R_DKIM_ALLOW(-0.20) Symbol: MIME_GOOD(-0.10) Symbol: RCPT_COUNT_TWELVE(0.00) Symbol: HAS_XOIP(0.00) Symbol: RCVD_COUNT_SEVEN(0.00) Symbol: TO_DN_SOME(0.00) Symbol: MID_CONTAINS_FROM(1.00) Symbol: BAYES_HAM(-3.00) Symbol: FROM_NE From: Sebastian Andrzej Siewior 4.9.115-rt94-rc1 stable review patch. If you have any objection to the inclusion of this patch, let me know. --- 8< --- 8< --- 8< --- [ Upstream commit 4ff648decf4712d39f184fc2df3163f43975575a ] Since the following commit: b91473ff6e97 ("sched,tracing: Update trace_sched_pi_setprio()") the sched_pi_setprio trace point shows the "newprio" during a deboost: |futex sched_pi_setprio: comm=futex_requeue_p pid"34 oldprio˜ newprio=98 |futex sched_switch: prev_comm=futex_requeue_p prev_pid"34 prev_prio0 This patch open codes __rt_effective_prio() in the tracepoint as the 'newprio' to get the old behaviour back / the correct priority: |futex sched_pi_setprio: comm=futex_requeue_p pid"20 oldprio˜ newprio=120 |futex sched_switch: prev_comm=futex_requeue_p prev_pid"20 prev_prio0 Peter suggested to open code the new priority so people using tracehook could get the deadline data out. Reported-by: Mansky Christian Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Fixes: b91473ff6e97 ("sched,tracing: Update trace_sched_pi_setprio()") Link: http://lkml.kernel.org/r/20180524132647.gg6ziuogczdmjjzu@linutronix.de Signed-off-by: Ingo Molnar Signed-off-by: Julia Cartwright --- include/trace/events/sched.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 516ae88cddf4..742682079acf 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -429,7 +429,9 @@ TRACE_EVENT(sched_pi_setprio, memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN); __entry->pid = tsk->pid; __entry->oldprio = tsk->prio; - __entry->newprio = pi_task ? pi_task->prio : tsk->prio; + __entry->newprio = pi_task ? + min(tsk->normal_prio, pi_task->prio) : + tsk->normal_prio; /* XXX SCHED_DEADLINE bits missing */ ), -- 2.18.0