public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WoeUSB: Remove writeback buffering workaround

Browse Source 
WoeUSB contains a writeback buffering workaround for 64-bit Linux
systems, however this workaround relies on setting
/proc/sys/vm/dirty_background_bytes which no longer works on newer
versions of the Linux kernel.
This commit is contained in:
Michael Hoang 2019-10-09 13:00:25 +11:00 committed by Bjørn Forsman
parent c82c6d3a12
commit 0277cc1f1c
2 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/woeusb/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1w3m3qbjn0igydsbpf22w29lzf1pkxv7dlny5mbyrb6j0q6wlx0b"; sha256 = "1w3m3qbjn0igydsbpf22w29lzf1pkxv7dlny5mbyrb6j0q6wlx0b";
}; };
patches = [ ./remove-workaround.patch ];
nativeBuildInputs = [ autoreconfHook makeWrapper ]; nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [ wxGTK30 ]; buildInputs = [ wxGTK30 ];

82
pkgs/tools/misc/woeusb/remove-workaround.patch Normal file
View File

@ -0,0 +1,82 @@
From 3cf93fd595bd3fca98c98a0bdc8fc86b36ee1403 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 9 Oct 2019 12:42:53 +1100
Subject: [PATCH] Remove writeback buffering workaround
---
src/woeusb | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
diff --git a/src/woeusb b/src/woeusb
index 3284259..0d3ea20 100755
--- a/src/woeusb
+++ b/src/woeusb
@@ -308,9 +308,6 @@ init(){
current_state=copying-filesystem
- workaround_linux_make_writeback_buffering_not_suck \
- apply
-
copy_filesystem_files \
"${source_fs_mountpoint}" \
"${target_fs_mountpoint}" \
@@ -1650,41 +1647,6 @@ workaround_support_windows_7_uefi_boot(){
> "${efi_boot_directory}/bootx64.efi"
}; declare -fr workaround_support_windows_7_uefi_boot
-## Currently WoeUSB indirectly causes severely unresponsive system on 64-bit architecture with large primary memory during file copy process due to a flaw of the writeback buffer size handling in Linux kernel, workaround it before it is fixed
-## Refer:
-## - System lagging while copying data · Issue #113 · slacka/WoeUSB <https://github.com/slacka/WoeUSB/issues/113>
-## - The pernicious USB-stick stall problem [LWN.net] <https://lwn.net/Articles/572911/>
-workaround_linux_make_writeback_buffering_not_suck(){
- util_check_function_parameters_quantity 1 "${#}"
- local -r mode="${1}"
-
- local -ir VM_DIRTY_BACKGROUND_BYTES=$((16*1024*1024)) # 16MiB
- local -ir VM_DIRTY_BYTES=$((48*1024*1024)) # 48MiB
-
- case "${mode}" in
- apply)
- echo_with_color \
- yellow \
- 'Applying workaround to prevent 64-bit systems with big primary memory from being unresponsive during copying files.'
- echo "${VM_DIRTY_BACKGROUND_BYTES}" > /proc/sys/vm/dirty_background_bytes
- echo "${VM_DIRTY_BYTES}" > /proc/sys/vm/dirty_bytes
- ;;
- reset)
- echo_with_color \
- yellow \
- 'Resetting workaround to prevent 64-bit systems with big primary memory from being unresponsive during copying files.'
- echo 0 > /proc/sys/vm/dirty_background_bytes
- echo 0 > /proc/sys/vm/dirty_bytes
- ;;
- *)
- printf_with_color \
- red \
- 'Fatal: %s: Unexpected *mode* encountered, please report bug.\n' \
- "${FUNCNAME[0]}"
- ;;
- esac
-}; declare -fr workaround_linux_make_writeback_buffering_not_suck
-
install_legacy_pc_bootloader_grub(){
util_check_function_parameters_quantity 3 "${#}"
local -r target_fs_mountpoint="${1}"; shift 1
@@ -1836,13 +1798,6 @@ trap_exit(){
off \
"${global_only_for_gui}"
- case "${current_state}" in
- copying-filesystem|finished)
- workaround_linux_make_writeback_buffering_not_suck \
- reset
- ;;
- esac
-
if util_is_parameter_set_and_not_empty \
source_fs_mountpoint; then
if ! cleanup_mountpoint \
--
2.23.0