Skip to content

Commit aa935a1

Browse files
fbqfbq
committed
Merge branch 'net-next-20231228' into rust-dev
2 parents 711cbfc + 3fb65f6 commit aa935a1

File tree

1,860 files changed

+83022
-106635
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,860 files changed

+83022
-106635
lines changed

‎.mailmap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ Gao Xiang <[email protected]> <[email protected]>
191191
Gao Xiang <[email protected]> <[email protected]>
192192
Gao Xiang <[email protected]> <[email protected]>
193193
Gao Xiang <[email protected]> <[email protected]>
194+
Geliang Tang <[email protected]> <[email protected]>
195+
Geliang Tang <[email protected]> <[email protected]>
196+
Geliang Tang <[email protected]> <[email protected]>
197+
Geliang Tang <[email protected]> <[email protected]>
194198
Georgi Djakov <[email protected]> <[email protected]>
195199
Gerald Schaefer <[email protected]> <[email protected]>
196200
Gerald Schaefer <[email protected]> <[email protected]>
@@ -266,6 +270,9 @@ Jens Osterkamp <[email protected]>
266270
Jernej Skrabec <[email protected]> <[email protected]>
267271
Jessica Zhang <[email protected]> <[email protected]>
268272
Jilai Wang <[email protected]> <[email protected]>
273+
Jiri Kosina <[email protected]> <[email protected]>
274+
Jiri Kosina <[email protected]> <[email protected]>
275+
Jiri Kosina <[email protected]> <[email protected]>
269276
Jiri Pirko <[email protected]> <[email protected]>
270277
Jiri Pirko <[email protected]> <[email protected]>
271278
Jiri Pirko <[email protected]> <[email protected]>

‎Documentation/Makefile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,21 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
9797
cp $(if $(patsubst /%,,$(DOCS_CSS)),$(abspath $(srctree)/$(DOCS_CSS)),$(DOCS_CSS)) $(BUILDDIR)/$3/_static/; \
9898
fi
9999

