Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To:     linux-kernel@vger.kernel.org
Cc:     linux-rt-users@vger.kernel.org,
        Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
        Steven Rostedt <rostedt@goodmis.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Carsten Emde <C.Emde@osadl.org>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
        Tom Zanussi <zanussi@kernel.org>,
        Julien Grall <julien.grall@arm.com>,
        Daniel Wagner <wagi@monom.org>, John Kacur <jkacur@redhat.com>
Subject: [PATCH -rt] hrtimer: fix logic for when grabbing softirq_expiry_lock can be elided
Date:   Tue, 28 Apr 2020 16:40:26 +0200
Message-Id: <20200428144026.5882-1-rasmus.villemoes@prevas.dk>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from prevas-ravi.prevas.se (5.186.116.45) by AM5PR04CA0036.eurprd04.prod.outlook.com (2603:10a6:206:1::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Tue, 28 Apr 2020 14:40:39 +0000
X-Mailer: git-send-email 2.23.0
X-Originating-IP: [5.186.116.45]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: d915df08-6303-4111-392f-08d7eb821f7d
X-MS-TrafficTypeDiagnostic: VI1PR10MB2384:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR10MB238459551DAB47FDE7E5623093AC0@VI1PR10MB2384.EURPRD10.PROD.OUTLOOK.COM>
X-MS-Oob-TLC-OOBClassifiers: OLM:1923;
X-Forefront-PRVS: 0387D64A71
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFTY:;SFS:(376002)(346002)(396003)(366004)(39850400004)(136003)(8676002)(4326008)(5660300002)(6486002)(7416002)(186003)(6512007)(16526019)(1076003)(2616005)(956004)(44832011)(2906002)(478600001)(36756003)(8936002)(81156014)(6916009)(54906003)(8976002)(6666004)(316002)(52116002)(6506007)(86362001)(66946007)(26005)(66556008)(66476007);DIR:OUT;SFP:1102;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Q/GBx6MILFARVnpTCNP55DjDJainaEpkqV5oUX3wT12ZI6U2APJQEI2QxWd7riib23kWhq/oAOcu6u5k99COA/YR0Dp3F4khrMGg0pdWv5TqwOhDX6a9DaBilJp7slpO2I7MjlV0bzIa/p6U7WLXHiT9+GUU8pSHXd7IHw6HWlRrzxYOh8BThBdG3BEDvxx/G9gtFRZjhIurJ2i2VAileOAzacP2LuE0LAkbtM8Hg46xvtog9PzSF6y7E1HcXs1CKQEO+nxvXSq5ojJxYMDWx9IJR3wz0QW/6fXPTSpVfxl337ORub9Lrw0UIvgVKxWJuUzNA4AyVoiXmHXizVCVKGuOhPlIhSrn+2OV7C2xaxJ6lOG1H1+EPzQeQwtsdFYL/Vz0/mRJr8ZvjGeAuofVx9mc05QoD0cdJU+GyJd++FinvuTa+tSrGzIhxDjbgcNW
X-MS-Exchange-AntiSpam-MessageData: sgmDzJProROkRL4GGLTGaHOsaAPSI8DfL3cdQgraclLQ6bMgJ4loOo4Jkb4dwVo2B5WkA93gj/hYg/9xtY9+qByZMHASn7hHuzNVCBkVghHLzCKE1v4Wn3q9r7Sq5kf7iK9qnW2T5vaHAjh9UfUOjD2CSFn7Jzy4+L6tQvY3jM4NdbtLzP7lWComjXlem+KJAKbIYrJswg9bkN1EEUIrCYRar99Ck8IYj5wnu37oZWZmJqvYBHMDUIdgIBqu5h9mRbHi3b+0GIusXEhLpsMBD+Wh2XuYQUatC1ypXnpCc25HnnoxZ9Hh4qb8FcjDOegCYpmkVUPS9Bv4VbSvrkxZ503LpL3JUcgmr/u8WL17YYXt8yCG6hyizIRdjy1f0ZFbsjhpC1w4rIgheHz/KSrJycanQf6RKbAxNHb2RAiD4Uq/Qp28gHwoqRiyQLqAxPy9yR0P+YiRXgvkMZuK/kSBzHZl3QaGFS4PPJXRDc6TVX4JwXNWpyJ/DgeeHxbTdC4JOgTalXTJk6VFeRmreVclQXA0XtEsVyTbvNxCZsitV4huMiDoJFpXiYjoZJbajC5HVj+D+6lDdq4I+++/y+MiQ+AXPTRLjL1+IExaY9g1FAso1emio6Csbgf/f2f5ossvIYfXYWyFegWuT58X+T/clpXHgHgAyfgL6TQFDlCrNcg/ScZ+c5eCFBVfZUEnvhBn0aYwi/kQKGyUYXLqjuDOO4opnX5XcXHF1HlatUewT98pRL9FggOKwPST/0KFlhVn4Pn+XDQMO/cuVhcvGUvI3UDrIsgKgMt2N8+t4qkauKI=
X-OriginatorOrg: prevas.dk
X-MS-Exchange-CrossTenant-Network-Message-Id: d915df08-6303-4111-392f-08d7eb821f7d
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2020 14:40:40.5049
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tANEQ83UaLj25zWskdagyUa7w1wnh2W4tgjty8qy3WYZdl6oY5JvNB2KXfeq5zzpbczYdrCymumVDFFDeWbIwp2yY/4YS9J5poTtlDeyjlk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2384
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit

  hrtimer: Add a missing bracket and hide `migration_base' on !SMP

which is 47b6de0b7f22 in 5.2-rt and 40aae5708e7a in 4.19-rt,
inadvertently changed the logic from base != &migration_base to base
== &migration_base.

On !CONFIG_SMP, the effect was to effectively always elide this
lock/unlock pair (since is_migration_base() is unconditionally false),
which for me consistently causes lockups during reboot, and reportedly
also often causes a hang during boot.

Adding this logical negation (or, what is effectively the same thing
on !CONFIG_SMP, reverting the above commit as well as "hrtimer:
Prevent using hrtimer_grab_expiry_lock() on migration_base") fixes
that lockup.

Fixes: 40aae5708e7a (hrtimer: Add a missing bracket and hide `migration_base' on !SMP) # 4.19-rt
Fixes: 47b6de0b7f22 (hrtimer: Add a missing bracket and hide `migration_base' on !SMP) # 5.2-rt
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
Something like this? I wasn't sure what Fixes: tag(s) to include, if
any. It's quite possible the same fix is needed on earlier -rt
kernels, I didn't check.

 kernel/time/hrtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index e54a95de8b79..c3966c090246 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -953,7 +953,7 @@ void hrtimer_grab_expiry_lock(const struct hrtimer *timer)
 {
 	struct hrtimer_clock_base *base = READ_ONCE(timer->base);
 
-	if (timer->is_soft && is_migration_base(base)) {
+	if (timer->is_soft && !is_migration_base(base)) {
 		spin_lock(&base->cpu_base->softirq_expiry_lock);
 		spin_unlock(&base->cpu_base->softirq_expiry_lock);
 	}
-- 
2.23.0