Skip to contentSkip to conversation

ptp: Validate the ancillary ioctl flags more carefully.

PATCH In review Richard Cochran 3 participants 3 messages Nov 14, 2019 – Nov 15, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ptp: Validate the ancillary ioctl flags more carefully.

The flags passed to the ioctls for periodic output signals and time stamping of external signals were never checked, and thus formed a useless ABI inadvertently. More recently, a version 2 of the ioctls was introduced in order make the flags meaningful. This series tightens up the checks on the new ioctl flags.

- Patch 1 ensures at least one edge flag is set for the new ioctl.
- Patches 2-7 are Jacob's recent checks, picking up the tags.
- Patch 8 introduces a "strict" flag for passing to the drivers when the new ioctl is used.
- Patches 9-12 implement the "strict" checking in the drivers.
- Patch 13 extends the test program to exercise combinations of flags.

Jacob Keller (6):
net: reject PTP periodic output requests with unsupported flags
mv88e6xxx: reject unsupported external timestamp flags
dp83640: reject unsupported external timestamp flags
igb: reject unsupported external timestamp flags
mlx5: reject unsupported external timestamp flags
renesas: reject unsupported external timestamp flags

Richard Cochran (7):
ptp: Validate requests to enable time stamping of external signals.
ptp: Introduce strict checking of external time stamp options.
mv88e6xxx: Reject requests to enable time stamping on both edges.
dp83640: Reject requests to enable time stamping on both edges.
igb: Reject requests that fail to enable time stamping on both edges.
mlx5: Reject requests to enable time stamping on both edges.
ptp: Extend the test program to check the external time stamp flags.

 drivers/net/dsa/mv88e6xxx/ptp.c               | 13 +++++
 drivers/net/ethernet/broadcom/tg3.c           |  4 ++
 drivers/net/ethernet/intel/igb/igb_ptp.c      | 17 ++++++
 .../ethernet/mellanox/mlx5/core/lib/clock.c   | 17 ++++++
 drivers/net/ethernet/microchip/lan743x_ptp.c  |  4 ++
 drivers/net/ethernet/renesas/ravb_ptp.c       | 11 ++++
 .../net/ethernet/stmicro/stmmac/stmmac_ptp.c  |  4 ++
 drivers/net/phy/dp83640.c                     | 16 ++++++
 drivers/ptp/ptp_chardev.c                     | 20 +++++--
 include/uapi/linux/ptp_clock.h                |  5 +-
 tools/testing/selftests/ptp/testptp.c         | 53 ++++++++++++++++++-
 11 files changed, 156 insertions(+), 8 deletions(-)
Signature · 1 line
2.20.1
Acked-by on the v1 series
#1 lore raw
Quoted 27 lines

-----Original Message-----
From: Richard Cochran <[email protected]>
Sent: Thursday, November 14, 2019 10:45 AM
To: netdev at vger.kernel.org
Cc: intel-wired-lan at lists.osuosl.org; David Miller <[email protected]>; Brandon Streiff <[email protected]>; Hall, Christopher S <[email protected]>; Eugenia Emantayev <[email protected]>; Felipe Balbi <[email protected]>; Feras Daoud <[email protected]>; Keller, Jacob E <[email protected]>; Kirsher, Jeffrey T <[email protected]>; Sergei Shtylyov <[email protected]>; Stefan Sorensen <[email protected]>
Subject: [PATCH net 00/13] ptp: Validate the ancillary ioctl flags more carefully.

The flags passed to the ioctls for periodic output signals and time stamping of external signals were never checked, and thus formed a useless ABI inadvertently. More recently, a version 2 of the ioctls was introduced in order make the flags meaningful. This series tightens up the checks on the new ioctl flags.

- Patch 1 ensures at least one edge flag is set for the new ioctl.
- Patches 2-7 are Jacob's recent checks, picking up the tags.
- Patch 8 introduces a "strict" flag for passing to the drivers when the new ioctl is used.
- Patches 9-12 implement the "strict" checking in the drivers.
- Patch 13 extends the test program to exercise combinations of flags.

Quoted 8 lines

Jacob Keller (6):
net: reject PTP periodic output requests with unsupported flags
mv88e6xxx: reject unsupported external timestamp flags
dp83640: reject unsupported external timestamp flags
igb: reject unsupported external timestamp flags
mlx5: reject unsupported external timestamp flags
renesas: reject unsupported external timestamp flags

The patches from me accurately represent what I submitted and I'm happy to have them committed via this series.

Quoted 8 lines

Richard Cochran (7):
ptp: Validate requests to enable time stamping of external signals.
ptp: Introduce strict checking of external time stamp options.
mv88e6xxx: Reject requests to enable time stamping on both edges.
dp83640: Reject requests to enable time stamping on both edges.
igb: Reject requests that fail to enable time stamping on both edges.
mlx5: Reject requests to enable time stamping on both edges.
ptp: Extend the test program to check the external time stamp flags.

My only suggestion here would be to implement the STRICT flag without modifying drivers, and have drivers allow STRICT and begin checking for it at the same time.

Given this series all lands together though, it's not really a big deal because the resulting tree after all patches apply is the same.

Overall:

Thanks,
Jake

Quoted 16 lines
 drivers/net/dsa/mv88e6xxx/ptp.c               | 13 +++++
 drivers/net/ethernet/broadcom/tg3.c           |  4 ++
 drivers/net/ethernet/intel/igb/igb_ptp.c      | 17 ++++++
 .../ethernet/mellanox/mlx5/core/lib/clock.c   | 17 ++++++
 drivers/net/ethernet/microchip/lan743x_ptp.c  |  4 ++
 drivers/net/ethernet/renesas/ravb_ptp.c       | 11 ++++
 .../net/ethernet/stmicro/stmmac/stmmac_ptp.c  |  4 ++
 drivers/net/phy/dp83640.c                     | 16 ++++++
 drivers/ptp/ptp_chardev.c                     | 20 +++++--
 include/uapi/linux/ptp_clock.h                |  5 +-
 tools/testing/selftests/ptp/testptp.c         | 53 ++++++++++++++++++-
 11 files changed, 156 insertions(+), 8 deletions(-)

--
2.20.1

maintainer
#2 lore raw
In reply to Richard Cochran

From: Richard Cochran <[email protected]>
Date: Thu, 14 Nov 2019 10:44:54 -0800

Quoted 6 lines

The flags passed to the ioctls for periodic output signals and time stamping of external signals were never checked, and thus formed a useless ABI inadvertently. More recently, a version 2 of the ioctls was introduced in order make the flags meaningful. This series tightens up the checks on the new ioctl flags.

Quoted 6 lines

- Patch 1 ensures at least one edge flag is set for the new ioctl.
- Patches 2-7 are Jacob's recent checks, picking up the tags.
- Patch 8 introduces a "strict" flag for passing to the drivers when the new ioctl is used.
- Patches 9-12 implement the "strict" checking in the drivers.
- Patch 13 extends the test program to exercise combinations of flags.

Series applied, thanks Richard.