100-
htmldocs:
100+
YNL_INDEX:=$(srctree)/Documentation/networking/netlink_spec/index.rst
101+
YNL_RST_DIR:=$(srctree)/Documentation/networking/netlink_spec
102+
YNL_YAML_DIR:=$(srctree)/Documentation/netlink/specs
103+
YNL_TOOL:=$(srctree)/tools/net/ynl/ynl-gen-rst.py
104+
105+
YNL_RST_FILES_TMP := $(patsubst %.yaml,%.rst,$(wildcard $(YNL_YAML_DIR)/*.yaml))
106+
YNL_RST_FILES := $(patsubst $(YNL_YAML_DIR)%,$(YNL_RST_DIR)%, $(YNL_RST_FILES_TMP))
107+
108+
$(YNL_INDEX): $(YNL_RST_FILES)
109+
$(Q)$(YNL_TOOL) -o $@ -x
110+
111+
$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL)
112+
$(Q)$(YNL_TOOL) -i $< -o $@
113+
114+
htmldocs: $(YNL_INDEX)
101115
@$(srctree)/scripts/sphinx-pre-install --version-check
102116
@+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
103117

‎Documentation/admin-guide/sysctl/net.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,10 @@ optmem_max
345345
----------
346346

347347
Maximum ancillary buffer size allowed per socket. Ancillary data is a sequence
348-
of struct cmsghdr structures with appended data.
348+
of struct cmsghdr structures with appended data. TCP tx zerocopy also uses
349+
optmem_max as a limit for its internal structures.
350+
351+
Default : 128 KB
349352

350353
fb_tunnels_only_for_init_net
351354
----------------------------

‎Documentation/bpf/cpumasks.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ can be used to query the contents of cpumasks.
352352

353353
.. kernel-doc:: kernel/bpf/cpumask.c
354354
:identifiers: bpf_cpumask_first bpf_cpumask_first_zero bpf_cpumask_first_and
355-
bpf_cpumask_test_cpu
355+
bpf_cpumask_test_cpu bpf_cpumask_weight
356356

357357
.. kernel-doc:: kernel/bpf/cpumask.c
358358
:identifiers: bpf_cpumask_equal bpf_cpumask_intersects bpf_cpumask_subset

‎Documentation/bpf/fs_kfuncs.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
.. _fs_kfuncs-header-label:
4+
5+
=====================
6+
BPF filesystem kfuncs
7+
=====================
8+
9+
BPF LSM programs need to access filesystem data from LSM hooks. The following
10+
BPF kfuncs can be used to get these data.
11+
12+
* ``bpf_get_file_xattr()``
13+
14+
* ``bpf_get_fsverity_digest()``
15+
16+
To avoid recursions, these kfuncs follow the following rules:
17+
18+
1. These kfuncs are only permitted from BPF LSM function.
19+
2. These kfuncs should not call into other LSM hooks, i.e. security_*(). For
20+
example, ``bpf_get_file_xattr()`` does not use ``vfs_getxattr()``, because
21+
the latter calls LSM hook ``security_inode_getxattr``.

‎Documentation/bpf/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ that goes into great technical depth about the BPF Architecture.
2121
helpers
2222
kfuncs
2323
cpumasks
24+
fs_kfuncs
2425
programs
2526
maps
2627
bpf_prog_run

‎Documentation/bpf/kfuncs.rst

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,30 @@ Either way, the returned buffer is either NULL, or of size buffer_szk. Without t
135135
annotation, the verifier will reject the program if a null pointer is passed in with
136136
a nonzero size.
137137

138+
2.2.5 __str Annotation
139+
----------------------------
140+
This annotation is used to indicate that the argument is a constant string.
141+
142+
An example is given below::
143+
144+
__bpf_kfunc bpf_get_file_xattr(..., const char *name__str, ...)
145+
{
146+
...
147+
}
148+
149+
In this case, ``bpf_get_file_xattr()`` can be called as::
150+
151+
bpf_get_file_xattr(..., "xattr_name", ...);
152+
153+
Or::
154+
155+
const char name[] = "xattr_name"; /* This need to be global */
156+
int BPF_PROG(...)
157+
{
158+
...
159+
bpf_get_file_xattr(..., name, ...);
160+
...
161+
}
138162

139163
.. _BPF_kfunc_nodef:
140164

‎Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
- lg,acx467akm-7
4343
# LG Corporation 7" WXGA TFT LCD panel
4444
- lg,ld070wx3-sl01
45+
# LG Corporation 5" HD TFT LCD panel
46+
- lg,lh500wx1-sd03
4547
# One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
4648
- osddisplays,osd101t2587-53ts
4749
# Panasonic 10" WUXGA TFT LCD panel

‎Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ properties:
208208
- lemaker,bl035-rgb-002
209209
# LG 7" (800x480 pixels) TFT LCD panel
210210
- lg,lb070wv8
211-
# LG Corporation 5" HD TFT LCD panel
212-
- lg,lh500wx1-sd03
213211
# LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel
214212
- lg,lp079qx1-sp0v
215213
# LG 9.7" (2048x1536 pixels) TFT LCD panel

‎Documentation/devicetree/bindings/net/dsa/dsa.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@ $defs:
4646
$ref: dsa-port.yaml#
4747
unevaluatedProperties: false
4848

49+
oneOf:
50+
- required:
51+
- ports
52+
- required:
53+
- ethernet-ports
54+
4955
...

‎Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6060.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell MV88E6060 DSA switch
8+
9+
maintainers:
10+
- Andrew Lunn <[email protected]>
11+
12+
description:
13+
The Marvell MV88E6060 switch has been produced and sold by Marvell
14+
since at least 2008. The switch has one pin ADDR4 that controls the
15+
MDIO address of the switch to be 0x10 or 0x00, and on the MDIO bus
16+
connected to the switch, the PHYs inside the switch appear as
17+
independent devices on address 0x00-0x04 or 0x10-0x14, so in difference
18+
from many other DSA switches this switch does not have an internal
19+
MDIO bus for the PHY devices.
20+
21+
properties:
22+
compatible:
23+
const: marvell,mv88e6060
24+
description:
25+
The MV88E6060 is the oldest Marvell DSA switch product, and
26+
as such a bit limited in features compared to later hardware.
27+
28+
reg:
29+
maxItems: 1
30+
31+
reset-gpios:
32+
description:
33+
GPIO to be used to reset the whole device
34+
maxItems: 1
35+
36+
allOf:
37+
- $ref: dsa.yaml#/$defs/ethernet-ports
38+
39+
required:
40+
- compatible
41+
- reg
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/gpio/gpio.h>
48+
#include <dt-bindings/interrupt-controller/irq.h>
49+
mdio {
50+
#address-cells = <1>;
51+
#size-cells = <0>;
52+
53+
ethernet-switch@16 {
54+
compatible = "marvell,mv88e6060";
55+
reg = <16>;
56+
57+
ethernet-ports {
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
ethernet-port@0 {
62+
reg = <0>;
63+
label = "lan1";
64+
};
65+
ethernet-port@1 {
66+
reg = <1>;
67+
label = "lan2";
68+
};
69+
ethernet-port@2 {
70+
reg = <2>;
71+
label = "lan3";
72+
};
73+
ethernet-port@3 {
74+
reg = <3>;
75+
label = "lan4";
76+
};
77+
ethernet-port@5 {
78+
reg = <5>;
79+
phy-mode = "rev-mii";
80+
ethernet = <&ethc>;
81+
fixed-link {
82+
speed = <100>;
83+
full-duplex;
84+
};
85+
};
86+
};
87+
};
88+
};

0 commit comments

Comments
 (0)