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:   Yanfei Xu <yanfei.xu@windriver.com>
To:     peterz@infradead.org, mingo@redhat.com, will@kernel.org,
        longman@redhat.com, boqun.feng@gmail.com
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] locking/rwsem: disable preemption for spinning region
Date:   Wed, 13 Oct 2021 21:41:53 +0800
Message-Id: <20211013134154.1085649-3-yanfei.xu@windriver.com>
In-Reply-To: <20211013134154.1085649-1-yanfei.xu@windriver.com>
References: <20211013134154.1085649-1-yanfei.xu@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k6l0DwavuO8Uj2uYiP27or6kH2nBL5WXqmkHhMyN+G1OeT41ePmletADY57c?=
 =?us-ascii?Q?LbO1Rofe+uzwLFwzQVZBn0vPOFfR6RiBy4u81rkwnSHRWVZoBA9AmXwwzd2I?=
 =?us-ascii?Q?plPUNHdvdJBex6f5FXdrZH1YwhJdicXQfSKXDmGT/6SPLF2hcYTjm9GwI5hv?=
 =?us-ascii?Q?grPXRvGZxTpEDxVaeXeKxgT6gKipta6j2wK9WM+n8yK+C5f6ERBA1jYtiJ4w?=
 =?us-ascii?Q?B2jTKAJ6OthMAmL3ex9KMKnMa9n+UOyXzpa54LrAw+9C+5rCApWfeh6EAtk4?=
 =?us-ascii?Q?RwZmMmS0DOQTAL17vvBhDatt9Yg1kk/qR3wR05lWAmR1koDEdIgsl+dnc6Pb?=
 =?us-ascii?Q?/lmwX8BFLvUV7HIR0Yp4t2D8d84HYdc2gY29G2WFWGti7SCTfKk2yiy+/oxb?=
 =?us-ascii?Q?HqMoaA6RPgMpnMt9GvGnT0AhJIKaxuO72YGn6OYKxCLmyG2QO1IGSxWYKaPj?=
 =?us-ascii?Q?FGZJtAlF9cAdZCI1Op6T3I/qbx++n94S5qWBK5KE9/XnR17AzTgk+r4MqST+?=
 =?us-ascii?Q?QUFEHFSz1CQIwwu82dqZ7oiWlZIHu92QQ+vLQFTSS8SBvSAaW1ENeNi5WFZ5?=
 =?us-ascii?Q?YCwar6v0WXztk6G899dl8wscbZYK1i6l3O+NBt1tD0l2o2KjHCatFrEg7GCh?=
 =?us-ascii?Q?IK4JOOdw319765oozOjXSx78AZ4UGAYoHJdIAntqMuefkoz+4n5y5S97SZge?=
 =?us-ascii?Q?gh8KnjWGai+W3KHuydn2TBuTzTzuAhbta/XdwaVMom12fvGZTN06xMzqxWYx?=
 =?us-ascii?Q?IKEbq6SSgzWZ6YjGo7ukstxLEGN00YXvolAgP53sX0IbN565FAzZmXITxDYy?=
 =?us-ascii?Q?cHTKii3VAJUmXqjaNq77ca7b4rZNxHzzzWG6DAzJqhCdZ761AZg/M5X5xMhl?=
 =?us-ascii?Q?mCJsXFDVXPRnFJa1NU5TLglRSuExmqxwGR0tJUEj011Djhrd4aRz5X4iPd95?=
 =?us-ascii?Q?D9my7v16ANLyQN/jC6lWppPgNWc0pu4HjDxw7rucmcH0W96HpKYPvPH6lmeM?=
 =?us-ascii?Q?q7rBkU6DoNdWe+Z7KnN44ZLbY2Kn1OfqZF9dTvez7vdAI9qZA7NaLQd6a6vA?=
 =?us-ascii?Q?XfO113QD/X140b05lWNY9g+EjkSwaT9KiwWRktWmbPyq6cN4fdwI2+k0HzOx?=
 =?us-ascii?Q?2XzIbyNVZSc5CHZv1y/0dWq2oYRYfTrG1T0DF5YfagTzXMi7SnT8rPHriA2U?=
 =?us-ascii?Q?FJQ2Rdk7A0rvI2eAbd5ki30vbClvTMRFEOt8VeMvZ/jXkoznb+5wP7Vwgj4q?=
 =?us-ascii?Q?CP3opibtmrm+Bg5BQiRwye2N5oHic9ohjlZ5coaMebkG6hn4QnWTOLt6nI1l?=
 =?us-ascii?Q?BYhIBaLjZ/RKUkX5TZ8IaX4V?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a85f040-06bc-45cc-1963-08d98e4f43e4
X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5734.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2021 13:42:14.6330
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6froXDLmDZ88pAvjXt/CihTwoQbJjpkmvlKiqrN7s7DrjK02qtVC8n2tRN7QiDj7F09NzX59G/oxZEZGcDDjhg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2715
X-Proofpoint-GUID: b7xsSs3VwchAKinU_4Ukqwbt5_rJ73qg
X-Proofpoint-ORIG-GUID: b7xsSs3VwchAKinU_4Ukqwbt5_rJ73qg
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-10-13_05,2021-10-13_02,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxscore=0
 impostorscore=0 mlxlogscore=513 malwarescore=0 clxscore=1015
 priorityscore=1501 suspectscore=0 spamscore=0 bulkscore=0
 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2109230001 definitions=main-2110130093
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The spinning region rwsem_spin_on_owner() should not be preempted,
however the rwsem_down_write_slowpath() invokes it and don't disable
preemption. Fix it by adding a pair of preempt_disable/enable().

Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
---
 kernel/locking/rwsem.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 7b5af452ace2..06925b43c3e7 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -1024,6 +1024,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
 	enum writer_wait_state wstate;
 	struct rwsem_waiter waiter;
 	struct rw_semaphore *ret = sem;
+	enum owner_state owner_state;
 	DEFINE_WAKE_Q(wake_q);
 
 	/* do optimistic spinning and steal lock if possible */
@@ -1099,9 +1100,13 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state)
 		 * In this case, we attempt to acquire the lock again
 		 * without sleeping.
 		 */
-		if (wstate == WRITER_HANDOFF &&
-		    rwsem_spin_on_owner(sem) == OWNER_NULL)
-			goto trylock_again;
+		if (wstate == WRITER_HANDOFF) {
+			preempt_disable();
+			owner_state = rwsem_spin_on_owner(sem);
+			preempt_enable();
+			if (owner_state == OWNER_NULL)
+				goto trylock_again;
+		}
 
 		/* Block until there are no active lockers. */
 		for (;;) {
-- 
2.27.0