Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Prakash Sangappa <prakash.sangappa@oracle.com>
To:     linux-kernel@vger.kernel.org
Cc:     akpm@linux-foundation.org, tglx@linutronix.de,
        peterz@infradead.org, prakash.sangappa@oracle.com
Subject: [PATCH] ipc: Update semtimedop() to use hrtimer
Date:   Mon, 18 Apr 2022 18:51:39 -0700
Message-Id: <1650333099-27214-1-git-send-email-prakash.sangappa@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?V4eCiXoNGxndRtLWMvZm8VZz/CEydFyppjD9RiFWczqIz3NOsl4K3Y7rhSBm?=
 =?us-ascii?Q?U6OIL0XaW3dSTcX4cQ54QN4S1+gcFIvb1J6iPLEswGtiZOp0lcNG74X7oqvY?=
 =?us-ascii?Q?fnPiAtcQiBqtJz8cd4fjE7u5g5bIvRpf/6IGjHkOfKvFosiGReaoFux7jmX4?=
 =?us-ascii?Q?dizZs685SjwnPR9noygH31Xf048sCmZl333+FhQuZw6DG3CLsaDUYOMbX6bI?=
 =?us-ascii?Q?5/L0ZEd7nKwsSruqxnuWdZ5LZhdSRVS+jCBu57po+ZjhJDq4MyOX7M1PDUtt?=
 =?us-ascii?Q?MXmjrM/BE2rrccbNLV2T6cXp1p+m8SHXTLs5N9mMYgDOmyETCjIYsmsialir?=
 =?us-ascii?Q?TkJgmLID1wRdsg31DwxeBFg7uTN9qT6KbBG9BjO3gWZebRbYiBdwdU1Bn95+?=
 =?us-ascii?Q?kM6ZFQv6BqfhJC2xdjZm5UI0O6rE5L1Le85IoMjgeF4xz7hY+S5iIZ5qk4RL?=
 =?us-ascii?Q?CwGhGpiH1W6XEPV7pjTOsL9h+bZaYqlwVsS4Z7OLwaOc2L4nem01tFQfFVT5?=
 =?us-ascii?Q?zqD4yUelVTnD33tzeGLkEp8HqXnyxaB1Dr41x85YJLllaV7cHxSoQTQ0oA1s?=
 =?us-ascii?Q?XKQfJ4BWE40lPTdygkAjNvUy3HZ6vJShDW4s/E+c0uv/a8/C/4iMJVnvGWEd?=
 =?us-ascii?Q?bWQp5cSHfUMkNW+xWEGwbMDJxb7xC0iBxg0wi520OXNK2mqVx2s9pHkR/UZ8?=
 =?us-ascii?Q?YTck/HzGFo+4kafLd+0EIzetcUkYYTPM5ZtZ2B/yyBCx9EVI4sp0OGIzbu6u?=
 =?us-ascii?Q?PCEye9HTh26V7TjVzcBaXDw1aLaIBDeCJbj18lvsKpPCQCYpK60ZVVobVmHk?=
 =?us-ascii?Q?Lb+MqTrgMQ676Csm6BvygFZh6ibgfkMVG8rVsGAM3CqIb+//cfDVWxjgjd4/?=
 =?us-ascii?Q?OajUIArtqCyCqpDhla4BBys4vhBvmsnSfIUqCpxAr+3OEcUgZtRNhWt/sCTV?=
 =?us-ascii?Q?1mb68cJBI2qPvrk4sVkLn2ca1AmBfXDZnnJlcZUjkaECmcT4Lh0PH47llp77?=
 =?us-ascii?Q?SBNZXQKZQ0cQD6R20gZ0NvYejwn8lEoJzN6xDYVsMFZ+hVYXJMLqXhRST2l9?=
 =?us-ascii?Q?53w552133tEI6JunCgnl+FiVeObYnEP0F+PK+ty/GnfOFKZ8s/aEs0FhawMx?=
 =?us-ascii?Q?U8VTLToXET6TbPZXG3UzT4lwCnDNEhXgfTJnNwo+yOy1zYHa+y1yfcBbtiJL?=
 =?us-ascii?Q?5slmkHi2gPGce63LZEgHzraQxDnbMlzBpYXu6Lu3f0cJGp0ZaxbaP9ldYTCN?=
 =?us-ascii?Q?/rSIJyMO3urMcKgLqWbi+kjQCX8KoZPiYG+g3eKU5Mu/7o1vXfgJHyQSb2tQ?=
 =?us-ascii?Q?k+MeyQ3cCnlRlCmlsk8PwzPNUPw22YsUP9r0Bk8au3QUs9iK3w/CJACAa4Qh?=
 =?us-ascii?Q?EVFYXsLjCEGhQb55cfvRRxg2M6Bz4N41kohDdm7hvFLyMlVrH/OaM1YyhNQu?=
 =?us-ascii?Q?hzonoC45Wb7ghEhQ5TrJh2t0KwN7RoDYPWlKf25JHXbGLQjHjvgwLLG1WdwR?=
 =?us-ascii?Q?WbURut9WIPwVGgboRhYTS2pthY3mcZTXG5ANrdMX4OGDG838CQFse6Jb8AYv?=
 =?us-ascii?Q?rin+7Viqdamzp+cMH9OzHuag0TDJPq0fVhedUVAu4xW/YO5bSsjBo/Wo1Mto?=
 =?us-ascii?Q?YCI0pWv6MaC2BgkaJjz20zUd3lTGZ57uI6yCK4dUYE5Zpqd87VpueFzjs0L4?=
 =?us-ascii?Q?jGKVLTdwubKOPFL/uvZR2aVh52I7OpWMCTLyv2BKY86QRtWUp+kXMF097Sq+?=
 =?us-ascii?Q?YetwT5pRZQIwNkRwC7+FC7dDSei2VIeMcDb1b/qKKlfK5g5S1l4Fc2d6jFDo?=
