Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging next #62209

Merged
merged 78 commits into from
Jun 7, 2019
Merged

Staging next #62209

merged 78 commits into from
Jun 7, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented May 29, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

dtzWill and others added 30 commits April 23, 2019 20:31
… or '.')

This introduces extra escaping for $NIX_STORE that gets interpolated
into a PCRE. The escaping is performed using a standard Perl function
"quotemeta" (see "perldoc -f quotemeta" for reference). The same value
is also used in sed regex which uses POSIX basic regular expressions
instead of PCRE, so it needs fewer characters to be escaped. It should
not cause much problem to not change sed invocation, but I replace it
with equivalent Perl expression (actually the behavior is changed to not
output a newline character after the matched output).
Adds support for building static libraries with meson.
Some SSL libs don't react to $SSL_CERT_FILE.
That actually makes sense to me, as we add this behavior
as nixpkgs-specific, so it seems "safer" to use $NIX_*.
That's very much consistent with the spirit of nix-shell --pure

BTW, nix 1.x shells will be always treated as pure;
in that version detection isn't possible.
NixOS/nix@1bffd83e1a9c
In nix 2.0 this changed: NixOS/nix@1bffd83
I only kept the original intention and did no kind of verification.
9.12 is EOL as of May 2019.

9.14.2 release notes (which appear to extend those for 9.14.1):

https://ftp.isc.org/isc/bind9/9.14.2/RELEASE-NOTES-bind-9.14.2.html

Please check the security fixes and prioritize this as appropriate.
static: set default_library flag for meson in makeStaticLibrary
It's one of the places that would reach out to /etc/ otherwise,
so I expect we have to pay this price to get the effect.
Hopefully there won't be too many places to patch.
@FRidh
Copy link
Member Author

FRidh commented May 31, 2019

I won't have time to look into this until the 10th of June.

vcunat added 6 commits June 3, 2019 10:01
Hydra nixpkgs: ?compare=1523028
Hydra nixpkgs: ?compare=1523575
It's exactly the same issue as in the parent commit.
/cc #60250 (2fe63c8).
... to one that works and should keep working over long term.
This fixes build with our new default icu version.
The changelog seems safe:
https://github.com/ovalhub/pyicu/blob/master/CHANGES
@vcunat
Copy link
Member

vcunat commented Jun 6, 2019

I think this is ready to be merged. I expect to do that after nixos-unstable channel updates.

I've given up on darwin binaries/testing ATM – I tried "restart-aborted" around a dozen times, but but they all got cancelled in about an hour or so. /cc @NixOS/darwin-maintainers I guess (but it's about Hydra setup in particular).

@vcunat vcunat merged commit 326148e into master Jun 7, 2019
vcunat added a commit that referenced this pull request Jun 7, 2019
@eadwu
Copy link
Member

eadwu commented Jun 8, 2019

Some of the commits seem to have broken udev and the kernel? Some of the errors include duplicate WMI GUID and error opening ATTR. Booting and display seem to work correctly. The network is also connected successfully, though audio is broken.

