Skip to content

buildnipkg: adding roboRIO 2.0 boot command#51

Merged
gratian merged 1 commit intoni:nilrt/master/4.14from
kimkhiam:dev/kilim/artemis/updatebootscript
Jan 28, 2022
Merged

buildnipkg: adding roboRIO 2.0 boot command#51
gratian merged 1 commit intoni:nilrt/master/4.14from
kimkhiam:dev/kilim/artemis/updatebootscript

Conversation

@kimkhiam
Copy link

@kimkhiam kimkhiam commented Jan 28, 2022

roborio2 using SD card as storage device and use ext4 file system
it is different from previous product that use ubifs.
in this case, a different boot command should be use for roboRIO 2.0

Signed-off-by: Kim Khiam Lim kim.khiam.lim@ni.com

@kimkhiam
buildnipkg: adding roboRIO 2.0 boot command
4ffc59c 
roborio2 using SD card as storage device and use ext4 file system
it is different from previous product that use ubifs.
in this case, a different boot command should be use for roboRIO 2.0

Signed-off-by: Kim Khiam Lim <kim.khiam.lim@ni.com>
@kimkhiam
Copy link
Author

kimkhiam commented Jan 28, 2022 •
edited
Loading

testing done:

  1. boot up with Artemis and verify boot log has line: Booting LabVIEW RT (custom kernel)...
  2. verified with uname -a command and version same as customer build kernel
    admin@NI-roboRIO2-0-03442222:~# uname -a
    Linux NI-roboRIO2-0-03442222 4.14.146-rt67-ni-g4ffc59cc8a78 nati_x86_64_defconfig: enable full real-time preemption #2 SMP PREEMPT RT Tue Jan 25 18:39:31 PST 2022 armv7l GNU/Linux
    admin@NI-roboRIO2-0-03442222:/lib/modules# ls
    4.14.146-rt67-cg-8.7.0f1-xilinx-zynq-/ 4.14.146-rt67-ni-g4ffc59cc8a78/

@marshallmassengill marshallmassengill mentioned this pull request Jan 28, 2022
Closed
@gratian gratian merged commit 051c956 into ni:nilrt/master/4.14 Jan 28, 2022
gratian pushed a commit to gratian/linux that referenced this pull request Apr 6, 2023
@mfijalko @gregkh
ice: xsk: disable txq irq before flushing hw
b89a453 
[ Upstream commit b830c96 ]

ice_qp_dis() intends to stop a given queue pair that is a target of xsk
pool attach/detach. One of the steps is to disable interrupts on these
queues. It currently is broken in a way that txq irq is turned off
*after* HW flush which in turn takes no effect.

ice_qp_dis():
-> ice_qvec_dis_irq()
--> disable rxq irq
--> flush hw
-> ice_vsi_stop_tx_ring()
-->disable txq irq

Below splat can be triggered by following steps:
- start xdpsock WITHOUT loading xdp prog
- run xdp_rxq_info with XDP_TX action on this interface
- start traffic
- terminate xdpsock

