Skip to content

Commit 4f5e509

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from can, wireless and netfilter. Current release - regressions: - af_unix: fix task hung while purging oob_skb in GC - pds_core: do not try to run health-thread in VF path Current release - new code bugs: - sched: act_mirred: don't zero blockid when net device is being deleted Previous releases - regressions: - netfilter: - nat: restore default DNAT behavior - nf_tables: fix bidirectional offload, broken when unidirectional offload support was added - openvswitch: limit the number of recursions from action sets - eth: i40e: do not allow untrusted VF to remove administratively set MAC address Previous releases - always broken: - tls: fix races and bugs in use of async crypto - mptcp: prevent data races on some of the main socket fields, fix races in fastopen handling - dpll: fix possible deadlock during netlink dump operation - dsa: lan966x: fix crash when adding interface under a lag when some of the ports are disabled - can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock Misc: - a handful of fixes and reliability improvements for selftests - fix sysfs documentation missing net/ in paths - finish the work of squashing the missing MODULE_DESCRIPTION() warnings in networking" * tag 'net-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (92 commits) net: fill in MODULE_DESCRIPTION()s for missing arcnet net: fill in MODULE_DESCRIPTION()s for mdio_devres net: fill in MODULE_DESCRIPTION()s for ppp net: fill in MODULE_DESCRIPTION()s for fddik/skfp net: fill in MODULE_DESCRIPTION()s for plip net: fill in MODULE_DESCRIPTION()s for ieee802154/fakelb net: fill in MODULE_DESCRIPTION()s for xen-netback net: ravb: Count packets instead of descriptors in GbEth RX path pppoe: Fix memory leak in pppoe_sendmsg() net: sctp: fix skb leak in sctp_inq_free() net: bcmasp: Handle RX buffer allocation failure net-timestamp: make sk_tskey more predictable in error path selftests: tls: increase the wait in poll_partial_rec_async ice: Add check for lport extraction to LAG init netfilter: nf_tables: fix bidirectional offload regression netfilter: nat: restore default DNAT behavior netfilter: nft_set_pipapo: fix missing : in kdoc igc: Remove temporary workaround igb: Fix string truncation warnings in igb_set_fw_version can: netlink: Fix TDCO calculation using the old data bittiming ...
2 parents cc9c4f0 + c40c0d3 commit 4f5e509

File tree

129 files changed

+817
-489
lines changed

Some content is hidden

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

129 files changed

+817
-489
lines changed

‎.mailmap

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
191191
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
192192
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
193193
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
194-
Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>
195-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>
196-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>
197-
Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>
194+
Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>
195+
Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
196+
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
197+
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
198+
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
198199
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
199200
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
200201
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

‎Documentation/ABI/testing/sysfs-class-net-statistics

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/class/<iface>/statistics/collisions
1+
What: /sys/class/net/<iface>/statistics/collisions
22
Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: netdev@vger.kernel.org
55
Description:
66
Indicates the number of collisions seen by this network device.
77
This value might not be relevant with all MAC layers.
88

9-
What: /sys/class/<iface>/statistics/multicast
9+
What: /sys/class/net/<iface>/statistics/multicast
1010
Date: April 2005
1111
KernelVersion: 2.6.12
1212
Contact: netdev@vger.kernel.org
1313
Description:
1414
Indicates the number of multicast packets received by this
1515
network device.
1616

17-
What: /sys/class/<iface>/statistics/rx_bytes
17+
What: /sys/class/net/<iface>/statistics/rx_bytes
1818
Date: April 2005
1919
KernelVersion: 2.6.12
2020
Contact: netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description:
2323
See the network driver for the exact meaning of when this
2424
value is incremented.
2525

26-
What: /sys/class/<iface>/statistics/rx_compressed
26+
What: /sys/class/net/<iface>/statistics/rx_compressed
2727
Date: April 2005
2828
KernelVersion: 2.6.12
2929
Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description:
3232
network device. This value might only be relevant for interfaces
3333
that support packet compression (e.g: PPP).
3434

35-
What: /sys/class/<iface>/statistics/rx_crc_errors
35+
What: /sys/class/net/<iface>/statistics/rx_crc_errors
3636
Date: April 2005
3737
KernelVersion: 2.6.12
3838
Contact: netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description:
4141
by this network device. Note that the specific meaning might
4242
depend on the MAC layer used by the interface.
4343

