Skip to content

Commit 692d42d

Browse files
committed
Merge branch 'iommufd/for-rc' into for-next
The following selftest patch requires both the bug fixes and the improvements of the selftest framework. * iommufd/for-rc: iommufd: Do not corrupt the pfn list when doing batch carry iommufd: Fix unpinning of pages when an access is present iommufd: Check for uptr overflow Linux 6.3-rc5 Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2 parents c52159b + 13a0d1a commit 692d42d

1,313 files changed

Lines changed: 14349 additions & 58900 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ modules.order
7878
# RPM spec file (make rpm-pkg)
7979
#
8080
/*.spec
81+
/rpmbuild/
8182

8283
#
8384
# Debian directory (make deb-pkg)

.mailmap

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
2828
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
2929
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
3030
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
31+
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3132
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3233
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3334
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
121122
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
122123
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
123124
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
124-
Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
125+
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
125126
Dmitry Baryshkov <dbaryshkov@gmail.com>
126127
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
127128
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -132,10 +133,15 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
132133
Domen Puncer <domen@coderock.org>
133134
Douglas Gilbert <dougg@torque.net>
134135
Ed L. Cashin <ecashin@coraid.com>
136+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
137+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
135138
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136139
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137140
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
138141
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
142+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
143+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
144+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
139145
Felipe W Damasio <felipewd@terra.com.br>
140146
Felix Kuhling <fxkuehl@gmx.de>
141147
Felix Moeller <felix@derklecks.de>
@@ -191,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
191197
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
192198
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
193199
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
200+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
194201
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
195202
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
196203
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -210,6 +217,9 @@ Jens Axboe <axboe@suse.de>
210217
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
211218
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
212219
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
220+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
221+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
222+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
213223
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
214224
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
215225
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -306,6 +316,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
306316
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
307317
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
308318
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
319+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
320+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
309321
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
310322
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
311323
Mayuresh Janorkar <mayur@ti.com>
@@ -369,6 +381,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
369381
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
370382
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
371383
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
384+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
372385
Rajesh Shah <rajesh.shah@intel.com>
373386
Ralf Baechle <ralf@linux-mips.org>
374387
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -377,6 +390,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
377390
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
378391
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
379392
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
393+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
394+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
395+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
380396
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
381397
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
382398
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -387,6 +403,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
387403
Rudolf Marek <R.Marek@sh.cvut.cz>
388404
Rui Saraiva <rmps@joel.ist.utl.pt>
389405
Sachin P Sant <ssant@in.ibm.com>
406+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
390407
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
391408
Sam Ravnborg <sam@mars.ravnborg.org>
392409
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -411,7 +428,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
411428
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
412429
Simon Kelley <simon@thekelleys.org.uk>
413430
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
414-
Stephen Hemminger <shemminger@osdl.org>
431+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
432+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
433+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
434+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
415435
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
416436
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
417437
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
@@ -424,6 +444,10 @@ Thomas Graf <tgraf@suug.ch>
424444
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
425445
Thomas Pedersen <twp@codeaurora.org>
426446
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
447+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
448+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
449+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
450+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
427451
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
428452
Tony Luck <tony.luck@intel.com>
429453
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/ABI/stable/sysfs-block

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,15 @@ Description:
705705
zoned will report "none".
706706

707707

708+
What: /sys/block/<disk>/hidden
709+
Date: March 2023
710+
Contact: linux-block@vger.kernel.org
711+
Description:
712+
[RO] the block device is hidden. it doesn’t produce events, and
713+
can’t be opened from userspace or using blkdev_get*.
714+
Used for the underlying components of multipath devices.
715+
716+
708717
What: /sys/block/<disk>/stat
709718
Date: February 2008
710719
Contact: Jerome Marchand <jmarchan@redhat.com>

Documentation/admin-guide/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ problems and bugs in particular.
3636

3737
reporting-issues
3838
reporting-regressions
39-
security-bugs
4039
bug-hunting
4140
bug-bisect
4241
tainted-kernels

Documentation/admin-guide/reporting-issues.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
395395
list of tracked regressions, to ensure it won't fall through the cracks.
396396

397397
What qualifies as security issue is left to your judgment. Consider reading
398-
Documentation/admin-guide/security-bugs.rst before proceeding, as it
398+
Documentation/process/security-bugs.rst before proceeding, as it
399399
provides additional details how to best handle security issues.
400400

401401
An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
12691269
the report's text to these addresses; but on top of it put a small note where
12701270
you mention that you filed it with a link to the ticket.
12711271

1272-
See Documentation/admin-guide/security-bugs.rst for more information.
1272+
See Documentation/process/security-bugs.rst for more information.
12731273

12741274

12751275
Duties after the report went out

Documentation/bpf/bpf_devel_QA.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ workflows related to reporting bugs, submitting patches, and queueing
77
patches for stable kernels.
88

99
For general information about submitting patches, please refer to
10-
`Documentation/process/`_. This document only describes additional specifics
11-
related to BPF.
10+
Documentation/process/submitting-patches.rst. This document only describes
11+
additional specifics related to BPF.
1212

1313
.. contents::
1414
:local:
@@ -461,15 +461,15 @@ needed::
461461

462462
$ sudo make run_tests
463463

464-
See the kernels selftest `Documentation/dev-tools/kselftest.rst`_
465-
document for further documentation.
464+
See :doc:`kernel selftest documentation </dev-tools/kselftest>`
465+
for details.
466466

467467
To maximize the number of tests passing, the .config of the kernel
468468
under test should match the config file fragment in
469469
tools/testing/selftests/bpf as closely as possible.
470470

471471
Finally to ensure support for latest BPF Type Format features -
472-
discussed in `Documentation/bpf/btf.rst`_ - pahole version 1.16
472+
discussed in Documentation/bpf/btf.rst - pahole version 1.16
473473
is required for kernels built with CONFIG_DEBUG_INFO_BTF=y.
474474
pahole is delivered in the dwarves package or can be built
475475
from source at
@@ -684,12 +684,8 @@ when:
684684

685685

686686
.. Links
687-
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
688687
.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
689688
.. _selftests:
690689
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
691-
.. _Documentation/dev-tools/kselftest.rst:
692-
https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
693-
.. _Documentation/bpf/btf.rst: btf.rst
694690

695691
Happy BPF hacking!

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ properties:
7676
If "broken-flash-reset" is present then having this property does not
7777
make any difference.
7878

79+
spi-cpol: true
80+
spi-cpha: true
81+
82+
dependencies:
83+
spi-cpol: [ spi-cpha ]
84+
spi-cpha: [ spi-cpol ]
85+
7986
unevaluatedProperties: false
8087

8188
examples:

Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ $defs:
9696
2: Lower Slew rate (slower edges)
9797
3: Reserved (No adjustments)
9898
99+
bias-bus-hold: true
99100
bias-pull-down: true
100101
bias-pull-up: true
101102
bias-disable: true
103+
input-enable: true
102104
output-high: true
103105
output-low: true
104106

Documentation/driver-api/vfio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ group and can access them as follows::
242242
VFIO User API
243243
-------------------------------------------------------------------------------
244244

245-
Please see include/linux/vfio.h for complete API documentation.
245+
Please see include/uapi/linux/vfio.h for complete API documentation.
246246

247247
VFIO bus driver API
248248
-------------------------------------------------------------------------------

Documentation/filesystems/ext4/blockgroup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor
105105
block is placed at the beginning of the first, second, and last block
106106
groups in a meta-block group. A meta-block group is a collection of
107107
block groups which can be described by a single block group descriptor
108-
block. Since the size of the block group descriptor structure is 32
109-
bytes, a meta-block group contains 32 block groups for filesystems with
110-
a 1KB block size, and 128 block groups for filesystems with a 4KB
108+
block. Since the size of the block group descriptor structure is 64
109+
bytes, a meta-block group contains 16 block groups for filesystems with
110+
a 1KB block size, and 64 block groups for filesystems with a 4KB
111111
blocksize. Filesystems can either be created using this new block group
112112
descriptor layout, or existing filesystems can be resized on-line, and
113113
the field s_first_meta_bg in the superblock will indicate the first

0 commit comments

Comments
 (0)