[  256.312485] BUG: kernel NULL pointer dereference, address: 0000000000000018
[  256.319560] #PF: supervisor read access in kernel mode
[  256.324775] #PF: error_code(0x0000) - not-present page
[  256.329994] PGD 0 P4D 0
[  256.332574] Oops: 0000 [#1] PREEMPT SMP NOPTI
[  256.337006] CPU: 3 PID: 32 Comm: ksoftirqd/3 Tainted: G           OE      6.2.0-rc5+ ni#51
[  256.345218] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019
[  256.355807] RIP: 0010:ice_clean_rx_irq_zc+0x9c/0x7d0 [ice]
[  256.361423] Code: b7 8f 8a 00 00 00 66 39 ca 0f 84 f1 04 00 00 49 8b 47 40 4c 8b 24 d0 41 0f b7 45 04 66 25 ff 3f 66 89 04 24 0f 84 85 02 00 00 <49> 8b 44 24 18 0f b7 14 24 48 05 00 01 00 00 49 89 04 24 49 89 44
[  256.380463] RSP: 0018:ffffc900088bfd20 EFLAGS: 00010206
[  256.385765] RAX: 000000000000003c RBX: 0000000000000035 RCX: 000000000000067f
[  256.393012] RDX: 0000000000000775 RSI: 0000000000000000 RDI: ffff8881deb3ac80
[  256.400256] RBP: 000000000000003c R08: ffff889847982710 R09: 0000000000010000
[  256.407500] R10: ffffffff82c060c0 R11: 0000000000000004 R12: 0000000000000000
[  256.414746] R13: ffff88811165eea0 R14: ffffc9000d255000 R15: ffff888119b37600
[  256.421990] FS:  0000000000000000(0000) GS:ffff8897e0cc0000(0000) knlGS:0000000000000000
[  256.430207] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  256.436036] CR2: 0000000000000018 CR3: 0000000005c0a006 CR4: 00000000007706e0
[  256.443283] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  256.450527] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[  256.457770] PKRU: 55555554
[  256.460529] Call Trace:
[  256.463015]  <TASK>
[  256.465157]  ? ice_xmit_zc+0x6e/0x150 [ice]
[  256.469437]  ice_napi_poll+0x46d/0x680 [ice]
[  256.473815]  ? _raw_spin_unlock_irqrestore+0x1b/0x40
[  256.478863]  __napi_poll+0x29/0x160
[  256.482409]  net_rx_action+0x136/0x260
[  256.486222]  __do_softirq+0xe8/0x2e5
[  256.489853]  ? smpboot_thread_fn+0x2c/0x270
[  256.494108]  run_ksoftirqd+0x2a/0x50
[  256.497747]  smpboot_thread_fn+0x1c1/0x270
[  256.501907]  ? __pfx_smpboot_thread_fn+0x10/0x10
[  256.506594]  kthread+0xea/0x120
[  256.509785]  ? __pfx_kthread+0x10/0x10
[  256.513597]  ret_from_fork+0x29/0x50
[  256.517238]  </TASK>

In fact, irqs were not disabled and napi managed to be scheduled and run
while xsk_pool pointer was still valid, but SW ring of xdp_buff pointers
was already freed.

To fix this, call ice_qvec_dis_irq() after ice_vsi_stop_tx_ring(). Also
while at it, remove redundant ice_clean_rx_ring() call - this is handled
in ice_qp_clean_rings().

Fixes: 2d4238f ("ice: Add support for AF_XDP")
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
xhuff pushed a commit to xhuff/linux that referenced this pull request Jan 3, 2024
@chenhengqi @gregkh
LoongArch: BPF: Don't sign extend function return value
40421e0 
[ Upstream commit 5d47ec2 ]

