From patchwork Tue Sep 7 15:15:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 508189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CC7C433FE for ; Tue, 7 Sep 2021 15:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C255B6113B for ; Tue, 7 Sep 2021 15:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345069AbhIGPQj (ORCPT ); Tue, 7 Sep 2021 11:16:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345061AbhIGPQi (ORCPT ); Tue, 7 Sep 2021 11:16:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4CB8C6112E; Tue, 7 Sep 2021 15:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631027732; bh=KvtCf6stqLiEbq7sySSQ86RmRGkW8yQj4rPuQwmzu+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=dL/ThkFhUhJ3Zsr4RbgRl+utBczBn/aXJK2OUdKeyehk05tb5tNl36zcWz2g41c7Q eX/OdvsACvZKzZkDzLR+axdyiIJZg3ekm5gC1O04d1sZWlnNalNxCHnDQo4pfg6pJF u42eqPlxTvW6QNMyJ1vaeLmz106BTjy0QOUdB/cUmM/Da4dpoN93PO/XEio4kCZC3B Z4oYD6N3K9dDzDAXYKFOACpWxb2sk1WFt4C+qUh4S6LVQTtMsPIsAOC/hPRQpumkS4 88Su9ZXGaXysp/tH0uLKad1IFaqGdp2uKOLcEkaYeIUJ5bGtngsGo6aHZgVmrFMd6r zuIDRu978cuvQ== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Cc: Andrew Halaney Subject: [PATCH RT 1/3] locking/rwsem-rt: Remove might_sleep() in __up_read() Date: Tue, 7 Sep 2021 10:15:27 -0500 Message-Id: <863d8c29a4b1b1500f7a90557af8b7fa442afcb7.1631027711.git.zanussi@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Andrew Halaney v5.4.143-rt64-rc2 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit b2ed0a4302faf2bb09e97529dd274233c082689b ] There's no chance of sleeping here, the reader is giving up the lock and possibly waking up the writer who is waiting on it. Reported-by: Chunyu Hu Signed-off-by: Andrew Halaney Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Tom Zanussi --- kernel/locking/rwsem-rt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/locking/rwsem-rt.c b/kernel/locking/rwsem-rt.c index 19ea20be3fd7..966946454ced 100644 --- a/kernel/locking/rwsem-rt.c +++ b/kernel/locking/rwsem-rt.c @@ -200,7 +200,6 @@ void __up_read(struct rw_semaphore *sem) if (!atomic_dec_and_test(&sem->readers)) return; - might_sleep(); raw_spin_lock_irq(&m->wait_lock); /* * Wake the writer, i.e. the rtmutex owner. It might release the From patchwork Tue Sep 7 15:15:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 507747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 960D1C433EF for ; Tue, 7 Sep 2021 15:15:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7EC3361132 for ; Tue, 7 Sep 2021 15:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345078AbhIGPQk (ORCPT ); Tue, 7 Sep 2021 11:16:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:42930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345070AbhIGPQj (ORCPT ); Tue, 7 Sep 2021 11:16:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6D1BE61107; Tue, 7 Sep 2021 15:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631027733; bh=Ea6i7nuMuxo3nuep6k3/uS6l/jmabdXQI6pMdAahtL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=ffKmvK3wBprZET4qTUhh03G1E3cAf1H157JybTYOQC1b9RvN1zuCmjlk0mLZAbG1G M70zYMMgr+417YC4BSLX4lB6w8hFwZBhQjVQp1Ec/IDE0K3v2gn3j/vyqYhGK2Rkal WZdHkuu5+0EGtL+OH33Eb7ZZ1v3zrEs6RmIFeaMzjYVQK2pAk7wscCO5lfSNO1r1SA Chd34hjt0ForzdkRbWeNXLdc3Qla7HayKJJ1QK4JGP9kbMLrLQIEX8oobHlKi1HueD yFCNM6sUqwhzB0Sj3MZRHEgvbcwwPSSjZ6qEK/WtV1kur+YLzNPFvP/dGiKB6ghF4G tK0JyD3NYMg3A== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Cc: Gregor Beck , Gregor Beck Subject: [PATCH RT 2/3] fscache: fix initialisation of cookie hash table raw spinlocks Date: Tue, 7 Sep 2021 10:15:28 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Gregor Beck v5.4.143-rt64-rc2 stable review patch. If anyone has any objections, please let me know. ----------- The original patch, 602660600bcd ("fscache: initialize cookie hash table raw spinlocks"), subtracted 1 from the shift and so still left some spinlocks uninitialized. This fixes that. [zanussi: Added changelog text] Signed-off-by: Gregor Beck Fixes: 602660600bcd ("fscache: initialize cookie hash table raw spinlocks") Signed-off-by: Tom Zanussi --- fs/fscache/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index 5508d92e3f8f..cba2a226897f 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -963,6 +963,6 @@ void __init fscache_cookie_init(void) { int i; - for (i = 0; i < (1 << fscache_cookie_hash_shift) - 1; i++) + for (i = 0; i < ARRAY_SIZE(fscache_cookie_hash); i++) INIT_HLIST_BL_HEAD(&fscache_cookie_hash[i]); } From patchwork Tue Sep 7 15:15:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 508188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDB3DC433F5 for ; Tue, 7 Sep 2021 15:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB3446113A for ; Tue, 7 Sep 2021 15:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345087AbhIGPQm (ORCPT ); Tue, 7 Sep 2021 11:16:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:43010 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345080AbhIGPQk (ORCPT ); Tue, 7 Sep 2021 11:16:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B14AD61139; Tue, 7 Sep 2021 15:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631027734; bh=U4qqO1PZZrbT1eql/pf4N2aOQvD+klKbLPwvP0QYdds=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=pkWWaaky0cPfjCGhwNxL8GPi6820f2GFBZ+kAbMmtF462NFVLZ+VJ/MDJ7mYN5SeQ FJ4pUAnnrjvAFXK3CSwFenH6Ngs6pzsmrpND5OLdvVVy0QPZJ2bgz88FvD+M1uUSvg UFsr6iuDQkOz1u/PMTZYvR4Ri3GpVlN3+DGon4tnLabh9/KyrnvTSJO62wOY5tHrp4 DS2FYzUA56J4DpPJuHHGS15S+bMsAXzpgE+oL38wKIT9dyVAQT7oNKqo/L+SaeWluv CxirCJc+fGKsVRmFwV7OlAl4dUrL8wohRAE7XFPDqTyI4PdArH8IDZIBoDubKCRyws 2KorADZSENJfQ== From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Clark Williams , "Luis Claudio R. Goncalves" , Tom Zanussi Subject: [PATCH RT 3/3] Linux 5.4.143-rt64-rc2 Date: Tue, 7 Sep 2021 10:15:29 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Tom Zanussi v5.4.143-rt64-rc2 stable review patch. If anyone has any objections, please let me know. ----------- Signed-off-by: Tom Zanussi --- localversion-rt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localversion-rt b/localversion-rt index b0e8dd7bd707..cc5ec6b9aa59 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt63 +-rt64-rc2