Commit 908057d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "Drivers:
   - Add ciphertext hiding support to ccp
   - Add hashjoin, gather and UDMA data move features to hisilicon
   - Add lz4 and lz77_only to hisilicon
   - Add xilinx hwrng driver
   - Add ti driver with ecb/cbc aes support
   - Add ring buffer idle and command queue telemetry for GEN6 in qat

  Others:
   - Use rcu_dereference_all to stop false alarms in rhashtable
   - Fix CPU number wraparound in padata"

* tag 'v6.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (78 commits)
  dt-bindings: rng: hisi-rng: convert to DT schema
  crypto: doc - Add explicit title heading to API docs
  hwrng: ks-sa - fix division by zero in ks_sa_rng_init
  KEYS: X.509: Fix Basic Constraints CA flag parsing
  crypto: anubis - simplify return statement in anubis_mod_init
  crypto: hisilicon/qm - set NULL to qm->debug.qm_diff_regs
  crypto: hisilicon/qm - clear all VF configurations in the hardware
  crypto: hisilicon - enable error reporting again
  crypto: hisilicon/qm - mask axi error before memory init
  crypto: hisilicon/qm - invalidate queues in use
  crypto: qat - Return pointer directly in adf_ctl_alloc_resources
  crypto: aspeed - Fix dma_unmap_sg() direction
  rhashtable: Use rcu_dereference_all and rcu_dereference_all_check
  crypto: comp - Use same definition of context alloc and free ops
  crypto: omap - convert from tasklet to BH workqueue
  crypto: qat - Replace kzalloc() + copy_from_user() with memdup_user()
  crypto: caam - double the entropy delay interval for retry
  padata: WQ_PERCPU added to alloc_workqueue users
  padata: replace use of system_unbound_wq with system_dfl_wq
  crypto: cryptd - WQ_PERCPU added to alloc_workqueue users
  ...
parents d104e3d1 166c83f7

Documentation/ABI/testing/debugfs-driver-qat_telemetry

+27 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ Description: (RO) Reports device telemetry counters. 
		gp_lat_acc_avg		average get to put latency [ns]

		bw_in			PCIe, write bandwidth [Mbps]

		bw_out			PCIe, read bandwidth [Mbps]

		re_acc_avg		average ring empty time [ns]

		at_page_req_lat_avg	Address Translator(AT), average page

					request latency [ns]

		at_trans_lat_avg	AT, average page translation latency [ns]
@@ -85,6 +86,32 @@ Description: (RO) Reports device telemetry counters. 
		exec_cph<N>		execution count of Cipher slice N

		util_ath<N>		utilization of Authentication slice N [%]

		exec_ath<N>		execution count of Authentication slice N

		cmdq_wait_cnv<N>	wait time for cmdq N to get Compression and verify

					slice ownership

		cmdq_exec_cnv<N>	Compression and verify slice execution time while

					owned by cmdq N

		cmdq_drain_cnv<N>	time taken for cmdq N to release Compression and

					verify slice ownership

		cmdq_wait_dcprz<N>	wait time for cmdq N to get Decompression

					slice N ownership

		cmdq_exec_dcprz<N>	Decompression slice execution time while

					owned by cmdq N

		cmdq_drain_dcprz<N>	time taken for cmdq N to release Decompression

					slice ownership

		cmdq_wait_pke<N>	wait time for cmdq N to get PKE slice ownership

		cmdq_exec_pke<N>	PKE slice execution time while owned by cmdq N

		cmdq_drain_pke<N>	time taken for cmdq N to release PKE slice

					ownership

		cmdq_wait_ucs<N>	wait time for cmdq N to get UCS slice ownership

		cmdq_exec_ucs<N>	UCS slice execution time while owned by cmdq N

		cmdq_drain_ucs<N>	time taken for cmdq N to release UCS slice

					ownership

		cmdq_wait_ath<N>	wait time for cmdq N to get Authentication slice

					ownership

		cmdq_exec_ath<N>	Authentication slice execution time while owned

					by cmdq N

		cmdq_drain_ath<N>	time taken for cmdq N to release Authentication

					slice ownership

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



		The telemetry report file can be read with the following command::

Documentation/crypto/api-aead.rst

+3 −0
Original line number Diff line number Diff line 
Authenticated Encryption With Associated Data (AEAD)

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



Authenticated Encryption With Associated Data (AEAD) Algorithm Definitions

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

Documentation/crypto/api-akcipher.rst

+3 −0
Original line number Diff line number Diff line 
Asymmetric Cipher

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



Asymmetric Cipher Algorithm Definitions

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

Documentation/crypto/api-digest.rst

+3 −0
Original line number Diff line number Diff line 
Message Digest

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



Message Digest Algorithm Definitions

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

Documentation/crypto/api-kpp.rst

+3 −0
Original line number Diff line number Diff line 
Key-agreement Protocol Primitives (KPP)

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



Key-agreement Protocol Primitives (KPP) Cipher Algorithm Definitions

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