The `cls_redirect` test triggers a kernel panic like:

  # ./test_progs -t cls_redirect
  Can't find bpf_testmod.ko kernel module: -2
  WARNING! Selftests relying on bpf_testmod.ko will be skipped.
  [   30.938489] CPU 3 Unable to handle kernel paging request at virtual address fffffffffd814de0, era == ffff800002009fb8, ra == ffff800002009f9c
  [   30.939331] Oops[ni#1]:
  [   30.939513] CPU: 3 PID: 1260 Comm: test_progs Not tainted 6.7.0-rc2-loong-devel-g2f56bb0d2327 ni#35 a896aca3f4164f09cc346f89f2e09832e07be5f6
  [   30.939732] Hardware name: QEMU QEMU Virtual Machine, BIOS unknown 2/2/2022
  [   30.939901] pc ffff800002009fb8 ra ffff800002009f9c tp 9000000104da4000 sp 9000000104da7ab0
  [   30.940038] a0 fffffffffd814de0 a1 9000000104da7a68 a2 0000000000000000 a3 9000000104da7c10
  [   30.940183] a4 9000000104da7c14 a5 0000000000000002 a6 0000000000000021 a7 00005555904d7f90
  [   30.940321] t0 0000000000000110 t1 0000000000000000 t2 fffffffffd814de0 t3 0004c4b400000000
  [   30.940456] t4 ffffffffffffffff t5 00000000c3f63600 t6 0000000000000000 t7 0000000000000000
  [   30.940590] t8 000000000006d803 u0 0000000000000020 s9 9000000104da7b10 s0 900000010504c200
  [   30.940727] s1 fffffffffd814de0 s2 900000010504c200 s3 9000000104da7c10 s4 9000000104da7ad0
  [   30.940866] s5 0000000000000000 s6 90000000030e65bc s7 9000000104da7b44 s8 90000000044f6fc0
  [   30.941015]    ra: ffff800002009f9c bpf_prog_846803e5ae81417f_cls_redirect+0xa0/0x590
  [   30.941535]   ERA: ffff800002009fb8 bpf_prog_846803e5ae81417f_cls_redirect+0xbc/0x590
  [   30.941696]  CRMD: 000000b0 (PLV0 -IE -DA +PG DACF=CC DACM=CC -WE)
  [   30.942224]  PRMD: 00000004 (PPLV0 +PIE -PWE)
  [   30.942330]  EUEN: 00000003 (+FPE +SXE -ASXE -BTE)
  [   30.942453]  ECFG: 00071c1c (LIE=2-4,10-12 VS=7)
  [   30.942612] ESTAT: 00010000 [PIL] (IS= ECode=1 EsubCode=0)
  [   30.942764]  BADV: fffffffffd814de0
  [   30.942854]  PRID: 0014c010 (Loongson-64bit, Loongson-3A5000)
  [   30.942974] Modules linked in:
  [   30.943078] Process test_progs (pid: 1260, threadinfo=00000000ce303226, task=000000007d10bb76)
  [   30.943306] Stack : 900000010a064000 90000000044f6fc0 9000000104da7b48 0000000000000000
  [   30.943495]         0000000000000000 9000000104da7c14 9000000104da7c10 900000010504c200
  [   30.943626]         0000000000000001 ffff80001b88c000 9000000104da7b70 90000000030e6668
  [   30.943785]         0000000000000000 9000000104da7b58 ffff80001b88c048 9000000003d05000
  [   30.943936]         900000000303ac88 0000000000000000 0000000000000000 9000000104da7b70
  [   30.944091]         0000000000000000 0000000000000001 0000000731eeab00 0000000000000000
  [   30.944245]         ffff80001b88c000 0000000000000000 0000000000000000 54b99959429f83b8
  [   30.944402]         ffff80001b88c000 90000000044f6fc0 9000000101d70000 ffff80001b88c000
  [   30.944538]         000000000000005a 900000010504c200 900000010a064000 900000010a067000
  [   30.944697]         9000000104da7d88 0000000000000000 9000000003d05000 90000000030e794c
  [   30.944852]         ...
  [   30.944924] Call Trace:
  [   30.945120] [<ffff800002009fb8>] bpf_prog_846803e5ae81417f_cls_redirect+0xbc/0x590
  [   30.945650] [<90000000030e6668>] bpf_test_run+0x1ec/0x2f8
  [   30.945958] [<90000000030e794c>] bpf_prog_test_run_skb+0x31c/0x684
  [   30.946065] [<90000000026d4f68>] __sys_bpf+0x678/0x2724
  [   30.946159] [<90000000026d7288>] sys_bpf+0x20/0x2c
  [   30.946253] [<90000000032dd224>] do_syscall+0x7c/0x94
  [   30.946343] [<9000000002541c5c>] handle_syscall+0xbc/0x158
  [   30.946492]
  [   30.946549] Code: 0015030e  5c0009c0  5001d000 <28c00304> 02c00484  29c00304  00150009  2a42d2e4  0280200d
  [   30.946793]
  [   30.946971] ---[ end trace 0000000000000000 ]---
  [   32.093225] Kernel panic - not syncing: Fatal exception in interrupt
  [   32.093526] Kernel relocated by 0x2320000
  [   32.093630]  .text @ 0x9000000002520000
  [   32.093725]  .data @ 0x9000000003400000
  [   32.093792]  .bss  @ 0x9000000004413200
  [   34.971998] ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]---