44-
What: /sys/class/<iface>/statistics/rx_dropped
44+
What: /sys/class/net/<iface>/statistics/rx_dropped
4545
Date: April 2005
4646
KernelVersion: 2.6.12
4747
Contact: netdev@vger.kernel.org
@@ -51,15 +51,15 @@ Description:
5151
packet processing. See the network driver for the exact
5252
meaning of this value.
5353

54-
What: /sys/class/<iface>/statistics/rx_errors
54+
What: /sys/class/net/<iface>/statistics/rx_errors
5555
Date: April 2005
5656
KernelVersion: 2.6.12
5757
Contact: netdev@vger.kernel.org
5858
Description:
5959
Indicates the number of receive errors on this network device.
6060
See the network driver for the exact meaning of this value.
6161

62-
What: /sys/class/<iface>/statistics/rx_fifo_errors
62+
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
6363
Date: April 2005
6464
KernelVersion: 2.6.12
6565
Contact: netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description:
6868
network device. See the network driver for the exact
6969
meaning of this value.
7070

71-
What: /sys/class/<iface>/statistics/rx_frame_errors
71+
What: /sys/class/net/<iface>/statistics/rx_frame_errors
7272
Date: April 2005
7373
KernelVersion: 2.6.12
7474
Contact: netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description:
7878
on the MAC layer protocol used. See the network driver for
7979
the exact meaning of this value.
8080

81-
What: /sys/class/<iface>/statistics/rx_length_errors
81+
What: /sys/class/net/<iface>/statistics/rx_length_errors
8282
Date: April 2005
8383
KernelVersion: 2.6.12
8484
Contact: netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description:
8787
error, oversized or undersized. See the network driver for the
8888
exact meaning of this value.
8989

90-
What: /sys/class/<iface>/statistics/rx_missed_errors
90+
What: /sys/class/net/<iface>/statistics/rx_missed_errors
9191
Date: April 2005
9292
KernelVersion: 2.6.12
9393
Contact: netdev@vger.kernel.org
@@ -96,15 +96,15 @@ Description:
9696
due to lack of capacity in the receive side. See the network
9797
driver for the exact meaning of this value.
9898

99-
What: /sys/class/<iface>/statistics/rx_nohandler
99+
What: /sys/class/net/<iface>/statistics/rx_nohandler
100100
Date: February 2016
101101
KernelVersion: 4.6
102102
Contact: netdev@vger.kernel.org
103103
Description:
104104
Indicates the number of received packets that were dropped on
105105
an inactive device by the network core.
106106

107-
What: /sys/class/<iface>/statistics/rx_over_errors
107+
What: /sys/class/net/<iface>/statistics/rx_over_errors
108108
Date: April 2005
109109
KernelVersion: 2.6.12
110110
Contact: netdev@vger.kernel.org
@@ -114,15 +114,15 @@ Description:
114114
(e.g: larger than MTU). See the network driver for the exact
115115
meaning of this value.
116116

117-
What: /sys/class/<iface>/statistics/rx_packets
117+
What: /sys/class/net/<iface>/statistics/rx_packets
118118
Date: April 2005
119119
KernelVersion: 2.6.12
120120
Contact: netdev@vger.kernel.org
121121
Description:
122122
Indicates the total number of good packets received by this
123123
network device.
124124

125-
What: /sys/class/<iface>/statistics/tx_aborted_errors
125+
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
126126
Date: April 2005
127127
KernelVersion: 2.6.12
128128
Contact: netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description:
132132
a medium collision). See the network driver for the exact
133133
meaning of this value.
134134

135-
What: /sys/class/<iface>/statistics/tx_bytes
135+
What: /sys/class/net/<iface>/statistics/tx_bytes
136136
Date: April 2005
137137
KernelVersion: 2.6.12
138138
Contact: netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description:
143143
transmitted packets or all packets that have been queued for
144144
transmission.
145145

146-
What: /sys/class/<iface>/statistics/tx_carrier_errors
146+
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
147147
Date: April 2005
148148
KernelVersion: 2.6.12
149149
Contact: netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description:
152152
because of carrier errors (e.g: physical link down). See the
153153
network driver for the exact meaning of this value.
154154

155-
What: /sys/class/<iface>/statistics/tx_compressed
155+
What: /sys/class/net/<iface>/statistics/tx_compressed
156156
Date: April 2005
157157
KernelVersion: 2.6.12
158158
Contact: netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description:
161161
this might only be relevant for devices that support
162162
compression (e.g: PPP).
163163

