Skip to content

Commit 89cdf9d

Browse files
committedNov 10, 2023
Merge tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from netfilter and bpf. Current release - regressions: - sched: fix SKB_NOT_DROPPED_YET splat under debug config Current release - new code bugs: - tcp: - fix usec timestamps with TCP fastopen - fix possible out-of-bounds reads in tcp_hash_fail() - fix SYN option room calculation for TCP-AO - tcp_sigpool: fix some off by one bugs - bpf: fix compilation error without CGROUPS - ptp: - ptp_read() should not release queue - fix tsevqs corruption Previous releases - regressions: - llc: verify mac len before reading mac header Previous releases - always broken: - bpf: - fix check_stack_write_fixed_off() to correctly spill imm - fix precision tracking for BPF_ALU | BPF_TO_BE | BPF_END - check map->usercnt after timer->timer is assigned - dsa: lan9303: consequently nested-lock physical MDIO - dccp/tcp: call security_inet_conn_request() after setting IP addr - tg3: fix the TX ring stall due to incorrect full ring handling - phylink: initialize carrier state at creation - ice: fix direction of VF rules in switchdev mode Misc: - fill in a bunch of missing MODULE_DESCRIPTION()s, more to come" * tag 'net-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits) net: ti: icss-iep: fix setting counter value ptp: fix corrupted list in ptp_open ptp: ptp_read should not release queue net_sched: sch_fq: better validate TCA_FQ_WEIGHTS and TCA_FQ_PRIOMAP net: kcm: fill in MODULE_DESCRIPTION() net/sched: act_ct: Always fill offloading tuple iifidx netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses netfilter: xt_recent: fix (increase) ipv6 literal buffer length ipvs: add missing module descriptions netfilter: nf_tables: remove catchall element in GC sync path netfilter: add missing module descriptions drivers/net/ppp: use standard array-copy-function net: enetc: shorten enetc_setup_xdp_prog() error message to fit NETLINK_MAX_FMTMSG_LEN virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt() r8169: respect userspace disabling IFF_MULTICAST selftests/bpf: get trusted cgrp from bpf_iter__cgroup directly bpf: Let verifier consider {task,cgroup} is trusted in bpf_iter_reg net: phylink: initialize carrier state at creation test/vsock: add dobule bind connect test test/vsock: refactor vsock_accept ...
2 parents 3b22041 + 83b9dda commit 89cdf9d

File tree

178 files changed

+1240
-432
lines changed

Some content is hidden

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

178 files changed

+1240
-432
lines changed
 

Diff for: ‎Documentation/bpf/kfuncs.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ prototype in a header for the wrapper kfunc.
3737
An example is given below::
3838

3939
/* Disables missing prototype warnings */
40-
__diag_push();
41-
__diag_ignore_all("-Wmissing-prototypes",
42-
"Global kfuncs as their definitions will be in BTF");
40+
__bpf_kfunc_start_defs();
4341

4442
__bpf_kfunc struct task_struct *bpf_find_get_task_by_vpid(pid_t nr)
4543
{
4644
return find_get_task_by_vpid(nr);
4745
}
4846

49-
__diag_pop();
47+
__bpf_kfunc_end_defs();
5048

5149
A wrapper kfunc is often needed when we need to annotate parameters of the
5250
kfunc. Otherwise one may directly make the kfunc visible to the BPF program by

Diff for: ‎Documentation/netlink/specs/devlink.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ definitions:
7171
name: roce-bit
7272
-
7373
name: migratable-bit
74+
-
75+
name: ipsec-crypto-bit
76+
-
77+
name: ipsec-packet-bit
7478
-
7579
type: enum
7680
name: sb-threshold-type

0 commit comments

Comments
 (0)
Please sign in to comment.