mlx5: reject unsupported external timestamp flags
Subsystems (3)
PATCH 6/13 mlx5: reject unsupported external timestamp flags
From: Jacob Keller <[email protected]>
Fix the mlx5 core PTP support to explicitly reject any future flags that get added to the external timestamp request ioctl.
In order to maintain currently functioning code, this patch accepts all three current flags. This is because the PTP_RISING_EDGE and PTP_FALLING_EDGE flags have unclear semantics and each driver seems to have interpreted them slightly differently.
[ RC: I'm not 100% sure what this driver does, but if I'm not wrong it
follows the dp83640:
flags Meaning ---------------------------------------------------- -------------------------- PTP_ENABLE_FEATURE Time stamp rising edge PTP_ENABLE_FEATURE|PTP_RISING_EDGE Time stamp rising edge PTP_ENABLE_FEATURE|PTP_FALLING_EDGE Time stamp falling edge PTP_ENABLE_FEATURE|PTP_RISING_EDGE|PTP_FALLING_EDGE Time stamp falling edge
]
--- drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +6 -0
@@ -236,6 +236,12 @@ static int mlx5_extts_configure(struct ptp_clock_info *ptp,if (!MLX5_PPS_CAP (mdev))return -EOPNOTSUPP ; +/* Reject requests with unsupported flags */ +if (rq->extts.flags & ~(PTP_ENABLE_FEATURE | +PTP_RISING_EDGE | +PTP_FALLING_EDGE )) +return -EOPNOTSUPP ; +if (rq->extts.index >= clock->ptp_info.n_pins)return -EINVAL ;
Signature · 1 line
2.20.1
Quoted 13 lines · Richard Cochran
From: Jacob Keller <[email protected]>
Fix the mlx5 core PTP support to explicitly reject any future flags that
get added to the external timestamp request ioctl.In order to maintain currently functioning code, this patch accepts all
three current flags. This is because thePTP_RISING_EDGEandPTP_FALLING_EDGEflags have unclear semantics and each driver seems to
have interpreted them slightly differently.
Quoted 4 lines
[ RC: I'm not 100% sure what this driver does, but if I'm not wrong it
follows the dp83640:
The driver will check if the PTP_FALLING_EDGE flag was set then it will set it in HW, if not then it is going to default to PTP_RISING_EDGE, so LGTM.
But same story here, old tools that lazily set 0xffff or 0x0000 and expected every thing to work.. again not sure if they do exist.
Ariel please have a look at this patch.
Quoted 40 lines
flags Meaning
---------------------------------------------------- -------------
-------------
PTP_ENABLE_FEATURETime stamp
rising edge
PTP_ENABLE_FEATURE|PTP_RISING_EDGE Time stamp
rising edge
PTP_ENABLE_FEATURE|PTP_FALLING_EDGE Time stamp
falling edge
PTP_ENABLE_FEATURE|PTP_RISING_EDGE|PTP_FALLING_EDGE Time stamp
falling edge
]Cc Feras Daoud <[email protected]>Cc Eugenia Emantayev <[email protected]>Signed-off-by Jacob Keller <[email protected]>Reviewed-by Richard Cochran <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +6
-0@@ -236,6 +236,12 @@ static int mlx5_extts_configure(struct ptp_clock_info *ptp, if (!MLX5_PPS_CAP(mdev)) return -EOPNOTSUPP; +/* Reject requests with unsupported flags */ +if (rq->extts.flags & ~(PTP_ENABLE_FEATURE | +PTP_RISING_EDGE | +PTP_FALLING_EDGE )) +return -EOPNOTSUPP ; +if (rq->extts.index >= clock->ptp_info.n_pins)return -EINVAL ;
Quoted 37 lines
-----Original Message-----
From: Saeed Mahameed <[email protected]>
Sent: Thursday, November 14, 2019 4:03 PM
To: Ariel Levkovich <[email protected]>; richardcochran at gmail.com; netdev at vger.kernel.org
Cc: Hall, Christopher S <[email protected]>; Eugenia Emantayev <[email protected]>; davem at davemloft.net;
sergei.shtylyov at cogentembedded.com; Feras Daoud <[email protected]>; stefan.sorensen at spectralink.com; brandon.streiff at ni.com; Keller, Jacob E <[email protected]>; Kirsher, Jeffrey T <[email protected]>; intel-wired-lan at lists.osuosl.org; felipe.balbi at linux.intel.com
Subject: Re: [PATCH net 06/13] mlx5: reject unsupported external timestamp flagsQuoted 13 lines · Richard Cochran
From: Jacob Keller <[email protected]>
Fix the mlx5 core PTP support to explicitly reject any future flags that
get added to the external timestamp request ioctl.In order to maintain currently functioning code, this patch accepts all
three current flags. This is because thePTP_RISING_EDGEandPTP_FALLING_EDGEflags have unclear semantics and each driver seems to
have interpreted them slightly differently.Quoted 4 lines
[ RC: I'm not 100% sure what this driver does, but if I'm not wrong it
follows the dp83640:The driver will check if the
PTP_FALLING_EDGEflag was set then it will set it in HW, if not then it is going to default toPTP_RISING_EDGE, so LGTM.
Quoted 7 lines
Reviewed-by Saeed Mahameed <[email protected]>But same story here, old tools that lazily set
0xffffor0x0000and expected every thing to work.. again not sure if they do exist.Ariel please have a look at this patch.
As long as they stick to the original ioctls this won't be a problem, because the v1 ioctl now explicitly clears unsupported bits before calling driver, so this check will pass. Obviously, this change should not be backported to earlier than 5.4 without also backporting that masking in the original ioctl functions.
Thanks,
Jake
Quoted 41 lines · Jacob E
Quoted 41 lines
-----Original Message-----
From: Saeed Mahameed <[email protected]>
Sent: Thursday, November 14, 2019 4:03 PM
To: Ariel Levkovich <[email protected]>; richardcochran at gmail.com; netdev at vger.kernel.org
Cc: Hall, Christopher S <[email protected]>; Eugenia Emantayev <[email protected]>; davem at davemloft.net;
sergei.shtylyov at cogentembedded.com; Feras Daoud <[email protected]>; stefan.sorensen at spectralink.com; brandon.streiff at ni.com; Keller, Jacob E <[email protected]>; Kirsher, Jeffrey T <[email protected]>; intel-wired-lan at lists.osuosl.org; felipe.balbi at linux.intel.com
Subject: Re: [PATCH net 06/13] mlx5: reject unsupported external timestamp flagsQuoted 13 lines · Richard Cochran
From: Jacob Keller <[email protected]>
Fix the mlx5 core PTP support to explicitly reject any future flags that
get added to the external timestamp request ioctl.In order to maintain currently functioning code, this patch accepts all
three current flags. This is because thePTP_RISING_EDGEandPTP_FALLING_EDGEflags have unclear semantics and each driver seems to
have interpreted them slightly differently.Quoted 4 lines
[ RC: I'm not 100% sure what this driver does, but if I'm not wrong it
follows the dp83640:The driver will check if the
PTP_FALLING_EDGEflag was set then it will set it in HW, if not then it is going to default toPTP_RISING_EDGE, so LGTM.Reviewed-by Saeed Mahameed <[email protected]>But same story here, old tools that lazily set
0xffffor0x0000and expected every thing to work.. again not sure if they do exist.
Quoted 7 lines
Quoted 2 lines
Ariel please have a look at this patch.
As long as they stick to the original ioctls this won't be a problem, because the v1 ioctl now explicitly clears unsupported bits before calling driver, so this check will pass. Obviously, this change should not be backported to earlier than 5.4 without also backporting that masking in the original ioctl functions.
Thanks,
Jake
Agree.
Just a small suggestion, you can perform the check with simply PTP_EXTTS_V1_VALID_FLAGS. Italready combines all the bits we need to check.