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;
Date:   Thu, 7 Oct 2021 12:59:28 -0400
From:   Joe Korty <joe.korty@concurrent-rt.com>
To:     Thomas Gleixner <tglx@linutronix.de>
Cc:     Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
        Steven Rostedt <rostedt@goodmis.org>,
        Clark Williams <williams@redhat.com>,
        Jun Miao <jun.miao@windriver.com>,
        linux-rt-users <linux-rt-users@vger.kernel.org>,
        linux-kernel@vger.kernel.org
Subject: [PATCH 5.10-rt+] drm/i915/gt: transform irq_disable into local_lock.
Message-ID: <20211007165928.GA43890@zipoli.concurrent-rt.com>
Reply-To: Joe Korty <joe.korty@concurrent-rt.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xhsmko599frZHh71iggSFbrub5tQ6OgEA6FjstjeUYLSMp2CX42sfa5J5X1X?=
 =?us-ascii?Q?EyaN/oLrRk90zCjS5CV5Fq4ofldUAEih7ny/9IpNETc+Qq9zJNTsSvhad8r3?=
 =?us-ascii?Q?owf2hjNRhvy58FQVK6Luc9oElAHX76qmliq5LuS0cwiCgfSIJyV8VzH3tGWI?=
 =?us-ascii?Q?TSLGJATQjbkx8tYFMXyLzHrg1VvjjyX7vCaLiZ9GXd2a5mNH6aAyoU0bFBlx?=
 =?us-ascii?Q?yg/IaMV+E5N6v9fRvOI/Djj6OdojrJYcKO41Fsp6CXr6mb7RdaNu3q/kYeQu?=
 =?us-ascii?Q?7mXFCLn/aZE0qf6VgU1LcryC6fZC8gewmoNdLfcztvB2oWGVQGVmu1wIthGt?=
 =?us-ascii?Q?ZCFRKwii7UqUim1q0HQBEvvk+hYhgGy4vzum2MnWe7Z61TmvdnanV2N5is9q?=
 =?us-ascii?Q?iPKkj+CXXWkDM6JoRbvtMF4Y+XGUQtxPyVrZnofU/9wu1Clf5E8hmb3sHAV+?=
 =?us-ascii?Q?EqN2/NlSmbZuB4wUAdxdm3+UTLxJ1XNHYEBoLT8OZuyXFqeXC66rXqlvgkWc?=
 =?us-ascii?Q?lR6/DvnP5K2fPfloEiXOgYiEk29XQ8CcKyVR6nEGcECpJMqd1zMDXIhf2U3q?=
 =?us-ascii?Q?O3pc7I+KYPwsYPVzQlowQv+GmhDcdeVYMiTrr8AyA1tEtdIjiVbXbZYE72ZU?=
 =?us-ascii?Q?JXQ1w5vF+nk+LJcHZ00A8ERQTZxXrNGP+TVb5n/ldYHmERNwR7ceVZ94vvi6?=
 =?us-ascii?Q?t/jb2+SBjiv0McJLFb2Fdw4rPgo/zS6xYyHX6zu8q1dcSyqTY7LJ6N3HCkZk?=
 =?us-ascii?Q?ZgAGzoxHjWgYDLioDFQYrdYlF25d//9lXMMpISRoRr390uhzis2nVrWo6s+t?=
 =?us-ascii?Q?jUN5Q3hRsmIPn0ewVkR7t/w2vEMr2cnzc/FH0Mmn4hCOYdZkLJGYPF+lsiji?=
 =?us-ascii?Q?rCWGKIvS6x6/o0MaA7qfgA0jO+kii6SQZ9wrMjvw3xZokmqzkZOBDuVlxTSn?=
 =?us-ascii?Q?55OKjTPtw6D0EhUbXpH6dZUYqprpheXt2q231F+JWp8sjbdOio3vuzNteZpM?=
 =?us-ascii?Q?hCK5/DA3jgc7R+hIv9DhiyrXpaxmI88iZISYRdLMZ3+gcC7ElJdHdtv2z7BX?=
 =?us-ascii?Q?mvs1h0koDAK/aZeCPli2iMbaUmvRL3JuPLxoSALmf1pQEyDWFWZ6X8CpXZoQ?=
 =?us-ascii?Q?GYs+5f65x7CKFCsCZ3232G1GSyg2Gktcxrhruc6o+PK6A2Ud8HAWI5t/FWiU?=
 =?us-ascii?Q?pThbbZFT4jAt4ZrjBMom4QR8pMxuCnRT1YieHTABJHsA2NGzRA+wcpj1dg4S?=
 =?us-ascii?Q?22gT9TzihG+xJFxfK8joRWOl/5MuB+m///tnAwrYeOU/beSjpTEPpCLhdA7r?=
 =?us-ascii?Q?IG0rjvrHs8UM6EguhLPFXaWv?=
X-OriginatorOrg: concurrent-rt.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b49ff65-82f4-44d2-4782-08d989b3d4c1
X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB2007.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 16:59:31.2763
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38747689-e6b0-4933-86c0-1116ee3ef93e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hz/lKWsWtggeNa7GWZz2JIwmKSzmbr8Ns8fc/gcJu6EW6RyhPjy6KogI/uemiR1SfOWV819cR+ml7SP805K0zJ0yevG8RX190cOvdurH43I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1718
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert IRQ blocking in intel_breadcrumbs_park() to a local lock.

Affects 5.10-rt and all later releases, up to and including when
rt was merged into mainline.

This problem has been reported in two other linux-rt-users postings,
  
   [PREEMPT_RT] i915: fix PREEMPT_RT locking splats (Clark Williams)
   [linux-5.12.y-rt] drm/i915/gt: Fix a lockdep warning with interrupts enabled (Jun Miao)

Neither of these submit the obvious solution, nor,
AFAICT, has either yet been acted on.  So I muddy the
waters further by submitting this, a third fix.

Signed-off-by: Joe Korty <joe.korty@concurrent-rt.com>
Tested-by: Joe Korty <joe.korty@concurrent-rt.com>

Index: b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
===================================================================
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -34,6 +34,16 @@
 #include "intel_gt_pm.h"
 #include "intel_gt_requests.h"
 
+#include <linux/local_lock.h>
+
+struct event_lock {
+	local_lock_t l;
+};
+
+static DEFINE_PER_CPU(struct event_lock, event_lock) = {
+	.l = INIT_LOCAL_LOCK(l),
+};
+
 static bool irq_enable(struct intel_engine_cs *engine)
 {
 	if (!engine->irq_enable)
@@ -342,9 +352,9 @@ void intel_breadcrumbs_park(struct intel
 	/* Kick the work once more to drain the signalers */
 	irq_work_sync(&b->irq_work);
 	while (unlikely(READ_ONCE(b->irq_armed))) {
-		local_irq_disable();
+		local_lock_irq(&event_lock.l);
 		signal_irq_work(&b->irq_work);
-		local_irq_enable();
+		local_unlock_irq(&event_lock.l);
 		cond_resched();
 	}
 	GEM_BUG_ON(!list_empty(&b->signalers));