* [Intel-wired-lan] [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-06 19:47 ` Christophe JAILLET
0 siblings, 0 replies; 9+ messages in thread
From: Christophe JAILLET @ 2018-02-06 19:47 UTC (permalink / raw)
To: intel-wired-lan
'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
The modified code should behave the same, because HWTSTAMP_TX_ON is 1
and no other possible values of 'tx_type' would match the test.
However, this is more future-proof, should other values be allowed one day.
See 'struct hwtstamp_config' in 'include/uapi/linux/net_tstamp.h'
This fixes a warning reported by smatch:
igb_xmit_frame_ring() warn: bit shifter 'HWTSTAMP_TX_ON' used for logical '&'
Fixes: 26bd4e2db06be ("igb: protect TX timestamping from API misuse")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index c208753ff5b7..e945d1f7c7fe 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5727,7 +5727,7 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
- if (adapter->tstamp_config.tx_type & HWTSTAMP_TX_ON &&
+ if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
!test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,
&adapter->state)) {
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
--
2.14.1
---
L'absence de virus dans ce courrier ?lectronique a ?t? v?rifi?e par le logiciel antivirus Avast.
https://www.avast.com/antivirus
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-06 19:47 ` Christophe JAILLET
0 siblings, 0 replies; 9+ messages in thread
From: Christophe JAILLET @ 2018-02-06 19:47 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: intel-wired-lan, netdev, linux-kernel, kernel-janitors,
Christophe JAILLET
'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
The modified code should behave the same, because HWTSTAMP_TX_ON is 1
and no other possible values of 'tx_type' would match the test.
However, this is more future-proof, should other values be allowed one day.
See 'struct hwtstamp_config' in 'include/uapi/linux/net_tstamp.h'
This fixes a warning reported by smatch:
igb_xmit_frame_ring() warn: bit shifter 'HWTSTAMP_TX_ON' used for logical '&'
Fixes: 26bd4e2db06be ("igb: protect TX timestamping from API misuse")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index c208753ff5b7..e945d1f7c7fe 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -5727,7 +5727,7 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
- if (adapter->tstamp_config.tx_type & HWTSTAMP_TX_ON &&
+ if (adapter->tstamp_config.tx_type = HWTSTAMP_TX_ON &&
!test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,
&adapter->state)) {
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
--
2.14.1
---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
2018-02-06 19:47 ` Christophe JAILLET
(?)
@ 2018-02-06 21:06 ` Richard Cochran
-1 siblings, 0 replies; 9+ messages in thread
From: Richard Cochran @ 2018-02-06 21:06 UTC (permalink / raw)
To: Christophe JAILLET
Cc: jeffrey.t.kirsher, intel-wired-lan, netdev, linux-kernel,
kernel-janitors
On Tue, Feb 06, 2018 at 08:47:59PM +0100, Christophe JAILLET wrote:
> 'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
> The modified code should behave the same, because HWTSTAMP_TX_ON is 1
> and no other possible values of 'tx_type' would match the test.
> However, this is more future-proof, should other values be allowed one day.
Nice catch, and I am going to introduce more tx_type values soon.
Thanks,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-wired-lan] [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-06 21:06 ` Richard Cochran
0 siblings, 0 replies; 9+ messages in thread
From: Richard Cochran @ 2018-02-06 21:06 UTC (permalink / raw)
To: intel-wired-lan
On Tue, Feb 06, 2018 at 08:47:59PM +0100, Christophe JAILLET wrote:
> 'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
> The modified code should behave the same, because HWTSTAMP_TX_ON is 1
> and no other possible values of 'tx_type' would match the test.
> However, this is more future-proof, should other values be allowed one day.
Nice catch, and I am going to introduce more tx_type values soon.
Thanks,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-06 21:06 ` Richard Cochran
0 siblings, 0 replies; 9+ messages in thread
From: Richard Cochran @ 2018-02-06 21:06 UTC (permalink / raw)
To: Christophe JAILLET
Cc: jeffrey.t.kirsher, intel-wired-lan, netdev, linux-kernel,
kernel-janitors
On Tue, Feb 06, 2018 at 08:47:59PM +0100, Christophe JAILLET wrote:
> 'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
> The modified code should behave the same, because HWTSTAMP_TX_ON is 1
> and no other possible values of 'tx_type' would match the test.
> However, this is more future-proof, should other values be allowed one day.
Nice catch, and I am going to introduce more tx_type values soon.
Thanks,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
2018-02-06 19:47 ` Christophe JAILLET
(?)
@ 2018-02-13 20:54 ` Brown, Aaron F
-1 siblings, 0 replies; 9+ messages in thread
From: Brown, Aaron F @ 2018-02-13 20:54 UTC (permalink / raw)
To: Christophe JAILLET, Kirsher, Jeffrey T
Cc: intel-wired-lan, netdev, linux-kernel, kernel-janitors
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Christophe JAILLET
> Sent: Tuesday, February 6, 2018 11:48 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe
> JAILLET <christophe.jaillet@wanadoo.fr>
> Subject: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
>
> 'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
> The modified code should behave the same, because HWTSTAMP_TX_ON is
> 1
> and no other possible values of 'tx_type' would match the test.
> However, this is more future-proof, should other values be allowed one day.
>
> See 'struct hwtstamp_config' in 'include/uapi/linux/net_tstamp.h'
>
> This fixes a warning reported by smatch:
> igb_xmit_frame_ring() warn: bit shifter 'HWTSTAMP_TX_ON' used for
> logical '&'
>
> Fixes: 26bd4e2db06be ("igb: protect TX timestamping from API misuse")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* [Intel-wired-lan] [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-13 20:54 ` Brown, Aaron F
0 siblings, 0 replies; 9+ messages in thread
From: Brown, Aaron F @ 2018-02-13 20:54 UTC (permalink / raw)
To: intel-wired-lan
> From: netdev-owner at vger.kernel.org [mailto:netdev-
> owner at vger.kernel.org] On Behalf Of Christophe JAILLET
> Sent: Tuesday, February 6, 2018 11:48 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org; linux-
> kernel at vger.kernel.org; kernel-janitors at vger.kernel.org; Christophe
> JAILLET <christophe.jaillet@wanadoo.fr>
> Subject: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
>
> 'HWTSTAMP_TX_ON' should be handled as a value, not as a bit mask.
> The modified code should behave the same, because HWTSTAMP_TX_ON is
> 1
> and no other possible values of 'tx_type' would match the test.
> However, this is more future-proof, should other values be allowed one day.
>
> See 'struct hwtstamp_config' in 'include/uapi/linux/net_tstamp.h'
>
> This fixes a warning reported by smatch:
> igb_xmit_frame_ring() warn: bit shifter 'HWTSTAMP_TX_ON' used for
> logical '&'
>
> Fixes: 26bd4e2db06be ("igb: protect TX timestamping from API misuse")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* RE: [PATCH] igb: Fix a test with HWTSTAMP_TX_ON
@ 2018-02-13 20:54 ` Brown, Aaron F
0 siblings, 0 replies; 9+ messages in thread
From: Brown, Aaron F @ 2018-02-13 20:54 UTC (permalink / raw)
To: Christophe JAILLET, Kirsher, Jeffrey T
Cc: intel-wired-lan, netdev, linux-kernel, kernel-janitors
PiBGcm9tOiBuZXRkZXYtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bmV0ZGV2LQ0KPiBv
d25lckB2Z2VyLmtlcm5lbC5vcmddIE9uIEJlaGFsZiBPZiBDaHJpc3RvcGhlIEpBSUxMRVQNCj4g
U2VudDogVHVlc2RheSwgRmVicnVhcnkgNiwgMjAxOCAxMTo0OCBBTQ0KPiBUbzogS2lyc2hlciwg
SmVmZnJleSBUIDxqZWZmcmV5LnQua2lyc2hlckBpbnRlbC5jb20+DQo+IENjOiBpbnRlbC13aXJl
ZC1sYW5AbGlzdHMub3N1b3NsLm9yZzsgbmV0ZGV2QHZnZXIua2VybmVsLm9yZzsgbGludXgtDQo+
IGtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc7IGtlcm5lbC1qYW5pdG9yc0B2Z2VyLmtlcm5lbC5vcmc7
IENocmlzdG9waGUNCj4gSkFJTExFVCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI+DQo+
IFN1YmplY3Q6IFtQQVRDSF0gaWdiOiBGaXggYSB0ZXN0IHdpdGggSFdUU1RBTVBfVFhfT04NCj4g
DQo+ICdIV1RTVEFNUF9UWF9PTicgc2hvdWxkIGJlIGhhbmRsZWQgYXMgYSB2YWx1ZSwgbm90IGFz
IGEgYml0IG1hc2suDQo+IFRoZSBtb2RpZmllZCBjb2RlIHNob3VsZCBiZWhhdmUgdGhlIHNhbWUs
IGJlY2F1c2UgSFdUU1RBTVBfVFhfT04gaXMNCj4gMQ0KPiBhbmQgbm8gb3RoZXIgcG9zc2libGUg
dmFsdWVzIG9mICd0eF90eXBlJyB3b3VsZCBtYXRjaCB0aGUgdGVzdC4NCj4gSG93ZXZlciwgdGhp
cyBpcyBtb3JlIGZ1dHVyZS1wcm9vZiwgc2hvdWxkIG90aGVyIHZhbHVlcyBiZSBhbGxvd2VkIG9u
ZSBkYXkuDQo+IA0KPiBTZWUgJ3N0cnVjdCBod3RzdGFtcF9jb25maWcnIGluICdpbmNsdWRlL3Vh
cGkvbGludXgvbmV0X3RzdGFtcC5oJw0KPiANCj4gVGhpcyBmaXhlcyBhIHdhcm5pbmcgcmVwb3J0
ZWQgYnkgc21hdGNoOg0KPiAgICBpZ2JfeG1pdF9mcmFtZV9yaW5nKCkgd2FybjogYml0IHNoaWZ0
ZXIgJ0hXVFNUQU1QX1RYX09OJyB1c2VkIGZvcg0KPiBsb2dpY2FsICcmJw0KPiANCj4gRml4ZXM6
IDI2YmQ0ZTJkYjA2YmUgKCJpZ2I6IHByb3RlY3QgVFggdGltZXN0YW1waW5nIGZyb20gQVBJIG1p
c3VzZSIpDQo+IFNpZ25lZC1vZmYtYnk6IENocmlzdG9waGUgSkFJTExFVCA8Y2hyaXN0b3BoZS5q
YWlsbGV0QHdhbmFkb28uZnI+DQo+IC0tLQ0KPiAgZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50ZWwv
aWdiL2lnYl9tYWluLmMgfCAyICstDQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyks
IDEgZGVsZXRpb24oLSkNCj4gDQoNClRlc3RlZC1ieTogQWFyb24gQnJvd24gPGFhcm9uLmYuYnJv
d25AaW50ZWwuY29tPg0K
^ permalink raw reply [flat|nested] 9+ messages in thread