Skip to content

Commit aa35e45

Browse files
committed
Merge tag 'net-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Networking fixes, including fixes from netfilter, wireless and bpf trees. Current release - regressions: - mt76: fix NULL pointer dereference in mt76u_status_worker and mt76s_process_tx_queue - net: ipa: fix interconnect enable bug Current release - always broken: - netfilter: fixes possible oops in mtype_resize in ipset - ath11k: fix number of coding issues found by static analysis tools and spurious error messages Previous releases - regressions: - e1000e: re-enable s0ix power saving flows for systems with the Intel i219-LM Ethernet controllers to fix power use regression - virtio_net: fix recursive call to cpus_read_lock() to avoid a deadlock - ipv4: ignore ECN bits for fib lookups in fib_compute_spec_dst() - sysfs: take the rtnl lock around XPS configuration - xsk: fix memory leak for failed bind and rollback reservation at NETDEV_TX_BUSY - r8169: work around power-saving bug on some chip versions Previous releases - always broken: - dcb: validate netlink message in DCB handler - tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS to prevent unnecessary retries - vhost_net: fix ubuf refcount when sendmsg fails - bpf: save correct stopping point in file seq iteration - ncsi: use real net-device for response handler - neighbor: fix div by zero caused by a data race (TOCTOU) - bareudp: fix use of incorrect min_headroom size and a false positive lockdep splat from the TX lock - mvpp2: - clear force link UP during port init procedure in case bootloader had set it - add TCAM entry to drop flow control pause frames - fix PPPoE with ipv6 packet parsing - fix GoP Networking Complex Control config of port 3 - fix pkt coalescing IRQ-threshold configuration - xsk: fix race in SKB mode transmit with shared cq - ionic: account for vlan tag len in rx buffer len - stmmac: ignore the second clock input, current clock framework does not handle exclusive clock use well, other drivers may reconfigure the second clock Misc: - ppp: change PPPIOCUNBRIDGECHAN ioctl request number to follow existing scheme" * tag 'net-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (99 commits) net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs net: lapb: Decrease the refcount of "struct lapb_cb" in lapb_device_event r8169: work around power-saving bug on some chip versions net: usb: qmi_wwan: add Quectel EM160R-GL selftests: mlxsw: Set headroom size of correct port net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag ibmvnic: fix: NULL pointer dereference. docs: networking: packet_mmap: fix old config reference docs: networking: packet_mmap: fix formatting for C macros vhost_net: fix ubuf refcount incorrectly when sendmsg fails bareudp: Fix use of incorrect min_headroom size bareudp: set NETIF_F_LLTX flag net: hdlc_ppp: Fix issues when mod_timer is called while timer is running atlantic: remove architecture depends erspan: fix version 1 check in gre_parse_header() net: hns: fix return value check in __lb_other_process() net: sched: prevent invalid Scell_log shift count net: neighbor: fix a crash caused by mod zero ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst() ...
2 parents 6207214 + a8f33c0 commit aa35e45

Some content is hidden

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

92 files changed

+710
-411
lines changed

Documentation/networking/netdev-FAQ.rst

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
netdev FAQ
77
==========
88

9-
Q: What is netdev?
10-
------------------
11-
A: It is a mailing list for all network-related Linux stuff. This
9+
What is netdev?
10+
---------------
11+
It is a mailing list for all network-related Linux stuff. This
1212
includes anything found under net/ (i.e. core code like IPv6) and
1313
drivers/net (i.e. hardware specific drivers) in the Linux source tree.
1414

@@ -25,9 +25,9 @@ Aside from subsystems like that mentioned above, all network-related
2525
Linux development (i.e. RFC, review, comments, etc.) takes place on
2626
netdev.
2727

28-
Q: How do the changes posted to netdev make their way into Linux?
29-
-----------------------------------------------------------------
30-
A: There are always two trees (git repositories) in play. Both are
28+
How do the changes posted to netdev make their way into Linux?
29+
--------------------------------------------------------------
30+
There are always two trees (git repositories) in play. Both are
3131
driven by David Miller, the main network maintainer. There is the
3232
``net`` tree, and the ``net-next`` tree. As you can probably guess from
3333
the names, the ``net`` tree is for fixes to existing code already in the
@@ -37,9 +37,9 @@ for the future release. You can find the trees here:
3737
- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
3838
- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
3939

