From patchwork Wed Nov 1 01:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 160415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp125320vqx; Tue, 31 Oct 2023 18:18:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEK4IKl1pP5uz1UH7UAAisk6Apw/HPPCw3D7Lj9cjhXyxNUE/1rKQ6OJ7prkHcW6fKVHEoX X-Received: by 2002:a05:6a00:938f:b0:6b9:a3d3:772a with SMTP id ka15-20020a056a00938f00b006b9a3d3772amr14634456pfb.14.1698801518777; Tue, 31 Oct 2023 18:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698801518; cv=none; d=google.com; s=arc-20160816; b=syJCQ0DIlI0LPX77iD2x8vW7zckl1L3A9trpFclJSoATjIS/33TP5jXxq2xkRRtHs5 5SjE8p1Su/4sstqfBwgGtjJceXi/jfxpomjSdl7Yrt9eftJAT1Lexh1B9IIQeRbQ/MC2 yBgqfOkV3Nvb7osaEJDO1vyoSTGNG8Sq5NGcg+cSxaj22iKTxo0zquTx4CtQnNmxe9MR uepTgeDggXMVmofBe32IgE09j7pJMwNEeLDbdBw8YaTEpQnmM6SP0OWvVo8ctDoOtR46 Io0avBIi/5fZOtB9ZfNUo+CjjDvbz/MWYJW7lvVnclg+A8407rsWeP2OQ1GtDLHCDilj 53XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OcADjQb3HC2xc9PqU/R+P2/eMdqcuJxoH9tzwgCi5IA=; fh=fv42Srh6G8VeZ7cGb2ypYsFL3oNsSRth8Uk7KI7f6oA=; b=n9PDG3JI71ERg3rm0gNIdfi/k2svvnKbHX+Xwocpj0A5LdpK8aF1FMpKjn+nsTxjFv PMpaSWzuGay6f0+iZipbIugPj11ep5U6FsnssuBWH6SidCC1SLfYgSc71Ktv7VCoonzn 9f/A175NHOWAcCXFxygBOqiD7WDrczCCQlbYZCQju3tHlKGYqJCCeSrGzpOvoSmWacSt CI6QACNOMgxemSfr3hlEkZYG9EYBGK5X4U3unHJQNbs30/U6KvVRHWE4373tWF8f1heA Wawpneq08pfWEcyjBEpmTH71KZz1pWr9wGNXTl76PXpC3qpGllL24h7kVJrvDBn9Sa7n ruDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iF+04qsF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id b15-20020a63e70f000000b0056952b496efsi1910314pgi.366.2023.10.31.18.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 18:18:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iF+04qsF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3F96A8023F14; Tue, 31 Oct 2023 18:18:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345068AbjKABSV (ORCPT + 34 others); Tue, 31 Oct 2023 21:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233002AbjKABSU (ORCPT ); Tue, 31 Oct 2023 21:18:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D1ABF4 for ; Tue, 31 Oct 2023 18:18:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5EE9C433C8; Wed, 1 Nov 2023 01:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698801493; bh=Nba6ylNwvuUvLsMHOnd7vDr6OTFeqrwEKUClJP8rdnA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iF+04qsFm7WOrh/U7P0/T0+sj3jQ47DijetytK2c9/ikYhcGOQww9O7cuLDCCqkMi iNQPWVMYK7zpUARn0FxRDQ8WATBrv05Ht8J8/0fwXHVyZYiu7bV253UzA7xY+MEAJU AF/8etJSBYrnbGi7xf7xGKa7Fn8K0CFI99mc7Om+hNojGg86maoUrP//GOcf2VUutA rJegixJIvSYQX5rumxGXGn9ANhceVkMmpS2d5P0ZHtgZGzu+krYAeHgDeufOj85cra n1Drwdw+pxLUx57Z4DBpq4qrd+kTUbBEVTjT4VO3l5meByCasosCCXFzeXVj5UrM9e KF9y8OGqqMXPw== From: Jakub Kicinski To: torvalds@linux-foundation.org Cc: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, pabeni@redhat.com Subject: [GIT PULL] Networking follow up for 6.7 Date: Tue, 31 Oct 2023 18:18:12 -0700 Message-ID: <20231101011812.2653409-1-kuba@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 31 Oct 2023 18:18:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781322501472965570 X-GMAIL-MSGID: 1781322501472965570 > Well, I had actually already merged the original pull request, and > then started a full allmodconfig build. > > And because I'm off gallivanting and traveling, that takes 2h on this > poor little laptop, so I had left to do more fun things than watch > paint dry. Eish. Sorry. > I pushed out my original merge. I'll pull the updates later. In case it's helpful here's a tag with just the delta described. Running a risk of another race condition :) The following changes since commit f1c73396133cb3d913e2075298005644ee8dfade: net: pcs: xpcs: Add 2500BASE-X case in get state for XPCS drivers (2023-10-27 15:59:44 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git tags/net-next-6.7-followup for you to fetch changes up to f2fbb908112311423b09cd0d2b4978f174b99585: net: tcp: remove call to obsolete crypto_ahash_alignmask() (2023-10-31 13:11:51 -0700) ---------------------------------------------------------------- Follow up to networking PR for 6.7 - Support GRO decapsulation for IPsec ESP in UDP. - Add a handful of MODULE_DESCRIPTION()s. - Drop questionable alignment check in TCP AO to avoid build issue after changes in the crypto tree. Signed-off-by: Jakub Kicinski ---------------------------------------------------------------- Florian Westphal (4): xfrm: pass struct net to xfrm_decode_session wrappers xfrm: move mark and oif flowi decode into common code xfrm: policy: replace session decode with flow dissector xfrm: policy: fix layer 4 flowi decoding Jakub Kicinski (5): net: fill in MODULE_DESCRIPTION()s in kuba@'s modules net: fill in MODULE_DESCRIPTION()s under net/core net: fill in MODULE_DESCRIPTION()s under net/802* net: fill in MODULE_DESCRIPTION()s under drivers/net/ Merge tag 'ipsec-next-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next Kees Cook (1): xfrm: Annotate struct xfrm_sec_ctx with __counted_by Steffen Klassert (6): xfrm: Use the XFRM_GRO to indicate a GRO call on input xfrm: Support GRO for IPv4 ESP in UDP encapsulation xfrm: Support GRO for IPv6 ESP in UDP encapsulation Merge branch 'xfrm: Support GRO decapsulation for ESP in UDP encapsulation' Merge branch 'xfrm: policy: replace session decode with flow dissector' xfrm Fix use after free in __xfrm6_udp_encap_rcv. Stephen Rothwell (1): net: tcp: remove call to obsolete crypto_ahash_alignmask() Yue Haibing (1): xfrm: Remove unused function declarations drivers/net/amt.c | 1 + drivers/net/dummy.c | 1 + drivers/net/eql.c | 1 + drivers/net/ifb.c | 1 + drivers/net/macvtap.c | 1 + drivers/net/netdevsim/netdev.c | 1 + drivers/net/sungem_phy.c | 1 + drivers/net/tap.c | 1 + drivers/net/wireless/mediatek/mt7601u/usb.c | 1 + include/net/gro.h | 2 +- include/net/ipv6_stubs.h | 3 + include/net/xfrm.h | 18 +- include/uapi/linux/xfrm.h | 3 +- net/802/fddi.c | 1 + net/802/garp.c | 1 + net/802/mrp.c | 1 + net/802/p8022.c | 1 + net/802/psnap.c | 1 + net/802/stp.c | 1 + net/8021q/vlan.c | 1 + net/core/dev_addr_lists_test.c | 1 + net/core/selftests.c | 1 + net/ipv4/esp4_offload.c | 6 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_vti.c | 4 +- net/ipv4/netfilter.c | 2 +- net/ipv4/tcp_ao.c | 6 - net/ipv4/udp.c | 16 ++ net/ipv4/xfrm4_input.c | 95 +++++++-- net/ipv6/af_inet6.c | 1 + net/ipv6/esp6_offload.c | 10 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_vti.c | 4 +- net/ipv6/netfilter.c | 2 +- net/ipv6/xfrm6_input.c | 103 ++++++++-- net/netfilter/nf_nat_proto.c | 2 +- net/xfrm/xfrm_input.c | 6 +- net/xfrm/xfrm_interface_core.c | 4 +- net/xfrm/xfrm_policy.c | 301 ++++++++++++---------------- 39 files changed, 362 insertions(+), 248 deletions(-)