[PATCH net-next 0/2] Expand Tx timestamping coverage by two drivers

[PATCH net-next 0/2] Expand Tx timestamping coverage by two drivers

[Richard Cochran]

This series adds SO_TIMESTAMPING in the transmit path for the Ethernet
MACs found in my older laptop and newer netbook.

Richard Cochran (2):
  r8169: enable transmit time stamping.
  e100: enable transmit time stamping.

 drivers/net/ethernet/intel/e100.c    |    2 ++
 drivers/net/ethernet/realtek/r8169.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

-- 
1.7.2.5

[PATCH net-next 1/2] r8169: enable transmit time stamping.

[Richard Cochran]

This patch has been tested on a machine with the Realtek
RTL8101E/RTL8102E PCI Express Fast Ethernet controller (rev 05).

Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: Francois Romieu <romieu@fr.zoreil.com>

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/realtek/r8169.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index c04df3d..4c6041c 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5564,6 +5564,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 
 	netdev_sent_queue(dev, skb->len);
 
+	skb_tx_timestamp(skb);
+
 	wmb();
 
 	/* Anti gcc 2.95.3 bugware (sic) */
-- 
1.7.2.5

[PATCH net-next 2/2] e100: enable transmit time stamping.

[Richard Cochran]

This patch enables software (and phy device) transmit time stamping.
Tested on an old PIII laptop with built in NIC.

Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/intel/e100.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index e498eff..8a1ba85 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -918,6 +918,8 @@ static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
 		}
 	}
 
+	if (skb)
+		skb_tx_timestamp(skb);
 err_unlock:
 	spin_unlock_irqrestore(&nic->cb_lock, flags);
 
-- 
1.7.2.5

Re: [PATCH net-next 1/2] r8169: enable transmit time stamping.

[Francois Romieu]

Richard Cochran <richardcochran@gmail.com> :
> This patch has been tested on a machine with the Realtek
> RTL8101E/RTL8102E PCI Express Fast Ethernet controller (rev 05).
> 
> Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
> Cc: Francois Romieu <romieu@fr.zoreil.com>

It seems ok. It is hooked at the right place.

-- 
Ueimor

Re: [PATCH net-next 2/2] e100: enable transmit time stamping.

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

On Sat, 2012-03-10 at 18:29 +0100, Richard Cochran wrote:
> This patch enables software (and phy device) transmit time stamping.
> Tested on an old PIII laptop with built in NIC.
> 
> Cc: Alex Duyck <alexander.h.duyck@intel.com>
> Cc: Bruce Allan <bruce.w.allan@intel.com>
> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
> Cc: Don Skidmore <donald.c.skidmore@intel.com>
> Cc: Greg Rose <gregory.v.rose@intel.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: John Ronciak <john.ronciak@intel.com>
> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> 
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
>  drivers/net/ethernet/intel/e100.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-) 

Thanks Richard, I will add the patch to my queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH net-next 1/2] r8169: enable transmit time stamping.

[David Miller]

From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 10 Mar 2012 23:21:47 +0100

> Richard Cochran <richardcochran@gmail.com> :
>> This patch has been tested on a machine with the Realtek
>> RTL8101E/RTL8102E PCI Express Fast Ethernet controller (rev 05).
>> 
>> Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
>> Cc: Francois Romieu <romieu@fr.zoreil.com>
> 
> It seems ok. It is hooked at the right place.

Applied.

Re: [PATCH net-next 2/2] e100: enable transmit time stamping.

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]

On Sat, 2012-03-10 at 09:29 -0800, Richard Cochran wrote:
> This patch enables software (and phy device) transmit time stamping.
> Tested on an old PIII laptop with built in NIC.
> 
> Cc: Alex Duyck <alexander.h.duyck@intel.com>
> Cc: Bruce Allan <bruce.w.allan@intel.com>
> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
> Cc: Don Skidmore <donald.c.skidmore@intel.com>
> Cc: Greg Rose <gregory.v.rose@intel.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: John Ronciak <john.ronciak@intel.com>
> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> 
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
>  drivers/net/ethernet/intel/e100.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-) 

Richard-