This is because we signed-extend function return values. When subprog
mode is enabled, we have:

  cls_redirect()
    -> get_global_metrics() returns pcpu ptr 0xfffffefffc00b480

The pointer returned is later signed-extended to 0xfffffffffc00b480 at
`BPF_JMP | BPF_EXIT`. During BPF prog run, this triggers unhandled page
fault and a kernel panic.

Drop the unnecessary signed-extension on return values like other
architectures do.

With this change, we have:

  # ./test_progs -t cls_redirect
  Can't find bpf_testmod.ko kernel module: -2
  WARNING! Selftests relying on bpf_testmod.ko will be skipped.
  ni#51/1    cls_redirect/cls_redirect_inlined:OK
  ni#51/2    cls_redirect/IPv4 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/3    cls_redirect/IPv6 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/4    cls_redirect/IPv4 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/5    cls_redirect/IPv6 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/6    cls_redirect/IPv4 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/7    cls_redirect/IPv6 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/8    cls_redirect/IPv4 TCP accept known (one hop, flags: ACK):OK
  ni#51/9    cls_redirect/IPv6 TCP accept known (one hop, flags: ACK):OK
  ni#51/10   cls_redirect/IPv4 UDP accept unknown (no hops, flags: none):OK
  ni#51/11   cls_redirect/IPv6 UDP accept unknown (no hops, flags: none):OK
  ni#51/12   cls_redirect/IPv4 UDP forward unknown (one hop, flags: none):OK
  ni#51/13   cls_redirect/IPv6 UDP forward unknown (one hop, flags: none):OK
  ni#51/14   cls_redirect/IPv4 UDP accept known (one hop, flags: none):OK
  ni#51/15   cls_redirect/IPv6 UDP accept known (one hop, flags: none):OK
  ni#51/16   cls_redirect/cls_redirect_subprogs:OK
  ni#51/17   cls_redirect/IPv4 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/18   cls_redirect/IPv6 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/19   cls_redirect/IPv4 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/20   cls_redirect/IPv6 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/21   cls_redirect/IPv4 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/22   cls_redirect/IPv6 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/23   cls_redirect/IPv4 TCP accept known (one hop, flags: ACK):OK
  ni#51/24   cls_redirect/IPv6 TCP accept known (one hop, flags: ACK):OK
  ni#51/25   cls_redirect/IPv4 UDP accept unknown (no hops, flags: none):OK
  ni#51/26   cls_redirect/IPv6 UDP accept unknown (no hops, flags: none):OK
  ni#51/27   cls_redirect/IPv4 UDP forward unknown (one hop, flags: none):OK
  ni#51/28   cls_redirect/IPv6 UDP forward unknown (one hop, flags: none):OK
  ni#51/29   cls_redirect/IPv4 UDP accept known (one hop, flags: none):OK
  ni#51/30   cls_redirect/IPv6 UDP accept known (one hop, flags: none):OK
  ni#51/31   cls_redirect/cls_redirect_dynptr:OK
  ni#51/32   cls_redirect/IPv4 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/33   cls_redirect/IPv6 TCP accept unknown (no hops, flags: SYN):OK
  ni#51/34   cls_redirect/IPv4 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/35   cls_redirect/IPv6 TCP accept unknown (no hops, flags: ACK):OK
  ni#51/36   cls_redirect/IPv4 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/37   cls_redirect/IPv6 TCP forward unknown (one hop, flags: ACK):OK
  ni#51/38   cls_redirect/IPv4 TCP accept known (one hop, flags: ACK):OK
  ni#51/39   cls_redirect/IPv6 TCP accept known (one hop, flags: ACK):OK
  ni#51/40   cls_redirect/IPv4 UDP accept unknown (no hops, flags: none):OK
  ni#51/41   cls_redirect/IPv6 UDP accept unknown (no hops, flags: none):OK
  ni#51/42   cls_redirect/IPv4 UDP forward unknown (one hop, flags: none):OK
  ni#51/43   cls_redirect/IPv6 UDP forward unknown (one hop, flags: none):OK
  ni#51/44   cls_redirect/IPv4 UDP accept known (one hop, flags: none):OK
  ni#51/45   cls_redirect/IPv6 UDP accept known (one hop, flags: none):OK
  ni#51      cls_redirect:OK
  Summary: 1/45 PASSED, 0 SKIPPED, 0 FAILED

