tun: remove possible false sharing in tun_flow_update()
Subsystems (3)
PATCH 1/1 tun: remove possible false sharing in tun_flow_update()
As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
a C compiler can legally transform
if (e->queue_index != queue_index)
e->queue_index = queue_index;
to :
e->queue_index = queue_index;
Note that the code using jiffies has no issue, since jiffies has volatile attribute.
if (e->updated != jiffies)
e->updated = jiffies;
--- drivers/net/tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/tun.c +2 -2
@@ -526,8 +526,8 @@ static void tun_flow_update(struct tun_struct *tun, u32 rxhash, e =tun_flow_find (head, rxhash);if (likely (e)) {/* TODO: keep queueing to old queue until it's empty? */ -if (e->queue_index != queue_index) - e->queue_index = queue_index; +if (READ_ONCE (e->queue_index) != queue_index) +WRITE_ONCE (e->queue_index, queue_index);if (e->updated != jiffies) e->updated = jiffies;sock_rps_record_flow_hash (e->rps_rxhash);
Signature · 1 line
2.23.0.581.g78d2f28ef7-goog
Quoted 31 lines · Eric Dumazet
As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
a C compiler can legally transformif (
e->queue_index!=queue_index)e->queue_index = queue_index;to :
e->queue_index = queue_index;Note that the code using jiffies has no issue, since jiffies has volatile attribute.
if (
e->updated!= jiffies)e->updated = jiffies;Fixes 83b1bc122cab ("tun: align write-heavy flow entry members to a cache line")Signed-off-by Eric Dumazet <[email protected]>Cc Zhang Yu <[email protected]>Cc Wang Li <[email protected]>Cc Li RongQing <[email protected]>Cc Jason Wang <[email protected]>--- drivers/net/tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/tun.c +0
-0
drivers/net/tun.c static void tun_flow_update(struct tun_struct *tun, u32 rxhash, · line 533
Quoted 10 lines
drivers/net/tun.c +2
-2@@ -526,8 +526,8 @@ static void tun_flow_update(struct tun_struct *tun, u32 rxhash, e =tun_flow_find (head, rxhash);if (likely (e)) {/* TODO: keep queueing to old queue until it's empty? */ -if (e->queue_index != queue_index) - e->queue_index = queue_index; +if (READ_ONCE (e->queue_index) != queue_index) +WRITE_ONCE (e->queue_index, queue_index);if (e->updated != jiffies) e->updated = jiffies;sock_rps_record_flow_hash (e->rps_rxhash);
Jakub Kicinski
AppliedQuoted 14 lines · Eric Dumazet
As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
a C compiler can legally transformif (
e->queue_index!=queue_index)e->queue_index = queue_index;to :
e->queue_index = queue_index;Note that the code using jiffies has no issue, since jiffies has volatile attribute.
if (
e->updated!= jiffies)
Quoted 8 lines
e->updated = jiffies;Fixes 83b1bc122cab ("tun: align write-heavy flow entry members to a cache line")Signed-off-by Eric Dumazet <[email protected]>Cc Zhang Yu <[email protected]>Cc Wang Li <[email protected]>Cc Li RongQing <[email protected]>Cc Jason Wang <[email protected]>
Applied, same story with stable, thanks!