bonding: add ACCESS_ONCE() and change local var names
Subsystems (3)
PATCH 1/1 bonding: add ACCESS_ONCE() and change local var names
We use bond->params.packets_per_slave without any locking in 2 places:bond_rr_gen_id() and bonding_show_packets_per_slave(), so as a precaution and to show what's intended, add ACCESS_ONCE() when fetching it in the local variable.
Also rename the local variables to pps_tmp so they're not with the name of the module parameter to avoid confusion.
---
Please note that this patch is on top of the one I posted earlier today ("bonding: fix packets_per_slave showing").
Also I'm not adding ACCESS_ONCE() to bond_check_params() now as we don't export almost anything through /sys/module/bonding/parameters and moreover it's a new feature and thus net-next material if such an export is to be made.
drivers/net/bonding/bond_main.c | 7 +++---- drivers/net/bonding/bond_sysfs.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/net/bonding/bond_main.c +3 -4
@@ -3590,10 +3590,10 @@ void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id)*/ static u32 bond_rr_gen_slave_id (struct bonding *bond) { -int packets_per_slave = bond->params.packets_per_slave; +int pps_tmp =ACCESS_ONCE (bond->params.packets_per_slave);u32 slave_id; -switch (packets_per_slave) { +switch (pps_tmp) {case 0 : slave_id =prandom_u32 ();break ;
@@ -3601,8 +3601,7 @@ static u32 bond_rr_gen_slave_id(struct bonding *bond) slave_id = bond->rr_tx_counter;break ;default : - slave_id =reciprocal_divide (bond->rr_tx_counter, - packets_per_slave); + slave_id =reciprocal_divide (bond->rr_tx_counter, pps_tmp);break ; } bond->rr_tx_counter++;
drivers/net/bonding/bond_sysfs.c +4 -4
@@ -1635,12 +1635,12 @@ static ssize_t bonding_show_packets_per_slave(struct device *d, char *buf) {struct bonding *bond =to_bond (d); -unsigned int packets_per_slave = bond->params.packets_per_slave; +unsigned int pps_tmp =ACCESS_ONCE (bond->params.packets_per_slave); -if (packets_per_slave >1 ) - packets_per_slave =reciprocal_value (packets_per_slave); +if (pps_tmp >1 ) + pps_tmp =reciprocal_value (pps_tmp); -return sprintf (buf,"%u\n" , packets_per_slave); +return sprintf (buf,"%u\n" , pps_tmp); } static ssize_t bonding_store_packets_per_slave(struct device *d,
Signature · 1 line
1.8.1.4
Quoted 64 lines · Nikolay Aleksandrov
We use
bond->params.packets_per_slavewithout any locking in 2 places:bond_rr_gen_id()andbonding_show_packets_per_slave(), so as a precaution and to show what's intended, addACCESS_ONCE()when fetching it in the local variable.
Also rename the local variables topps_tmpso they're not with the name of the module parameter to avoid confusion.CC Andy Gospodarek <[email protected]>CC Jay Vosburgh <[email protected]>CC Veaceslav Falico <[email protected]>CC David S. Miller <[email protected]>CC Eric Dumazet <[email protected]>Signed-off-by Nikolay Aleksandrov <[email protected]>---
Please note that this patch is on top of the one I posted earlier today ("bonding: fixpackets_per_slaveshowing").
Also I'm not addingACCESS_ONCE()tobond_check_params()now as we don't export almost anything through/sys/module/bonding/parametersand moreover it's a new feature and thus net-next material if such an export is to be made.drivers/net/bonding/bond_main.c | 7 +++---- drivers/net/bonding/bond_sysfs.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-)drivers/net/bonding/bond_main.c +3
-4@@ -3590,10 +3590,10 @@ void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id)*/ static u32 bond_rr_gen_slave_id (struct bonding *bond) { -int packets_per_slave = bond->params.packets_per_slave; +int pps_tmp =ACCESS_ONCE (bond->params.packets_per_slave);u32 slave_id; -switch (packets_per_slave) { +switch (pps_tmp) {case 0 : slave_id =prandom_u32 ();break ;@@ -3601,8 +3601,7 @@ static u32 bond_rr_gen_slave_id(struct bonding *bond) slave_id = bond->rr_tx_counter;break ;default : - slave_id =reciprocal_divide (bond->rr_tx_counter, - packets_per_slave); + slave_id =reciprocal_divide (bond->rr_tx_counter, pps_tmp);break ; } bond->rr_tx_counter++;drivers/net/bonding/bond_sysfs.c +1
-1@@ -1635,12 +1635,12 @@ static ssize_t bonding_show_packets_per_slave(struct device *d, char *buf) {struct bonding *bond =to_bond (d); -unsigned int packets_per_slave = bond->params.packets_per_slave; +unsigned int pps_tmp =ACCESS_ONCE (bond->params.packets_per_slave);
drivers/net/bonding/bond_sysfs.c static ssize_t bonding_show_packets_per_slave(struct device *d, · line 1646
Quoted 10 lines
drivers/net/bonding/bond_sysfs.c +3
-3-if (packets_per_slave >1 ) - packets_per_slave =reciprocal_value (packets_per_slave); +if (pps_tmp >1 ) + pps_tmp =reciprocal_value (pps_tmp); -return sprintf (buf,"%u\n" , packets_per_slave); +return sprintf (buf,"%u\n" , pps_tmp); } static ssize_t bonding_store_packets_per_slave(struct device *d,
Self-nak
please disregard this patch and sorry for the noise. I'm so blind...
Nik