From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 A96CF1E04B9 for ; Tue, 7 Jan 2025 11:11:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736248321; cv=none; b=CKfLQleETFuLn4QR8xW4rcfq0TDLGuLcXOnKgAZ0Xjx6BXyeiFkZFuk6/dHQk3LPP4Vbp5rBoqgIyjTQ2GuTuLtaq3T7BTEzMRRFZXkl13vK3rILyDoXTQn3ex/C3E7M0Gt1FqNrmN65QAWDwBkq9kEPdfecToA63cyoNDs4NZ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736248321; c=relaxed/simple; bh=lEzP1kRy5RG3Qb48LWPiVc6zEJxtMMdbd2+7trQLmrs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nh5uIATHa4U96Z5x3ATQFuJhEcacw/j4dWqLNGlvEPdSg4ESUcIIJlT9P1I5E8idtZSusOo/sDNvxmIqpPtCfnzaNJv0Xo5TnRgWbfJFx4l6QZihvlFfh9zQuZ7tfqcXh1PZ9YClH5HXqR2LnRoR/NzVC+St2jCtwDbYFwFrIEg= 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=QrOSMS8d; arc=none smtp.client-ip=209.85.214.182 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="QrOSMS8d" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2164b1f05caso219397045ad.3 for ; Tue, 07 Jan 2025 03:11:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736248319; x=1736853119; 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=1RgKAccMwlEvXqQoO5YfVZ/b++XMarpdfduJzqdvQEM=; b=QrOSMS8dvH0zMElcVx+slrSQa6fCGn2yQYqb1TL20KrrlOIp9bCuzavLx5KfLWjWPD rhQeesSYJege7+GkOqb4vJ0LXfRVIYR38BYl+fT3vVmBcOeUQ75s5PST5hMFIVWe2URq w35cWok3Kao5KXZXuoTL+f21505bKiM1Il3Ne+yH9qgNM7rvbR2malWBx52y1el46p+C uAeFkjFwHRHTh9iimli49akzcR0r7qoJZrxT95oFhPgpFPdgefkXFyu3mSPaA7gb9GP+ //KNwiZtOVI7oFBGhptGjMOzeqB6enyEoTqqFEfXLbXkOCJ5VmTVFMf6lUUmvRS499Vp /1Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736248319; x=1736853119; 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=1RgKAccMwlEvXqQoO5YfVZ/b++XMarpdfduJzqdvQEM=; b=ARrlcPsPoNTCtDhXPSVkJ/6gCZt0qFeD+glDq5Jz0bXwBqTKebbT5TV/MCKvoHmdAu zke/rbzhlGj4jei7PKCFA/N/ApaIeoYbOiiyXeWGCGKX5Aw5JF5bufM8QZQf4QLO0z7x Akt86Rp3XFvDfT65N7O7u4D6cBCpCaTrh3YYffHk9tqfZoJ6S291S2Y6ZrloTrHSWbDW EuQY7jtNOCpPlNYEcLQ2vH36n9yb8Ms5k4k8HZcTjcjn4ATlSwi1Xewwa/hCIHy1BCWK IAMcvcfKp8Y5eRLRiR3cnHjvNIJkkK9SJNXtBxSN7zpitLDXRVH521XcQNge5VtXvvv9 dVuw== X-Forwarded-Encrypted: i=1; AJvYcCXQVGDr61tt+udSLKr7DBfcrRpr+42bFtTWfC7pVlWmpPU4jRx8nCLrs7BUm9YomcnJfoX3bO+D5Vwg5F4=@vger.kernel.org X-Gm-Message-State: AOJu0YwAQD1q8XLHkT2e7nXv11EBUAbb0nxUM/KrEy1cEZ7TxQvQHKGX ydavYvxyy0qtS6zBt/9CFnF2og/Qjesdw8WxjmVsULXr+ggnHVmZ X-Gm-Gg: ASbGncsFSdgh2aPVIVrJAQLdYtvTAMG4AQOpvTVTfQ68IwSfTo53fKYbSgUbKHjnct4 wzwzzptz2+vebyAVZh5NkXcvWcBcEZ6NnSm/ontG7vhsM666We3jR2l5xcDYAk807i0soFZRvTV 9T8W0nKmlRng/XZcNFjqKorFJeOqEUoUH3NQLVAjzwxRdCACQhpkaLY/wIbPMZjwJkTxD5b41n1 43pimQfhteehHYY+q6ZXNe0gouKtV+x01usb8JF+uRZzvD04dVMesqLgn8YzA+oB6RdsVCqT5n2 h463SKxiac25ZmihTRClIUkckBM= X-Google-Smtp-Source: AGHT+IGHwHSsSQwRi2Sy0n1gRusyodf4HSulRZEkw2lNyxeUst4kmnSIkjZXW3QCT9NYqQ8pn1NB7A== X-Received: by 2002:a17:902:c409:b0:216:2bd7:1c27 with SMTP id d9443c01a7336-219e6ebd10dmr764566865ad.33.1736248318829; Tue, 07 Jan 2025 03:11:58 -0800 (PST) Received: from DESKTOP-NBGHJ1C.local.valinux.co.jp (vagw.valinux.co.jp. [210.128.90.14]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9629acsm308242575ad.46.2025.01.07.03.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 03:11:58 -0800 (PST) From: Ryo Takakura To: llong@redhat.com Cc: bigeasy@linutronix.de, boqun.feng@gmail.com, clrkwllms@kernel.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org, tglx@linutronix.de, will@kernel.org Subject: Re: [PATCH v2] lockdep: Fix wait context check on softirq for PREEMPT_RT Date: Tue, 7 Jan 2025 20:11:50 +0900 Message-Id: <20250107111150.27315-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 Hi Long, and happy new year to everyone! On Mon, 6 Jan 2025 14:13:57 -0500, Waiman Long wrote: >On 12/26/24 11:08 PM, Ryo Takakura wrote: >> include/linux/bottom_half.h | 8 ++++++++ >> kernel/softirq.c | 12 ++++++++++++ >> 2 files changed, 20 insertions(+) >> >> diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h >> index fc53e0ad5..f77dc746c 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,8 +16,13 @@ static __always_inline void __local_bh_disable_ip(unsigned long ip, unsigned int >> } >> #endif >> >> +#ifdef CONFIG_LOCKDEP >> +extern struct lockdep_map bh_lock_map; >> +#endif >> + >> static inline void local_bh_disable(void) >> { >> + lock_map_acquire_read(&bh_lock_map); >> __local_bh_disable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); >> } >> >> @@ -25,11 +31,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 4dae6ac2e..a8211ba9a 100644 >> --- a/kernel/softirq.c >> +++ b/kernel/softirq.c >> @@ -1073,3 +1073,15 @@ unsigned int __weak arch_dynirq_lower_bound(unsigned int from) >> { >> return from; >> } >> + >> +#ifdef CONFIG_LOCKDEP >> +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); >> +#endif > >All the locking code use CONFIG_DEBUG_LOCK_ALLOC to determine if >lockdep_map should be used. Should you also use CONFIG_DEBUG_LOCK_ALLOC >instead of CONFIG_LOCKDEP to be consistent with the others? I see, I wasn't sure which CONFIG should be use here. Thanks for pointing it out! I'll use CONFIG_DEBUG_LOCK_ALLOC for the next version. >Cheers, >Longman Sincerely, Ryo Takakura