40-
Q: How often do changes from these trees make it to the mainline Linus tree?
41-
----------------------------------------------------------------------------
42-
A: To understand this, you need to know a bit of background information on
40+
How often do changes from these trees make it to the mainline Linus tree?
41+
-------------------------------------------------------------------------
42+
To understand this, you need to know a bit of background information on
4343
the cadence of Linux development. Each new release starts off with a
4444
two week "merge window" where the main maintainers feed their new stuff
4545
to Linus for merging into the mainline tree. After the two weeks, the
@@ -81,7 +81,8 @@ focus for ``net`` is on stabilization and bug fixes.
8181

8282
Finally, the vX.Y gets released, and the whole cycle starts over.
8383

84-
Q: So where are we now in this cycle?
84+
So where are we now in this cycle?
85+
----------------------------------
8586

8687
Load the mainline (Linus) page here:
8788

@@ -91,9 +92,9 @@ and note the top of the "tags" section. If it is rc1, it is early in
9192
the dev cycle. If it was tagged rc7 a week ago, then a release is
9293
probably imminent.
9394

94-
Q: How do I indicate which tree (net vs. net-next) my patch should be in?
95-
-------------------------------------------------------------------------
96-
A: Firstly, think whether you have a bug fix or new "next-like" content.
95+
How do I indicate which tree (net vs. net-next) my patch should be in?
96+
----------------------------------------------------------------------
97+
Firstly, think whether you have a bug fix or new "next-like" content.
9798
Then once decided, assuming that you use git, use the prefix flag, i.e.
9899
::
99100

@@ -105,48 +106,45 @@ in the above is just the subject text of the outgoing e-mail, and you
105106
can manually change it yourself with whatever MUA you are comfortable
106107
with.
107108

108-
Q: I sent a patch and I'm wondering what happened to it?
109-
--------------------------------------------------------
110-
Q: How can I tell whether it got merged?
111-
A: Start by looking at the main patchworks queue for netdev:
109+
I sent a patch and I'm wondering what happened to it - how can I tell whether it got merged?
110+
--------------------------------------------------------------------------------------------
111+
Start by looking at the main patchworks queue for netdev:
112112

113113
https://patchwork.kernel.org/project/netdevbpf/list/
114114

115115
The "State" field will tell you exactly where things are at with your
116116
patch.
117117