164-
What: /sys/class/<iface>/statistics/tx_dropped
164+
What: /sys/class/net/<iface>/statistics/tx_dropped
165165
Date: April 2005
166166
KernelVersion: 2.6.12
167167
Contact: netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description:
170170
See the driver for the exact reasons as to why the packets were
171171
dropped.
172172

173-
What: /sys/class/<iface>/statistics/tx_errors
173+
What: /sys/class/net/<iface>/statistics/tx_errors
174174
Date: April 2005
175175
KernelVersion: 2.6.12
176176
Contact: netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description:
179179
a network device. See the driver for the exact reasons as to
180180
why the packets were dropped.
181181

182-
What: /sys/class/<iface>/statistics/tx_fifo_errors
182+
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
183183
Date: April 2005
184184
KernelVersion: 2.6.12
185185
Contact: netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description:
188188
FIFO error. See the driver for the exact reasons as to why the
189189
packets were dropped.
190190

191-
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
191+
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
192192
Date: April 2005
193193
KernelVersion: 2.6.12
194194
Contact: netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description:
197197
reported as heartbeat errors. See the driver for the exact
198198
reasons as to why the packets were dropped.
199199

200-
What: /sys/class/<iface>/statistics/tx_packets
200+
What: /sys/class/net/<iface>/statistics/tx_packets
201201
Date: April 2005
202202
KernelVersion: 2.6.12
203203
Contact: netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description:
206206
device. See the driver for whether this reports the number of all
207207
attempted or successful transmissions.
208208

209-
What: /sys/class/<iface>/statistics/tx_window_errors
209+
What: /sys/class/net/<iface>/statistics/tx_window_errors
210210
Date: April 2005
211211
KernelVersion: 2.6.12
212212
Contact: netdev@vger.kernel.org

‎Documentation/netlink/specs/dpll.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,6 @@ operations:
384384
- type
385385

386386
dump:
387-
pre: dpll-lock-dumpit
388-
post: dpll-unlock-dumpit
389387
reply: *dev-attrs
390388

391389
-
@@ -473,8 +471,6 @@ operations:
473471
- fractional-frequency-offset
474472

475473
dump:
476-
pre: dpll-lock-dumpit
477-
post: dpll-unlock-dumpit
478474
request:
479475
attributes:
480476
- id

‎Documentation/networking/devlink/devlink-port.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Users may also set the RoCE capability of the function using
126126
`devlink port function set roce` command.
127127

128128
Users may also set the function as migratable using
129-
'devlink port function set migratable' command.
129+
`devlink port function set migratable` command.
130130

131131
Users may also set the IPsec crypto capability of the function using
132132
`devlink port function set ipsec_crypto` command.

‎Documentation/networking/net_cachelines/net_device.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ struct_netpoll_info* npinfo -
136136
possible_net_t nd_net - read_mostly (dev_net)napi_busy_loop,tcp_v(4/6)_rcv,ip(v6)_rcv,ip(6)_input,ip(6)_input_finish
137137
void* ml_priv
138138
enum_netdev_ml_priv_type ml_priv_type
139-
struct_pcpu_lstats__percpu* lstats
140-
struct_pcpu_sw_netstats__percpu* tstats
139+
struct_pcpu_lstats__percpu* lstats read_mostly dev_lstats_add()
140+
struct_pcpu_sw_netstats__percpu* tstats read_mostly dev_sw_netstats_tx_add()
141141
struct_pcpu_dstats__percpu* dstats
142142
struct_garp_port* garp_port
143143
struct_mrp_port* mrp_port

‎Documentation/networking/net_cachelines/tcp_sock.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ u32 max_window read_mostly -
3838
u32 mss_cache read_mostly read_mostly tcp_rate_check_app_limited,tcp_current_mss,tcp_sync_mss,tcp_sndbuf_expand,tcp_tso_should_defer(tx);tcp_update_pacing_rate,tcp_clean_rtx_queue(rx)
3939
u32 window_clamp read_mostly read_write tcp_rcv_space_adjust,__tcp_select_window
4040
u32 rcv_ssthresh read_mostly - __tcp_select_window
41-
u82 scaling_ratio
41+
u8 scaling_ratio read_mostly read_mostly tcp_win_from_space
4242
struct tcp_rack
4343
u16 advmss - read_mostly tcp_rcv_space_adjust
4444
u8 compressed_ack
4545
u8:2 dup_ack_counter
4646
u8:1 tlp_retrans
47-
u8:1 tcp_usec_ts
47+
u8:1 tcp_usec_ts read_mostly read_mostly
4848
u32 chrono_start read_write - tcp_chrono_start/stop(tcp_write_xmit,tcp_cwnd_validate,tcp_send_syn_data)
4949
u32[3] chrono_stat read_write - tcp_chrono_start/stop(tcp_write_xmit,tcp_cwnd_validate,tcp_send_syn_data)
5050
u8:2 chrono_type read_write - tcp_chrono_start/stop(tcp_write_xmit,tcp_cwnd_validate,tcp_send_syn_data)

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15324,7 +15324,7 @@ K: \bmdo_
1532415324
NETWORKING [MPTCP]
1532515325
M: Matthieu Baerts <matttbe@kernel.org>
1532615326
M: Mat Martineau <martineau@kernel.org>
15327-
R: Geliang Tang <geliang.tang@linux.dev>
15327+
R: Geliang Tang <geliang@kernel.org>
1532815328
L: netdev@vger.kernel.org
1532915329
L: mptcp@lists.linux.dev
1533015330
S: Maintained

