bcachefs: 2023-06-28 -> 2023-09-22#256638
Merged
Mic92 merged 7 commits intoNixOS:stagingfrom Oct 3, 2023
Merged
Conversation
Contributor
Author
|
This supersedes: #252348
|
cc3911d to
e92e0dc
Compare
YellowOnion
commented
Sep 22, 2023
547f8e5 to
6fb965a
Compare
Mic92
reviewed
Sep 23, 2023
Mic92
reviewed
Sep 23, 2023
PedroHLC
approved these changes
Sep 23, 2023
Member
PedroHLC
left a comment
There was a problem hiding this comment.
No issues for me as long as we remember to drop all the workaround when we drop the "testing" kernel.
TL;DR: LGTM.
Contributor
nix build --print-out-paths -L .#bcachefs-tools.tests.bcachefsSimple
trace: warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash.
bcachefs> trying https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=508de596ed0b58b1dbe783ca1fbbee04d40e9ccf&id2=v6.5
bcachefs> % Total % Received % Xferd Average Speed Time Time Time Current
bcachefs> Dload Upload Total Spent Left Speed
console-env> created 333 symlinks in user environment
bcachefs> 100 2611k 0 2611k 0 0 3003k 0 --:--:-- --:--:-- --:--:-- 3001k
fontconfig-etc> created 1 symlinks in user environment
error: hash mismatch in fixed-output derivation '/nix/store/ghrvp7r3lynprk4dk9iaxhkhmrk2z5lj-bcachefs-508de596ed0b58b1dbe783ca1fbbee04d40e9ccf.diff.drv':
specified: sha256-wNMttW681D47YYXhRXjRT4/QWdFM0pOcKrrtZvgyd5w=
got: sha256-MdSoXJVxytSbIoJr73vD5gr9UC5Hwh4n6i28ElSeOUE=
error: 1 dependencies of derivation '/nix/store/kjvnkj2xaqgw6llk01jajm6svckfvvrn-linux-6.5.4.drv' failed to build
error: 1 dependencies of derivation '/nix/store/la77m480b0dvr4a8ld9vqm016224g2aj-linux-6.5.4-modules.drv' failed to build
error: 1 dependencies of derivation '/nix/store/mvi3gahq31ipl2vvlmrac7wiz285w4ln-nixos-system-machine-23.11pre-git.drv' failed to build
error: 1 dependencies of derivation '/nix/store/j02a7i9mh2b194j50l7si39yrm0hprnr-nixos-vm.drv' failed to build
error: 1 dependencies of derivation '/nix/store/ryrflimbb912wxkhzwsmk8r117nymjmg-nixos-test-driver-installer-bcachefs-simple.drv' failed to build
error: 1 dependencies of derivation '/nix/store/kgmjvjjiajpiapnp9zyxgxnlnf8pcqrb-vm-test-run-installer-bcachefs-simple.drv' failed to buildReplacing the hash fixes it. diff --git a/pkgs/os-specific/linux/kernel/bcachefs.json b/pkgs/os-specific/linux/kernel/bcachefs.json
index 8082cffcc1e9..c24e2fb16dd8 100644
--- a/pkgs/os-specific/linux/kernel/bcachefs.json
+++ b/pkgs/os-specific/linux/kernel/bcachefs.json
@@ -1,4 +1,5 @@
{
- "diffHash": "sha256-wNMttW681D47YYXhRXjRT4/QWdFM0pOcKrrtZvgyd5w=",
- "commit": "508de596ed0b58b1dbe783ca1fbbee04d40e9ccf"
+ "diffHash": "sha256-n3f9VWU7MsLja+roSCXQ2uZ0+63vbCSZKJWoiQM89zM=",
+ "commit": "38a4d47c01fb65fb74bb85584d27f950cdb2e2a7",
+ "date": "2023-09-22"
}
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index f4fc5361003d..18af0f55bd74 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -2,7 +2,6 @@
, stdenv
, fetchpatch
, kernel
-, commitDate ? "2023-06-28"
# bcachefs-tools stores the expected-revision in:
# https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision
# but this does not means that it'll be the latest-compatible revision
@@ -18,7 +17,7 @@ in
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
(kernel.override ( args // {
- version = "${kernel.version}-bcachefs-unstable-${commitDate}";
+ version = "${kernel.version}-bcachefs-unstable-${version.date}";
extraMeta = {
branch = "master"; |
Contributor
|
All tests except for vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 0.970516] virtio_blk virtio3: [vda] 16777216 512-byte logical blocks (8.59 GB/8.00 GiB)
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 0.979977] vda: vda1 vda2 vda3
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 0.982396] sr 1:0:0:0: [sr0] scsi3-mmc drive: 4x/4x cd/rw xa/form2 tray
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 0.983363] cdrom: Uniform CD-ROM driver Revision: 3.20
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.154878] raid6: avx2x4 gen() 36054 MB/s
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.171877] raid6: avx2x2 gen() 30172 MB/s
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.188878] raid6: avx2x1 gen() 28696 MB/s
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.189472] raid6: using algorithm avx2x4 gen() 36054 MB/s
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.206877] raid6: .... xor() 6476 MB/s, rmw enabled
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.207549] raid6: using avx2x2 recovery algorithm
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.211393] xor: automatically using best checksumming function avx
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.375898] I/O error, dev fd0, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.377013] floppy: error 10 while reading block 0
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.382647] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000100
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.383690] CPU: 0 PID: 1 Comm: init Not tainted 6.5.4 #1-NixOS
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.384467] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.2-0-gea1b7a073390-prebuilt.qemu.org 04/01/2014
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.385925] Call Trace:
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.386320] <TASK>
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.386667] dump_stack_lvl+0x47/0x60
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.387196] panic+0x323/0x340
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.387654] ? srso_alias_return_thunk+0x5/0x7f
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.388279] do_exit+0x959/0xad0
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.388800] ? handle_mm_fault+0x9e/0x350
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.389375] do_group_exit+0x31/0x80
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.389888] __x64_sys_exit_group+0x18/0x20
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.390473] do_syscall_64+0x3e/0x90
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.390989] entry_SYSCALL_64_after_hwframe+0x6e/0xd8
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.391671] RIP: 0033:0x7f5b8c6d42ed
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.392186] Code: 01 48 83 c8 ff c3 0f 1f 80 00 00 00 00 f3 0f 1e fa 48 8b 35 1d 4b 10 00 ba e7 00 00 00 eb 07 66 0f 1f 44 00 00 f4 89 d0 0f 05 <48> 3d 00 f0 ff ff 76 f3 f7 d8 64 89 06 eb ec 0f 1f 40 00 f3 0f 1e
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.394522] RSP: 002b:00007ffd5fa06ae8 EFLAGS: 00000202 ORIG_RAX: 00000000000000e7
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.395542] RAX: ffffffffffffffda RBX: 00007ffd5fa07f04 RCX: 00007f5b8c6d42ed
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.396452] RDX: 00000000000000e7 RSI: ffffffffffffff88 RDI: 0000000000000001
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.397361] RBP: 0000000000000004 R08: 00007ffd5fa06af0 R09: 0000000000000004
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.398275] R10: 02b87a7c7497567c R11: 0000000000000202 R12: 0000000000000000
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.399190] R13: 00007ffd5fa06ed0 R14: 0000000000000000 R15: 00007f5b8c924000
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.400105] </TASK>
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.400524] Kernel Offset: 0x36c00000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff)
vm-test-run-installer-bcachefs-encrypted> boot-after-install # [ 1.401912] Rebooting in 1 seconds.. |
Mic92
reviewed
Sep 24, 2023
Member
|
We could greatly simplify the amount of packages by just add this patchset to utillinux: util-linux/util-linux#2505 |
Contributor
Author
|
@Madouura I was meaning to run that test and got distracted, I know what the issue is, the device is encrypted so we can't find the UUID, I'm unsure how we're meant to handle this without also specifying a custom flag / parameter. Maybe I'll write a patch for upstream. |
Madouura
approved these changes
Sep 26, 2023
Contributor
Madouura
left a comment
There was a problem hiding this comment.
Since the encryption issue in the VM test is an upstream issue, LGTM.
Might wanna update to koverstreet/bcachefs@0a84850 since apparently there was a lock leak.
Contributor
Author
|
@Madouura I found a work around for the encryption stuff, I can use |
I believe this has been fixed upstream.
Includes prep work for mainline bcachefs release.
buildLinux doesn't provide argsOverride by default. Prior to 663caaa, a default kernel was replaced with a direct invocation to buildLinux, this broke the use of argsOverride, in 663caaa, the use of argsOverride was removed, and then later the invocation of buildLinux was replaced with vanilla linux kernel that required argsOverride which then rebroke things again. Recommend either: put argsOverride inside buildLinux, or replace it with something less confusing to maintainers.
Mic92
reviewed
Oct 3, 2023
Mic92
reviewed
Oct 3, 2023
Mic92
reviewed
Oct 3, 2023
Mic92
reviewed
Oct 3, 2023
Mic92
reviewed
Oct 3, 2023
The json appearantly contained the wrong checksum and we don't have a way to generate this
Member
|
I fixed the build locally and made sure all nixos tests for bcachefs run. I suggest to move these json refactorings to a later PR, when this is merged into master. |
12 tasks
13 tasks
13 tasks
Member
It's okay. Also, I merged which bumps us to 1.3.3. |
Contributor
|
This broke bcache during install (nixosTests.installer.bcache); |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This release includes an overhaul of various bcachefs systems in prep for mainline merge.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)@Madouura @Mic92 @davidak @PedroHLC @RaitoBezarius