Skip to content

Commit c8b8b81

Browse files
committed
Merge tag 'loongarch-kvm-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.11 1. Add ParaVirt steal time support. 2. Add some VM migration enhancement. 3. Add perf kvm-stat support for loongarch.
2 parents f0a2388 + 492ac37 commit c8b8b81

File tree

1,262 files changed

+15591
-8319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,262 files changed

+15591
-8319
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <[email protected]> <[email protected]>
7272
7373
7474
Andy Adamson <[email protected]>
75+
76+
7577
7678
7779
@@ -217,6 +219,7 @@ Geliang Tang <[email protected]> <[email protected]>
217219
218220
219221
222+
220223
221224
222225
@@ -605,6 +608,7 @@ Simon Kelley <[email protected]>
605608
Sricharan Ramabadhran <[email protected]> <[email protected]>
606609
607610
611+
Stanislav Fomichev <[email protected]> <[email protected]>
608612
609613
Stéphane Witzmann <[email protected]>
610614

CREDITS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,10 @@ D: UDF filesystem
12141214
S: (ask for current address)
12151215
S: USA
12161216

1217+
N: Larry Finger
1218+
1219+
D: Maintainer of wireless drivers, too many to list here
1220+
12171221
N: Jürgen Fischer
12181222
12191223
D: Author of Adaptec AHA-152x SCSI driver
@@ -3146,9 +3150,11 @@ S: Triftstra=DFe 55
31463150
S: 13353 Berlin
31473151
S: Germany
31483152

3149-
N: Gustavo Pimental
3153+
N: Gustavo Pimentel
31503154
31513155
D: PCI driver for Synopsys DesignWare
3156+
D: Synopsys DesignWare eDMA driver
3157+
D: Synopsys DesignWare xData traffic generator
31523158

31533159
N: Emanuel Pirker
31543160

Documentation/admin-guide/LSM/tomoyo.rst

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
99

1010
LiveCD-based tutorials are available at
1111

12-
http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html
13-
http://tomoyo.sourceforge.jp/1.8/centos6-live.html
12+
https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html
13+
https://tomoyo.sourceforge.net/1.8/centos6-live.html
1414

1515
Though these tutorials use non-LSM version of TOMOYO, they are useful for you
1616
to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO?
2121
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
2222
kernel's command line.
2323

24-
Please see http://tomoyo.osdn.jp/2.5/ for details.
24+
Please see https://tomoyo.sourceforge.net/2.6/ for details.
2525

2626
Where is documentation?
2727
=======================
2828

2929
User <-> Kernel interface documentation is available at
30-
https://tomoyo.osdn.jp/2.5/policy-specification/index.html .
30+
https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .
3131

3232
Materials we prepared for seminars and symposiums are available at
33-
https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
33+
https://sourceforge.net/projects/tomoyo/files/docs/ .
3434
Below lists are chosen from three aspects.
3535

3636
What is TOMOYO?
3737
TOMOYO Linux Overview
38-
https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf
38+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf
3939
TOMOYO Linux: pragmatic and manageable security for Linux
40-
https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf
40+
https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf
4141
TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box
42-
https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf
42+
https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf
4343

4444
What can TOMOYO do?
4545
Deep inside TOMOYO Linux
46-
https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf
46+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf
4747
The role of "pathname based access control" in security.
48-
https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf
48+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf
4949

5050
History of TOMOYO?
5151
Realities of Mainlining
52-
https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf
53-
54-
What is future plan?
55-
====================
56-
57-
We believe that inode based security and name based security are complementary
58-
and both should be used together. But unfortunately, so far, we cannot enable
59-
multiple LSM modules at the same time. We feel sorry that you have to give up
60-
SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
61-
62-
We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
63-
version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .
64-
LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
65-
to port non-LSM version's functionalities to LSM versions.
52+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -788,25 +788,6 @@
788788
Documentation/networking/netconsole.rst for an
789789
alternative.
790790

791-
<DEVNAME>:<n>.<n>[,options]
792-
Use the specified serial port on the serial core bus.
793-
The addressing uses DEVNAME of the physical serial port
794-
device, followed by the serial core controller instance,
795-
and the serial port instance. The options are the same
796-
as documented for the ttyS addressing above.
797-
798-
The mapping of the serial ports to the tty instances
799-
can be viewed with:
800-
801-
$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*
802-
/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0
803-
804-
In the above example, the console can be addressed with
805-
console=00:04:0.0. Note that a console addressed this
806-
way will only get added when the related device driver
807-
is ready. The use of an earlycon parameter in addition to
808-
the console may be desired for console output early on.
809-
810791
uart[8250],io,<addr>[,options]
811792
uart[8250],mmio,<addr>[,options]
812793
uart[8250],mmio16,<addr>[,options]
@@ -2192,12 +2173,6 @@
21922173
Format: 0 | 1
21932174
Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.
21942175