‎drivers/connector/cn_proc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@ static inline void send_msg(struct cn_msg *msg)
108108
filter_data[1] = 0;
109109
}
110110

111-
if (cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,
112-
cn_filter, (void *)filter_data) == -ESRCH)
113-
atomic_set(&proc_event_num_listeners, 0);
111+
cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,
112+
cn_filter, (void *)filter_data);
114113

115114
local_unlock(&local_event.lock);
116115
}

‎drivers/dpll/dpll_netlink.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,7 @@ int dpll_nl_pin_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
11991199
unsigned long i;
12001200
int ret = 0;
12011201

1202+
mutex_lock(&dpll_lock);
12021203
xa_for_each_marked_start(&dpll_pin_xa, i, pin, DPLL_REGISTERED,
12031204
ctx->idx) {
12041205
if (!dpll_pin_available(pin))
@@ -1218,6 +1219,8 @@ int dpll_nl_pin_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
12181219
}
12191220
genlmsg_end(skb, hdr);
12201221
}
1222+
mutex_unlock(&dpll_lock);
1223+
12211224
if (ret == -EMSGSIZE) {
12221225
ctx->idx = i;
12231226
return skb->len;
@@ -1373,6 +1376,7 @@ int dpll_nl_device_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
13731376
unsigned long i;
13741377
int ret = 0;
13751378

1379+
mutex_lock(&dpll_lock);
13761380
xa_for_each_marked_start(&dpll_device_xa, i, dpll, DPLL_REGISTERED,
13771381
ctx->idx) {
13781382
hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid,
@@ -1389,6 +1393,8 @@ int dpll_nl_device_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
13891393
}
13901394
genlmsg_end(skb, hdr);
13911395
}
1396+
mutex_unlock(&dpll_lock);
1397+
13921398
if (ret == -EMSGSIZE) {
13931399
ctx->idx = i;
13941400
return skb->len;
@@ -1439,20 +1445,6 @@ dpll_unlock_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
14391445
mutex_unlock(&dpll_lock);
14401446
}
14411447

1442-
int dpll_lock_dumpit(struct netlink_callback *cb)
1443-
{
1444-
mutex_lock(&dpll_lock);
1445-
1446-
return 0;
1447-
}
1448-
1449-
int dpll_unlock_dumpit(struct netlink_callback *cb)
1450-
{
1451-
mutex_unlock(&dpll_lock);
1452-
1453-
return 0;
1454-
}
1455-
14561448
int dpll_pin_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
14571449
struct genl_info *info)
14581450
{

‎drivers/dpll/dpll_nl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ static const struct genl_split_ops dpll_nl_ops[] = {
9595
},
9696
{
9797
.cmd = DPLL_CMD_DEVICE_GET,
98-
.start = dpll_lock_dumpit,
9998
.dumpit = dpll_nl_device_get_dumpit,
100-
.done = dpll_unlock_dumpit,
10199
.flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
102100
},
103101
{
@@ -129,9 +127,7 @@ static const struct genl_split_ops dpll_nl_ops[] = {
129127
},
130128
{
131129
.cmd = DPLL_CMD_PIN_GET,
132-
.start = dpll_lock_dumpit,
133130
.dumpit = dpll_nl_pin_get_dumpit,
134-
.done = dpll_unlock_dumpit,
135131
.policy = dpll_pin_get_dump_nl_policy,
136132
.maxattr = DPLL_A_PIN_ID,
137133
.flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,

0 commit comments

Comments
 (0)