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 2/2] locking/rwsem: add preempt_disable/enable for spin region
Date:   Tue, 28 Sep 2021 00:38:47 +0800
Message-Id: <20210927163847.3308333-2-yanfei.xu@windriver.com>
In-Reply-To: <20210927163847.3308333-1-yanfei.xu@windriver.com>
References: <20210927163847.3308333-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?jPvfYfGClgjpJbNMLOCCZ4PxvrySh5wUG0ldNB9vxQOAqIH9RoADYRJyqp5E?=
 =?us-ascii?Q?J9nCqr27c3ChEjlScAaKmhZEUHgbxLBktJii+IbTM3UMnRt7NCeHjo6jDZOg?=
 =?us-ascii?Q?3U7kVdTjCOS0zibo3jwcvB2kr+0mqb20qtwGEKRUGgX56fwRbUfmr0smHSaq?=
 =?us-ascii?Q?Z5ru14FCSTB79dKzcDHGDJZpolv8uCRDV1vGZalV/+G2t3vdno4VV/UM2Uor?=
 =?us-ascii?Q?WcwakQu7p8Bo03Hk8/oys+4S0JWqpZuGwILIlz31BFZF42yPKW5RcZtCvYvn?=
 =?us-ascii?Q?N6hvbi6R4E4+/zYEPJWXtUy8KlG/Fy5xgJrY/HTDMSM6/d3kaoV/3py51btZ?=
 =?us-ascii?Q?wf1yE4KYt9FW4rWgAcH49BKJ2qP++2i2jiwb17wDcP2R38b//lZoPhF7rZKS?=
 =?us-ascii?Q?Gdun8PRMHG12PikrZ9pFzFdFk0Legs7DtAW+TENj1ND7oLX+sIH4SqIS0htM?=
 =?us-ascii?Q?0pi+AQW5c4LXUoyJDUDdVHDGM9CAwtlwGhWNBuJK7G2narGdMPgZ1lNM3SNZ?=
 =?us-ascii?Q?tReI9/dn7r0ogz5rChluAD5PAMm9EjaYeeD5E9tiUIlsk7HWAsd0fxG3XrGg?=
 =?us-ascii?Q?PAIPEj7TzbFgyIUx87eCdxXfVyXytZmbtyLH4TmPmJw3DIX2GQSFkt5Z2MV0?=
 =?us-ascii?Q?iDwppaJzU2RqSaX8GFsAMJ0G3V3Ghb41VArEYbcWcEsjLfjb+X+uU+dFj3ux?=
 =?us-ascii?Q?p31R1yvhhDwdUD0axw24bAz++vm2l6eATuhuYvW3BD8bgTYRCEkMqJtAx6Y+?=
 =?us-ascii?Q?HIyRQF1AewYmOZZgSGPIIpFWWKmv5OxrKj8vJHjiDsboXN1uzVL+7i73+Jlf?=
 =?us-ascii?Q?BlHfdRXQBIcbjN0yNUY9l+9udn9Zvn52bCya58sKOovZ2oCG/vaF27Y5+IYC?=
 =?us-ascii?Q?vuiX+k/ApfJPWPunEJPqGxjlZiIgH/mkOeYSPnfeV/o6SugqFHKP8Ac8Ukok?=
 =?us-ascii?Q?+QsJOZnS2BADC9gcljPKiz2yEUsbCz4RHdDkH7fiXDEVf0Q+VdBFuZIyLjrL?=
 =?us-ascii?Q?eMggfyFCZE+KkAd3oVLtjZfF7suHWs/n7ZYgdlDdQqRmoYD94znETRW9Cf3a?=
 =?us-ascii?Q?Mlg66C8uZXrlI7KfGAuYD+USxiAGkqaykEStv6qofh7isq/tADGeh5S5HtvL?=
 =?us-ascii?Q?bW9Wj+sK6DyhB26vfoNqiwjQ5qu+0YNXSPtv466oHT4OKmTH9fCpPA5rbKoo?=
 =?us-ascii?Q?puo4dpw5wr561+FADbujvMXQRuWIbqffhaHm5DF4DT57huc+kWq1uf8TQ16Q?=
 =?us-ascii?Q?jz1ACsDYE4G91BQQb41aZyLkJwSZGAnSZWg0L1wY3MSTKqKoY42I+z9WHcCF?=
 =?us-ascii?Q?b9Rlfkqnyq7yUkZocGioNsKV?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 07e3acae-1348-451e-8c9d-08d981d5593c
X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5734.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 16:39:17.7591
 (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: ECpw0CuSkWYErrIOSRwZ7qe0P8Q2DDXHPwOpr8BY56XSEau9M1YK14uhUbpI+6GN+MNVObLiTsOR4zVtnt/IEQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3593
X-Proofpoint-ORIG-GUID: epdzOOs-iNZye75HixbdnI7GjUXAdYVU
X-Proofpoint-GUID: epdzOOs-iNZye75HixbdnI7GjUXAdYVU
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475
 definitions=2021-09-27_06,2021-09-24_02,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0
 phishscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501
 clxscore=1015 mlxscore=0 mlxlogscore=469 adultscore=0 bulkscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109230001 definitions=main-2109270112
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The rwsem_optimistic_spin() invokes the rwsem_spin_on_owner() with
preemption disabled, but rwsem_down_write_slowpath() doesn't. Because
the spin region should not be preempted, add preempt_disable/enable()
in rwsem_spin_on_owner().

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

diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 2907f9d8e4a6..db3a6a06a9c8 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -674,6 +674,7 @@ rwsem_spin_on_owner(struct rw_semaphore *sem)
 	if (state != OWNER_WRITER)
 		return state;
 
+	preempt_disable();
 	rcu_read_lock();
 	for (;;) {
 		/*
@@ -704,6 +705,7 @@ rwsem_spin_on_owner(struct rw_semaphore *sem)
 		cpu_relax();
 	}
 	rcu_read_unlock();
+	preempt_enable();
 
 	return state;
 }
-- 
2.27.0