Skip to content

Commit 356d71e

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2 parents df45370 + 1a9df9e commit 356d71e

File tree

926 files changed

+15145
-7580
lines changed

Some content is hidden

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

926 files changed

+15145
-7580
lines changed

‎Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What: /sys/class/dax/
2+
Date: May, 2016
3+
KernelVersion: v4.7
4+
Contact: [email protected]
5+
Description: Device DAX is the device-centric analogue of Filesystem
6+
DAX (CONFIG_FS_DAX). It allows memory ranges to be
7+
allocated and mapped without need of an intervening file
8+
system. Device DAX is strict, precise and predictable.
9+
Specifically this interface:
10+
11+
1/ Guarantees fault granularity with respect to a given
12+
page size (pte, pmd, or pud) set at configuration time.
13+
14+
2/ Enforces deterministic behavior by being strict about
15+
what fault scenarios are supported.
16+
17+
The /sys/class/dax/ interface enumerates all the
18+
device-dax instances in the system. The ABI is
19+
deprecated and will be removed after 2020. It is
20+
replaced with the DAX bus interface /sys/bus/dax/ where
21+
device-dax instances can be found under
22+
/sys/bus/dax/devices/

‎Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ Description:
8686
The unit size is one block, now only support configuring in range
8787
of [1, 512].
8888

89+
What: /sys/fs/f2fs/<disk>/umount_discard_timeout
90+
Date: January 2019
91+
Contact: "Jaegeuk Kim" <[email protected]>
92+
Description:
93+
Set timeout to issue discard commands during umount.
94+
Default: 5 secs
95+
8996
What: /sys/fs/f2fs/<disk>/max_victim_search
9097
Date: January 2014
9198
Contact: "Jaegeuk Kim" <[email protected]>

‎Documentation/admin-guide/md.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,3 +756,6 @@ These currently include:
756756
The cache mode for raid5. raid5 could include an extra disk for
757757
caching. The mode can be "write-throuth" and "write-back". The
758758
default is "write-through".
759+
760+
ppl_write_hint
761+
NVMe stream ID to be set for each PPL write request.

‎Documentation/arm/kernel_mode_neon.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TL;DR summary
66
* Use only NEON instructions, or VFP instructions that don't rely on support
77
code
88
* Isolate your NEON code in a separate compilation unit, and compile it with
9-
'-mfpu=neon -mfloat-abi=softfp'
9+
'-march=armv7-a -mfpu=neon -mfloat-abi=softfp'
1010
* Put kernel_neon_begin() and kernel_neon_end() calls around the calls into your
1111
NEON code
1212
* Don't sleep in your NEON code, and be aware that it will be executed with
@@ -87,7 +87,7 @@ instructions appearing in unexpected places if no special care is taken.
8787
Therefore, the recommended and only supported way of using NEON/VFP in the
8888
kernel is by adhering to the following rules:
8989
* isolate the NEON code in a separate compilation unit and compile it with
90-
'-mfpu=neon -mfloat-abi=softfp';
90+
'-march=armv7-a -mfpu=neon -mfloat-abi=softfp';
9191
* issue the calls to kernel_neon_begin(), kernel_neon_end() as well as the calls
9292
into the unit containing the NEON code from a compilation unit which is *not*
9393
built with the GCC flag '-mfpu=neon' set.

‎Documentation/devicetree/bindings/display/ssd1307fb.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ ssd1307: oled@3c {
3636
reg = <0x3c>;
3737
pwms = <&pwm 4 3000>;
3838
reset-gpios = <&gpio2 7>;
39-
reset-active-low;
4039
};
4140