2195-
init_mlocked_on_free= [MM] Fill freed userspace memory with zeroes if
2196-
it was mlock'ed and not explicitly munlock'ed
2197-
afterwards.
2198-
Format: 0 | 1
2199-
Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON
2200-
22012176
init_pkru= [X86] Specify the default memory protection keys rights
22022177
register contents for all processes. 0x55555554 by
22032178
default (disallow access to all but pkey 0). Can
@@ -4098,9 +4073,9 @@
40984073
prediction) vulnerability. System may allow data
40994074
leaks with this option.
41004075

4101-
no-steal-acc [X86,PV_OPS,ARM64,PPC/PSERIES,RISCV,EARLY] Disable
4102-
paravirtualized steal time accounting. steal time is
4103-
computed, but won't influence scheduler behaviour
4076+
no-steal-acc [X86,PV_OPS,ARM64,PPC/PSERIES,RISCV,LOONGARCH,EARLY]
4077+
Disable paravirtualized steal time accounting. steal time
4078+
is computed, but won't influence scheduler behaviour
41044079

41054080
nosync [HW,M68K] Disables sync negotiation for all devices.
41064081

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ anon_fault_fallback_charge
467467
instead falls back to using huge pages with lower orders or
468468
small pages even though the allocation was successful.
469469

470-
anon_swpout
470+
swpout
471471
is incremented every time a huge page is swapped out in one
472472
piece without splitting.
473473

474-
anon_swpout_fallback
474+
swpout_fallback
475475
is incremented if a huge page has to be split before swapout.
476476
Usually because failed to allocate some continuous swap space
477477
for the huge page.

Documentation/arch/riscv/cmodx.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ cmodx.c::
6262
printf("Value before cmodx: %d\n", value);
6363

6464
// Call prctl before first fence.i is called inside modify_instruction
65-
prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_ON, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);
65+
prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_ON, PR_RISCV_SCOPE_PER_PROCESS);
6666
modify_instruction();
6767
// Call prctl after final fence.i is called in process
68-
prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_OFF, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);
68+
prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_OFF, PR_RISCV_SCOPE_PER_PROCESS);
6969

7070
value = get_value();
7171
printf("Value after cmodx: %d\n", value);

Documentation/cdrom/cdrom-standard.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ current *struct* is::
217217
int (*media_changed)(struct cdrom_device_info *, int);
218218
int (*tray_move)(struct cdrom_device_info *, int);
219219
int (*lock_door)(struct cdrom_device_info *, int);
220-
int (*select_speed)(struct cdrom_device_info *, int);
220+
int (*select_speed)(struct cdrom_device_info *, unsigned long);
221221
int (*get_last_session) (struct cdrom_device_info *,
222222
struct cdrom_multisession *);
223223
int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0.
396396

397397
::
398398

399-
int select_speed(struct cdrom_device_info *cdi, int speed)
399+
int select_speed(struct cdrom_device_info *cdi, unsigned long speed)
400400

401401
Some CD-ROM drives are capable of changing their head-speed. There
402402
are several reasons for changing the speed of a CD-ROM drive. Badly

Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@ unevaluatedProperties: false
5454

5555
examples:
5656
- |
57-
mlahb: ahb@38000000 {
57+
ahb {
5858
compatible = "st,mlahb", "simple-bus";
5959
#address-cells = <1>;
6060
#size-cells = <1>;
61-
reg = <0x10000000 0x40000>;
6261
ranges;
6362
dma-ranges = <0x00000000 0x38000000 0x10000>,
6463
<0x10000000 0x10000000 0x60000>,

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ properties:
5757
- const: allwinner,sun8i-v3s
5858

5959
- description: Anbernic RG35XX (2024)
60-
- items:
60+
items:
6161
- const: anbernic,rg35xx-2024
6262
- const: allwinner,sun50i-h700
6363

6464
- description: Anbernic RG35XX Plus
65-
- items:
65+
items:
6666
- const: anbernic,rg35xx-plus
6767
- const: allwinner,sun50i-h700
6868

6969
- description: Anbernic RG35XX H
70-
- items:
70+
items:
7171
- const: anbernic,rg35xx-h
7272
- const: allwinner,sun50i-h700
7373

0 commit comments

Comments
 (0)