Jun 07 19:27:56 nixos kernel: ------------[ cut here ]------------
Jun 07 19:27:56 nixos kernel: refcount_t: underflow; use-after-free.
Jun 07 19:27:56 nixos kernel: WARNING: CPU: 0 PID: 1760 at ../lib/refcount.c:187 refcount_sub_and_test_checked+0x47/0x60
Jun 07 19:27:56 nixos kernel: Modules linked in: ctr af_packet ccm algif_aead cbc des_generic ecb algif_skcipher cmac bnep sha512_ssse3 sha512_generic md4 algif_hash af_alg snd_hda_codec_hdmi wacom usbhid hid_multitouch sn>
Jun 07 19:27:56 nixos kernel:  snd_soc_skl_ipc evdev snd_soc_sst_ipc psmouse mac_hid kvmgt snd_soc_sst_dsp vfio_mdev snd_hda_ext_core mdev serio_raw snd_soc_acpi_intel_match vfio_iommu_type1 nvidia_drm(PO) snd_soc_acpi efi>
Jun 07 19:27:56 nixos kernel:  snd_timer snd soundcore msr loop tun kvm_intel kvm irqbypass usb_storage efivarfs ip_tables x_tables ipv6 crc_ccitt autofs4 bcachefs zstd_compress lz4_compress zstd_decompress crc64 libcrc32c>
Jun 07 19:27:56 nixos kernel: CPU: 0 PID: 1760 Comm: X Tainted: P     U     O    T 5.0.21-hardened #1-NixOS
Jun 07 19:27:56 nixos kernel: Hardware name: Dell Inc. XPS 15 9570/02MJVY, BIOS 1.10.1 04/26/2019
Jun 07 19:27:56 nixos kernel: RIP: 0010:refcount_sub_and_test_checked+0x47/0x60
Jun 07 19:27:56 nixos kernel: Code: f0 0f b1 13 75 2b 85 d2 0f 94 c0 5b 5d c3 80 3d ab 16 b4 00 00 75 15 48 c7 c7 c0 be b4 b4 c6 05 9b 16 b4 00 01 e8 39 7d cd ff <0f> 0b 31 c0 5b 5d c3 83 f8 ff 75 bb 31 c0 eb f4 66 0f 1f 8>
Jun 07 19:27:56 nixos kernel: RSP: 0018:ffffa84592aafd38 EFLAGS: 00010282
Jun 07 19:27:56 nixos kernel: RAX: 0000000000000000 RBX: ffff8efe72677428 RCX: 0000000000000006
Jun 07 19:27:56 nixos kernel: RDX: 0000000000000007 RSI: 0000000000000092 RDI: ffff8efe9c216600
Jun 07 19:27:56 nixos kernel: RBP: 0000000000000001 R08: 000000000000043b R09: 0000000000000004
Jun 07 19:27:56 nixos kernel: R10: 0000000000000001 R11: 0000000000000001 R12: ffff8efe72677428
Jun 07 19:27:56 nixos kernel: R13: ffff8efe7583d800 R14: 0000000000000000 R15: 0000000000000000
Jun 07 19:27:56 nixos kernel: FS:  00007f5f4fb565c0(0000) GS:ffff8efe9c200000(0000) knlGS:0000000000000000
Jun 07 19:27:56 nixos kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
Jun 07 19:27:56 nixos kernel: CR2: 00007bbf4fb490e0 CR3: 0000000832574002 CR4: 00000000003606f0
Jun 07 19:27:56 nixos kernel: Call Trace:
Jun 07 19:27:56 nixos kernel:  nv_drm_atomic_helper_disable_all+0x217/0x250 [nvidia_drm]
Jun 07 19:27:56 nixos kernel:  nv_drm_master_drop+0x25/0x60 [nvidia_drm]
Jun 07 19:27:56 nixos kernel:  drm_drop_master+0x28/0x40 [drm]
Jun 07 19:27:56 nixos kernel:  drm_master_release+0x112/0x130 [drm]
Jun 07 19:27:56 nixos kernel:  drm_file_free.part.5+0x32a/0x330 [drm]
Jun 07 19:27:56 nixos kernel:  drm_release+0x99/0xd0 [drm]
Jun 07 19:27:56 nixos kernel:  __fput+0xc8/0x220
Jun 07 19:27:56 nixos kernel:  task_work_run+0x8d/0xb0
Jun 07 19:27:56 nixos kernel:  do_syscall_64+0x13e/0x3c5
Jun 07 19:27:56 nixos kernel:  entry_SYSCALL_64_after_hwframe+0x44/0xa9
Jun 07 19:27:56 nixos kernel: RIP: 0033:0x7f5f504704c1
Jun 07 19:27:56 nixos kernel: Code: f7 d8 64 89 02 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 8b 05 aa ec 00 00 85 c0 75 2e b8 03 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 07 c3 66 0f 1f 44 00 00 48 8b 15 d9 a>
Jun 07 19:27:56 nixos kernel: RSP: 002b:00007fff5bc1bfb8 EFLAGS: 00000246 ORIG_RAX: 0000000000000003
Jun 07 19:27:56 nixos kernel: RAX: 0000000000000000 RBX: 000000000000000c RCX: 00007f5f504704c1
Jun 07 19:27:56 nixos kernel: RDX: 0000000000000242 RSI: 0000200038050000 RDI: 000000000000000c
Jun 07 19:27:56 nixos kernel: RBP: 00007b9f4fb45ad0 R08: 0000000000000000 R09: 0000000000000005
Jun 07 19:27:56 nixos kernel: R10: 00007baf4fb49910 R11: 0000000000000246 R12: 00007baf4fb49920
Jun 07 19:27:56 nixos kernel: R13: 00007b7f4fb4c4d0 R14: 0000000000000000 R15: 0000000000000000
Jun 07 19:27:56 nixos kernel: ---[ end trace dd1a6542e78e2a12 ]---

@vcunat
Copy link
Member

vcunat commented Jun 8, 2019

How did you determine it's not (say) due to a kernel update done around the same time? I wouldn't expect user-space changes to cause traces inside kernel.

@eadwu
Copy link
Member

eadwu commented Jun 8, 2019

Usually I follow nixpkgs by the day and it doesn't seem like there were any kernel updates yesterday. So after rebuilding the system and rebooting the problems started to occur so I found the PRs that had mass rebuilds and tried reverting them 1 by 1. Currently my local nixpkgs is d09e670 with reverted commits including linux 5.1[.x] and this PR.

Off of 635e3b1 everything seems to work fine (disabled the nvidia gpu).

@vcunat
Copy link
Member

vcunat commented Jun 23, 2019

Well, sqlite is discussed on #63157 and linked places. I still can't see what to do about this kernel trace, I'm afraid.

@olealgoritme
Copy link

olealgoritme commented Mar 24, 2020

@eadwu That call trace in your log is a bug which disables DRM capabilities of the shitty proprietary NVIDIA driver. It was likely solved with this commit: torvalds/linux@8de679a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.