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 1/2] locking/rwsem: fix comments about reader optimistic lock stealing conditions
Date:   Tue, 28 Sep 2021 00:38:46 +0800
Message-Id: <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?z72fSg1aqEc2XzlAfg2skn9Ywnjh0bmLY23dHe4ThrTHc8IcQN1RtZx8/Tpd?=
 =?us-ascii?Q?co+cocmVT1T3eDwxC3x4ec+/l1kY/uModDkgUIqPB+SKc2umIhjVzcIcj/a4?=
 =?us-ascii?Q?FMvL5WZmbaXkVYktWOTfmjpXWoeeI3ld2VXAcf+CKWdaNhnA7j9ZOguaCN6a?=
 =?us-ascii?Q?K/QwFDwymAUE3kbWpwkjII5ujJAPfTBHoPj30RHrhlRIWTT+gi1vrm+/Iqzi?=
 =?us-ascii?Q?SYHy6fceZXEChsCIPGkZuLmRY2hpzUo9GmN0D07RA320+BnNJxkzVBZcQ+9f?=
 =?us-ascii?Q?JCrAUhkD8XzGHwIDwBejhzP1EKFTcgg8aV8bzgQPx3OsDZVDOzJl6U1Tf3os?=
 =?us-ascii?Q?bu0T5KlP8Rt3VnryahN6zYsgQ2Qt0QYjLn34Z6S5xFJyHs9geqHvqDtJAIi9?=
 =?us-ascii?Q?0txdCJ21DOoFlkRzOX3kWnT04od2nsaE0vVWvt5bHrkr7uAy4aivsPYi/h2O?=
 =?us-ascii?Q?qZsqmgmcJIN5DqcEVKz3YxBgQtgbFes8UE+byuI7dP5/cuIg2rccEAfrNDzk?=
 =?us-ascii?Q?UrwlvSunJDjWjAkHGBSRe4PHcwJwzhiUUGbGM2vPSwyN6xLK0ip+RRuE1Png?=
 =?us-ascii?Q?IEdVrYBxpanPty37/YpcDQ4DBKwLwHuSHVzxDkCkNqt64x1KX/ZlCdk0+clW?=
 =?us-ascii?Q?BTK4IQMJI4d8BWRZYsoJQktG+fLPhDjPbjysOz5LGzGgdj+r8QhvUcx7eKfW?=
 =?us-ascii?Q?1q3OgcMa0CAZKEN74ajnSYrzUvbHUc26rCW7+uQ+qtDZjhRjv+LVp6HjVNCl?=
 =?us-ascii?Q?Gt03tslpIDoDuUvFEZ9jnwTlPytiJ/6ryqU7fmQAtMS6KnkS/8u9CoFmCdZV?=
 =?us-ascii?Q?cQeuPE8uITcDJeyDgfMfM7YqmpQoFaPv1YI6BeLKcOAnbVPm24NGReH2f6/d?=
 =?us-ascii?Q?csjxLPb78XH2v+kinQEpY0Yp1npGaDK4BJ9aSHA1U2QLG5b1ngv0MNi6lVvJ?=
 =?us-ascii?Q?xYh1aWUPGwlcUA9qowg8jQTO4+rvMwllZoSpWqATPm3gWrMsQNZrWIkVpjHw?=
 =?us-ascii?Q?VoRN28QWa8WPkjNJldR6LJgg83AxCdsx/MPsMmt9VyylnJQozKtzXSjfP5jg?=
 =?us-ascii?Q?uc5iiFaA2sMzEvuVeeZOODthghs8WEmf8zItC8l1XH/ILnPwq0iy3L362T5g?=
 =?us-ascii?Q?xmL1FBNRpp+idbgA42j+n3COAgpkEvXlckUVx7+UaGqrwm76wBfQ2Fmpk9Ed?=
 =?us-ascii?Q?eJei92lwixw30VKUZi20Uj7EIhB8uToiQ2Vyyem3dXe5DqR9xR5EzcrmU3IC?=
 =?us-ascii?Q?DW63pStRWF0PMH8CWZ5/EhDD7zZ8yfjodYD/KzdFLMB9Gwqnx19FXCDrtC7Q?=
 =?us-ascii?Q?5gkgyf+NGjSFB+5BDN+LoFh9?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c33970dc-3e50-4609-2412-08d981d557b4
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:15.2630
 (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: FUhPTIZHsndTbqzoK7sSG6IjgG7jMVUf1cz6btZdiQooDrPzCezklkU5CljjZY388aGSJOsY9U0OZSXZl+WjBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3593
X-Proofpoint-ORIG-GUID: qr7ImPI4pIaWmI265-JvjBD_Jkg2KYid
X-Proofpoint-GUID: qr7ImPI4pIaWmI265-JvjBD_Jkg2KYid
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=929 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

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.

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 000e8d5a2884..2907f9d8e4a6 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