Skip to content

Commit 458420c

Browse files
committed
Copy latest files from kernel tree
Signed-off-by: Dave Thaler <[email protected]>
1 parent 465f474 commit 458420c

File tree

7 files changed

+732
-34
lines changed

7 files changed

+732
-34
lines changed

rst/bpf_design_QA.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ Q: What is the compatibility story for special BPF types in map values?
314314
Q: Users are allowed to embed bpf_spin_lock, bpf_timer fields in their BPF map
315315
values (when using BTF support for BPF maps). This allows to use helpers for
316316
such objects on these fields inside map values. Users are also allowed to embed
317-
pointers to some kernel types (with __kptr and __kptr_ref BTF tags). Will the
317+
pointers to some kernel types (with __kptr_untrusted and __kptr BTF tags). Will the
318318
kernel preserve backwards compatibility for these features?
319319

320320
A: It depends. For bpf_spin_lock, bpf_timer: YES, for kptr and everything else:
@@ -324,7 +324,7 @@ For struct types that have been added already, like bpf_spin_lock and bpf_timer,
324324
the kernel will preserve backwards compatibility, as they are part of UAPI.
325325

326326
For kptrs, they are also part of UAPI, but only with respect to the kptr
327-
mechanism. The types that you can use with a __kptr and __kptr_ref tagged
327+
mechanism. The types that you can use with a __kptr_untrusted and __kptr tagged
328328
pointer in your struct are NOT part of the UAPI contract. The supported types can
329329
and will change across kernel releases. However, operations like accessing kptr
330330
fields and bpf_kptr_xchg() helper will continue to be supported across kernel

rst/bpf_devel_QA.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ into the bpf-next tree will make their way into net-next tree. net and
128128
net-next are both run by David S. Miller. From there, they will go
129129
into the kernel mainline tree run by Linus Torvalds. To read up on the
130130
process of net and net-next being merged into the mainline tree, see
131-
the :ref:`netdev-FAQ`
131+
the `netdev-FAQ`_.
132132

133133

134134

@@ -147,7 +147,7 @@ request)::
147147
Q: How do I indicate which tree (bpf vs. bpf-next) my patch should be applied to?
148148
---------------------------------------------------------------------------------
149149

150-
A: The process is the very same as described in the :ref:`netdev-FAQ`,
150+
A: The process is the very same as described in the `netdev-FAQ`_,
151151
so please read up on it. The subject line must indicate whether the
152152
patch is a fix or rather "next-like" content in order to let the
153153
maintainers know whether it is targeted at bpf or bpf-next.
@@ -206,7 +206,7 @@ ii) run extensive BPF test suite and
206206
Once the BPF pull request was accepted by David S. Miller, then
207207
the patches end up in net or net-next tree, respectively, and
208208
make their way from there further into mainline. Again, see the
209-
:ref:`netdev-FAQ` for additional information e.g. on how often they are
209+
`netdev-FAQ`_ for additional information e.g. on how often they are
210210
merged to mainline.
211211

212212
Q: How long do I need to wait for feedback on my BPF patches?
@@ -230,7 +230,7 @@ Q: Are patches applied to bpf-next when the merge window is open?
230230
-----------------------------------------------------------------
231231
A: For the time when the merge window is open, bpf-next will not be
232232
processed. This is roughly analogous to net-next patch processing,
233-
so feel free to read up on the :ref:`netdev-FAQ` about further details.
233+
so feel free to read up on the `netdev-FAQ`_ about further details.
234234

235235
During those two weeks of merge window, we might ask you to resend
236236
your patch series once bpf-next is open again. Once Linus released
@@ -394,7 +394,7 @@ netdev kernel mailing list in Cc and ask for the fix to be queued up:
394394
395395

396396
The process in general is the same as on netdev itself, see also the
397-
:ref:`netdev-FAQ`.
397+
`netdev-FAQ`_.
398398

399399
Q: Do you also backport to kernels not currently maintained as stable?
400400
----------------------------------------------------------------------
@@ -410,7 +410,7 @@ Q: The BPF patch I am about to submit needs to go to stable as well
410410
What should I do?
411411

412412
A: The same rules apply as with netdev patch submissions in general, see
413-
the :ref:`netdev-FAQ`.
413+
the `netdev-FAQ`_.
414414

415415
Never add "``Cc: [email protected]``" to the patch description, but
416416
ask the BPF maintainers to queue the patches instead. This can be done
@@ -685,7 +685,7 @@ when:
685685

686686
.. Links
687687
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
688-
.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
688+
.. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
689689
.. _selftests:
690690
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
691691
.. _Documentation/dev-tools/kselftest.rst:

0 commit comments

Comments
 (0)