Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Prakash Sangappa <prakash.sangappa@oracle.com>
To:     linux-kernel@vger.kernel.org
Cc:     tglx@linutronix.de, akpm@linux-foundation.org,
        peterz@infradead.org, dave@stgolabs.net, manfred@colorfullife.com,
        Prakash Sangappa <prakash.sangappa@oracle.com>
Subject: [PATCH v3] ipc: Update semtimedop() to use hrtimer
Date:   Thu, 28 Apr 2022 13:46:07 -0700
Message-Id: <1651178767-447-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?ILk3dmgVOgUNZ6Yq3dpNj8ZJbhSLVGH9U2W39ubr1xq3Y8qbHifbQzfGWW/k?=
 =?us-ascii?Q?4bhbJEUIvEmzU5dYdnTUCXypXhGfTuH19gq4ISr+Jmcs70S+t7Q9b5c6Opwc?=
 =?us-ascii?Q?+OO+YCMztawfsz7OtYW/gtvZmRgcG7B9SscYOOOhNwZbvmPNm2Er8isOf0Pg?=
 =?us-ascii?Q?fbwr1mjwHMaQJmg4d41nug6rzWF+PI7LSh2XeMbDNrGTxgChrVqh/SvFQ7qr?=
 =?us-ascii?Q?U4fSoazAPVVEAQUfY2ZmP+XUVn3KdYHt1Unczj+GuNjznuZ9+cvxeybXH9ym?=
 =?us-ascii?Q?X7VBUDdYKdkWiC8sJE4AeTRsQoYxtHTRAJLjRthJOW1G5hsUd8guRkm3yatF?=
 =?us-ascii?Q?z1n3ZVOgu5MUQx874fxsrKj3zDm/oOaOc3oJHKh5IQNAnRSltiSC3TWON2+6?=
 =?us-ascii?Q?Xcgmi4dsFrD/VGmexsExYlaWAIWz+wzN3IHLnEAGwLNWdQK4MPKlNivx1Cjd?=
 =?us-ascii?Q?JfsqYlrPcCrbHq1gd1MH25Fz0coOH7d2u2LKGD61jtMYeVb43sQ3AQ8+w1+B?=
 =?us-ascii?Q?PlEOpDA45EnwuyhROdBuSzoFROqWQ5uwhCkGtM/FraiSUlWO7cPqBYKslNvw?=
 =?us-ascii?Q?a3VIYye+pZjCK/f41hYaq4bFzMt2E+nh6DRDeDbBdDxRBUIcQHbNdSRmIaT5?=
 =?us-ascii?Q?ZReBC60zOEWMouqf70ikcooN+NCd1LNZBNXXnt7DMdi2CPzlrY8f79DOzZq9?=
 =?us-ascii?Q?fmn0PbAZFFUtAdHNxoS0UJ6uUxvAl+D7w1L4qo9TPUg7+SvP3BXcGkbcZzUl?=
 =?us-ascii?Q?4NI/77qeG2xOWiaEaHMIpjsUoKsQeZe6JlT+MhwB1+k3L89dpYAIuGufaKmY?=
 =?us-ascii?Q?7gtHPLZCoeQxefo1uUGlAYLl1+7UsfM5awBaBm87PvNViXWkPGgZgEpq/7mh?=
 =?us-ascii?Q?yB7/zyvnHo4kvh0tyBmh2lyTd3/pEOLmucLlVgu56kwPUdn7l3UI/zK5ipt4?=
 =?us-ascii?Q?nXm74sn2qKOCUd90IaQ/t4vdgkHA38uB6yRvkXI3kwS6vOZjWvNOKLjOUlUX?=
 =?us-ascii?Q?ukVDK99qWpDRmj8Mpd5zmypu5IzIFxrAFbGL+f7HOoWDE6E94iX9Q4QYu1Vm?=
 =?us-ascii?Q?sDt1d7RsU1/hg6JeLMaobSCrgHaaj5XeehgZnl+i2OG8DHTJs3lWhOpOVlrq?=
 =?us-ascii?Q?9TU/yS6yKI69qWwFDIYIQ3lGXe0m58MNFRCm1LlLa7j1dRThc0z1hgzBCF1Q?=
 =?us-ascii?Q?zlsnk6jMGa6PRD83zgr5bhbR6uxxtyWE7LAXClAOvleLMMr/tgcJLQXJA6fj?=
 =?us-ascii?Q?EWTyCKz03gxyArnfYEpb16u0zIrycvj5+s/LArc6QwklL2fFf0xVUCqnwrkr?=
 =?us-ascii?Q?oPstz0xw0i97baUEyfqYaxaR52XS5ZtpYbfqX+CeNHidlxquMtmgdHNQk4Qv?=
 =?us-ascii?Q?/33kxPOAnEZwQEz05DGufDaYSaWzQjGXennfETeJ9TQIOljB7J92bk94/BwK?=
 =?us-ascii?Q?Yab9kNc/eQCRB5v3AfSL6ExVm/GTo7T6nLlxZLdPWignXmkXDHOKKUS/OF/R?=
 =?us-ascii?Q?S99lTQIehkX7IjE9YZQjABlCMEYCs2FNO3XwgpGxeY07ujmH/R4IHSURIEde?=
 =?us-ascii?Q?ytBAf56joyucA1flp2ZOqwuLj5xyNkHdE2yXTg5+48ulOGjwwhoKDZEAKCLy?=
 =?us-ascii?Q?1MswXL4V+Dd/NndkVubpCkKPHiIaznukIXe9vtdGtPDUK2nXYdRCnx/SysoT?=
 =?us-ascii?Q?xjgAz78NQKFOewHWWe021eD13hj8Py01IXk9Zc0r3TpRtom77ShrS37ANilH?=
 =?us-ascii?Q?to8dVVIWeG6xQGAE6bNYCc/66w53oxQK01FqsmAIEEyAX1zjjxBeMfvVgeoQ?=