4241
ssd1306: oled@3c {
4342
compatible = "solomon,ssd1306fb-i2c";
4443
reg = <0x3c>;
4544
pwms = <&pwm 4 3000>;
4645
reset-gpios = <&gpio2 7>;
47-
reset-active-low;
4846
solomon,com-lrremap;
4947
solomon,com-invdir;
5048
solomon,com-offset = <32>;

‎Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Required properties:
1616
- "renesas,irqc-r8a7793" (R-Car M2-N)
1717
- "renesas,irqc-r8a7794" (R-Car E2)
1818
- "renesas,intc-ex-r8a774a1" (RZ/G2M)
19+
- "renesas,intc-ex-r8a774c0" (RZ/G2E)
1920
- "renesas,intc-ex-r8a7795" (R-Car H3)
2021
- "renesas,intc-ex-r8a7796" (R-Car M3-W)
2122
- "renesas,intc-ex-r8a77965" (R-Car M3-N)

‎Documentation/devicetree/bindings/net/dsa/qca8k.txt

Lines changed: 66 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@ Required properties:
1212
Subnodes:
1313

1414
The integrated switch subnode should be specified according to the binding
15-
described in dsa/dsa.txt. As the QCA8K switches do not have a N:N mapping of
16-
port and PHY id, each subnode describing a port needs to have a valid phandle
17-
referencing the internal PHY connected to it. The CPU port of this switch is
18-
always port 0.
15+
described in dsa/dsa.txt. If the QCA8K switch is connect to a SoC's external
16+
mdio-bus each subnode describing a port needs to have a valid phandle
17+
referencing the internal PHY it is connected to. This is because there's no
18+
N:N mapping of port and PHY id.
19+
20+
Don't use mixed external and internal mdio-bus configurations, as this is
21+
not supported by the hardware.
22+
23+
The CPU port of this switch is always port 0.
1924

2025
A CPU port node has the following optional node:
2126

@@ -31,8 +36,9 @@ For QCA8K the 'fixed-link' sub-node supports only the following properties:
3136
- 'full-duplex' (boolean, optional), to indicate that full duplex is
3237
used. When absent, half duplex is assumed.
3338

34-
Example:
39+
Examples:
3540

41+
for the external mdio-bus configuration:
3642

3743
&mdio0 {
3844
phy_port1: phy@0 {
@@ -55,12 +61,12 @@ Example:
5561
reg = <4>;
5662
};
5763

58-
switch0@0 {
64+
switch@10 {
5965
compatible = "qca,qca8337";
6066
#address-cells = <1>;
6167
#size-cells = <0>;
6268

63-
reg = <0>;
69+
reg = <0x10>;
6470

6571
ports {
6672
#address-cells = <1>;
@@ -108,3 +114,56 @@ Example:
108114
};
109115
};
110116
};
117+
118+
for the internal master mdio-bus configuration:
119+
120+
&mdio0 {
121+
switch@10 {
122+
compatible = "qca,qca8337";
123+
#address-cells = <1>;
124+
#size-cells = <0>;
125+
126+
reg = <0x10>;
127+
128+
ports {
129+
#address-cells = <1>;
130+
#size-cells = <0>;
131+
132+
port@0 {
133+
reg = <0>;
134+
label = "cpu";
135+
ethernet = <&gmac1>;
136+
phy-mode = "rgmii";
137+
fixed-link {
138+
speed = 1000;
139+
full-duplex;
140+
};
141+
};
142+
143+
port@1 {
144+
reg = <1>;
145+
label = "lan1";
146+
};
147+
148+
port@2 {
149+
reg = <2>;
150+
label = "lan2";
151+
};
152+
153+
port@3 {
154+
reg = <3>;
155+
label = "lan3";
156+
};
157+
158+
port@4 {
159+
reg = <4>;
160+
label = "lan4";
161+
};
162+
163+
port@5 {
164+
reg = <5>;
165+
label = "wan";
166+
};
167+
};
168+
};
169+
};

‎Documentation/filesystems/cifs/TODO

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ negotiated size) and send larger write sizes to modern servers.
111111

112112
5) Continue to extend the smb3 "buildbot" which does automated xfstesting
113113
against Windows, Samba and Azure currently - to add additional tests and
114-
to allow the buildbot to execute the tests faster.
114+
to allow the buildbot to execute the tests faster. The URL for the
115+
buildbot is: http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com
115116

