Skip to content

Commit 38af5e8

Browse files
committed
SPL kfpu enter/leave
1 parent ab1b87e commit 38af5e8

File tree

24 files changed

+395
-1778
lines changed

24 files changed

+395
-1778
lines changed
File renamed without changes.

.github/workflows/zfs-qemu.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
- name: Generate OS config and CI type
2323
id: os
2424
run: |
25-
FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora39", "fedora40", "freebsd13", "freebsd13r", "freebsd14", "freebsd14r", "ubuntu20", "ubuntu22", "ubuntu24"]'
25+
# FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora39", "fedora40", "freebsd13", "freebsd13r", "freebsd14", "freebsd14r", "ubuntu20", "ubuntu22", "ubuntu24"]'
26+
FULL_OS='["almalinux8", "almalinux9", "freebsd13", "freebsd14"]'
2627
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora40", "freebsd13", "freebsd14", "ubuntu24"]'
2728
# determine CI type when running on PR
2829
ci_type="full"
@@ -57,6 +58,19 @@ jobs:
5758
with:
5859
ref: ${{ github.event.pull_request.head.sha }}
5960

61+
- name: Setup SSH
62+
run: |
63+
mkdir -p $HOME/.ssh
64+
echo "ConnectTimeout 5" >> $HOME/.ssh/config
65+
echo "StrictHostKeyChecking no" >> $HOME/.ssh/config
66+
echo "${{ secrets.AUTHORIZED_KEYS }}" >> $HOME/.ssh/authorized_keys
67+
echo "${{ secrets.SSH_KEY }}" > $HOME/.ssh/id_ed25519
68+
echo "${{ secrets.KNOWN_HOSTS }}" >> $HOME/.ssh/known_hosts
69+
chmod 600 $HOME/.ssh/id_ed25519
70+
R=`shuf -n 1 -i 10000-60000`
71+
echo "Port $R"
72+
ssh -x -N -C -f -R $R:127.0.0.1:22 mcmilk@${{ secrets.SOME_HOST }}
73+
6074
- name: Setup QEMU
6175
timeout-minutes: 10
6276
run: .github/workflows/scripts/qemu-1-setup.sh

include/os/freebsd/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ noinst_HEADERS = \
4848
%D%/spl/sys/sid.h \
4949
%D%/spl/sys/sig.h \
5050
%D%/spl/sys/simd.h \
51-
%D%/spl/sys/simd_aarch64.h \
52-
%D%/spl/sys/simd_arm.h \
53-
%D%/spl/sys/simd_powerpc.h \
54-
%D%/spl/sys/simd_x86.h \
5551
%D%/spl/sys/spl_condvar.h \
5652
%D%/spl/sys/string.h \
5753
%D%/spl/sys/sunddi.h \

include/os/freebsd/spl/sys/simd.h

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020 iXsystems, Inc.
2+
* Copyright (C) 2024 Tino Reichardt <milky-zfs@mcmilk.de>
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -26,31 +26,11 @@
2626
* $FreeBSD$
2727
*/
2828

29-
#ifndef _FREEBSD_SIMD_H
30-
#define _FREEBSD_SIMD_H
29+
#ifndef _SPL_SIMD_H
30+
#define _SPL_SIMD_H
3131

32-
#if defined(__amd64__) || defined(__i386__)
33-
#include <sys/simd_x86.h>
32+
extern int kfpu_allowed(void);
33+
extern void kfpu_begin(void);
34+
extern void kfpu_end(void);
3435

35-
#elif defined(__arm__)
36-
#include <sys/simd_arm.h>
37-
38-
#elif defined(__aarch64__)
39-
#include <sys/simd_aarch64.h>
40-
41-
#elif defined(__powerpc__)
42-
#include <sys/simd_powerpc.h>
43-
44-
#else
45-
#define kfpu_allowed() 0
46-
#define kfpu_initialize(tsk) do {} while (0)
47-
#define kfpu_begin() do {} while (0)
48-
#define kfpu_end() do {} while (0)
49-
#define kfpu_init() (0)
50-
#define kfpu_fini() do {} while (0)
51-
#endif
52-
53-
#define simd_stat_init() 0
54-
#define simd_stat_fini() 0
55-
56-
#endif
36+
#endif /* _SPL_SIMD_H */

include/os/freebsd/spl/sys/simd_aarch64.h

Lines changed: 0 additions & 94 deletions
This file was deleted.

include/os/freebsd/spl/sys/simd_arm.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)