118-
Q: The above only says "Under Review". How can I find out more?
119-
----------------------------------------------------------------
120-
A: Generally speaking, the patches get triaged quickly (in less than
118+
The above only says "Under Review". How can I find out more?
119+
-------------------------------------------------------------
120+
Generally speaking, the patches get triaged quickly (in less than
121121
48h). So be patient. Asking the maintainer for status updates on your
122122
patch is a good way to ensure your patch is ignored or pushed to the
123123
bottom of the priority list.
124124

125-
Q: I submitted multiple versions of the patch series
126-
----------------------------------------------------
127-
Q: should I directly update patchwork for the previous versions of these
128-
patch series?
129-
A: No, please don't interfere with the patch status on patchwork, leave
125+
I submitted multiple versions of the patch series. Should I directly update patchwork for the previous versions of these patch series?
126+
--------------------------------------------------------------------------------------------------------------------------------------
127+
No, please don't interfere with the patch status on patchwork, leave
130128
it to the maintainer to figure out what is the most recent and current
131129
version that should be applied. If there is any doubt, the maintainer
132130
will reply and ask what should be done.
133131

134-
Q: I made changes to only a few patches in a patch series should I resend only those changed?
135-
---------------------------------------------------------------------------------------------
136-
A: No, please resend the entire patch series and make sure you do number your
132+
I made changes to only a few patches in a patch series should I resend only those changed?
133+
------------------------------------------------------------------------------------------
134+
No, please resend the entire patch series and make sure you do number your
137135
patches such that it is clear this is the latest and greatest set of patches
138136
that can be applied.
139137

140-
Q: I submitted multiple versions of a patch series and it looks like a version other than the last one has been accepted, what should I do?
141-
-------------------------------------------------------------------------------------------------------------------------------------------
142-
A: There is no revert possible, once it is pushed out, it stays like that.
138+
I submitted multiple versions of a patch series and it looks like a version other than the last one has been accepted, what should I do?
139+
----------------------------------------------------------------------------------------------------------------------------------------
140+
There is no revert possible, once it is pushed out, it stays like that.
143141
Please send incremental versions on top of what has been merged in order to fix
144142
the patches the way they would look like if your latest patch series was to be
145143
merged.
146144

147-
Q: How can I tell what patches are queued up for backporting to the various stable releases?
148-
--------------------------------------------------------------------------------------------
149-
A: Normally Greg Kroah-Hartman collects stable commits himself, but for
145+
How can I tell what patches are queued up for backporting to the various stable releases?
146+
-----------------------------------------------------------------------------------------
147+
Normally Greg Kroah-Hartman collects stable commits himself, but for
150148
networking, Dave collects up patches he deems critical for the
151149
networking subsystem, and then hands them off to Greg.
152150

@@ -169,11 +167,9 @@ simply clone the repo, and then git grep the mainline commit ID, e.g.
169167
releases/3.9.8/ipv6-fix-possible-crashes-in-ip6_cork_release.patch
170168
stable/stable-queue$
171169

172-
Q: I see a network patch and I think it should be backported to stable.
173-
-----------------------------------------------------------------------
174-
Q: Should I request it via [email protected] like the references in
175-
the kernel's Documentation/process/stable-kernel-rules.rst file say?
176-
A: No, not for networking. Check the stable queues as per above first
170+
I see a network patch and I think it should be backported to stable. Should I request it via [email protected] like the references in the kernel's Documentation/process/stable-kernel-rules.rst file say?
171+
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
172+
No, not for networking. Check the stable queues as per above first
177173
to see if it is already queued. If not, then send a mail to netdev,
178174
listing the upstream commit ID and why you think it should be a stable
179175
candidate.
@@ -190,11 +186,9 @@ mainline, the better the odds that it is an OK candidate for stable. So
190186
scrambling to request a commit be added the day after it appears should
191187
be avoided.
192188

193-
Q: I have created a network patch and I think it should be backported to stable.
194-
--------------------------------------------------------------------------------
195-
Q: Should I add a Cc: [email protected] like the references in the
196-
kernel's Documentation/ directory say?
197-
A: No. See above answer. In short, if you think it really belongs in
189+
I have created a network patch and I think it should be backported to stable. Should I add a Cc: [email protected] like the references in the kernel's Documentation/ directory say?
190+
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
191+
No. See above answer. In short, if you think it really belongs in
198192
stable, then ensure you write a decent commit log that describes who
199193
gets impacted by the bug fix and how it manifests itself, and when the
200194
bug was introduced. If you do that properly, then the commit will get
@@ -207,18 +201,18 @@ marker line as described in
207201
:ref:`Documentation/process/submitting-patches.rst <the_canonical_patch_format>`
208202
to temporarily embed that information into the patch that you send.
209203

210-
Q: Are all networking bug fixes backported to all stable releases?
211-
------------------------------------------------------------------
212-
A: Due to capacity, Dave could only take care of the backports for the
204+
Are all networking bug fixes backported to all stable releases?
205+
---------------------------------------------------------------
206+
Due to capacity, Dave could only take care of the backports for the
213207
last two stable releases. For earlier stable releases, each stable
214208
branch maintainer is supposed to take care of them. If you find any
215209
patch is missing from an earlier stable branch, please notify
216210
[email protected] with either a commit ID or a formal patch
217211
backported, and CC Dave and other relevant networking developers.
218212

219-
Q: Is the comment style convention different for the networking content?
220-
------------------------------------------------------------------------
221-
A: Yes, in a largely trivial way. Instead of this::
213+
Is the comment style convention different for the networking content?
214+
---------------------------------------------------------------------
215+
Yes, in a largely trivial way. Instead of this::
222216

223217
/*
224218
* foobar blah blah blah
@@ -231,32 +225,30 @@ it is requested that you make it look like this::
231225
* another line of text
232226
*/
233227

234-
Q: I am working in existing code that has the former comment style and not the latter.
235-
--------------------------------------------------------------------------------------
236-
Q: Should I submit new code in the former style or the latter?
237-
A: Make it the latter style, so that eventually all code in the domain
228+
I am working in existing code that has the former comment style and not the latter. Should I submit new code in the former style or the latter?
229+
-----------------------------------------------------------------------------------------------------------------------------------------------
230+
Make it the latter style, so that eventually all code in the domain
238231
of netdev is of this format.
239232

240-
Q: I found a bug that might have possible security implications or similar.
241-
---------------------------------------------------------------------------
242-
Q: Should I mail the main netdev maintainer off-list?**
243-
A: No. The current netdev maintainer has consistently requested that
233+
I found a bug that might have possible security implications or similar. Should I mail the main netdev maintainer off-list?
234+
---------------------------------------------------------------------------------------------------------------------------
235+
No. The current netdev maintainer has consistently requested that
244236
people use the mailing lists and not reach out directly. If you aren't
245237
OK with that, then perhaps consider mailing [email protected] or
246238
reading about http://oss-security.openwall.org/wiki/mailing-lists/distros
247239
as possible alternative mechanisms.
248240

249-
Q: What level of testing is expected before I submit my change?
250-
---------------------------------------------------------------
251-
A: If your changes are against ``net-next``, the expectation is that you
241+
What level of testing is expected before I submit my change?
242+
------------------------------------------------------------
243+
If your changes are against ``net-next``, the expectation is that you
252244
have tested by layering your changes on top of ``net-next``. Ideally
253245
you will have done run-time testing specific to your change, but at a
254246
minimum, your changes should survive an ``allyesconfig`` and an
255247
``allmodconfig`` build without new warnings or failures.
256248

257-
Q: How do I post corresponding changes to user space components?
258-
----------------------------------------------------------------
259-
A: User space code exercising kernel features should be posted
249+
How do I post corresponding changes to user space components?
250+
-------------------------------------------------------------
251+
User space code exercising kernel features should be posted
260252
alongside kernel patches. This gives reviewers a chance to see
261253
how any new interface is used and how well it works.
262254

@@ -280,9 +272,9 @@ to the mailing list, e.g.::
280272
Posting as one thread is discouraged because it confuses patchwork
281273
(as of patchwork 2.2.2).
282274

283-
Q: Any other tips to help ensure my net/net-next patch gets OK'd?
284-
-----------------------------------------------------------------
285-
A: Attention to detail. Re-read your own work as if you were the
275+
Any other tips to help ensure my net/net-next patch gets OK'd?
276+
--------------------------------------------------------------
277+
Attention to detail. Re-read your own work as if you were the
286278
reviewer. You can start with using ``checkpatch.pl``, perhaps even with
287279
the ``--strict`` flag. But do not be mindlessly robotic in doing so.
288280
If your change is a bug fix, make sure your commit log indicates the

Documentation/networking/packet_mmap.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Abstract
88
========
99

1010
This file documents the mmap() facility available with the PACKET
11-
socket interface on 2.4/2.6/3.x kernels. This type of sockets is used for
11+
socket interface. This type of sockets is used for
1212

1313
i) capture network traffic with utilities like tcpdump,
1414
ii) transmit network traffic, or any other that needs raw
@@ -25,12 +25,12 @@ Please send your comments to
2525
Why use PACKET_MMAP
2626
===================
2727

