Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (14684b93) · Commits · 戴 / test

Documentation/networking/tls-offload.rst

+4 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,10 @@ by the driver:
		encryption.
		* ``tx_tls_ooo`` - number of TX packets which were part of a TLS stream
		but did not arrive in the expected order.
		* ``tx_tls_skip_no_sync_data`` - number of TX packets which were part of
		a TLS stream and arrived out-of-order, but skipped the HW offload routine
		and went to the regular transmit flow as they were retransmissions of the
		connection handshake.
		* ``tx_tls_drop_no_sync_data`` - number of TX packets which were part of
		a TLS stream dropped, because they arrived out of order and associated
		record could not be found.

+6 −0

Original line number	Diff line number	Diff line
		@@ -3060,6 +3060,7 @@ M: Daniel Borkmann <daniel@iogearbox.net>
		R: Martin KaFai Lau <kafai@fb.com>
		R: Song Liu <songliubraving@fb.com>
		R: Yonghong Song <yhs@fb.com>
		R: Andrii Nakryiko <andriin@fb.com>
		L: netdev@vger.kernel.org
		L: bpf@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
		@@ -10533,8 +10534,12 @@ F: mm/memblock.c
		F: Documentation/core-api/boot-time-mm.rst

		MEMORY MANAGEMENT
		M: Andrew Morton <akpm@linux-foundation.org>
		L: linux-mm@kvack.org
		W: http://www.linux-mm.org
		T: quilt https://ozlabs.org/~akpm/mmotm/
		T: quilt https://ozlabs.org/~akpm/mmots/
		T: git git://github.com/hnaz/linux-mm.git
		S: Maintained
		F: include/linux/mm.h
		F: include/linux/gfp.h
		@@ -18048,6 +18053,7 @@ F: Documentation/vm/zsmalloc.rst
		ZSWAP COMPRESSED SWAP CACHING
		M: Seth Jennings <sjenning@redhat.com>
		M: Dan Streetman <ddstreet@ieee.org>
		M: Vitaly Wool <vitaly.wool@konsulko.com>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/zswap.c

+1 −1

+0 −17

Original line number	Diff line number	Diff line
		@@ -283,23 +283,6 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
		set_pte(ptep, pte);
		}

		#define __HAVE_ARCH_PTE_SAME
		static inline int pte_same(pte_t pte_a, pte_t pte_b)
		{
		pteval_t lhs, rhs;

		lhs = pte_val(pte_a);
		rhs = pte_val(pte_b);

		if (pte_present(pte_a))
		lhs &= ~PTE_RDONLY;

		if (pte_present(pte_b))
		rhs &= ~PTE_RDONLY;

		return (lhs == rhs);
		}

		/*
		* Huge pte definitions.
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@

		static inline void kuap_update_sr(u32 sr, u32 addr, u32 end)
		{
		addr &= 0xf0000000; /* align addr to start of segment */
		barrier(); /* make sure thread.kuap is updated before playing with SRs */
		while (addr < end) {
		mtsrin(sr, addr);