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: Use rcu_read_lock_sched to simplify codes
Date:   Sun, 26 Sep 2021 18:16:24 +0800
Message-Id: <20210926101624.2460704-2-yanfei.xu@windriver.com>
In-Reply-To: <20210926101624.2460704-1-yanfei.xu@windriver.com>
References: <20210926101624.2460704-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?H5bfQPsmexfTQ4s6Ezk/+H/RNjtUBJd/OWZ2HyG0p2oqrCQfnPRCbMQjifhl?=
 =?us-ascii?Q?l+k0e9O8QErv+Uoxl2Zxbq6THKKBSEp6ygE5MrW7VXf/EwpilRlVFXKC9qhj?=
 =?us-ascii?Q?Gp3Lw8upmO5CRVESbMA+r7D4Ekno8OtmAtVzNRbc3bDLVsanrj/WhHYVhM2c?=
 =?us-ascii?Q?q6kKZ2bkjai8MWYRLX4kP4TtnPJmljszWcUhCTy/GL+2WyvfxmwnasAMVzBX?=
 =?us-ascii?Q?F4g62ZSCmB8O+HikGwwGPIqv7bhJPnyTl0qq6AEqh+piUtBsRqCAnxBa8YEy?=
 =?us-ascii?Q?aYU4bJkiNJEmYywWLhVmvxMNqF3uDbuO6PeI5NeSUKpC+R5PVdnrxHe534jr?=
 =?us-ascii?Q?Xxl0ZtMJVWMYCNvFuQdty+3lZR48RiWgG579X7A5BzWtne0TOWrhnVOz5+wY?=
 =?us-ascii?Q?h0KBD27bEcXpRRfsgrcoDzl9aw4UMH/Tz7GBcK5RRd/eR/kUfPkI5tVqMPFj?=
 =?us-ascii?Q?+6Gsqm1ep2gZNXdcmSeL3ejNjUdZVPgTUOWi4rXO+UECFNTDZhKxu/p/FoBa?=
 =?us-ascii?Q?XqDEzDmbENycBNJCA1B1rt1TqziIv+OicbAIJmMFQ69/U+RkbR/jOx7MJEFu?=
 =?us-ascii?Q?RQMoUzcR8EImx9/cPLnzCJo3xlOFwEYtMVIbofdax2t/MXRxDtOOmYC+pSx4?=
 =?us-ascii?Q?sXcjavmbYTEsJgdjPG0N71GYNJJ2ZxDMRivvc6ek15mxkD1LVKqQ0h0ePp6O?=
 =?us-ascii?Q?ru5gDINNpPRd84/FiRx3WK8UT/SlY3ZEKdptU9bGXmvfIdHvfj40IgaBshmr?=
 =?us-ascii?Q?RvU3Azc9Obli+efg/DaXtmyCRPUi8HIUy9vwgqGcsQoiTDSVf3wN3VqCHjMs?=
 =?us-ascii?Q?PBFMljIXpMBU0b7dtHnI1Bn2G8Qtqr/X3uM+fHZLzK47O7beWy82qFfAlIeW?=
 =?us-ascii?Q?zoMS3fZP1fDho+dDvHNJopzpBkwkeTHjpXXw26gIfCxXVGa41XAig20uq43Q?=
 =?us-ascii?Q?LeAZ/Bbq9aH4SM8XS7+8Uv9J02IZtRxDgq7MQlXJLL6Ic6eMPIwPbmL9tKTE?=
 =?us-ascii?Q?oLkGNm9STC40IvT1K3aQjPGFKFAzKd+tU0VCdtDhCrzZUeeJJVk+p+Qv6n6O?=
 =?us-ascii?Q?kMakdgAMlkJv1KcAJevRozCShwMfnwNfmfoxIne8wQeGN5+JDDwOAjH/0h9U?=
 =?us-ascii?Q?zpDgvjTw5/+7l0P6LKZOMW1IetptmT+5BfUHyFKCia2N0BFP6nYaBCoEY9f4?=
 =?us-ascii?Q?SROEmD+immffr5EWhosJvi5zDDVnT8Oe8UjJ4W/eAetVjN8erijBCwsPv5jq?=
 =?us-ascii?Q?pf3UCBSTywmKaRJvXdEsOQ4FBtMSEd0E4e6BvDI7qshgqafnKiH7k62EUCCC?=
 =?us-ascii?Q?87rJ/nqL7euedWSBvidtRCwQ?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dde9af9d-4b68-4178-4066-08d980d6c13e
X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5734.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2021 10:16:50.5822
 (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: g/7zic5LbbDPQbT8n9Tv9rDufF+MzCt68vCW0rYkT72ak+6loiOSXF0RttVx1dDW+/fxr0oe/na6MApLOmLFNw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1579
X-Proofpoint-GUID: pryqEZVHLHnepQtcIvle0Hv7Nl2FIV0z
X-Proofpoint-ORIG-GUID: pryqEZVHLHnepQtcIvle0Hv7Nl2FIV0z
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-26_03,2021-09-24_02,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0
 clxscore=1015 mlxscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0
 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0
 mlxlogscore=725 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109230001 definitions=main-2109260071
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use rcu_read_lock_sched to simplify the codes, and it also saves
some cycles of handling rcu nesting counter.

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

diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 000e8d5a2884..7afadfe02286 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -616,8 +616,7 @@ static inline bool rwsem_can_spin_on_owner(struct rw_semaphore *sem)
 		return false;
 	}
 
-	preempt_disable();
-	rcu_read_lock();
+	rcu_read_lock_sched();
 	owner = rwsem_owner_flags(sem, &flags);
 	/*
 	 * Don't check the read-owner as the entry may be stale.
@@ -625,8 +624,7 @@ static inline bool rwsem_can_spin_on_owner(struct rw_semaphore *sem)
 	if ((flags & RWSEM_NONSPINNABLE) ||
 	    (owner && !(flags & RWSEM_READER_OWNED) && !owner_on_cpu(owner)))
 		ret = false;
-	rcu_read_unlock();
-	preempt_enable();
+	rcu_read_unlock_sched();
 
 	lockevent_cond_inc(rwsem_opt_fail, !ret);
 	return ret;
-- 
2.27.0