From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tina Ruchandani <ruchandani.tina@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
y2038@lists.linaro.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
David Vrabel <david.vrabel@citrix.com>,
"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: Re: [PATCH v2] xen/pcifront: Remove usage of struct timeval
Date: Fri, 5 Jun 2015 15:07:58 -0400 [thread overview]
Message-ID: <20150605190758.GF21113@l.oracle.com> (raw)
In-Reply-To: <CAErSpo47yMfPREFOTCiL8Pa=xbqgsSWk90Ge=u2YeTkUgdFESQ@mail.gmail.com>
On Wed, May 20, 2015 at 08:16:24AM -0500, Bjorn Helgaas wrote:
> On Tue, May 19, 2015 at 1:08 AM, Tina Ruchandani
> <ruchandani.tina@gmail.com> wrote:
> > struct timeval uses a 32-bit field for representing seconds,
> > which will overflow in the year 2038 and beyond. This patch replaces
> > struct timeval with 64-bit ktime_t which is 2038 safe.
> > The patch is part of a larger effort to remove instances of
> > 32-bit timekeeping variables (timeval, time_t and timespec)
> > from the kernel.
> >
> > Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
>
> This isn't PCI-related, so I expect Konrad, Boris, or David will merge this.
OK. Thanks.
>
> > --
> > Changes in v2:
> > - Use monotonic time (ktime_get_ns()) instead of real time
> > since we only care about elapsed delta here.
> > - Use macro ktime_get_ns() instead of getting ktime_t and
> > converting it to ns.
> > ---
> > drivers/pci/xen-pcifront.c | 8 +++-----
> > 1 file changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> > index 7cfd2db..c4796c8 100644
> > --- a/drivers/pci/xen-pcifront.c
> > +++ b/drivers/pci/xen-pcifront.c
> > @@ -20,6 +20,7 @@
> > #include <linux/workqueue.h>
> > #include <linux/bitops.h>
> > #include <linux/time.h>
> > +#include <linux/ktime.h>
> > #include <xen/platform_pci.h>
> >
> > #include <asm/xen/swiotlb-xen.h>
> > @@ -115,7 +116,6 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
> > evtchn_port_t port = pdev->evtchn;
> > unsigned irq = pdev->irq;
> > s64 ns, ns_timeout;
> > - struct timeval tv;
> >
> > spin_lock_irqsave(&pdev->sh_info_lock, irq_flags);
> >
> > @@ -132,8 +132,7 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
> > * (in the latter case we end up continually re-executing poll() with a
> > * timeout in the past). 1s difference gives plenty of slack for error.
> > */
> > - do_gettimeofday(&tv);
> > - ns_timeout = timeval_to_ns(&tv) + 2 * (s64)NSEC_PER_SEC;
> > + ns_timeout = ktime_get_ns() + 2 * (s64)NSEC_PER_SEC;
> >
> > xen_clear_irq_pending(irq);
> >
> > @@ -141,8 +140,7 @@ static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
> > (unsigned long *)&pdev->sh_info->flags)) {
> > xen_poll_irq_timeout(irq, jiffies + 3*HZ);
> > xen_clear_irq_pending(irq);
> > - do_gettimeofday(&tv);
> > - ns = timeval_to_ns(&tv);
> > + ns = ktime_get_ns();
> > if (ns > ns_timeout) {
> > dev_err(&pdev->xdev->dev,
> > "pciback not responding!!!\n");
> > --
> > 2.2.0.rc0.207.ga3a616c
> >
next prev parent reply other threads:[~2015-06-05 19:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-19 6:08 [PATCH v2] xen/pcifront: Remove usage of struct timeval Tina Ruchandani
2015-05-19 14:14 ` Boris Ostrovsky
2015-05-20 12:21 ` [Y2038] " Arnd Bergmann
2015-05-20 13:16 ` Bjorn Helgaas
2015-06-05 19:07 ` Konrad Rzeszutek Wilk [this message]
2015-06-08 10:18 ` [Xen-devel] " David Vrabel
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=20150605190758.GF21113@l.oracle.com \
--to=konrad.wilk@oracle.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=linux-pci@vger.kernel.org \
--cc=ruchandani.tina@gmail.com \
--cc=xen-devel@lists.xenproject.org \
--cc=y2038@lists.linaro.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).