Fixes: 5dc6155 ("LoongArch: Add BPF JIT support")
Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Sasha Levin <sashal@kernel.org>
gratian pushed a commit that referenced this pull request Jan 31, 2024
@gregkh
net/smc: fix invalid link access in dumping SMC-R connections
84c3833 
[ Upstream commit 9dbe086 ]

A crash was found when dumping SMC-R connections. It can be reproduced
by following steps:

- environment: two RNICs on both sides.
- run SMC-R between two sides, now a SMC_LGR_SYMMETRIC type link group
  will be created.
- set the first RNIC down on either side and link group will turn to
  SMC_LGR_ASYMMETRIC_LOCAL then.
- run 'smcss -R' and the crash will be triggered.

 BUG: kernel NULL pointer dereference, address: 0000000000000010
 #PF: supervisor read access in kernel mode
 #PF: error_code(0x0000) - not-present page
 PGD 8000000101fdd067 P4D 8000000101fdd067 PUD 10ce46067 PMD 0
 Oops: 0000 [#1] PREEMPT SMP PTI
 CPU: 3 PID: 1810 Comm: smcss Kdump: loaded Tainted: G W   E      6.7.0-rc6+ #51
 RIP: 0010:__smc_diag_dump.constprop.0+0x36e/0x620 [smc_diag]
 Call Trace:
  <TASK>
  ? __die+0x24/0x70
  ? page_fault_oops+0x66/0x150
  ? exc_page_fault+0x69/0x140
  ? asm_exc_page_fault+0x26/0x30
  ? __smc_diag_dump.constprop.0+0x36e/0x620 [smc_diag]
  smc_diag_dump_proto+0xd0/0xf0 [smc_diag]
  smc_diag_dump+0x26/0x60 [smc_diag]
  netlink_dump+0x19f/0x320
  __netlink_dump_start+0x1dc/0x300
  smc_diag_handler_dump+0x6a/0x80 [smc_diag]
  ? __pfx_smc_diag_dump+0x10/0x10 [smc_diag]
  sock_diag_rcv_msg+0x121/0x140
  ? __pfx_sock_diag_rcv_msg+0x10/0x10
  netlink_rcv_skb+0x5a/0x110
  sock_diag_rcv+0x28/0x40
  netlink_unicast+0x22a/0x330
  netlink_sendmsg+0x240/0x4a0
  __sock_sendmsg+0xb0/0xc0
  ____sys_sendmsg+0x24e/0x300
  ? copy_msghdr_from_user+0x62/0x80
  ___sys_sendmsg+0x7c/0xd0
  ? __do_fault+0x34/0x1a0
  ? do_read_fault+0x5f/0x100
  ? do_fault+0xb0/0x110
  __sys_sendmsg+0x4d/0x80
  do_syscall_64+0x45/0xf0
  entry_SYSCALL_64_after_hwframe+0x6e/0x76

When the first RNIC is set down, the lgr->lnk[0] will be cleared and an
asymmetric link will be allocated in lgr->link[SMC_LINKS_PER_LGR_MAX - 1]
by smc_llc_alloc_alt_link(). Then when we try to dump SMC-R connections
in __smc_diag_dump(), the invalid lgr->lnk[0] will be accessed, resulting
in this issue. So fix it by accessing the right link.

Fixes: f16a7dd ("smc: netlink interface for SMC sockets")
Reported-by: henaumars <henaumars@sina.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7616
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
Link: https://lore.kernel.org/r/1703662835-53416-1-git-send-email-guwen@linux.alibaba.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gratian gratian gratian approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kimkhiam @gratian