X-MS-Exchange-AntiSpam-MessageData-1: lWkrdjtpMNrqpQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d4f0bab-eab6-4a10-6a12-08da295824b2
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2629.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 20:46:17.7285
 (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: 1iq8Z7Z90uGe66q+LsyLj17U7omw3W1iXkpFJkQnb+esCJKvvBcW2abs3yJ9Z+I3ki1xam0Ikc/GaJTGY391QC6zvxJixBUuBZQpR/Risic=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4458
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-28_04:2022-04-28,2022-04-28 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 adultscore=0
 mlxscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204280123
X-Proofpoint-ORIG-GUID: H7OCTEGMICGxxTAFjxvgpSpk2yIKZ88G
X-Proofpoint-GUID: H7OCTEGMICGxxTAFjxvgpSpk2yIKZ88G
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_NONE autolearn=ham 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>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
---
v1->v2:
  - Use timespec64_valid() to validate timeout
     and other changes as suggested by Thomas Gleixner
v2-v3 Added Reviewed by tag
---
 ipc/sem.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ipc/sem.c b/ipc/sem.c
index 0dbdb98..44b65b6 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1995,7 +1995,9 @@ 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, *exp = NULL;
+	bool timed_out = false;
 
 	if (nsops < 1 || semid < 0)
 		return -EINVAL;
@@ -2003,12 +2005,11 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 		return -E2BIG;
 
 	if (timeout) {
-		if (timeout->tv_sec < 0 || timeout->tv_nsec < 0 ||
-			timeout->tv_nsec >= 1000000000L) {
-			error = -EINVAL;
-			goto out;
-		}
-		jiffies_left = timespec64_to_jiffies(timeout);
+		if (!timespec64_valid(timeout))
+			return -EINVAL;
+		expires = ktime_add_safe(ktime_get(),
+				timespec64_to_ktime(*timeout));
+		exp = &expires;
 	}
 
 
@@ -2166,10 +2167,8 @@ long __do_semtimedop(int semid, struct sembuf *sops,
 		sem_unlock(sma, locknum);
 		rcu_read_unlock();
 
-		if (timeout)
-			jiffies_left = schedule_timeout(jiffies_left);
-		else
-			schedule();
+		timed_out = !schedule_hrtimeout_range(exp,
+				current->timer_slack_ns, HRTIMER_MODE_ABS);
 
 		/*
 		 * fastpath: the semop has completed, either successfully or
@@ -2210,7 +2209,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 (timed_out)
 			error = -EAGAIN;
 	} while (error == -EINTR && !signal_pending(current)); /* spurious */
 
-- 
2.7.4