I had this patch in my queue, but during testing we found some serious
issues with some adapters.  With every 82559 based adapter Aaron tried
the system would panic on driver load.  This included at least one
sampling of D101S and D101M.  Every other e100 chipset Aaron tried
(82557, 82558, 82550) appeared to work fine.

So I am dropping this patch as is due to the kernel panics.

Cheers,
Jeff

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH net-next 2/2] e100: enable transmit time stamping.

[Richard Cochran]

On Wed, Apr 04, 2012 at 02:04:43AM -0700, Jeff Kirsher wrote:
> 
> I had this patch in my queue, but during testing we found some serious
> issues with some adapters.  With every 82559 based adapter Aaron tried
> the system would panic on driver load.  This included at least one
> sampling of D101S and D101M.  Every other e100 chipset Aaron tried
> (82557, 82558, 82550) appeared to work fine.
> 
> So I am dropping this patch as is due to the kernel panics.

Okay, fine. That driver is strangely written, with weird callbacks and
passing function pointers around.

Taking a second look, I think I might have found the problem. The
drivers casts a firmware pointer onto a skb, and my patch then tries
to timestamp the firmware blob.

If I rework this, are you willing to give it another try?

Thanks,
Richard

Re: [PATCH net-next 2/2] e100: enable transmit time stamping.

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

On Wed, 2012-04-04 at 11:30 +0200, Richard Cochran wrote:
> On Wed, Apr 04, 2012 at 02:04:43AM -0700, Jeff Kirsher wrote:
> > 
> > I had this patch in my queue, but during testing we found some serious
> > issues with some adapters.  With every 82559 based adapter Aaron tried
> > the system would panic on driver load.  This included at least one
> > sampling of D101S and D101M.  Every other e100 chipset Aaron tried
> > (82557, 82558, 82550) appeared to work fine.
> > 
> > So I am dropping this patch as is due to the kernel panics.
> 
> Okay, fine. That driver is strangely written, with weird callbacks and
> passing function pointers around.
> 
> Taking a second look, I think I might have found the problem. The
> drivers casts a firmware pointer onto a skb, and my patch then tries
> to timestamp the firmware blob.
> 
> If I rework this, are you willing to give it another try?
> 
> Thanks,
> Richard

Yeah, we appreciate the work your doing.  Just send me an updated patch
and I will add it to my queue.

That was our thoughts as well regarding the firmware blobs.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH V2 net-next 0/1] e100: support Tx timestamping

[Richard Cochran]

Changes in V2:
- Avoid time stamping of firmware blobs

This patch adds SO_TIMESTAMPING in the transmit path for the Ethernet
MACs found in my older laptop.


Richard Cochran (1):
  e100: enable transmit time stamping.

 drivers/net/ethernet/intel/e100.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

-- 
1.7.2.5

[PATCH V2 net-next 1/1] e100: enable transmit time stamping.

[Richard Cochran]

This patch enables software (and phy device) transmit time stamping.
Tested on an old PIII laptop with built in NIC.

Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/intel/e100.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index e498eff..872e17c 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -1759,6 +1759,7 @@ static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
 		skb->data, skb->len, PCI_DMA_TODEVICE));
 	/* check for mapping failure? */
 	cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
+	skb_tx_timestamp(skb);
 }
 
 static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
-- 
1.7.2.5

Re: [PATCH V2 net-next 1/1] e100: enable transmit time stamping.

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 856 bytes --]

On Sat, 2012-04-07 at 14:49 +0200, Richard Cochran wrote:
> This patch enables software (and phy device) transmit time stamping.
> Tested on an old PIII laptop with built in NIC.
> 
> Cc: Alex Duyck <alexander.h.duyck@intel.com>
> Cc: Bruce Allan <bruce.w.allan@intel.com>
> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
> Cc: Don Skidmore <donald.c.skidmore@intel.com>
> Cc: Greg Rose <gregory.v.rose@intel.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: John Ronciak <john.ronciak@intel.com>
> Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> 
> Signed-off-by: Richard Cochran <richardcochran@gmail.com>
> ---
>  drivers/net/ethernet/intel/e100.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-) 

Thanks Richard, I will add this to my queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]