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 3/3] locking/rwsem: fix comments about reader optimistic lock stealing conditions
Date:   Wed, 13 Oct 2021 21:41:54 +0800
Message-Id: <20211013134154.1085649-4-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?mIhB7kdP87eDyyEVGGgGYo0l6h+qaXyv2LeX51QA8KnXogVUoJ2ZXjYycHRl?=
 =?us-ascii?Q?RLsN6XTLllit5WFibupmjfVH4DaBZzpH11GPVuEGspmwf7g/0Ae8KNVmuQe/?=
 =?us-ascii?Q?8ro8tj2PsaCRy9g3ufzXJADvY73rGzAcfyCYl3nIQRttTdbQSy9O3ztAg+7C?=
 =?us-ascii?Q?zcNpvOt01IuXkhwP0mPy6ZFTw2lxnR7bsVxqIZdAE0nm2K+kBqrvY1xiFQJ8?=
 =?us-ascii?Q?IWDe0OY2SRE78YAOJmWBAwsrwD1/OsFrMMIkXuVF9EJmcuvyJZHN+Vf+r/yC?=
 =?us-ascii?Q?gbi+yEmj4EcaquC326fS031ClLct3IwpohUF+jfhjMeUs/G5InsVejID/eSd?=
 =?us-ascii?Q?W2CGIXMnlFNc4DpEYlIRqVFzf2vTjJAYwF6Ybo6VTy5yD8rzrVYTm0iSCmDm?=
 =?us-ascii?Q?ztMN29HDMdAHeFCvvtApD7V9HY/+JQR+Y0FuuLqhqdIwKT91XpPOXGvt7l6i?=
 =?us-ascii?Q?0hJ5Dm9WuqWAClgGcCKSsYxaqxqlz1Z/Z0EJRXG+VfV5MlchKhzdbEhwqPmh?=
 =?us-ascii?Q?x4KP/DULpDRzCX6leTjPfVUDNTvj8KGYjQWSOAzzbkhf+MNrqU8r+sjJRVhB?=
 =?us-ascii?Q?pKTDiltS+0o645FufsddT08gaZDJXurOLZGhvWI2kPiDlpChMdPTb2eR0Jcj?=
 =?us-ascii?Q?bllxveqrDhHQvOtnmdQgp3nUKcqU+cyaWaqIyQN92aOpybD8uY1kvTMqx+vR?=
 =?us-ascii?Q?7CPnVBHiW/ZOsjEUEC8D5XT1mrqhonBXLcKOnGYkH1E5j8tBICrjjdKfnWbD?=
 =?us-ascii?Q?dd7maz++8cEV8XgJXsiWtkhMC11U0QQcWYryOPjC5VQlxA6O1kNBGb6gw7Vz?=
 =?us-ascii?Q?Eeju4h3t1bxArF5pEOk62Tn3lQqO+0EgJm9OBwK8G+NwJDXVYj5nRLjoFdqY?=
 =?us-ascii?Q?LwkpXspeNLNbz6SAGjNHnKc5N5QxmdEW56SB4Xdpy43Vj3v2kzq+XPS6muM/?=
 =?us-ascii?Q?Z7d0C1ywJxgm6seew5+QeoQ8wMZRQfhQXDRfQ/AitY+lz23PFME+BI551mcm?=
 =?us-ascii?Q?Q/4XwgwYVgkr4GaLlLNLkIqAR59hvd8bmdzCRqc6HJt5E/TexIXLz7DGsq3c?=
 =?us-ascii?Q?TwuXaUu/quWR3iy6yg04rLP1r6+UarZGIfduX0UTeDxUjrkkIfCxoQtNOhx9?=
 =?us-ascii?Q?96XEZMOKbcZilZtVI31MOCbhT4ff6Ff2z12s4LcsyM4zYknBU8kJxUMpmlVQ?=
 =?us-ascii?Q?3JczEKnTlAKhuevJEVjOyhClsgm13uRKo4SEKGkv0ykIMPqhnPpNcOUbmWYt?=
 =?us-ascii?Q?8LyQ1vSfiRocsz/KprU8PkFUI+QlWfWD00pBXRargRof9+1hFK0MTAY8f+/u?=
 =?us-ascii?Q?YNc6IFNPBne40Wb+tLedc5k/?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b10941c0-7c0a-49b4-c39c-08d98e4f457c
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:17.1748
 (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: XChc3Xfs23b/nE+n7uKXBZdkn0C3iiDEEpgEXnurjRyt7cWAP+q7Pmv9bgbR1iZEeu5CXb/f3borF4jbP3HCvg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2715
X-Proofpoint-GUID: F40Ty0WdAx0rQFLLLVQd5101_lBA2wk9
X-Proofpoint-ORIG-GUID: F40Ty0WdAx0rQFLLLVQd5101_lBA2wk9
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 impostorscore=0
 bulkscore=0 clxscore=1015 suspectscore=0 adultscore=0 mlxlogscore=889
 spamscore=0 malwarescore=0 priorityscore=1501 mlxscore=0
 lowpriorityscore=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

After the commit 617f3ef95177 ("locking/rwsem: Remove reader
optimistic spinning"), reader doesn't support optimistic spinning
anymore, there is no need meet the condition which OSQ is empty.

BTW, add an unlikely() for the max reader wakeup check in the loop.

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

diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 06925b43c3e7..2bd914187399 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -56,7 +56,6 @@
  *
  * A fast path reader optimistic lock stealing is supported when the rwsem
  * is previously owned by a writer and the following conditions are met:
- *  - OSQ is empty
  *  - rwsem is not currently writer owned
  *  - the handoff isn't set.
  */
@@ -485,7 +484,7 @@ static void rwsem_mark_wake(struct rw_semaphore *sem,
 		/*
 		 * Limit # of readers that can be woken up per wakeup call.
 		 */
-		if (woken >= MAX_READERS_WAKEUP)
+		if (unlikely(woken >= MAX_READERS_WAKEUP))
 			break;
 	}
 
-- 
2.27.0