From: Richard Cochran <richardcochran@gmail.com> To: Miroslav Lichvar <mlichvar@redhat.com> Cc: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, Jacob Keller <jacob.e.keller@intel.com> Subject: Re: [RFC PATCH 1/4] ptp: add PTP_SYS_OFFSET_EXTENDED ioctl Date: Tue, 30 Oct 2018 19:23:51 -0700 [thread overview] Message-ID: <20181031022351.24mmvf7u7bcx42rv@localhost> (raw) In-Reply-To: <20181026162742.631-2-mlichvar@redhat.com> On Fri, Oct 26, 2018 at 06:27:39PM +0200, Miroslav Lichvar wrote: > diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c > index 2012551d93e0..1a04c437fd4f 100644 > --- a/drivers/ptp/ptp_chardev.c > +++ b/drivers/ptp/ptp_chardev.c > @@ -124,11 +124,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) > struct ptp_clock_caps caps; > struct ptp_clock_request req; > struct ptp_sys_offset *sysoff = NULL; > + struct ptp_sys_offset_extended *sysoff_extended = NULL; How about a more succinct name, like 'extoff' ? > struct ptp_sys_offset_precise precise_offset; > struct ptp_pin_desc pd; > struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); > struct ptp_clock_info *ops = ptp->info; > struct ptp_clock_time *pct; > + struct ptp_system_timestamp sts; > struct timespec64 ts; > struct system_device_crosststamp xtstamp; > int enable, err = 0; This collection of automatic variables is getting ugly. May I ask you to prefix a patch that puts them into reverse Christmas tree before your changes? (Patch below) > @@ -211,6 +213,43 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) > err = -EFAULT; > break; > > + case PTP_SYS_OFFSET_EXTENDED: > + if (!ptp->info->gettimex64) { > + err = -EOPNOTSUPP; > + break; > + } > + sysoff_extended = memdup_user((void __user *)arg, > + sizeof(*sysoff_extended)); As pointed out before, this needs to be freed, and > + if (IS_ERR(sysoff_extended)) { > + err = PTR_ERR(sysoff_extended); > + sysoff = NULL; here you meant, sysoff_extended = NULL; > + break; > + } > + if (sysoff_extended->n_samples > PTP_MAX_SAMPLES) { > + err = -EINVAL; > + break; > + } > + > + pct = &sysoff_extended->ts[0]; > + for (i = 0; i < sysoff_extended->n_samples; i++) { > + err = ptp->info->gettimex64(ptp->info, &sts); > + if (err) > + break; > + pct->sec = sts.sys_ts1.tv_sec; > + pct->nsec = sts.sys_ts1.tv_nsec; > + pct++; > + pct->sec = sts.phc_ts.tv_sec; > + pct->nsec = sts.phc_ts.tv_nsec; > + pct++; > + pct->sec = sts.sys_ts2.tv_sec; > + pct->nsec = sts.sys_ts2.tv_nsec; > + pct++; > + } > + if (copy_to_user((void __user *)arg, sysoff_extended, > + sizeof(*sysoff_extended))) > + err = -EFAULT; > + break; > + > case PTP_SYS_OFFSET: > sysoff = memdup_user((void __user *)arg, sizeof(*sysoff)); > if (IS_ERR(sysoff)) { > diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h > index 51349d124ee5..79321d929925 100644 > --- a/include/linux/ptp_clock_kernel.h > +++ b/include/linux/ptp_clock_kernel.h > @@ -39,6 +39,13 @@ struct ptp_clock_request { > }; > > struct system_device_crosststamp; > + KernelDoc please for this: > +struct ptp_system_timestamp { > + struct timespec64 sys_ts1; > + struct timespec64 phc_ts; > + struct timespec64 sys_ts2; > +}; > + Thanks, Richard
WARNING: multiple messages have this Message-ID (diff)
From: Richard Cochran <richardcochran@gmail.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [RFC PATCH 1/4] ptp: add PTP_SYS_OFFSET_EXTENDED ioctl Date: Tue, 30 Oct 2018 19:23:51 -0700 [thread overview] Message-ID: <20181031022351.24mmvf7u7bcx42rv@localhost> (raw) In-Reply-To: <20181026162742.631-2-mlichvar@redhat.com> On Fri, Oct 26, 2018 at 06:27:39PM +0200, Miroslav Lichvar wrote: > diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c > index 2012551d93e0..1a04c437fd4f 100644 > --- a/drivers/ptp/ptp_chardev.c > +++ b/drivers/ptp/ptp_chardev.c > @@ -124,11 +124,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) > struct ptp_clock_caps caps; > struct ptp_clock_request req; > struct ptp_sys_offset *sysoff = NULL; > + struct ptp_sys_offset_extended *sysoff_extended = NULL; How about a more succinct name, like 'extoff' ? > struct ptp_sys_offset_precise precise_offset; > struct ptp_pin_desc pd; > struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); > struct ptp_clock_info *ops = ptp->info; > struct ptp_clock_time *pct; > + struct ptp_system_timestamp sts; > struct timespec64 ts; > struct system_device_crosststamp xtstamp; > int enable, err = 0; This collection of automatic variables is getting ugly. May I ask you to prefix a patch that puts them into reverse Christmas tree before your changes? (Patch below) > @@ -211,6 +213,43 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) > err = -EFAULT; > break; > > + case PTP_SYS_OFFSET_EXTENDED: > + if (!ptp->info->gettimex64) { > + err = -EOPNOTSUPP; > + break; > + } > + sysoff_extended = memdup_user((void __user *)arg, > + sizeof(*sysoff_extended)); As pointed out before, this needs to be freed, and > + if (IS_ERR(sysoff_extended)) { > + err = PTR_ERR(sysoff_extended); > + sysoff = NULL; here you meant, sysoff_extended = NULL; > + break; > + } > + if (sysoff_extended->n_samples > PTP_MAX_SAMPLES) { > + err = -EINVAL; > + break; > + } > + > + pct = &sysoff_extended->ts[0]; > + for (i = 0; i < sysoff_extended->n_samples; i++) { > + err = ptp->info->gettimex64(ptp->info, &sts); > + if (err) > + break; > + pct->sec = sts.sys_ts1.tv_sec; > + pct->nsec = sts.sys_ts1.tv_nsec; > + pct++; > + pct->sec = sts.phc_ts.tv_sec; > + pct->nsec = sts.phc_ts.tv_nsec; > + pct++; > + pct->sec = sts.sys_ts2.tv_sec; > + pct->nsec = sts.sys_ts2.tv_nsec; > + pct++; > + } > + if (copy_to_user((void __user *)arg, sysoff_extended, > + sizeof(*sysoff_extended))) > + err = -EFAULT; > + break; > + > case PTP_SYS_OFFSET: > sysoff = memdup_user((void __user *)arg, sizeof(*sysoff)); > if (IS_ERR(sysoff)) { > diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h > index 51349d124ee5..79321d929925 100644 > --- a/include/linux/ptp_clock_kernel.h > +++ b/include/linux/ptp_clock_kernel.h > @@ -39,6 +39,13 @@ struct ptp_clock_request { > }; > > struct system_device_crosststamp; > + KernelDoc please for this: > +struct ptp_system_timestamp { > + struct timespec64 sys_ts1; > + struct timespec64 phc_ts; > + struct timespec64 sys_ts2; > +}; > + Thanks, Richard
next prev parent reply other threads:[~2018-10-31 11:19 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-26 16:27 [RFC PATCH 0/4] More accurate PHC<->system clock synchronization Miroslav Lichvar 2018-10-26 16:27 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-26 16:27 ` [RFC PATCH 1/4] ptp: add PTP_SYS_OFFSET_EXTENDED ioctl Miroslav Lichvar 2018-10-26 16:27 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-26 22:16 ` Vinicius Costa Gomes 2018-10-26 22:16 ` Vinicius Costa Gomes 2018-10-29 12:52 ` Miroslav Lichvar 2018-10-29 12:52 ` Miroslav Lichvar 2018-10-31 2:23 ` Richard Cochran [this message] 2018-10-31 2:23 ` Richard Cochran 2018-10-31 3:01 ` Richard Cochran 2018-10-31 3:01 ` [Intel-wired-lan] " Richard Cochran 2018-10-26 16:27 ` [RFC PATCH 2/4] e1000e: add support for extended PHC gettime Miroslav Lichvar 2018-10-26 16:27 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-26 16:27 ` [RFC PATCH 3/4] igb: " Miroslav Lichvar 2018-10-26 16:27 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-31 2:29 ` Richard Cochran 2018-10-31 2:29 ` [Intel-wired-lan] " Richard Cochran 2018-10-31 9:39 ` Miroslav Lichvar 2018-10-31 9:39 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-31 16:56 ` Keller, Jacob E 2018-10-31 16:56 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-26 16:27 ` [RFC PATCH 4/4] ixgbe: " Miroslav Lichvar 2018-10-26 16:27 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-26 16:54 ` Keller, Jacob E 2018-10-26 16:54 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-29 13:31 ` Miroslav Lichvar 2018-10-29 13:31 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-29 16:02 ` Keller, Jacob E 2018-10-29 16:02 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-31 14:40 ` Richard Cochran 2018-10-31 14:40 ` [Intel-wired-lan] " Richard Cochran 2018-10-31 14:49 ` Miroslav Lichvar 2018-10-31 14:49 ` [Intel-wired-lan] " Miroslav Lichvar 2018-10-31 21:16 ` Richard Cochran 2018-10-31 21:16 ` [Intel-wired-lan] " Richard Cochran 2018-10-31 22:08 ` Keller, Jacob E 2018-10-31 22:08 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-31 16:55 ` Keller, Jacob E 2018-10-31 16:55 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-26 16:40 ` [RFC PATCH 0/4] More accurate PHC<->system clock synchronization Keller, Jacob E 2018-10-26 16:40 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-26 16:51 ` Keller, Jacob E 2018-10-26 16:51 ` [Intel-wired-lan] " Keller, Jacob E 2018-10-31 2:25 ` Richard Cochran 2018-10-31 2:25 ` [Intel-wired-lan] " Richard Cochran
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181031022351.24mmvf7u7bcx42rv@localhost \ --to=richardcochran@gmail.com \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jacob.e.keller@intel.com \ --cc=mlichvar@redhat.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.