e1000e: prevent corruption of EEPROM/NVM
Subsystems (2)
PATCH 4/4 e1000e: prevent corruption of EEPROM/NVM
From: Christopher Li <[email protected]>
Andrey reports e1000e corruption, and that a patch in vmware's ESX fixed it.
The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.
---
drivers/net/e1000/e1000_hw.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/net/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c~e1000e-prevent-corruption-of-eeprom-nvm +23 -0
@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(strstatic u8 e1000_calculate_mng_checksum (char *buffer,u32 length);static s32 e1000_configure_kmrn_for_10_100 (struct e1000_hw *hw,u16 duplex);static s32 e1000_configure_kmrn_for_1000 (struct e1000_hw *hw); +static s32 e1000_do_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data); +static s32 e1000_do_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data);/* IGP cable length table */ static const
@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP0283 ,89 ,95 ,100 ,105 ,109 ,113 ,116 ,119 ,122 ,124 , 104, 109, 114, 118, 121, 124}; +static DEFINE_SPINLOCK (e1000_eeprom_lock); +/****************************************************************************** * Set the phy type member in the hw struct. *
@@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct*****************************************************************************/ s32 e1000_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) { +s32 ret; +spin_lock (&e1000_eeprom_lock); + ret =e1000_do_read_eeprom (hw, offset, words, data); +spin_unlock (&e1000_eeprom_lock); +return ret; +} + +static s32 e1000_do_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) +{struct e1000_eeprom_info *eeprom = &hw->eeprom;u32 i =0 ;
@@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct*****************************************************************************/ s32 e1000_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) { +s32 ret; +spin_lock (&e1000_eeprom_lock); + ret =e1000_do_write_eeprom (hw, offset, words, data); +spin_unlock (&e1000_eeprom_lock); +return ret; +} + + +static s32 e1000_do_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) +{struct e1000_eeprom_info *eeprom = &hw->eeprom;s32 status =0 ;
_
Quoted 9 lines · [email protected] wrote:
From: Christopher Li <[email protected]>
Andrey reports e1000e corruption, and that a patch in vmware's ESX fixed
it.The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.
NAK. Please do not apply this patch, for reasons mentioned in my other reply just sent to netdev.
The RTNL should be preventing this from being a possible bug in *Linux* and if it is not we have much larger problems, not the least of which is that this patch doesn't lock against the driver accessing the eeprom simultaneously.
Quoted 10 lines · Jesse
Quoted 8 lines · [email protected] wrote:
From: Christopher Li <[email protected]>
Andrey reports e1000e corruption, and that a patch in vmware's ESX fixed it.
The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.
Quoted 7 lines
NAK. Please do not apply this patch, for reasons mentioned in my other reply just sent to netdev.
The RTNL should be preventing this from being a possible bug in *Linux* and if it is not we have much larger problems, not the least of which is that this patch doesn't lock against the driver accessing the eeprom simultaneously.
Ping. A problem still occurs, regardless of what should be prevented?
Quoted 4 lines · [email protected] wrote:
From: Christopher Li <[email protected]>
Andrey reports e1000e corruption, and that a patch in vmware's ESX fixed it.
wrong subject? the patch applies to e1000, not e1000e...
Quoted 80 lines
The EEPROM corruption is triggered by concurrent access of the EEPROM read/write. Putting a lock around it solve the problem.
[[email protected]: use DEFINE_SPINLOCK to avoid confusing lockdep]Signed-off-by Christopher Li <[email protected]>Reported-by Andrey Borzenkov <[email protected]>Cc Zach Amsden <[email protected]>Cc Pratap Subrahmanyam <[email protected]>Cc Jeff Kirsher <[email protected]>Cc Jesse Brandeburg <[email protected]>Cc Bruce Allan <[email protected]>Cc PJ Waskiewicz <[email protected]>Cc John Ronciak <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/e1000/e1000_hw.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)diff -puN
drivers/net/e1000/e1000_hw.c~e1000e-prevent-corruption-of-eeprom-nvmdrivers/net/e1000/e1000_hw.cdrivers/net/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c~e1000e-prevent-corruption-of-eeprom-nvm +23
-0@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(strstatic u8 e1000_calculate_mng_checksum (char *buffer,u32 length);static s32 e1000_configure_kmrn_for_10_100 (struct e1000_hw *hw,u16 duplex);static s32 e1000_configure_kmrn_for_1000 (struct e1000_hw *hw); +static s32 e1000_do_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data); +static s32 e1000_do_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data);/* IGP cable length table */ static const@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP0283 ,89 ,95 ,100 ,105 ,109 ,113 ,116 ,119 ,122 ,124 , 104, 109, 114, 118, 121, 124}; +static DEFINE_SPINLOCK (e1000_eeprom_lock); +/****************************************************************************** * Set the phy type member in the hw struct. * @@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct*****************************************************************************/ s32 e1000_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) { +s32 ret; +spin_lock (&e1000_eeprom_lock); + ret =e1000_do_read_eeprom (hw, offset, words, data); +spin_unlock (&e1000_eeprom_lock); +return ret; +} + +static s32 e1000_do_read_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) +{struct e1000_eeprom_info *eeprom = &hw->eeprom;u32 i =0 ;@@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct*****************************************************************************/ s32 e1000_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) { +s32 ret; +spin_lock (&e1000_eeprom_lock); + ret =e1000_do_write_eeprom (hw, offset, words, data); +spin_unlock (&e1000_eeprom_lock); +return ret; +} + + +static s32 e1000_do_write_eeprom (struct e1000_hw *hw,u16 offset,u16 words,u16 *data) +{struct e1000_eeprom_info *eeprom = &hw->eeprom;s32 status =0 ;_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html