116117
6) Address various coverity warnings (most are not bugs per-se, but
117118
the more warnings are addressed, the easier it is to spot real

‎Documentation/filesystems/cifs/cifs.txt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
This is the client VFS module for the SMB3 NAS protocol as well
2-
older dialects such as the Common Internet File System (CIFS)
2+
as for older dialects such as the Common Internet File System (CIFS)
33
protocol which was the successor to the Server Message Block
44
(SMB) protocol, the native file sharing mechanism for most early
55
PC operating systems. New and improved versions of CIFS are now
6-
called SMB2 and SMB3. These dialects are also supported by the
7-
CIFS VFS module. CIFS is fully supported by network
8-
file servers such as Windows 2000, 2003, 2008, 2012 and 2016
9-
as well by Samba (which provides excellent CIFS
10-
server support for Linux and many other operating systems), Apple
11-
systems, as well as most Network Attached Storage vendors, so
12-
this network filesystem client can mount to a wide variety of
13-
servers.
6+
called SMB2 and SMB3. Use of SMB3 (and later, including SMB3.1.1)
7+
is strongly preferred over using older dialects like CIFS due to
8+
security reaasons. All modern dialects, including the most recent,
9+
SMB3.1.1 are supported by the CIFS VFS module. The SMB3 protocol
10+
is implemented and supported by all major file servers
11+
such as all modern versions of Windows (including Windows 2016
12+
Server), as well as by Samba (which provides excellent
13+
CIFS/SMB2/SMB3 server support and tools for Linux and many other
14+
operating systems). Apple systems also support SMB3 well, as
15+
do most Network Attached Storage vendors, so this network
16+
filesystem client can mount to a wide variety of systems.
17+
It also supports mounting to the cloud (for example
18+
Microsoft Azure), including the necessary security features.
1419

1520
The intent of this module is to provide the most advanced network
1621
file system function for SMB3 compliant servers, including advanced
@@ -24,12 +29,17 @@
2429
cluster file systems for fileserving in some Linux to Linux environments,
2530
not just in Linux to Windows (or Linux to Mac) environments.
2631

27-
This filesystem has an mount utility (mount.cifs) that can be obtained from
32+
This filesystem has a mount utility (mount.cifs) and various user space
33+
tools (including smbinfo and setcifsacl) that can be obtained from
2834

29-
https://ftp.samba.org/pub/linux-cifs/cifs-utils/
35+
https://git.samba.org/?p=cifs-utils.git
36+
or
37+
git://git.samba.org/cifs-utils.git
3038

31-
It must be installed in the directory with the other mount helpers.
39+
mount.cifs should be installed in the directory with the other mount helpers.
3240

3341
For more information on the module see the project wiki page at
3442

43+
https://wiki.samba.org/index.php/LinuxCIFS
44+
and
3545
https://wiki.samba.org/index.php/LinuxCIFS_utils

‎Documentation/filesystems/f2fs.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ disable_ext_identify Disable the extension list configured by mkfs, so f2fs
126126
does not aware of cold files such as media files.
127127
inline_xattr Enable the inline xattrs feature.
128128
noinline_xattr Disable the inline xattrs feature.
129+
inline_xattr_size=%u Support configuring inline xattr size, it depends on
130+
flexible inline xattr feature.
129131
inline_data Enable the inline data feature: New created small(<~3.4k)
130132
files can be written into inode block.
131133
inline_dentry Enable the inline dir feature: data in new created

‎Documentation/kbuild/makefiles.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ See subsequent chapter for the syntax of the Kbuild file.
12741274

12751275
--- 7.4 mandatory-y
12761276

1277-
mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild.asm
1277+
mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild
12781278
to define the minimum set of ASM headers that all architectures must have.
12791279

12801280
This works like optional generic-y. If a mandatory header is missing

‎Documentation/networking/nf_flowtable.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ including the Netfilter hooks and the flowtable fastpath bypass.
4444
/ \ / \ |Routing | / \
4545
--> ingress ---> prerouting ---> |decision| | postrouting |--> neigh_xmit
4646
\_________/ \__________/ ---------- \____________/ ^
47-
| ^ | | ^ |
48-
flowtable | | ____\/___ | |
49-
| | | / \ | |
50-
__\/___ | --------->| forward |------------ |
47+
| ^ | ^ |
48+
flowtable | ____\/___ | |
49+
| | / \ | |
50+
__\/___ | | forward |------------ |
5151
|-----| | \_________/ |
5252
|-----| | 'flow offload' rule |
5353
|-----| | adds entry to |

‎Documentation/virtual/kvm/api.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,23 @@ the API. The only supported use is one virtual machine per process,
4545
and one vcpu per thread.
4646

4747

48+
It is important to note that althought VM ioctls may only be issued from
49+
the process that created the VM, a VM's lifecycle is associated with its
50+
file descriptor, not its creator (process). In other words, the VM and
51+
its resources, *including the associated address space*, are not freed
52+
until the last reference to the VM's file descriptor has been released.
53+
For example, if fork() is issued after ioctl(KVM_CREATE_VM), the VM will
54+
not be freed until both the parent (original) process and its child have
55+
put their references to the VM's file descriptor.
56+
57+
Because a VM's resources are not freed until the last reference to its
58+
file descriptor is released, creating additional references to a VM via
59+
via fork(), dup(), etc... without careful consideration is strongly
60+
discouraged and may have unwanted side effects, e.g. memory allocated
61+
by and on behalf of the VM's process may not be freed/unaccounted when
62+
the VM is shut down.
63+
64+
4865
3. Extensions
4966
-------------
5067

‎Documentation/virtual/kvm/halt-polling.txt

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ the global max polling interval then the polling interval can be increased in
5353
the hope that next time during the longer polling interval the wake up source
5454
will be received while the host is polling and the latency benefits will be
5555
received. The polling interval is grown in the function grow_halt_poll_ns() and
56-
is multiplied by the module parameter halt_poll_ns_grow.
56+
is multiplied by the module parameters halt_poll_ns_grow and
57+
halt_poll_ns_grow_start.
5758

5859
In the event that the total block time was greater than the global max polling
5960
interval then the host will never poll for long enough (limited by the global
@@ -80,22 +81,30 @@ shrunk. These variables are defined in include/linux/kvm_host.h and as module
8081
parameters in virt/kvm/kvm_main.c, or arch/powerpc/kvm/book3s_hv.c in the
8182
powerpc kvm-hv case.
8283

83-
Module Parameter | Description | Default Value
84+
Module Parameter | Description | Default Value
8485
--------------------------------------------------------------------------------
85-
halt_poll_ns | The global max polling interval | KVM_HALT_POLL_NS_DEFAULT
86-
| which defines the ceiling value |
87-
| of the polling interval for | (per arch value)
88-
| each vcpu. |
86+
halt_poll_ns | The global max polling | KVM_HALT_POLL_NS_DEFAULT
87+
| interval which defines |
88+
| the ceiling value of the |
89+
| polling interval for | (per arch value)
90+
| each vcpu. |
8991
--------------------------------------------------------------------------------
90-
halt_poll_ns_grow | The value by which the halt | 2
91-
| polling interval is multiplied |
92-
| in the grow_halt_poll_ns() |
93-
| function. |
92+
halt_poll_ns_grow | The value by which the | 2
93+
| halt polling interval is |
94+
| multiplied in the |
95+
| grow_halt_poll_ns() |
96+
| function. |
9497
--------------------------------------------------------------------------------
95-
halt_poll_ns_shrink | The value by which the halt | 0
96-
| polling interval is divided in |
97-
| the shrink_halt_poll_ns() |
98-
| function. |
98+
halt_poll_ns_grow_start | The initial value to grow | 10000
99+
| to from zero in the |
100+
| grow_halt_poll_ns() |
101+
| function. |
102+
--------------------------------------------------------------------------------
103+
halt_poll_ns_shrink | The value by which the | 0
104+
| halt polling interval is |
105+
| divided in the |
106+
| shrink_halt_poll_ns() |
107+
| function. |
99108
--------------------------------------------------------------------------------
100109

101110
These module parameters can be set from the debugfs files in:

0 commit comments

Comments
 (0)