dell_rbu: make firmware payload memory uncachable
Subsystems (2)
PATCH v4 1/1 dell_rbu: make firmware payload memory uncachable
The dell_rbu driver takes firmware update payloads and puts them in memory so the system BIOS can find them after a reboot. This sometimes fails (though rarely), because the memory containing the payload is in the CPU cache but never gets written back to main memory before the system is rebooted (CPU cache contents are lost on reboot).
With this patch, the payload memory will be changed to uncachable to ensure that the payload is actually in main memory before the system is rebooted.
---
v2 Added include, removed extra parentheses
v3 Corrected formatting and include line
v4 Moved set_memory_uc() outside the while loop so that the memory is
definitely allocated before it is set to uncachable
This driver has no maintainer.
drivers/firmware/dell_rbu.c +8 -0
@@ -45,6 +45,7 @@#include <linux/moduleparam.h> #include <linux/firmware.h> #include <linux/dma-mapping.h> +#include <asm/set_memory.h> MODULE_AUTHOR ("Abhay Salunke <[email protected]>" );MODULE_DESCRIPTION ("Driver for updating BIOS image on DELL systems" );
@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length) packet_data_temp_buf =NULL ; } } +/* +* set to uncachable or it may never get written back before reboot +*/ +set_memory_uc ((unsigned long )packet_data_temp_buf,1 << ordernum); +spin_lock (&rbu_data.lock); newpacket->data = packet_data_temp_buf;
@@ -349,6 +355,8 @@ static void packet_empty_list(void)* to make sure there are no stale RBU packets left in memory */ memset (newpacket->data,0 , rbu_data.packetsize); +set_memory_wb ((unsigned long )newpacket->data, +1 << newpacket->ordernum);free_pages ((unsigned long ) newpacket->data, newpacket->ordernum);kfree (newpacket);
Quoted 11 lines · Stuart Hayes
The
dell_rbudriver takes firmware update payloads and puts them in memory so the system BIOS can find them after a reboot. This sometimes fails (though rarely), because the memory containing the payload is in the CPU cache but never gets written back to main memory before the system is rebooted (CPU cache contents are lost on reboot).With this patch, the payload memory will be changed to uncachable to ensure that the payload is actually in main memory before the system is rebooted.
Signed-off-by Stuart Hayes <[email protected]>
Looks good to me.
Andrew, could you pick this one? The driver seems to have no maintainer.
thanks,
Takashi
Quoted 43 lines
---
v2 Added include, removed extra parentheses
v3 Corrected formatting and include line
v4 Movedset_memory_uc()outside the while loop so that the memory is
definitely allocated before it is set to uncachableThis driver has no maintainer.
drivers/firmware/dell_rbu.c +8
-0@@ -45,6 +45,7 @@#include <linux/moduleparam.h> #include <linux/firmware.h> #include <linux/dma-mapping.h> +#include <asm/set_memory.h> MODULE_AUTHOR ("Abhay Salunke <[email protected]>" );MODULE_DESCRIPTION ("Driver for updating BIOS image on DELL systems" );@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length) packet_data_temp_buf =NULL ; } } +/* +* set to uncachable or it may never get written back before reboot +*/ +set_memory_uc ((unsigned long )packet_data_temp_buf,1 << ordernum); +spin_lock (&rbu_data.lock); newpacket->data = packet_data_temp_buf;@@ -349,6 +355,8 @@ static void packet_empty_list(void)* to make sure there are no stale RBU packets left in memory */ memset (newpacket->data,0 , rbu_data.packetsize); +set_memory_wb ((unsigned long )newpacket->data, +1 << newpacket->ordernum);free_pages ((unsigned long ) newpacket->data, newpacket->ordernum);kfree (newpacket);
Hi,
[This is an automated email]
This commit has been processed by the -stable helper bot and determined to be a high probability candidate for -stable trees. (score: 19.9792)
The bot has tested the following trees: v4.16.1, v4.15.16, v4.14.33, v4.9.93, v4.4.127.
v4.16.1: Build OK!
v4.15.16: Build OK!
v4.14.33: Build OK!
v4.9.93: Build failed! Errors:
set_memory.h: No such file or directory
v4.4.127: Build failed! Errors:
set_memory.h: No such file or directory
Please let us know if you'd like to have this patch included in a stable tree.
--
Thanks,
Sasha
PATCH RESEND v4 1/1 dell_rbu: make firmware payload memory uncachable
In reply to Stuart HayesThe dell_rbu driver takes firmware update payloads and puts them in memory so the system BIOS can find them after a reboot. This sometimes fails (though rarely), because the memory containing the payload is in the CPU cache but never gets written back to main memory before the system is rebooted (CPU cache contents are lost on reboot).
With this patch, the payload memory will be changed to uncachable to ensure that the payload is actually in main memory before the system is rebooted.
---
v2 Added include, removed extra parentheses
v3 Corrected formatting and include line
v4 Moved set_memory_uc() outside the while loop so that the memory is
definitely allocated before it is set to uncachable
This driver has no maintainer.
drivers/firmware/dell_rbu.c +8 -0
@@ -45,6 +45,7 @@#include <linux/moduleparam.h> #include <linux/firmware.h> #include <linux/dma-mapping.h> +#include <asm/set_memory.h> MODULE_AUTHOR ("Abhay Salunke <[email protected]>" );MODULE_DESCRIPTION ("Driver for updating BIOS image on DELL systems" );
@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length) packet_data_temp_buf =NULL ; } } +/* +* set to uncachable or it may never get written back before reboot +*/ +set_memory_uc ((unsigned long )packet_data_temp_buf,1 << ordernum); +spin_lock (&rbu_data.lock); newpacket->data = packet_data_temp_buf;
@@ -349,6 +355,8 @@ static void packet_empty_list(void)* to make sure there are no stale RBU packets left in memory */ memset (newpacket->data,0 , rbu_data.packetsize); +set_memory_wb ((unsigned long )newpacket->data, +1 << newpacket->ordernum);free_pages ((unsigned long ) newpacket->data, newpacket->ordernum);kfree (newpacket);
Quoted 16 lines
-----Original Message-----
From: [email protected] [mailto:platform-driver-x86- [email protected]] On Behalf Of Stuart Hayes
Sent: Friday, July 6, 2018 11:19 AM
To: [email protected]
Cc: Takashi Iwai; Andy Shevchenko; [email protected]; Platform Driver
Subject: [PATCH resend v4]dell_rbu: make firmware payload memory uncachableThe
dell_rbudriver takes firmware update payloads and puts them in memory so the system BIOS can find them after a reboot. This sometimes fails (though rarely), because the memory containing the payload is in the CPU cache but never gets written back to main memory before the system is rebooted (CPU cache contents are lost on reboot).
Quoted 6 lines
With this patch, the payload memory will be changed to uncachable to ensure that the payload is actually in main memory before the system is rebooted.
Signed-off-by Stuart Hayes <[email protected]>Reviewed-by Takashi Iwai <[email protected]>Signed-off-by Takashi Iwai <[email protected]>
Quoted 7 lines
---
v2 Added include, removed extra parentheses
v3 Corrected formatting and include line
v4 Movedset_memory_uc()outside the while loop so that the memory is
definitely allocated before it is set to uncachableThis driver has no maintainer.
Stuart,
Outside of this patch, I think it would make sense to send some follow up patch series that do the following:
1) Let you take over as maintainer (Update MAINTAINERS)
2) Move this driver to platform-x86
3) Update dell_rbu.txt with the correct URLs and mention that it's only for enterprise
hardware. Client hardware has instead opted to support UEFI capsules for updates
from Linux.
Since it's really a platform feature and specific to only Dell enterprise hardware I think it makes sense to move over to an area with subsystem maintainers that can help to review patches as needed.
Quoted 35 lines
drivers/firmware/dell_rbu.c +8
-0@@ -45,6 +45,7 @@#include <linux/moduleparam.h> #include <linux/firmware.h> #include <linux/dma-mapping.h> +#include <asm/set_memory.h> MODULE_AUTHOR ("Abhay Salunke <[email protected]>" );MODULE_DESCRIPTION ("Driver for updating BIOS image on DELL systems" );@@ -181,6 +182,11 @@ static int create_packet(void *data, size_t length) packet_data_temp_buf =NULL ; } } +/* +* set to uncachable or it may never get written back before reboot +*/ +set_memory_uc ((unsigned long )packet_data_temp_buf,1 << ordernum); +spin_lock (&rbu_data.lock); newpacket->data = packet_data_temp_buf;@@ -349,6 +355,8 @@ static void packet_empty_list(void)* to make sure there are no stale RBU packets left in memory */ memset (newpacket->data,0 , rbu_data.packetsize); +set_memory_wb ((unsigned long )newpacket->data, +1 << newpacket->ordernum);free_pages ((unsigned long ) newpacket->data, newpacket->ordernum);kfree (newpacket);
Quoted 1 line · On Fri, Jul 6, 2018 at 7:28 PM, <[email protected]> wrote:
Reviewed-by Mario Limonciello <[email protected]>
Pushed to my review and testing queue, thanks!
Quoted 10 lines
Quoted 1 line
This driver has no maintainer.
Stuart,
Outside of this patch, I think it would make sense to send some follow up patch series that do the following:
1) Let you take over as maintainer (Update
MAINTAINERS)2) Move this driver to platform-x86
Darren, what do you think about this step?
If we would go this way, first move, then take maintainership to reduce a churn.
Quoted 7 lines
3) Update dell_rbu.txt with the correct URLs and mention that it's only for enterprise
hardware. Client hardware has instead opted to support UEFI capsules for updates
from Linux.Since it's really a platform feature and specific to only Dell enterprise hardware I think it makes sense to move over to an area with subsystem maintainers that can help to review patches as needed.
Signature · 2 lines
With Best Regards, Andy Shevchenko