From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AC3D218EBE for ; Fri, 20 Dec 2024 16:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734711025; cv=none; b=AB/TwLUIxlkvU9XT8OpVoCOU00nI0tMs7at+aBxuLBMOufRkLup55BZ2Th1ObB5h0fe0vAqZo+tu/VH9qT8p2vmqkU0nsMFmzVJvQbCUmNWHhpKMqbEHZCl6RidnHmFuGEZpIIJZsWBnhrWQWHwKgV/WgvvFuLlVjZTIp4DWnpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734711025; c=relaxed/simple; bh=DW75gGgwTrdEPrpl9OFcroYrBY2GtFLKUPL3CvZoIts=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DZPK/stYU5lKF73SP5T31XLf0Vscnxus51l3g6sl4Exo9S4Ul0i+VdFwAb9Dug5Yn49QIyUWo/s8e2bltOJWflgDKN582QeLU8haiEUyRWGMEh9mInW0LDR7HdcYtVLSIMSJoRedJgm6pej7bGhrIo+A00pGwJw1e1MwwdZUoYo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Rq7TWh4g; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rq7TWh4g" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7273967f2f0so2612631b3a.1 for ; Fri, 20 Dec 2024 08:10:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734711024; x=1735315824; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ae4oyfSl9VHq0GUA10t6av6eAE8uuVk00WqNvGV6qA8=; b=Rq7TWh4gPTFgSN6s/wVS9jJJ3rsnIianM8/+e3qZWba+ApoISj5mwNOSDGAAH7oCdn 2Mz4BKYJUrt0r5FxD+Geevpj2ODtF0u3mVgwgKEbO5I9MnQHHb7n2N6H1T3IwTrJvPGh H3hh1Py0M3D2AVVrhI9TJ1It8X6WRLj0ihYZfRbskb/Tw80INkyNDAq2PrBS40ZK0sDu cmTwSYdggCr8vyOM3xEhb8WEUsXxbGpjg/7cr3lm+ppSZJg0GdQG0J/JdA8A4gFOrWcd 7rlZlurL3Hv0s8psTBUC0ij0+onqZPFdRGbLkvZKmnWrgwunqbFE0Wj1KSSO94dpYhJP NLhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734711024; x=1735315824; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ae4oyfSl9VHq0GUA10t6av6eAE8uuVk00WqNvGV6qA8=; b=DZYIBplFkzI8S9lifECDTkyzFW+GbAcByZL4kPYm5+NCkGn8LF09vHBB5xBGcOcmdc PXqWQWn8EVasHNz5DnZkqg0/KlAVi++WrJohRqEXgFfvl7A5/QrJMxFUS6JpFG4BeWrk ZvAuOW91W8ysF0PO6xYXtGh6CnYfbBz5U0JfqjRiGv3c31HnyoOsxkX6ulk1h88dpSO4 1iH3xaDVI+Ke3NtE6c+RKnOlvhGI8hFS6sV7NaLLsyInC/p5YrFsWwHLWMLivzMlu3GZ 6z4tzPD2SaY+tmjhZCOd3kw9riklDSi7hUwEOUinYMkmtNIzd/Atzj2bKxmUxSPkklzl lJCg== X-Forwarded-Encrypted: i=1; AJvYcCWaL6PseTVGg2HN7P5mL9kFTGnlxLiTbD+MFUISn/ODXkvPwGz2648zj0xf2W2XBPultD+Qoxu6yZ+AwRw=@vger.kernel.org X-Gm-Message-State: AOJu0YyF9uY+ShxP86gn8BBL5bMQDw1xNRFaIKAWP9eDrTE1W6TYszoc bul3dkl71YZa4lROqbBrWpaGjQNAr8pWGfEm1OqtIb2QNsepAkwP X-Gm-Gg: ASbGncugzyi7qk/ONVG6Ep53t6jkM9D9Xbjv5dloFCFn9jQCugeqtdcPYtWhqxxUM2v BSCDf5ZD+pzOkXoAKiA16TWhf+oufWcHG0Jul6/D7SqiHdNk5HXHW1SHC3PY1j79mvvdLWVTI83 IBmgZhOW97i3RU7XGEm6mvPB58sjtRsK7AsVaDGTDfUN93rqmUe2Gplmykl4ftIGbyrO5NijNJN UDJ0MccgL11tNcHkSmU+Is2MjP5h9KOQcq+0UVFv7gtFdmNpIlPaobF95j01JZkQzQ24QTHH+2w MUZD5MWiEjwK41TDx5QLbroMQUenHBt9UtLG6tcZewLnF64dMpTyvlOzd8Q= X-Google-Smtp-Source: AGHT+IE586Uv/A/CdK91Ddl35OLRgh801uOnKRMHq4t0wZO18hUk6rT+mrEr8OUFSaKa1XaCjjZwxQ== X-Received: by 2002:a05:6a20:e347:b0:1e1:f5a:c027 with SMTP id adf61e73a8af0-1e5e0846a43mr4766817637.43.1734711023665; Fri, 20 Dec 2024 08:10:23 -0800 (PST) Received: from DESKTOP-NBGHJ1C.flets-east.jp (p10213112-ipngn20001marunouchi.tokyo.ocn.ne.jp. [153.220.101.112]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad835469sm3407738b3a.60.2024.12.20.08.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 08:10:23 -0800 (PST) From: Ryo Takakura To: boqun.feng@gmail.com Cc: bigeasy@linutronix.de, clrkwllms@kernel.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, longman@redhat.com, mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org, tglx@linutronix.de, will@kernel.org Subject: Re: [PATCH] lockdep: Fix wait context check on softirq for PREEMPT_RT Date: Sat, 21 Dec 2024 01:10:16 +0900 Message-Id: <20241220161016.422991-1-ryotkkr98@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On Thu, 19 Dec 2024 14:27:11 -0800, Boqun Feng wrote: >The following is the rough idea: > >Regards, >Boqun > >----->8 >diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h >index fc53e0ad56d9..7191a753e983 100644 >--- a/include/linux/bottom_half.h >+++ b/include/linux/bottom_half.h >@@ -4,6 +4,7 @@ > > #include > #include >+#include > > #if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_TRACE_IRQFLAGS) > extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt); >@@ -15,9 +16,12 @@ static __always_inline void __local_bh_disable_ip(unsigned long ip, unsigned int > } > #endif > >+extern struct lockdep_map bh_lock_map; >+ > static inline void local_bh_disable(void) > { > __local_bh_disable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); >+ lock_map_acquire_read(&bh_lock_map); > } > > extern void _local_bh_enable(void); >@@ -25,11 +29,13 @@ extern void __local_bh_enable_ip(unsigned long ip, unsigned int cnt); > > static inline void local_bh_enable_ip(unsigned long ip) > { >+ lock_map_release(&bh_lock_map); > __local_bh_enable_ip(ip, SOFTIRQ_DISABLE_OFFSET); > } > > static inline void local_bh_enable(void) > { >+ lock_map_release(&bh_lock_map); > __local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); > } > >diff --git a/kernel/softirq.c b/kernel/softirq.c >index 8b41bd13cc3d..17d9bf6e0caf 100644 >--- a/kernel/softirq.c >+++ b/kernel/softirq.c >@@ -1066,3 +1066,13 @@ unsigned int __weak arch_dynirq_lower_bound(unsigned int from) > { > return from; > } >+ >+static struct lock_class_key bh_lock_key; >+struct lockdep_map bh_lock_map = { >+ .name = "local_bh", >+ .key = &bh_lock_key, >+ .wait_type_outer = LD_WAIT_FREE, >+ .wait_type_inner = LD_WAIT_CONFIG, /* PREEMPT_RT makes BH preemptible. */ >+ .lock_type = LD_LOCK_PERCPU, >+}; >+EXPORT_SYMBOL_GPL(bh_lock_map); Self-tests are now all passing. Thanks! It looks good to me. Sincerely, Ryo Takakura