From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FBFC4727E for ; Thu, 1 Oct 2020 21:03:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB6AD207FB for ; Thu, 1 Oct 2020 21:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733095AbgJAVDA (ORCPT ); Thu, 1 Oct 2020 17:03:00 -0400 Received: from goliath.siemens.de ([192.35.17.28]:55423 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726606AbgJAVDA (ORCPT ); Thu, 1 Oct 2020 17:03:00 -0400 Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 091Kq7rb008970 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Oct 2020 22:52:07 +0200 Received: from tsnlaptop.atstm41.nbgm.siemens.de ([144.145.220.50]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id 091KpxYU027868; Thu, 1 Oct 2020 22:52:06 +0200 From: Erez Geva To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Cong Wang , "David S . Miller" , Jakub Kicinski , Jamal Hadi Salim , Jiri Pirko , Andrei Vagin , Dmitry Safonov <0x7f454c46@gmail.com>, "Eric W . Biederman" , Ingo Molnar , John Stultz , Michal Kubecek , Oleg Nesterov , Peter Zijlstra , Richard Cochran , Stephen Boyd , Thomas Gleixner , Vladis Dronov , Sebastian Andrzej Siewior , Frederic Weisbecker , Eric Dumazet Cc: Jesus Sanchez-Palencia , Vinicius Costa Gomes , Vedang Patel , Simon Sudler , Andreas Meisinger , Andreas Bucher , Henning Schild , Jan Kiszka , Andreas Zirkler , Ermin Sakic , An Ninh Nguyen , Michael Saenger , Bernd Maehringer , Gisela Greinert , Erez Geva , Erez Geva Subject: [PATCH 1/7] POSIX clock ID check function Date: Thu, 1 Oct 2020 22:51:35 +0200 Message-Id: <20201001205141.8885-2-erez.geva.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201001205141.8885-1-erez.geva.ext@siemens.com> References: <20201001205141.8885-1-erez.geva.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add function to check whether a clock ID refer to a file descriptor of a POSIX dynamic clock. Signed-off-by: Erez Geva --- include/linux/posix-timers.h | 5 +++++ kernel/time/posix-timers.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 896c16d2c5fb..7cb551bbb763 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -57,6 +57,11 @@ static inline int clockid_to_fd(const clockid_t clk) return ~(clk >> 3); } +static inline bool is_clockid_fd_clock(const clockid_t clk) +{ + return (clk < 0) && ((clk & CLOCKFD_MASK) == CLOCKFD); +} + #ifdef CONFIG_POSIX_TIMERS /** diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index bf540f5a4115..806465233303 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -1400,7 +1400,7 @@ static const struct k_clock *clockid_to_kclock(const clockid_t id) clockid_t idx = id; if (id < 0) { - return (id & CLOCKFD_MASK) == CLOCKFD ? + return is_clockid_fd_clock(id) ? &clock_posix_dynamic : &clock_posix_cpu; } -- 2.20.1