Commit 0a3173a5 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'linus/master' into rdma.git for-next 



rdma.git merge resolution for the 4.19 merge window

Conflicts:
 drivers/infiniband/core/rdma_core.c
   - Use the rdma code and revise with the new spelling for
     atomic_fetch_add_unless
 drivers/nvme/host/rdma.c
   - Replace max_sge with max_send_sge in new blk code
 drivers/nvme/target/rdma.c
   - Use the blk code and revise to use NULL for ib_post_recv when
     appropriate
   - Replace max_sge with max_recv_sge in new blk code
 net/rds/ib_send.c
   - Use the net code and revise to use NULL for ib_post_recv when
     appropriate

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 92f4e77c 5c60a738

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ IncludeIsMainRegex: '(Test)?$' 
IndentCaseLabels: false

#IndentPPDirectives: None # Unknown to clang-format-5.0

IndentWidth: 8

IndentWrappedFunctionNames: true

IndentWrappedFunctionNames: false

JavaScriptQuotes: Leave

JavaScriptWrapImports: true

KeepEmptyLinesAtTheStartOfBlocks: false

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com> 
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>

Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Documentation/ABI/stable/sysfs-class-rfkill

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ KernelVersion: v2.6.22 
Contact:	linux-wireless@vger.kernel.org,

Description: 	The rfkill class subsystem folder.

		Each registered rfkill driver is represented by an rfkillX

		subfolder (X being an integer > 0).

		subfolder (X being an integer >= 0).





What:		/sys/class/rfkill/rfkill[0-9]+/name
@@ -48,8 +48,8 @@ Contact: linux-wireless@vger.kernel.org 
Description: 	Current state of the transmitter.

		This file was scheduled to be removed in 2014, but due to its

		large number of users it will be sticking around for a bit

		longer. Despite it being marked as stabe, the newer "hard" and

		"soft" interfaces should be preffered, since it is not possible

		longer. Despite it being marked as stable, the newer "hard" and

		"soft" interfaces should be preferred, since it is not possible

		to express the 'soft and hard block' state of the rfkill driver

		through this interface. There will likely be another attempt to

		remove it in the future.

Documentation/ABI/testing/procfs-diskstats

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Description: 
		The /proc/diskstats file displays the I/O statistics

		of block devices. Each line contains the following 14

		fields:



		 1 - major number

		 2 - minor mumber

		 3 - device name
@@ -19,4 +20,13 @@ Description: 
		12 - I/Os currently in progress

		13 - time spent doing I/Os (ms)

		14 - weighted time spent doing I/Os (ms)



		Kernel 4.18+ appends four more fields for discard

		tracking putting the total at 18:



		15 - discards completed successfully

		16 - discards merged

		17 - sectors discarded

		18 - time spent discarding



		For more details refer to Documentation/iostats.txt

Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats

0 → 100644
+122 −0
Original line number Diff line number Diff line 
==========================

PCIe Device AER statistics

==========================

These attributes show up under all the devices that are AER capable. These

statistical counters indicate the errors "as seen/reported by the device".

Note that this may mean that if an endpoint is causing problems, the AER

counters may increment at its link partner (e.g. root port) because the

errors may be "seen" / reported by the link partner and not the

problematic endpoint itself (which may report all counters as 0 as it never

saw any problems).



Where:		/sys/bus/pci/devices/<dev>/aer_dev_correctable

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	List of correctable errors seen and reported by this

		PCI device using ERR_COR. Note that since multiple errors may

		be reported using a single ERR_COR message, thus

		TOTAL_ERR_COR at the end of the file may not match the actual

		total of all the errors in the file. Sample output:

-------------------------------------------------------------------------

localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_correctable

Receiver Error 2

Bad TLP 0

Bad DLLP 0

RELAY_NUM Rollover 0

Replay Timer Timeout 0

Advisory Non-Fatal 0

Corrected Internal Error 0

Header Log Overflow 0

TOTAL_ERR_COR 2

-------------------------------------------------------------------------



Where:		/sys/bus/pci/devices/<dev>/aer_dev_fatal

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	List of uncorrectable fatal errors seen and reported by this

		PCI device using ERR_FATAL. Note that since multiple errors may

		be reported using a single ERR_FATAL message, thus

		TOTAL_ERR_FATAL at the end of the file may not match the actual

		total of all the errors in the file. Sample output:

-------------------------------------------------------------------------

localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_fatal

Undefined 0

Data Link Protocol 0

Surprise Down Error 0

Poisoned TLP 0

Flow Control Protocol 0

Completion Timeout 0

Completer Abort 0

Unexpected Completion 0

Receiver Overflow 0

Malformed TLP 0

ECRC 0

Unsupported Request 0

ACS Violation 0

Uncorrectable Internal Error 0

MC Blocked TLP 0

AtomicOp Egress Blocked 0

TLP Prefix Blocked Error 0

TOTAL_ERR_FATAL 0

-------------------------------------------------------------------------



Where:		/sys/bus/pci/devices/<dev>/aer_dev_nonfatal

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	List of uncorrectable nonfatal errors seen and reported by this

		PCI device using ERR_NONFATAL. Note that since multiple errors

		may be reported using a single ERR_FATAL message, thus

		TOTAL_ERR_NONFATAL at the end of the file may not match the

		actual total of all the errors in the file. Sample output:

-------------------------------------------------------------------------

localhost /sys/devices/pci0000:00/0000:00:1c.0 # cat aer_dev_nonfatal

Undefined 0

Data Link Protocol 0

Surprise Down Error 0

Poisoned TLP 0

Flow Control Protocol 0

Completion Timeout 0

Completer Abort 0

Unexpected Completion 0

Receiver Overflow 0

Malformed TLP 0

ECRC 0

Unsupported Request 0

ACS Violation 0

Uncorrectable Internal Error 0

MC Blocked TLP 0

AtomicOp Egress Blocked 0

TLP Prefix Blocked Error 0

TOTAL_ERR_NONFATAL 0

-------------------------------------------------------------------------



============================

PCIe Rootport AER statistics

============================

These attributes show up under only the rootports (or root complex event

collectors) that are AER capable. These indicate the number of error messages as

"reported to" the rootport. Please note that the rootports also transmit

(internally) the ERR_* messages for errors seen by the internal rootport PCI

device, so these counters include them and are thus cumulative of all the error

messages on the PCI hierarchy originating at that root port.



Where:		/sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_cor

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	Total number of ERR_COR messages reported to rootport.



Where:	    /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_fatal

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	Total number of ERR_FATAL messages reported to rootport.



Where:	    /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_nonfatal

Date:		July 2018

Kernel Version: 4.19.0

Contact:	linux-pci@vger.kernel.org, rajatja@google.com

Description:	Total number of ERR_NONFATAL messages reported to rootport.

CRA Git | Maintained and supported by SUSTech CRA and CCSE