Skip to content

Update to a new nightly version #288

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 29, 2021
Merged

Conversation

Bobo1239
Copy link

Includes rust-lang/rust#83592 and rust-lang/rust#85276 which were needed
to build correctly again after rustc's upgrade to LLVM 12.

Fixes #135.

@ksquirrel

This comment has been minimized.

@alex
Copy link
Member

alex commented May 22, 2021

Looks like the ppc builder is unhappy here.

@Bobo1239
Copy link
Author

Yeah, seems like there's still something going wrong after LLVM 12. Only tested x86_64 locally so there was a good chance that one of the other platforms miscompiles. Will try to take a look at the failure.

@alex
Copy link
Member

alex commented May 22, 2021 via email

@ojeda
Copy link
Member

ojeda commented May 22, 2021

Thanks a lot for rust-lang/rust#85276 -- I mentioned in the last informal meeting we still had relocations going on but did not have time to look into what was going on, so it is great to see that being solved.

For the CI failure, I would suggest giving a quick try at disabling optimizations in the Hacking menu to discard LLVM opt issues.

@alex
Copy link
Member

alex commented May 25, 2021

Follow up PR to fix ppc: rust-lang/rust#85700

Thanks so much for chasing down this details!

@ksquirrel

This comment has been minimized.

@ksquirrel

This comment has been minimized.

@alex
Copy link
Member

alex commented May 29, 2021

Looks like there's a new clippy error.

@ksquirrel

This comment has been minimized.

@Bobo1239
Copy link
Author

Bobo1239 commented May 29, 2021

Apparently CLIPPY=1 somehow doesn't work together with O=builddir. (it just uses regular rustc without emitting any clippy warnings)

@ojeda
Copy link
Member

ojeda commented May 29, 2021

Good catch, created issue.

Includes rust-lang/rust#83592, rust-lang/rust#85276 and
rust-lang/rust#85700 which are needed to build correctly again after
rustc's upgrade to LLVM 12.

Signed-off-by: Boris-Chengbiao Zhou <bobo1239@web.de>
@ksquirrel
Copy link
Member

Review of 67c7a712d705:

  • ✔️ Commit 67c7a71: Looks fine!

@Bobo1239
Copy link
Author

Removed the clippy fix from the commit message again since #319 took care of that.

@ojeda
Copy link
Member

ojeda commented May 29, 2021

Yes!

@ojeda ojeda merged commit 934f970 into Rust-for-Linux:rust May 29, 2021
Darksonn pushed a commit to Darksonn/linux that referenced this pull request Dec 2, 2024
Offset into the page should also be considered while calculating a physical
address for struct dma_debug_entry. page_to_phys() just shifts the value
PAGE_SHIFT bits to the left so offset part is zero-filled.

An example (wrong) debug assertion failure with CONFIG_DMA_API_DEBUG
enabled which is observed during systemd boot process after recent
dma-debug changes:

DMA-API: e1000 0000:00:03.0: cacheline tracking EEXIST, overlapping mappings aren't supported
WARNING: CPU: 4 PID: 941 at kernel/dma/debug.c:596 add_dma_entry
CPU: 4 UID: 0 PID: 941 Comm: ip Not tainted 6.12.0+ Rust-for-Linux#288
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-debian-1.16.2-1 04/01/2014
RIP: 0010:add_dma_entry kernel/dma/debug.c:596
Call Trace:
 <TASK>
debug_dma_map_page kernel/dma/debug.c:1236
dma_map_page_attrs kernel/dma/mapping.c:179
e1000_alloc_rx_buffers drivers/net/ethernet/intel/e1000/e1000_main.c:4616
...

Found by Linux Verification Center (linuxtesting.org).

Fixes: 9d4f645 ("dma-debug: store a phys_addr_t in struct dma_debug_entry")
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
[hch: added a little helper to clean up the code]
Signed-off-by: Christoph Hellwig <hch@lst.de>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Fix rustc >= nightly-2021-03-05 builds (i.e. LLVM 12)
4 participants