From patchwork Mon Mar 3 16:13:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Wasko X-Patchwork-Id: 13999155 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FBAB22B8C1 for ; Mon, 3 Mar 2025 16:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018441; cv=fail; b=tSwRcjCJuOaV9w15AJv4oYJrL7rynZEwyQEwMe1sKuJa5E2eZqYgVm84nMbgqMcOw6y8kB05/6YSf54o4Vd5WD7stuil2A2UQiX5k4SvLt6IBgaxHyw6HscDHeh4XbCqabypIPG2mQcADAF8getQGvXuoWVhH0F2PuzrM2qldlk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018441; c=relaxed/simple; bh=KqWU23so06PZFyLp3WE3tqYxDkHldCy1P3kvJDrQbl8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=bkciB9jyXxfUciXbODTUyhFFwMNwCPQK57mbiomhrUAlmKTQc0YOcQi3fxbtQlboMm1RJwDfn4c2SAvu2djMSpPbRXGfO2RbYcKeoz6CedkHR01My94HlLYr1JL/XwC7PY5YNeioCbXJ84UUYia4DK3Adl4+bbbD9MDTfacnONk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=qKvWM2jn; arc=fail smtp.client-ip=40.107.93.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="qKvWM2jn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RaFOMOU+O+FUYoQdwaWs955To8qEKCdL8HlPfOb9klnYeo5s60FdLZummkC/IjnBPp7LLWtx/h3an2LcGa5FQJiUAXrnK0ywbBUCzAfqPAFMJaY9sNTi5elbC02H7eG8RoG43nNMbCOOoNBoU5khU784T1FKAhQcM3NVBjTycxUjO4rsLRXFra5Gwz2NqAkjdNp3vNilAmDhJtbvWOD49U0e9boGX+kKWLC1zJNKDOH4Rmpvp2zXp+t+wEGfIPU7N8XR/JinAjKvew+QgCntbdBmtNFiktY9U2prDIk0DAv+HK1Ke8pWa0Zf9Dz0oMCLez5yiVcwb+FBGyZO+h0r1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8D/S7GQPnLgXnKNIubANsV15nNWPvprc+rgWdPTONCA=; b=kDxo00rXZXe94twRXJOXYvIC8KIxoaFUYyNjc/UBVewn544iGt6QNDiGnS8ttGPxFc0t+aaFjRjReTyXxleXMrSvByewQSKbgViFgbiU8l5yehHjeO4GaPTWL5kpesfGv5LCxFNEZQ1G5qQ4TVgmnjpjCWWk/ms6StnMh/oRcrLJn6jH+jT8GLl6BqU1qC9pSa5HMXkBpmyWZSMNLRWn3M7MF6Hkgs1NIH7pjsQRXYcwvk5EcEMsgEvYrxQaAUze5z/Zr6LqZ0hXA7vFbWsZ0h6PKPmo03osJPuZhwoK6yxfiCukYEecfBSbow/IYV9IilJvgGrpdwklxztgCnIu9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8D/S7GQPnLgXnKNIubANsV15nNWPvprc+rgWdPTONCA=; b=qKvWM2jn5ZLw2pfbrRGEd1kMl/msAIR9LwvWMHN2CIT+wPiTavmA7Tl1IPUxkCvDB35da32LzKTeUXHAdpNFSeN/kdVwnP/JTqAxJgQ5i1I9FiEqqAXSVlgj11rg+IFmTEkqH6BV++Ub+5onXlUhpl8KHAPKXi/yiv1oHullfdV9jaERcd70t2tI+nSbKMgsRsheEclp/zkVW5AplIS0dvNEZRcQo3hMOY7VBR9iyjuwB6nzYgRNz8P+3RPvrnUC0xnchMCfYb9s8iMT4OTYFveOUZ2VWQOFZjeBftu/8OZZyxFPhb6UcGa3Y1w1pF4q5S7AuT7tvOugpIFnxYeI9A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) by MN2PR12MB4094.namprd12.prod.outlook.com (2603:10b6:208:15f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Mon, 3 Mar 2025 16:13:53 +0000 Received: from DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703]) by DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:13:52 +0000 From: Wojtek Wasko To: netdev@vger.kernel.org Cc: richardcochran@gmail.com, vadim.fedorenko@linux.dev, kuba@kernel.org, horms@kernel.org, anna-maria@linutronix.de, frederic@kernel.org, pabeni@redhat.com, tglx@linutronix.de Subject: [PATCH net-next v4 1/3] posix-clock: Store file pointer in struct posix_clock_context Date: Mon, 3 Mar 2025 18:13:43 +0200 Message-ID: <20250303161345.3053496-2-wwasko@nvidia.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250303161345.3053496-1-wwasko@nvidia.com> References: <20250303161345.3053496-1-wwasko@nvidia.com> X-ClientProxiedBy: LO2P265CA0123.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::15) To DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR12MB8558:EE_|MN2PR12MB4094:EE_ X-MS-Office365-Filtering-Correlation-Id: 69cfd729-fcb7-4a9c-6e03-08dd5a6e63d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?5qi2DkPPrWYqem+QFG7lRBwZSKgVF6t?= =?utf-8?q?pyAqrc5Ri+FlCLYio7kgW6YN6zTWaRj83MM+wAtY0Oovd8uanR7zYLqBP6mzAGvo9?= =?utf-8?q?cb3Dn8AsEf3amILWuHtgD1hYlXAj16hT9AlN11kHO5Q1zZ1bPS8DrnYR9/Qvl0ulK?= =?utf-8?q?1Aw8kr0C/SRjDfZ5enR//6gNWbvf9p5OFiPOQbGFcyS0q9c0udD4Q+vyWc3x65Tdw?= =?utf-8?q?KO6hrNieumzaiygliqetQyBAxuuSN3X/YiXT+Y0629di7qdhQRnO01qVBM7AsCFg3?= =?utf-8?q?8TOxPiIDx40icIdM1psSIz6nenWV+PTs1QRBArmr0t7LUSPWP1gsjj9VjVj/2EMQi?= =?utf-8?q?LNwK2bPIw9YdJ1zzttPrH4bZcxflDJWbAX9kFjREuJTvfP3JggWqs2ApkiBnBMQGy?= =?utf-8?q?1F4ahOfMNclao/WHzfwEEQX+AHe7hVvlzX0EKzRsSmvHmt92ONN8Dw27Qi/WJeDHC?= =?utf-8?q?u/3Mh3N41CV0iN+s+IrQU+K0+QHbfwJPe1Ru/aD15eOnfOYfBG4V4el3dr5V9U6Fs?= =?utf-8?q?dcNmVSk44Xls2DZyY9YrqeR2sBBdfWwMGNJYVQIDTXmoc0ftlpjdZVvpnwx5l7rn6?= =?utf-8?q?zlyxq1d5ZaTZI/1+TCksuAg45sIEhw4XRzmAk0SNdUTXTHZMkUDGR2cec4R1mH+1x?= =?utf-8?q?6bjD4AX/XyauysfDXJArY7cuLWiFuDKckbbo3aM/A+ZcOOeJtaYHrswOkTy80tRwJ?= =?utf-8?q?8FhZs17/qeRVOEwh4zTbLJ0Sn55nfWU3RTskT74YqdKql9vf5TcDI8S7MWz2iKWsA?= =?utf-8?q?tAwi3q3nIodf8BjUG0UUiB1n47mkh58VfXJgp3u8B2nHFuNoJQ3pcbOmNq7ozOb3m?= =?utf-8?q?mJVlso4opdkqAJaK099aj1Npx3neMqQaiamdtF86/1wAuYGN93uAAhy3esKj3HYNr?= =?utf-8?q?cJrH7DFhtls/RTS+afbq1CFC1lZsiA5bvrVSHWlznwiYKIOBsfkiXX+EP9bQctM4s?= =?utf-8?q?y8bDLSAQf29HOyveDESBhsfOJOXDK3NL7APl9vFxQd+rYaU6zcNqM/TdvMT6YQwD4?= =?utf-8?q?gAuPV9QOm6j+3xUfZJvB/M+M0pI7r+YmRa5hmyGv0dfyyJ3qypDUUGqlf/05Nuj2y?= =?utf-8?q?VEhmTVQFZJkYcixTEq7vudCuaC9rmR1536sJB5WKxzha4aq0A0t1mDtJOBsfDUFTA?= =?utf-8?q?zQOp1Z9XZC9JoDXjeimwAbH5iQAnFZTR35Li0Mu0bmiGd5+jVGNIznEO6PntKODIZ?= =?utf-8?q?Q4fmtmTpT+a+pUfc43L2kV5oxHLFikB4l/zJYpQMhpg+zAuBjTd+Lp5fpTGNJUUf4?= =?utf-8?q?pdGYnoz6PY+PkWIszhQ3cbqrJioRik5179HiU6mY2TzcAyMlejSNJRYNfab6RkFI8?= =?utf-8?q?cnM/drl82z8B?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB8558.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?2og21j0hRKQqkm4F9bc+IbKoJJew?= =?utf-8?q?/h/CDMAzd8VkkBri0YX93MH8H83ztMmLCJeNasKH1GZ5FjwdFIGJI1rmtTn5IMBbn?= =?utf-8?q?V50Q3wHAEuy17jQO45sM7IlSVsEjzm2yZ1ZXota74TfseBkpHhRGoV2xpADJon5iY?= =?utf-8?q?+897Ytzjpg4PqSAfZtCYg86eMlmlGXAmhVrTR6gfS6czUk2ypO8dK/S95pZv3L2fA?= =?utf-8?q?wEuaZBrFFKmS4+EJWDNHuHug0AWa2sCUatfNUbQdOMvI69UAXuARqDv+EWjhP/pi2?= =?utf-8?q?MhoshH1iKRO5M768wr0YRQQ+VvAt/hgPXnWrzmR2zZX10dfX/T8PN5YSOWfYxcTS/?= =?utf-8?q?kSORLXkonFAcgIP9+yseZtICA7sM2ifsBOghkrFDD1ptryAAuNP6Jt1DQgsjrPLXn?= =?utf-8?q?VtgIANmWPsgzDncFiwRJWGMVamNNGLh1J2dC1yQDOrLvQTCC/Lc86l9CXyzw75IXX?= =?utf-8?q?btS/9LWTN9AcOxa7gKOHajB8dFr1xXHy0ebfGIAUbOLsfsySJNRpHKICVevuv0C0J?= =?utf-8?q?KhawpCwEvyRVMuEnovqzk0QEUhxX6iVgA0F/9E8JvY/0/CTu/Ip0zsYqL+eA+txIU?= =?utf-8?q?nt+vukgO2UYgB59+W2VL99JtIIq0i4Ql22i2SKsLcj9R8o6dF+7w7MLpzKaQKYyjz?= =?utf-8?q?L+hRncUyFIeGElqoJjGfKLLfj4gLN9cl7eWHiZO2IPqsQlcjpWmRkIcEhA0Z2Oyq2?= =?utf-8?q?HQ0E95Z+MlaQUEZyMIZb4i4gpY8N5LQp9hA6kyo1ePI4szS2H/yFQfO4eO0i+x9Qa?= =?utf-8?q?5d5x7bTz5BpOEcu80B+EomjzLleq1ENtffKGH/5ZjHyOdNi5xnfeUr9GumHwuVBYZ?= =?utf-8?q?ZIUOZcX2Qq466LEveIfAMICdaeK3pq73NY5NP1qzBhjS0LbyNxA77YUMZhQ9XZ/nV?= =?utf-8?q?e/vJ+IDzMnN3R3xgWFxAJavWbozo161vun0MgpoStcqkgcxiGTB+w6oAzemVZn3wb?= =?utf-8?q?j3wHPQlY+hRnb1y0w336WBq7gdmh+Mgp/p1QcpIBhjUEpikVV3YU/s3j4Px+FC6yC?= =?utf-8?q?UD6PyboWG4Ph3P9eQiZhwRI/gP3GjIPSzLTulEb7KfRgvhNQB1IkwtiGXVkT6RzV8?= =?utf-8?q?UFKfGUv8nliLegK8AtfBTFpUXbDuDrdqc0gsuklRP7NbGKl/HvkURVFbPHVa2c3Sz?= =?utf-8?q?8fn0kcamFxvnPdV8edAqej26qC6vL0kDxEUxyWCQE8tIoObgNXSsdxbxOyIG4sorV?= =?utf-8?q?go3Bazsor0ukg+v+e+Qq2WnwL5FM0KiwLzjwLaooxmoqHWJwtkY4xSxemQ6FMlecm?= =?utf-8?q?M4FVF1HucXenpWnAvZqSHM7fmOSyZEc675EPVGi+RVw02Of8rLUJiQjM3gD5zUBsu?= =?utf-8?q?KHrflmIdhujlCzFowafLyJJixUzTtI55kiJokrkz8wbzH+PQUjY05JDfLUmsVmAhb?= =?utf-8?q?yGdtaaUaHQZi/0lEzAK525oWyNJsb4upZwbN5h5DRSS5J59TGPiw4V4RRj6V4xNzL?= =?utf-8?q?HCEDSlNG/z6Yfk8IUhX7BCIV84ftzN9c22qp+MkqgVEczkmzfpIbsHyMfxxlODRUp?= =?utf-8?q?ZlaW447yfAWP?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69cfd729-fcb7-4a9c-6e03-08dd5a6e63d7 X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB8558.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:13:52.8370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4mu+mG6YBu3j4E9sEwaB3Ipa94dD+XzNKqIP/yKAAHUTHYwdsA3OLp353vsS8RPG29WzjaW66xpNOutEdElKKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4094 X-Patchwork-Delegate: kuba@kernel.org File descriptor based pc_clock_*() operations of dynamic posix clocks have access to the file pointer and implement permission checks in the generic code before invoking the relevant dynamic clock callback. Character device operations (open, read, poll, ioctl) do not implement a generic permission control and the dynamic clock callbacks have no access to the file pointer to implement them. Extend struct posix_clock_context with a struct file pointer and initialize it in posix_clock_open(), so that all dynamic clock callbacks can access it. Acked-by: Richard Cochran Reviewed-by: Vadim Fedorenko Reviewed-by: Thomas Gleixner Signed-off-by: Wojtek Wasko --- include/linux/posix-clock.h | 6 +++++- kernel/time/posix-clock.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h index ef8619f48920..a500d3160fe8 100644 --- a/include/linux/posix-clock.h +++ b/include/linux/posix-clock.h @@ -95,10 +95,13 @@ struct posix_clock { * struct posix_clock_context - represents clock file operations context * * @clk: Pointer to the clock + * @fp: Pointer to the file used to open the clock * @private_clkdata: Pointer to user data * * Drivers should use struct posix_clock_context during specific character - * device file operation methods to access the posix clock. + * device file operation methods to access the posix clock. In particular, + * the file pointer can be used to verify correct access mode for ioctl() + * calls. * * Drivers can store a private data structure during the open operation * if they have specific information that is required in other file @@ -106,6 +109,7 @@ struct posix_clock { */ struct posix_clock_context { struct posix_clock *clk; + struct file *fp; void *private_clkdata; }; diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c index 1af0bb2cc45c..4e114e34a6e0 100644 --- a/kernel/time/posix-clock.c +++ b/kernel/time/posix-clock.c @@ -129,6 +129,7 @@ static int posix_clock_open(struct inode *inode, struct file *fp) goto out; } pccontext->clk = clk; + pccontext->fp = fp; if (clk->ops.open) { err = clk->ops.open(pccontext, fp->f_mode); if (err) { From patchwork Mon Mar 3 16:13:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wojtek Wasko X-Patchwork-Id: 13999156 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C772215065 for ; Mon, 3 Mar 2025 16:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018443; cv=fail; b=VUZfS0PQy2TiTmzfUgYIzSHBTmMZx53DsDczcyxrLJegwKNOD6wUPMNXfUAH6TIgm5va9cCtHzvkn7m2UlT4SDYCvl11+3qmlHDQJXalqaDn+q2IF2Ahq90FGYKuXjVwYlYw3EGzv7rHFo4vdCv68QuvJ3h68RynCHVRx2BXV74= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018443; c=relaxed/simple; bh=fliqJnpAyL80wqzXGSanK9wToGVWK6SPNqNE3RzN4sU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=us1Bw5xteWjULwUEZB38gkJ9zb1U35r3Rx3bB+I8Zum/ii4j1ve57UJcm0Wd9iPfK+8Rn5VIpQJefM6Ko5/1qeGydtuw3pxdRe2t3lj5aM9kkEMF3QuZi3JMaaFh3qrS2lNLDVTh/UQ6ElV94NoDRME34raqbW4E4RSZH7fE95A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=ZMMJwDgo; arc=fail smtp.client-ip=40.107.93.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="ZMMJwDgo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bW+/e0nc906Of7kRkSLtNVznjx494tOJ9iS7mVpUcZIsXq77hkXpXqp++hVIWj8/LhR4UiDAFDtNx7wXIUg7v+RD/kRzZm8jepD4IVgKNanEEfPOeytmIx+Ix4x3rS5KrYElK77XB/oN5xHX/qCZ7U3QB+bG+QhCksfVonbTeFtOmJUYYmdZyDCvePy+pEZD1ji7xj2DPCRbsCqrFTIARaHYLqrRHbkeqC/cDEuF6ojWHIGd9c3DNso14xm90oAiem14S3Uw1wpc8b/3EJIX2VQBOqWVWy3JUj6wQ9NgWUzhYgC1eV/u/8+QcY5CJGUx8tAMAbxIzRelfp+BYCwtTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1u3sienot18OR3i0pvYADTXqEf7ONtbNtaS96ExKp4w=; b=lRlUgaZ3g7V+A5jjRCpjtRBR+JDDByZO+JiM5YvWB4ObbrgwPjeDuM15PSJ2wS1HhpFAVRh2V1mmIaNBv63Ki/X1iSggBume/L4unrP/0Dm0z4sqE5j2Fi3zHkDZ75GjQ8Dz0cGreiiB8TK6IzZdydIvm4SL/9mLQ2HHNDrWknaHFk8KJ1ohFeHeJMml7qtWIR9PdwizFCOLz/JDB2zTAj95gZHWwkwMobNObpJH9Qzhtbo7TKViJDp6M25y0tCXpFwULL/YIiJv+ViOZBYqT8ex3OlEiSy4AA4zbFyBSb8ZuSuAV0VvWIfUqPJWk4H0FBbUMzXE/Nbmo037pHkhwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1u3sienot18OR3i0pvYADTXqEf7ONtbNtaS96ExKp4w=; b=ZMMJwDgoALbWLwcEUGI3OGpRQZzswEMxgOiXZRvD5vUZXRbyIMCd09/k4V0ERP7Vtjry5UNqbRoNhYaORP5//eiRDqh0rgrc/BEL/fRFG2asPyjtF4u8kDnWw/1lQTDqmPVHRUPsG9pn4Fb0Us4uKKIBQ8ZXtD8rVrOpgWJTzcdmQCNAO3ckv+GXAXHi5gVBcWRQ49WVLCOaDUD51cJUm8mCHiGm6pZKQwgd8is+HZnxr7wxBH9caU0vNp7r/NC7SWZp+EYgeC4I/hq79k3H53hT0m3doIIeWXwuep0TQsT0jp+tS8yjK5XiO9IyxYbIMxlhcDKadCTnvTIgTK370g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) by MN2PR12MB4094.namprd12.prod.outlook.com (2603:10b6:208:15f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Mon, 3 Mar 2025 16:13:56 +0000 Received: from DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703]) by DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:13:56 +0000 From: Wojtek Wasko To: netdev@vger.kernel.org Cc: richardcochran@gmail.com, vadim.fedorenko@linux.dev, kuba@kernel.org, horms@kernel.org, anna-maria@linutronix.de, frederic@kernel.org, pabeni@redhat.com, tglx@linutronix.de Subject: [PATCH net-next v4 2/3] ptp: Add PHC file mode checks. Allow RO adjtime() without FMODE_WRITE. Date: Mon, 3 Mar 2025 18:13:44 +0200 Message-ID: <20250303161345.3053496-3-wwasko@nvidia.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250303161345.3053496-1-wwasko@nvidia.com> References: <20250303161345.3053496-1-wwasko@nvidia.com> X-ClientProxiedBy: LNXP123CA0011.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::23) To DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR12MB8558:EE_|MN2PR12MB4094:EE_ X-MS-Office365-Filtering-Correlation-Id: 8566cfe5-1eb0-46a8-4722-08dd5a6e660b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?KrG3t1sTF2GPK/U8/S1XojlTe5R0msY?= =?utf-8?q?EZGlkj6vDyQxL59SXWQXxfAkuwsONG20t6BX7sHRN/o23DAMFar7Gha5SyKU8kU9Q?= =?utf-8?q?Uhgz1GAIa/MKPrHsSRTM1aL6Bdey5wbRiAmoGY6cDusTlZnqHK2fEdbq6jRhsn47x?= =?utf-8?q?R0fGyo04v7k2YjXKKt/QYbbdZGAhEXA5oM7QG8y4/2qeH0Tmyr4xie8T6v/0S9kg1?= =?utf-8?q?FlM/KwMnvsSA2K6qvLPgwf0E2Jkqx+mwkW8xPWYayNCL4l1YdRCz3mMJEIkEJyz3G?= =?utf-8?q?HqqZ58QL7OR2uCh4fqurfRIcSvA7PqBWmHAioRksfl8vpyFDLD13TfaUSsRr5MUlS?= =?utf-8?q?1o1VDPSd7N8OYlAadnCxyMn8StOYv3K6bSH2o5+rGk0QgG5hTnDeO+X9byprPYyda?= =?utf-8?q?A7tA/0nYDLxbx4QRCQIJhk+XgYP7nz6TMapaxBIonAimxDKHF+nLNBv09q1KKoju6?= =?utf-8?q?P3ozYOu8kRTGSTjcOaTI5ft66B6ktmdTeMZMYcD0T81dU6Oy33uZHAulzUt7got6z?= =?utf-8?q?QL7jl8X39ytOP0swg+56H5BT9Tmo7rKYZlmxPUPm0gO9xyGMLN1xezDTMgzORk/tK?= =?utf-8?q?Ji+xL7kGzMhGqTQiKaYBcCJCdORkFdiWgQMQ5XmKl+8cDW2VIquQoXk5u+UrMTMUg?= =?utf-8?q?ewN79bemIl+CSH7eY/JHdPKjK+k8/6eIILrOzzCbLP9AseMYdV9GbqBwu5yCuCgTg?= =?utf-8?q?cf0BndnGG1amxc75c71qqsISCh+yYBIDOpb6ZMqlCruK0zY9Ie6yZBnhTVUT0GKIr?= =?utf-8?q?tTE/LWBCVi+Jr7xtUcUiWejmgHeQOXFLCZQpnWZ6sl+NdjqrN4oeviO027cvnidx6?= =?utf-8?q?IcQ0VH1L+xC38qQNPLhJXGBsps261yIHswYioBkwbSgoY150GbsDYwORh2jaPGo6l?= =?utf-8?q?0HGYqa8YgSk8hqvEDkoN9qP1R8Iwj6WXhY9E8xbbk2sFVEmbXJplMiX494rdYatgA?= =?utf-8?q?ZBrUd/y4NOxyamxV7Qe+AsPiXZ86zGlSCZ++ruEAbhfhUBiZxF5eQnhgiuOVct6gu?= =?utf-8?q?tLolHD81XrBTkIy7reATdDrgWF/ejlrERNBPy01a/KHBIH30jo5NmGULtA9RDIX4v?= =?utf-8?q?2gJyljPxHGt11qwmpySXMZ2pZGCBTF0vcerzZQfwNlqug4apQKO9ZpmRP11OiUduQ?= =?utf-8?q?Bm3cM0f/RbugG3XtOkeqAk23Yl8gEAHQWbUAmS9ikvGTJ/fQdX45wMXQ3bd9MCySK?= =?utf-8?q?CJvD2r7fpzdZ2uuVfIpoIKTL58MkRgCFDnaCiAzGCCecdFwDjP+7UIP0TW6qnnFSc?= =?utf-8?q?KhLK2MgNC6eXnysIeH+6hBVUYXOeedH0aqHLhZixx00o0JEgIqDNro0Sq/gcO8Qbk?= =?utf-8?q?BOrevDNZih59?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB8558.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?E8O5BcxzDkt7xNgJCcx8nHJlfajL?= =?utf-8?q?XEOHCxDkNPPUIWdUrf8rwwXfcs4awTlmXPz0MH+tpF2VlZpT7fxMSyRZ8gbHeD3Na?= =?utf-8?q?FTkdgPhdAaTPT5x24YXxbS1gYVYqRSvm5tIREspzCvCULA+smP27Yffmfpip/EE+N?= =?utf-8?q?nB+LTXSJYVnwqdWlWfNgYdYMJ5ot8PyPIYPmD6pUKl8eFv5nXhi0PsECaz9Jw4yxJ?= =?utf-8?q?vkCCBh24MhsWFSur67dDMT86gXIQ55k8/7bYJYJWEK4cgVKUQE7wE6ARLtsYE+OFa?= =?utf-8?q?NiuQ68vMg77BBL4oD5GalwGXEXFvM7FneA/J7sfu1RcYGM6LNMAwh3GYAuPLQVSpF?= =?utf-8?q?HRQzzy6zKcSZhMK75+4AgQ97D8JJZvNWIOGtqll0+tc5V6m3EFHO5QGzA0uCmSS+g?= =?utf-8?q?9+vqyc4iVjjad6KzSFD4sbsh1d5AJc8lBTWiG1VIRw8e3uFZkt9vwTIHTraYW1Sfx?= =?utf-8?q?CYykkA6sd+pPaeDuazVSiGLhBnRJQdQYrHdPRsyB2briTtqZZaidVnEKCeAsiMZlh?= =?utf-8?q?R+Ivm5/jIhnkpB0tNftFD/3fs/b8hGiRnDDNN2J1AzMhuzfYapay8LS5RvHd55pmZ?= =?utf-8?q?52joDlJq63lLdAmJI2nfX/57OyRbY+Cj9QjOrBEQmXaskADK8grQNiLuGqgvn95sn?= =?utf-8?q?0dmDxlPwUUTqNNWqZQasimFdTZm1l3meb86xDLhnAm/sb8JvkBG+b4aAWHrfbMc2c?= =?utf-8?q?34zNo+01eMZeR8FqDYOOuhk1ExT0Nj+Xscf7pqIOb1EP2mgUwB1Pb3fmN0gw6atbQ?= =?utf-8?q?7KvzEPfAQFfb4FETe9GtZDwNa4RR6CzYXSvYFN6DkR/z0uObFLvmB5V2Ddb0ILxzm?= =?utf-8?q?gckygjzpUvF2sMpBGyJjI9ao4Az0n3I9pD1wfzn8YPJ2AnWyzd/LuSitWMX7sF7RR?= =?utf-8?q?tUqDfWqi5HSboHKk8PXdn5fOav9F9jFi4qwHZ7atMDn5kAEJQVTawJfrBYF2SAWFf?= =?utf-8?q?p+WBSE8kuzlMFRAjiYJCrnq2CHUK3oU6sK1tduXkcIrfW2fDPVMqeGvsgJZLXmg9S?= =?utf-8?q?8wl98RkYUoOfUsHieJ93PAEFqI8/uWiSNnBv2efkd4gqwIok/gXt4/bwE621FZV/i?= =?utf-8?q?WzslWg+/FNvfmWyNKZUtmPfl4ZPJZ9IDd0x6wDSdJcbXSdMEatj23S/B/bEtFCZ0D?= =?utf-8?q?rLG7Y8cyl3DOkDnleVMKYAwKa/7XGu/9wmuXnGl7dJvFP+VydBdDsgSSzjr3g12S/?= =?utf-8?q?s3SLTsOKV5rGVGP9vX8W9GyUAfrjQdumLiGqzaf6J1gF3/fNekk6IpJ2Wp7s6QEC5?= =?utf-8?q?w9S4Sozy4Ra9bKHIQgDlGn0FfwFD4uDsAaXbNeq0s1UdG74lDEf+afAvtHS50vuGZ?= =?utf-8?q?PI7lIHVGJ3IUU9mwtKzUx7ejKsR9SiIy4aNdv+lRESjZ/n5aPxWjrMl45MlefzqWK?= =?utf-8?q?AX9mlGHLEG9owNw0vL9kdcQVKhAHSavnyJvbUimLg+qa1sxFocAf7jsxcYqGBH47b?= =?utf-8?q?SUoNcaKzwUf4Sd3YwpFVcAAkqQp9K0LxsS+pfGz7IShbm2iHEdLoErlqx7MyWv5pO?= =?utf-8?q?aPNkI4ZEp83P?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8566cfe5-1eb0-46a8-4722-08dd5a6e660b X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB8558.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:13:56.4014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YWiU+SSGdORjYcAvx/nyCVYcwi7EtYc6O+2FI3B5T0See+Kb4A9ryeyN366+yOU0BGSrSQCt68ymzoJGx1aKhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4094 X-Patchwork-Delegate: kuba@kernel.org Many devices implement highly accurate clocks, which the kernel manages as PTP Hardware Clocks (PHCs). Userspace applications rely on these clocks to timestamp events, trace workload execution, correlate timescales across devices, and keep various clocks in sync. The kernel’s current implementation of PTP clocks does not enforce file permissions checks for most device operations except for POSIX clock operations, where file mode is verified in the POSIX layer before forwarding the call to the PTP subsystem. Consequently, it is common practice to not give unprivileged userspace applications any access to PTP clocks whatsoever by giving the PTP chardevs 600 permissions. An example of users running into this limitation is documented in [1]. Additionally, POSIX layer requires WRITE permission even for readonly adjtime() calls which are used in PTP layer to return current frequency offset applied to the PHC. Add permission checks for functions that modify the state of a PTP device. Continue enforcing permission checks for POSIX clock operations (settime, adjtime) in the POSIX layer. Only require WRITE access for dynamic clocks adjtime() if any flags are set in the modes field. [1] https://lists.nwtime.org/sympa/arc/linuxptp-users/2024-01/msg00036.html Changes in v4: - Require FMODE_WRITE in ajtime() only for calls modifying the clock in any way. Acked-by: Richard Cochran Reviewed-by: Vadim Fedorenko Signed-off-by: Wojtek Wasko Reviewed-by: Thomas Gleixner --- drivers/ptp/ptp_chardev.c | 16 ++++++++++++++++ kernel/time/posix-clock.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index bf6468c56419..4380e6ddb849 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -205,6 +205,10 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd, case PTP_EXTTS_REQUEST: case PTP_EXTTS_REQUEST2: + if ((pccontext->fp->f_mode & FMODE_WRITE) == 0) { + err = -EACCES; + break; + } memset(&req, 0, sizeof(req)); if (copy_from_user(&req.extts, (void __user *)arg, @@ -246,6 +250,10 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd, case PTP_PEROUT_REQUEST: case PTP_PEROUT_REQUEST2: + if ((pccontext->fp->f_mode & FMODE_WRITE) == 0) { + err = -EACCES; + break; + } memset(&req, 0, sizeof(req)); if (copy_from_user(&req.perout, (void __user *)arg, @@ -314,6 +322,10 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd, case PTP_ENABLE_PPS: case PTP_ENABLE_PPS2: + if ((pccontext->fp->f_mode & FMODE_WRITE) == 0) { + err = -EACCES; + break; + } memset(&req, 0, sizeof(req)); if (!capable(CAP_SYS_TIME)) @@ -456,6 +468,10 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd, case PTP_PIN_SETFUNC: case PTP_PIN_SETFUNC2: + if ((pccontext->fp->f_mode & FMODE_WRITE) == 0) { + err = -EACCES; + break; + } if (copy_from_user(&pd, (void __user *)arg, sizeof(pd))) { err = -EFAULT; break; diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c index 4e114e34a6e0..fe963384d5c2 100644 --- a/kernel/time/posix-clock.c +++ b/kernel/time/posix-clock.c @@ -252,7 +252,7 @@ static int pc_clock_adjtime(clockid_t id, struct __kernel_timex *tx) if (err) return err; - if ((cd.fp->f_mode & FMODE_WRITE) == 0) { + if (tx->modes && (cd.fp->f_mode & FMODE_WRITE) == 0) { err = -EACCES; goto out; } From patchwork Mon Mar 3 16:13:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Wasko X-Patchwork-Id: 13999157 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2040.outbound.protection.outlook.com [40.107.223.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5FB422E3E9 for ; Mon, 3 Mar 2025 16:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018444; cv=fail; b=O/r15Iy2CyasUuODr/Gm30BTr2feG+EZivoNz7FairUsLxuIXGl15jR3r4WluphAhI6IhURZbv9breAB3Bpfvvrs+bODyMRracfc4hrloyIoiH30S7zDwNCaCDzMs8eZ+aNeLU2VPoRs5/odDnY8/KCknh8Zl+BWNfOE/hGNxgw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018444; c=relaxed/simple; bh=jI7Z0RPIUDZZQcW+odQqrXsyoPz8dfGXLL7pTAAds5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Gxs6jWpFosj9uGh2ySEakkPUd33xL4/708H/HHHKKh8ObHPLtDnllgKm8bE+5C0HyR8gVRSnd1PNVVdrCiEj4ADGIJFdlELZLQ8qPvZz2xrqwe43FpEqcKZXje69MjpenJPhuQBO+5dL8eP+umZMyOwsgtIrhg2zac6MuD5qq7k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=kBQy8Ggp; arc=fail smtp.client-ip=40.107.223.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="kBQy8Ggp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ID+jfqCm/aaa3j8wXeVc++EQAmLtaUcUmzOyvpXRZbDxkHeoRR01BuHA0G0hVUm0/rp3LirtQVaJp1SbLmxdmkeYuRc9Nt1Pt72kyjNy76WlKI/vog0bY7XeVdPrf4D6qADA6Veggk8MZXI2SQyteXBAD81PXT8wF+SiBhfq6cTq9HdyQ6qhxKr8G8suhcE+e5EL1iVCY6nT22qd1a3DMJtBnQbTypJdzkcdG2CyW3Uo4cQtzm5fP1I3fX4jenGDgdxelvArMto63HJdbSZAqhhP4jDmJ8yHjmN/Xs3kA5ou/oPDuzf8K4zG+6kK87s86hhsTgGV6wEJpZe5Ds33fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5bGEbL8UsDW/lntfljG1L4K6eomaTCMikWWfqVL6UdE=; b=USibllHTvAzplOL1feoKLDr8O5xIVnd1PwAMV3HvZRRRnJBr2nH2GikUcYv7UVYhGDYVqbPOSTaIUEOiALG72G1fNeM6bX5zqcZBeKo5ooH9hVB77pgmitDODEbWdyn7KOTN6WULsmFdkuwj9S02XVHkC/ite4EVRXx3EaBQOmJj3KBrV1n/Fk+d4vOqQ8jAxqHXL79mxYoL8keAZ3obVy4cO3Sg+QamxZgWze+h+Ep+OI8A7MLhMxbnbcVfLhHdINV060PzhZO5m2K0f4fdKc+2oB2L/jwUmRPO+j35BeFPm8OTgRownrzvleYpR/D93yIv6HFgAlxzDoWWFSrJZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5bGEbL8UsDW/lntfljG1L4K6eomaTCMikWWfqVL6UdE=; b=kBQy8Ggp9aQ8C2s6el594WpMr+oIFiM4BbZBQYaIh0Jo8PQ09HF57rJ9ta0QFqbaycCSmAphB7hkXiLYWIgM/1/ORGS9POxSWbX5CQ6k9NoWeno5AB/8Xllt1p8uUoK+zd2jbDTQ8v+Bn9+tdEcBaIJbmpDToBz77f1XR2ThIgSE6OK+ulkd7HGoyygOvNr16TdOZ/yISNYr+uhLEAFzMx/T3fVcFCY1oFoMpY58HfbKSeDykueBOponzzTUww4NVkQ3+9EgjXO4Nk64FoYuOANVbsaOMEYOoncTqLZCj1SmomY/dAZbWKeA5pDbydg3ReTm5ysEc2eXPDlp9ivKTw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) by IA0PPF1D04084C7.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bca) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Mon, 3 Mar 2025 16:14:00 +0000 Received: from DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703]) by DM4PR12MB8558.namprd12.prod.outlook.com ([fe80::5ce:264f:c63c:2703%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:14:00 +0000 From: Wojtek Wasko To: netdev@vger.kernel.org Cc: richardcochran@gmail.com, vadim.fedorenko@linux.dev, kuba@kernel.org, horms@kernel.org, anna-maria@linutronix.de, frederic@kernel.org, pabeni@redhat.com, tglx@linutronix.de Subject: [PATCH net-next v4 3/3] testptp: Add option to open PHC in readonly mode Date: Mon, 3 Mar 2025 18:13:45 +0200 Message-ID: <20250303161345.3053496-4-wwasko@nvidia.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250303161345.3053496-1-wwasko@nvidia.com> References: <20250303161345.3053496-1-wwasko@nvidia.com> X-ClientProxiedBy: LO4P123CA0123.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:192::20) To DM4PR12MB8558.namprd12.prod.outlook.com (2603:10b6:8:187::22) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR12MB8558:EE_|IA0PPF1D04084C7:EE_ X-MS-Office365-Filtering-Correlation-Id: 03a6cf41-0a60-4f94-927f-08dd5a6e683c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?960H1TAAqDdsrnxNMTuuOzSI/61Iyo9?= =?utf-8?q?RBBDnmeHYTUIW93oKCnqw8QST5ZQTxLuV9gDgKN7xvZjf15sZvfA74d1PbKHXovV6?= =?utf-8?q?I94Ac4C3QF70rLecIeRbCrUFeK0FxBLgLIJtM6keCkOfbd3uuqK+nCp8rI8XxhDsJ?= =?utf-8?q?m3+tWfX9chyatmWLR2wFQPKw38eQhfxbeELpBHuj2mFCb559sKK9R2ThuiNNtTDWx?= =?utf-8?q?4zKtUMx4gpMy3yRJDDb9f4pJVkYdbfEZaKn2P/VF8rEnN1rN+I5pW36AHtRaVRshA?= =?utf-8?q?S7zlzLo1OPc7wm+foIkDMgDkM4FzWO06+56h6XOHJMWGYYzJ09HdeN4oUTHRYZkT6?= =?utf-8?q?eUolhYL9/yHHFnpHJyZ3snzLX5yLQAfZyOrQx+Z21w59XIJ+FcgwQo1NfVDmqeovA?= =?utf-8?q?iFQp08xhQ3oEipKpZcFko3OMYX7LmgZufaXl73DcSqvekaP99pfLZQej52UMSyDwd?= =?utf-8?q?0a0R7LSnpWVyg4Lw8gKE7Xo7WbzVUkzbtEc1k8vvbINOC8cW0nKbKFphRXJY3jdzG?= =?utf-8?q?N/PR/bQ3cBChKlxKUn1veO7eOT+TbKKwrpaKu3PJAawfDya64VFpu+cmWBaC6J5n5?= =?utf-8?q?hfzPRcDmQuH/oN7MRbszj4pfA+bRi69Lab49gdqucKkHE9/x+SL8F0eWv9/tyopn9?= =?utf-8?q?e2vjeThdvOOSQRy5igmyQy8R1XGK540oZm6x0bSKi/WNj31X+10RtPXiPzJ7V0h8h?= =?utf-8?q?Ds9Y72m0SPe5Dg3E5zryMaVHUIdPjuQ/o48RWsMy1a/kEjxqXHcQs3mz7ypFNMFTn?= =?utf-8?q?TYpU5fyVyCgnj1kiF52DqzPont2tCwpEHsWUugnX85fAjUmaCE4zdS4TFzMSUvuAY?= =?utf-8?q?jh3s9RsUMX0PUw0q2J8dLXT74zNVADakO5sKzw5N3NVydt9YNAHmm6ylQJ16vzoju?= =?utf-8?q?srBz350pLOcJdIWjMO3PTdJ1O1rJ7DEOr5rZS9GlGeS9IvXsWyMPgrlb+m8eFPcOn?= =?utf-8?q?IYR4UT+0wSEuhx4xD5E2QrvKPr7Tp6QdzzsPvUu0ngVK62/e7Om0pPQOiwTNW6gbW?= =?utf-8?q?9SEbcTnrJeE1atEkOuj7fpMgF5ouFLOJD2KgbWIX6EFbp+ZWAM7wCg5HXk1ohghYb?= =?utf-8?q?k7uQmJzMj7LXYLg/RP+WI6fjW9oSfGZLOpb6W4BcSKwIYwQ+PlT4EoW5qfa6ymrx3?= =?utf-8?q?6Y1kX55SH0p4nu7XeTTemoBJJb12g3gdq0Bi5uqhyPqpbRhcnfJxPf4ZC9nM7biWV?= =?utf-8?q?oc31qsXylIYFbVGJpehqQMNxUEn+xK4EuKA56bohvZDFq4u8B/3UKCn3QjQvN7hc5?= =?utf-8?q?3b+EZgKxk8u8QEcGJ4xar/QJNQVzbYcYvca02cPhwxtn+9MhswHvxlyt2y6l/FJEZ?= =?utf-8?q?699XdDwhmVZY?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB8558.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?QF05z5zKwg72TfOk2c0nEx7qcCJ6?= =?utf-8?q?3bUHYQVUphJIOkGHN/Hb/vD04IB8TQA54TJpP+5sLGmuqz52w7GOo6w9Y0faPDP//?= =?utf-8?q?OwOcz4Ye3kto31jD6vyHZ2qQHCZMHQ0DhSTvUuq5HtB48Wd2LAS/Yl2/7BYL2TAdt?= =?utf-8?q?UD9S8gsMetWgtRx8B/f1loXjl454ROQZTRq7NsijoZU/X7wWiK3rX/hpfDYmlHLrS?= =?utf-8?q?/4eT5DWnPccJprIqOxFrkm59ZmB0l2voJpep5lM+TEZdnq6gBRU5pWUMH52nYFj+z?= =?utf-8?q?zeEK+mXpFlW2z8mwyC58TjulOroI1duEG9CVYIG1b8WkxBZbNHhpxkTG47ycdzWdc?= =?utf-8?q?P4rRhqrdQc1o5Kc+6nULFbpLXlVnOJ1WgBvIxG29hnxhhHqc/BOVxORZZPp8TWB9C?= =?utf-8?q?tnprjcmSKlmfpIL5te+gSCOA5sLvxsqXXMBLYtRwTloMuJB8dy6tEt9CPG4mBqhRh?= =?utf-8?q?3KxYgJMdCYLuG5uXu/8LAcwYNnwcZXWKGV3Pv6wWcfU6R6Vb/HefbJsyu06E2R1cd?= =?utf-8?q?LmX00108oBzcIZa4kEGmoToFG+kJGTp4tARoFffzKzvyOnEG2D/igbjSqsfq0upkv?= =?utf-8?q?jUZueSWy2xexdPopZAKLur5C17tIuxrywyZtimOc6GNR5s/lQ8Yv+sHldAGOHrQSo?= =?utf-8?q?XV0ioEZ3KFXMnpXuEjjV4th8YioB8gMt84ArIiCaJOg/LsP8sC/0ZH0ArhaWGUWuw?= =?utf-8?q?ggZIx+YESaCe/6IJTr56pk3EUeFd1e4luK1VNEupKeB91W0r2C+IgNITkMf3c/8Ge?= =?utf-8?q?0d7ZyedLkC44Bf60V5MfiDNzpzb27ZmAzJi1q9u4Fa8kpm0o49PnURS61aXnqHDku?= =?utf-8?q?aNVN2qLr1EEJ09+hRfep/IHE1umyRD0Rc1ozFK7Xit4tOEGKH9Bw2kM3S4vl2X0sg?= =?utf-8?q?MnX7mwmyT2UJP6eXOoX87Iyj6YbezIfDIV5IvHE/tQfXobvv5U4nc75OInN8ZUgiY?= =?utf-8?q?kMK2VsAXnoytLiHV2E1pE89x0w03WOFhHtqPLHZ2NivrIfT6Jg/vPfYk+CyV6u8oN?= =?utf-8?q?6/GxC6UbyCNUt5Fxw5kevvYhG/u3Zsz0U/DNL6OHyPNBxfpcFxMdj2ILm+Wk/Wr3R?= =?utf-8?q?boS2hTdWnIvE+TNZyYfsQzuSAmmK28HUVoKEX7/Pk8k1iBq74GDa4YEk+hOeKOKps?= =?utf-8?q?MsUglTAnN+l8duf4i3XEkkmgiYFcR/B2U4t5wxsI+hz2tIUZCS+eNRGJAiEygeYyf?= =?utf-8?q?NGvg0JdV2p2baLfCFk8cYXlGQdyhajeRUhekuW6va1JfGZ69STNTPKctm1agTzEVi?= =?utf-8?q?s+gBBJ0CgmxBbZlvGLnfyHSQ0uX+1mC+KPsrXa5H4UB/ET9r/DO7QaUj/DUyObNph?= =?utf-8?q?tV0ZrMEntcRNR9z63NX711K2TrOPqAh0wB1DumduVKhx29XPWD0ReDjfsy9IRD97j?= =?utf-8?q?UJeE5Wl6PzeW7HqNEtIPEf3mxeZIfspo+PgEl6zOrBogKZnA71zFMt+h1gWbEvgHD?= =?utf-8?q?QQZoqBKSLiW+ACgWSrtmqeq1413c0XrIeGNLBjQ80BypM0kyfv+HJbc6cpet/j4Au?= =?utf-8?q?tLENXu4GCsVe?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03a6cf41-0a60-4f94-927f-08dd5a6e683c X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB8558.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:14:00.0092 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yT3wxUg36zBFRlOriBL0S/mGSwOhzjrfvvSbyJTcWEyZUajiTBV46IsIe150chFYY2KPATijHZpnAnf//739dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF1D04084C7 X-Patchwork-Delegate: kuba@kernel.org PTP Hardware Clocks no longer require WRITE permission to perform readonly operations, such as listing device capabilities or listening to EXTTS events once they have been enabled by a process with WRITE permissions. Add '-r' option to testptp to open the PHC in readonly mode instead of the default read-write mode. Skip enabling EXTTS if readonly mode is requested. Acked-by: Richard Cochran Reviewed-by: Vadim Fedorenko Signed-off-by: Wojtek Wasko --- tools/testing/selftests/ptp/testptp.c | 37 +++++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/ptp/testptp.c b/tools/testing/selftests/ptp/testptp.c index 58064151f2c8..edc08a4433fd 100644 --- a/tools/testing/selftests/ptp/testptp.c +++ b/tools/testing/selftests/ptp/testptp.c @@ -140,6 +140,7 @@ static void usage(char *progname) " -H val set output phase to 'val' nanoseconds (requires -p)\n" " -w val set output pulse width to 'val' nanoseconds (requires -p)\n" " -P val enable or disable (val=1|0) the system clock PPS\n" + " -r open the ptp clock in readonly mode\n" " -s set the ptp clock time from the system time\n" " -S set the system time from the ptp clock time\n" " -t val shift the ptp clock time by 'val' seconds\n" @@ -188,6 +189,7 @@ int main(int argc, char *argv[]) int pin_index = -1, pin_func; int pps = -1; int seconds = 0; + int readonly = 0; int settime = 0; int channel = -1; clockid_t ext_clockid = CLOCK_REALTIME; @@ -200,7 +202,7 @@ int main(int argc, char *argv[]) progname = strrchr(argv[0], '/'); progname = progname ? 1+progname : argv[0]; - while (EOF != (c = getopt(argc, argv, "cd:e:f:F:ghH:i:k:lL:n:o:p:P:sSt:T:w:x:Xy:z"))) { + while (EOF != (c = getopt(argc, argv, "cd:e:f:F:ghH:i:k:lL:n:o:p:P:rsSt:T:w:x:Xy:z"))) { switch (c) { case 'c': capabilities = 1; @@ -252,6 +254,9 @@ int main(int argc, char *argv[]) case 'P': pps = atoi(optarg); break; + case 'r': + readonly = 1; + break; case 's': settime = 1; break; @@ -308,7 +313,7 @@ int main(int argc, char *argv[]) } } - fd = open(device, O_RDWR); + fd = open(device, readonly ? O_RDONLY : O_RDWR); if (fd < 0) { fprintf(stderr, "opening %s: %s\n", device, strerror(errno)); return -1; @@ -436,14 +441,16 @@ int main(int argc, char *argv[]) } if (extts) { - memset(&extts_request, 0, sizeof(extts_request)); - extts_request.index = index; - extts_request.flags = PTP_ENABLE_FEATURE; - if (ioctl(fd, PTP_EXTTS_REQUEST, &extts_request)) { - perror("PTP_EXTTS_REQUEST"); - extts = 0; - } else { - puts("external time stamp request okay"); + if (!readonly) { + memset(&extts_request, 0, sizeof(extts_request)); + extts_request.index = index; + extts_request.flags = PTP_ENABLE_FEATURE; + if (ioctl(fd, PTP_EXTTS_REQUEST, &extts_request)) { + perror("PTP_EXTTS_REQUEST"); + extts = 0; + } else { + puts("external time stamp request okay"); + } } for (; extts; extts--) { cnt = read(fd, &event, sizeof(event)); @@ -455,10 +462,12 @@ int main(int argc, char *argv[]) event.t.sec, event.t.nsec); fflush(stdout); } - /* Disable the feature again. */ - extts_request.flags = 0; - if (ioctl(fd, PTP_EXTTS_REQUEST, &extts_request)) { - perror("PTP_EXTTS_REQUEST"); + if (!readonly) { + /* Disable the feature again. */ + extts_request.flags = 0; + if (ioctl(fd, PTP_EXTTS_REQUEST, &extts_request)) { + perror("PTP_EXTTS_REQUEST"); + } } }