X-MS-Exchange-AntiSpam-MessageData-1: H3htNrWViGTSjw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c0276de6-4534-46e8-e6d6-08da21a73047
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2629.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2022 01:51:58.0869
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0gatkr/ld705ajPtnIMeLNPTwr7RuUpkexAyNejhZA09XV0EQMo/7dmEuwh7rF+aX2xql7UVspOW+1GcMME1wI8kWKmMCzMf8JhikxZ9PMg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5391
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-18_10:2022-04-15,2022-04-18 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 malwarescore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204190008
X-Proofpoint-GUID: y0PdSaLa5B9dLoGWjxHpAv1uFy9cFngS
X-Proofpoint-ORIG-GUID: y0PdSaLa5B9dLoGWjxHpAv1uFy9cFngS
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

semtimedop() should be converted to use hrtimer like it has been
done for most of the system calls with timeouts. This system call
already takes a struct timespec as an argument and can therefore
provide finer granularity timed wait.

Signed-off-by: Prakash Sangappa <prakash.sangappa@oracle.com>
---
 ipc/sem.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ipc/sem.c b/ipc/sem.c
index 0dbdb98..6cd1a1b8 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1995,7 +1995,10 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 	int max, locknum;
 	bool undos = false, alter = false, dupsop = false;
 	struct sem_queue queue;
-	unsigned long dup = 0, jiffies_left = 0;
+	unsigned long dup = 0;
+	ktime_t expires;
+	int timed_out = 0;
+	struct timespec64 end_time;
 
 	if (nsops < 1 || semid < 0)
 		return -EINVAL;
@@ -2008,7 +2011,9 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 			error = -EINVAL;
 			goto out;
 		}
-		jiffies_left = timespec64_to_jiffies(timeout);
+		ktime_get_ts64(&end_time);
+		end_time = timespec64_add_safe(end_time, *timeout);
+		expires = timespec64_to_ktime(end_time);
 	}
 
 
@@ -2167,7 +2172,9 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 		rcu_read_unlock();
 
 		if (timeout)
-			jiffies_left = schedule_timeout(jiffies_left);
+			timed_out = !schedule_hrtimeout_range(&expires,
+						current->timer_slack_ns,
+						HRTIMER_MODE_ABS);
 		else
 			schedule();
 
@@ -2210,7 +2217,7 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 		/*
 		 * If an interrupt occurred we have to clean up the queue.
 		 */
-		if (timeout && jiffies_left == 0)
+		if (timeout && timed_out)
 			error = -EAGAIN;
 	} while (error == -EINTR && !signal_pending(current)); /* spurious */
 
-- 
2.7.4