28-
In Linux 2.4/2.6/3.x if PACKET_MMAP is not enabled, the capture process is very
28+
Non PACKET_MMAP capture process (plain AF_PACKET) is very
2929
inefficient. It uses very limited buffers and requires one system call to
3030
capture each packet, it requires two if you want to get packet's timestamp
3131
(like libpcap always does).
3232

33-
In the other hand PACKET_MMAP is very efficient. PACKET_MMAP provides a size
33+
On the other hand PACKET_MMAP is very efficient. PACKET_MMAP provides a size
3434
configurable circular buffer mapped in user space that can be used to either
3535
send or receive packets. This way reading packets just needs to wait for them,
3636
most of the time there is no need to issue a single system call. Concerning
@@ -252,8 +252,7 @@ PACKET_MMAP setting constraints
252252

253253
In kernel versions prior to 2.4.26 (for the 2.4 branch) and 2.6.5 (2.6 branch),
254254
the PACKET_MMAP buffer could hold only 32768 frames in a 32 bit architecture or
255-
16384 in a 64 bit architecture. For information on these kernel versions
256-
see http://pusa.uv.es/~ulisses/packet_mmap/packet_mmap.pre-2.4.26_2.6.5.txt
255+
16384 in a 64 bit architecture.
257256

258257
Block size limit
259258
----------------
@@ -437,7 +436,7 @@ and the following flags apply:
437436
Capture process
438437
^^^^^^^^^^^^^^^
439438

440-
from include/linux/if_packet.h
439+
From include/linux/if_packet.h::
441440

442441
#define TP_STATUS_COPY (1 << 1)
443442
#define TP_STATUS_LOSING (1 << 2)

0 commit comments

Comments
 (0)