From patchwork Sun Oct 22 16:20:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838006vqx; Sun, 22 Oct 2023 09:20:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4VG3B1zrVUmYQB6cxSff7RcrCM+ntPyaDYh6CGw6Tl9H8wDXZ4TGjnEcPNO52rtI/hgAk X-Received: by 2002:a17:90b:46c2:b0:27d:4283:b8a2 with SMTP id jx2-20020a17090b46c200b0027d4283b8a2mr6727552pjb.14.1697991624602; Sun, 22 Oct 2023 09:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991624; cv=none; d=google.com; s=arc-20160816; b=mXZK0wyN6jFgOvZy9pm1I/DOvtNs5lV72T6NTCrjl04jjNnv91ITlwD2JfuhE1uj2H E2KDQqG8sPsC2uKdhOpksxrpPm+h3NmGk5SS7gon54lJt5+84VkS/mhf1Nvctdhboq4C oyYwrdWWuBxUc4H3+3V+gJwrJA64wozlAY/RNn1s6NoEQgy+aByf/8DiYWkL8Bq45qYE AajDoUNIlTytkaoDS/0jTWFzUCxwxykC/nOD6V8lJCCWjl00+rxb4eJJ103f9dAxpFeH lhfSx0GPr0rnto73xRvsaTTbxMSVL3NtaJb4P6ZZs8GdFrl5th28aKwVFKDDE6UaPp9g KWwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=WvEMV92Y7IGxOW7ep+lKkBzNSVWQ3OvimPsEysx6x70=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=Eu1YiQlKUvQ28xlTlhZ8U0xzc0obybJvmPGYEwGDuw9iQMco4UG3LUQwYQ0S+GcUKC dL9XKuxZbqbmZfpFtQmEl2CGNPKXA1K+x+csgcMVzxc0eZWH4SooQ8g5JJ5FilkFaViD 6vFe4iyzyKki8CbShf25znFY+ER8XKqTyeLVxneTQjcd+b72AmIcLNOB+XmMNhb86jSc rsgCdqu/WprQysUK3s4hZlgc/A5QwUDG62SAL6hBxkmdwPE8IHL2PGgU1yltxtQQ3xnd CkoEQlymaqj9USwyqm2fRx/YUmyqXWiIQsTe3A2sX9KLZVeZKDacoLXUct7N5WdpDVR6 nTmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O3AhVLMK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id lp5-20020a17090b4a8500b0027769e8672fsi7970744pjb.119.2023.10.22.09.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O3AhVLMK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A84BD8056A36; Sun, 22 Oct 2023 09:20:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232425AbjJVQUK (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232416AbjJVQUI (ORCPT ); Sun, 22 Oct 2023 12:20:08 -0400 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0F2C112; Sun, 22 Oct 2023 09:20:05 -0700 (PDT) Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-66d11fec9a5so14089236d6.1; Sun, 22 Oct 2023 09:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991605; x=1698596405; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=WvEMV92Y7IGxOW7ep+lKkBzNSVWQ3OvimPsEysx6x70=; b=O3AhVLMKPtO93JimthaJkAQ4a7yAcNF6luxKSs92oLDzVut6tri2eDEEGTNWsyZr3t YZ+RQBQSQWX7jLCW8FfULT41Nbp6D/2TXXsArJN0pcZJTa/BExJs/nKPij3JeJieExS1 Rto34+WCtAHgs8fvq2EDUoboekLdiLybZ0KnNcMNwmlqILiNipgB+OFr6sbaE6tNmxdb /5Sikr8dTaD9qnAFZjaT/4gido7v+2yV1g8xFFm98uQvFG3uxYzRtgppgFvkph0p4wT7 iGracaewlwo4gC2ukCpDfNRvl/1RosUGXUsFRFd6wsj8bmpINIcV45Z3S/sWrapft5oJ hhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991605; x=1698596405; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WvEMV92Y7IGxOW7ep+lKkBzNSVWQ3OvimPsEysx6x70=; b=w+h0RBwHsCLtNd82nqxiD1Evh+N6CdSCUiCyk6QA07WSRKSmkEDwAmyBWKQGtl+teq NEV/4ldj0TH3uQsMtJlqYYUP1n98f1L/97j4onnJjstrFS5VAivkviVgSC9RcxXgsQfS gX5LqBqmnERUPiJqSIud5EDsHYN2j9sV/CaPiVoCdb3EKyoEgMZN5hLROcxrgHXxtUM9 mN5NEQCWO8XstJxzTSynvG3iUYfsOTGxm3YGDRLG8/baNCKZS+GhOurJsT3TkzaIhFeT Yl40hCAv1LQE3EJIoFEsbP91SeqRwsb+HldOCIF6tjHzUfKmxCI7lzE2UJmZahEKbrOz Bi1Q== X-Gm-Message-State: AOJu0YxQGN8bLUEbDCFmMOVx6z5jRTeRIdwIn8YO2xsP+Om7hzLZgebO c9WCsCdYcWt/myjIUfOBFJ8lOFW1MM/y6Z7e X-Received: by 2002:a05:6214:5012:b0:651:66c4:cf4e with SMTP id jo18-20020a056214501200b0065166c4cf4emr9143878qvb.23.1697991604672; Sun, 22 Oct 2023 09:20:04 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id di12-20020ad458ec000000b0065b229ecb8dsm2281042qvb.3.2023.10.22.09.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:04 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:03 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 01/17] Make cork in inet_sock a pointer. Message-ID: <1a849abd2f67545bc99988c5f18de46e6b273618.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:20:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473265653261611 X-GMAIL-MSGID: 1780473265653261611 Change the cork in inet_sock to a pointer. This is the actual change to the struct itself for ipv4. Signed-off-by: Oliver Crumrine --- include/net/inet_sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 2de0e4d4a027..335cd6b2d472 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -240,7 +240,7 @@ struct inet_sock { } local_port_range; struct ip_mc_socklist __rcu *mc_list; - struct inet_cork_full cork; + struct inet_cork_full *cork; }; #define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */ From patchwork Sun Oct 22 16:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838126vqx; Sun, 22 Oct 2023 09:20:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHkEW4FSiJv4vTYtdmy4egd5Id6+MuCHwtV5RNuwWUqrOxzS66V5KX14aBORuYMIjDOxsz X-Received: by 2002:a17:902:c78a:b0:1b8:954c:1f6 with SMTP id w10-20020a170902c78a00b001b8954c01f6mr5644652pla.36.1697991640899; Sun, 22 Oct 2023 09:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991640; cv=none; d=google.com; s=arc-20160816; b=rm+OWDBfCVWvieLjj2ZC9tRUL4QF6/XlEk8+4SDpks/GcM18CInpJlmAqJtDQ9Wez7 GlxUJMw14Luw7yurmDD2dzmevrhCif2kT5n8NklPYrygVMY1jtYPAsY0AsxgflegJvFC ALXxr3nZpgdQzxMl+G62Nh/wsAKjzCBJA2Ed8HYOSs3LR2uPQ0V7y1/i0Gyf5xmCzsCz PeTDd1gPjccnUBKiUkkWPee1t9gBl4q1NSRKOBYzAFZVVAQ0FTAfov2zPLoDopf8mQBH fZsmaIa2zWV1MRrDLShuF5Wa7N8iXigVxh3bh22Cz7qe4sO5BPhOu96hkdUkLikC4SLZ aK8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=11Lp+yVZvF+OP07qRE75BniQsajVFgOyx716K7LaebY=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=ji7hsvPFn4PLwISWB3ocCE2rRDSSh0YklIzpR2dJ5+GSfd2uAVVGm31D3Qw9JIAIo5 gWh0ye3KBD8R1HFL+sqz/f08RzPcjQUWGEMuvNU0FlpUTv1kV2cKEEdyO/5EVuHfQXWG m0nmBQFgQjooeO7imb2ZcxfnJ679eU2+5CWva1oqMDnFF3RZQoVS/u0hjLEUdZMpCZer M/DwvfDDwVEL2nzLcu7f5S+ijUhRCtXY7WCSID21uuiElftwl5w/UvBJ4lzggOH/aLKo uS58OphXMqXkLPwnjU3c49f8txgklDqantVlTuLY0w3oR4Q7bYUQy/hwtNAPiea4fRTS FZgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hW8QlV67; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id i2-20020a170902c94200b001c0a165a219si5397207pla.134.2023.10.22.09.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hW8QlV67; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 6BF5480560C4; Sun, 22 Oct 2023 09:20:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232351AbjJVQUR (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232381AbjJVQUP (ORCPT ); Sun, 22 Oct 2023 12:20:15 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B6AD98; Sun, 22 Oct 2023 09:20:13 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-778940531dbso154238685a.0; Sun, 22 Oct 2023 09:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991612; x=1698596412; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=11Lp+yVZvF+OP07qRE75BniQsajVFgOyx716K7LaebY=; b=hW8QlV67rumG7PpjyXs3gdlg824oNs6ZAKUFvC3nkIlZpdgjGwgZnvfogKapVJhuUV yY8pt/4KiembWGpsN7gvG6nMrYtmdzhKCQ9E0OMCp8ctdTHiOZBfXscif6x26h9KIDAw AXfDKRpK8HKIGMzZ50XDhmjGBWHh9lFzxpT9yJ/Tx4UZv+DeboaGoV3EcYspzcIVGHak yA1ba5q2pPsQGHPVw05fqPzjEM4vO/2qLYp8Ld7cXcro5jN2p3qQuPrdoGOMqgiuvqvl i7S3c3pxfe9jSvZZFcF7+YQsEBkJ5XM5SZiksmM47kVY5ShiPSM0e9FgnTL6Pm/SHSnh N52w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991612; x=1698596412; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=11Lp+yVZvF+OP07qRE75BniQsajVFgOyx716K7LaebY=; b=duj3XTCn+stu8jZ7zKBF1d1WhQxEYyrBI8rwHLScqQsfTYc7i9CAtwCehJv80+YDU6 ab7pMkv+dgD17DEGehQy8+tQiWcVkZRVzzqquOl2nyStgHtNanwbjRvAKxnRb5/aROjT WMxoo6qNYBj0wmPBJFGG5Nj6J1aQUkA2b2D3yGmoyMIcDAPu5a3nbb1ydgs3vMDlCmxP 3Hd/PAnIQywk/w5yncwI81Mcu69SR7GeUZqXZGi8blQDxzqWvjRb8UyH6oaPaE24QdFX P+p8eP3Hq8ZOHHGR3f4P+MlJNUDMH7XuYGrvxrjSJkSOtBTG8udymNWKscxg6m0U1x/M 6G3w== X-Gm-Message-State: AOJu0Yx3rV6PFcDRc/UagbxQWoLDfYf8DAckuJ4yZM56KizsJObfU03k uJXwAmeAYqhCFIzovWyxhWmJRJtos3wtZDhc X-Received: by 2002:ad4:594d:0:b0:668:ecf4:d9b7 with SMTP id eo13-20020ad4594d000000b00668ecf4d9b7mr7255656qvb.8.1697991611838; Sun, 22 Oct 2023 09:20:11 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id g19-20020ad457b3000000b0066cfbe4e0f4sm2243863qvx.26.2023.10.22.09.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:11 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:10 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 02/17] Allocate and free cork for ipv4 and ipv6 Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:20:37 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473282887052714 X-GMAIL-MSGID: 1780473282887052714 This allocates the cork for ipv4, and frees it for both ipv4 and ipv6 (ipv6 inet_cork_full is allocated in a different function) Signed-off-by: Oliver Crumrine --- net/ipv4/af_inet.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 2713c9b06c4c..3edfd8737715 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -362,6 +362,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, inet->mc_index = 0; inet->mc_list = NULL; inet->rcv_tos = 0; + inet->cork = kzalloc(sizeof(struct inet_cork_full), GFP_KERNEL); if (inet->inet_num) { /* It assumes that any protocol which allows @@ -431,6 +432,7 @@ int inet_release(struct socket *sock) !(current->flags & PF_EXITING)) timeout = sk->sk_lingertime; sk->sk_prot->close(sk, timeout); + kfree(inet_sk(sk)->cork); sock->sk = NULL; } return 0; From patchwork Sun Oct 22 16:20:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156549 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838532vqx; Sun, 22 Oct 2023 09:21:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUes3+/k8nMF82MTzebR7pv1mnWKbfndJlPwB/tjMDGm1s9CqBiC4a7X6dO2+iyjevOpab X-Received: by 2002:a17:902:e809:b0:1c9:d908:d60c with SMTP id u9-20020a170902e80900b001c9d908d60cmr4784598plg.63.1697991705617; Sun, 22 Oct 2023 09:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991705; cv=none; d=google.com; s=arc-20160816; b=oNOBbGRv4zgQwZVggDLmKB4euLpoAZb9VLX/9A1LT3O0law0cg44XWU5FVQScq/9rd LY9CyRpujP6PSmYzWES6vjGlxgjyZGp22Ga02vbOYXsh67WshI/xUB8+QsTLyZjJ8TWT GUhuIdeTrF/RLKMfLgH0q61L5y+V47DzjzRyKwbIj210IoyPv9xzUlTpYqu/xgjT+ku9 qnnBRMhoDOBoasZ48mOd6/mxnv1eWe2SdDc08tObwzPfci0h/QgtMGMczdhm183qgap+ HALdxCljrZHr9IOUJtbhVuZ4Y1c/PyY8/qGBP11LGDCnNg9eyl7ZocBMdL8JrtcJIqfg MXQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=MM3mqVThapC2gHr48TgRVIKUoeAj5E3tYfQaohXgAZg=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=N/BZmkHY3GaygvNbywQo6Ve5Tg1lIwszvmXOw/m24TBgEnqVxmhdT2zYD5Z/fYVYWg H1lfmDsFgul5CqHQ38/+fi9zFjivFN6G33LpfxEf4DR2yuxEMFJsG9rbb+76CvimEzJS NfdQPO/FPur9JC8qEcQwByt9O3wR/dvoSiIKK7CiCG4h22U6V77zY+GohTc1sGHdNzG/ lFihDuSmS6noDdsKPMujY9gyt81iNCCy0rdQ90MWt35hTOZ58wYuh2kUaCfBgIQk9mlQ bpXvDJMXmKlPwnScchHIDGU2HJpU07mP/oLnABUJDZN6lpymEhOHqF0IQhp9fanxqFN6 NfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="f/7XzPTs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id kg14-20020a170903060e00b001bbc0ca8650si4907893plb.370.2023.10.22.09.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="f/7XzPTs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 0635A8073843; Sun, 22 Oct 2023 09:20:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232515AbjJVQUa (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232482AbjJVQUV (ORCPT ); Sun, 22 Oct 2023 12:20:21 -0400 Received: from mail-vs1-xe2a.google.com (mail-vs1-xe2a.google.com [IPv6:2607:f8b0:4864:20::e2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AA09119; Sun, 22 Oct 2023 09:20:19 -0700 (PDT) Received: by mail-vs1-xe2a.google.com with SMTP id ada2fe7eead31-457c7177a42so787733137.2; Sun, 22 Oct 2023 09:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991618; x=1698596418; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MM3mqVThapC2gHr48TgRVIKUoeAj5E3tYfQaohXgAZg=; b=f/7XzPTsoNyydOVsd15eZrR1Hwws2wN9ugWha0PZApPO99aK+6RxV/uV/zyO0QAO/c YyM+2PbX/BPqeuXqboSXaO41pBtH7jSlGxkXTg6qm4nCH4uQjHPw0Afe3O9WMKvwrvsZ BNew1OCjO1k2NVD+7i/4UvM3WyhyXdkzix8KUp3j221xi7TGp95CiX/62LPlOv4xW2hM gc1D5mGmwtNNtHCBySfz9YkNSuHL2Tq7GjsgO3TfaqYY6kXJ2DhQVg7jmJdiD+Z4qh8n d16q5IHi+0Yf63PT6yn8sssOxwar8TnivMgDQxxR5I9H9X9YjrVM1GP1liucz75ebCor Vowg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991618; x=1698596418; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MM3mqVThapC2gHr48TgRVIKUoeAj5E3tYfQaohXgAZg=; b=u5QmuJ9S19A6FcPBEyc1A0v4qAOJ8cGLguarI0237hGXJHOlWGg/yPIBTLZnScoFOY CQmvl7HNqBwou8FQPI+iWWe6HejcEBt2wQHhFX+J+tqDbLVaHxoZuwUe0gE3L+NshLG2 Xsh9YR37kfMnDhFlv0egRt3lYEcY8hc1J76f5qZIIx/5ltbQhyed/Y1awsn1bbZPuvED klKSeAdGD7XJRJiHdEFGjlo/fk/j+BsMqeb30yhGUNvav9uLbX3v9kSES3P8Wl4r79RY SOmhaD1Ql83nddObdQxiMUQcUFnI02f2LsW43pE3Ue2VqT5+JyejdMsCMHVsn6dFfHuG 2m0A== X-Gm-Message-State: AOJu0YwLTJHvEKE9vvGjvQcEjiNC/Aku37QkvBG4Hd7B5RHqu/+aZtAY kLC0666YNaSx7kJmacb0TzhO+whaYww+KZP4 X-Received: by 2002:a67:e1d2:0:b0:452:60c5:20b with SMTP id p18-20020a67e1d2000000b0045260c5020bmr5668459vsl.15.1697991618166; Sun, 22 Oct 2023 09:20:18 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id l15-20020a05620a0c0f00b0077892023fc5sm2103369qki.120.2023.10.22.09.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:17 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:17 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 03/17] Change cork in ipv6_pinfo to a pointer. Message-ID: <6b25cdc64a066e1a214020d0452fff10a33495ac.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:20:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473350791548798 X-GMAIL-MSGID: 1780473350791548798 The actual change to make inet6_cork a pointer in the ipv6_pinfo struct itself. Signed-off-by: Oliver Crumrine --- include/linux/ipv6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index af8a771a053c..0c707ce9e776 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -290,7 +290,7 @@ struct ipv6_pinfo { struct ipv6_txoptions __rcu *opt; struct sk_buff *pktoptions; struct sk_buff *rxpmtu; - struct inet6_cork cork; + struct inet6_cork *cork; }; /* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */ From patchwork Sun Oct 22 16:20:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838535vqx; Sun, 22 Oct 2023 09:21:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgNRq+4TPPiQH9/ru1HI8r1yX0S7Ci16fj5n+ppTMnDGopeR+KEGrOWbWSKfX88TW64A3P X-Received: by 2002:a17:90a:130c:b0:274:7db1:f50f with SMTP id h12-20020a17090a130c00b002747db1f50fmr8963163pja.15.1697991706182; Sun, 22 Oct 2023 09:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991706; cv=none; d=google.com; s=arc-20160816; b=xpNiWmMYopewjX2BPFoogDF9NGmWY2Wnf76d6LsWiXcTOdw+dOqk07zqIczXD/Yj6p gOivI0iS9/as+QB9wsmy5UIcAcTPfAgq1hARi28YDvvk/xd1XzZDD7mnmHTUY2SOHawq KES1O9xylYAZJTg26UDvdhJ5rDSRtG6rSZUMIceshCZB4ELQbBFQaheelNYs+jGjGPb0 MeG27vY9YVKqpVSnDnAAcxoWCwDae3Q/SeCZOHDWE5foLg8H/BK9VFaBtPTTataHwhPy UizwPRVYmi26kBPtH0grLY09cOS6gw+9s7sGwXK0Hst86kvwe16qvikAUzYg9uvNEwu9 yzHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=1L1EoQYDbmiosHQzcLpjg625XGZkEv3QC1cmuWB3ELg=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=zh8e/Q8u6lK/KF43/kzp28DdAm+2ZY6k3mJPygckhiCgFS4nQpWfWPJSSLA2CrM5tF vQTmGHNGfM8TkwGHc/xrvmZ5zu838mzqu4g6x8qRhZTNHotCC4qVzAZTf/e/b56OAaL0 kz7Rsy4Vn7/49yNuqT3dWH7owKsBkHjPmMaPlNEjti2A6QpbKiUKv0y1sraAO8UMJ89O pUnjV/65uuclb10jhIe+Fxn6WfI0zOIKYzeWVSPMQDdnT1xMUuA2nSBY1ZUf0338+qu5 IYavtMOncVB6biD6wbZZqDCxLMhh22Jefh1xUOYH0kSVmWS/kMvq5yBdBJH+E/Otaju3 StyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DW42v0b7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id nk20-20020a17090b195400b00279202f4151si7590820pjb.45.2023.10.22.09.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DW42v0b7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 414AD807BEF1; Sun, 22 Oct 2023 09:20:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232456AbjJVQUd (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232445AbjJVQU2 (ORCPT ); Sun, 22 Oct 2023 12:20:28 -0400 Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71ABC19E; Sun, 22 Oct 2023 09:20:25 -0700 (PDT) Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-66d17fd450aso30380816d6.1; Sun, 22 Oct 2023 09:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991624; x=1698596424; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1L1EoQYDbmiosHQzcLpjg625XGZkEv3QC1cmuWB3ELg=; b=DW42v0b7lCrm66DVfhHYLtnx21cyqQQNRYweMHl+0AI5MICBS8lQQLfgzUVs5CrxJy 7l3Xvkff16E4fneyOWQkV9wKMX0YDYGSZMRNtzFSUD8VZuAtRaNj6eBdyo+At5Q0AUfJ YOt1Z8De9oVhLn++BrS55RCG9/i3kzT/ybp5nrMgxkyvu6tq39HUjPLYtbhEFqhOIeo5 sM4QA2OfRLhmNlv+Sttr8+nO6d6vzMMi/9GtwdmjIVROpIb2XCJ0ogR/r29IbhpGH7Yj s7m1gla+KNVhXYIdKu2GtYKNl2ZrNLmEnOdKlAiI1W4one36nSUxSKmwa+ZwYdRGg0tq ZxcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991624; x=1698596424; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1L1EoQYDbmiosHQzcLpjg625XGZkEv3QC1cmuWB3ELg=; b=Y+Pv0xGt/kwLUZVEzpeXMNxvDGwUtUFZfoOt4e2evm+eJuhpROg66fWtFpK3dXFVyG 5uxON0Snr6a944EuRnry4ETxYGeFkFcP+n95vyXXlIPmQMcrRrTRXAED+UfLXsiJBYuR D9bXs7dTUcqUmpvDTwzYKRqjaUB67Ul3T1sETd8Y8auo5J2KB8Kk4xLsQlS1tp9uHBid ICVEfsFbSSfAxxtN2M9QEtncDJ2v5IfralEDvyhq7xl2EcBz2WZ2OGr/MRkaqgr9IfqT 8BZHU0+HSMHV8IoTV4LQ0/TfbAycc8liW4nMb2BpAbK5o5PZ+8U+tt64sfGFvsjzvbEn kL4g== X-Gm-Message-State: AOJu0YyozcWZspFU8TgBtG3wJc2DsDvaqMSMhXxrwap0lcvCa51gAqj7 uVAQcBfEoS7VR05cnYHrGtPqYBTdoTn8Qwxl X-Received: by 2002:a05:6214:2b97:b0:66d:995e:24f6 with SMTP id kr23-20020a0562142b9700b0066d995e24f6mr9250563qvb.10.1697991624252; Sun, 22 Oct 2023 09:20:24 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id j17-20020a05620a001100b0077703f31496sm2111420qki.92.2023.10.22.09.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:24 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:23 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 04/17] Allocate and free cork in inet6_sk. Message-ID: <5e5dcbb87d4b57a347c5146373c75737967e4cd0.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:20:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473351363705768 X-GMAIL-MSGID: 1780473351363705768 Allocate both the inet6_cork and inet_cork_full here, and free the inet6_cork. (The inet_cork_full is freed in inet_release called at the last line of inet6_release) Signed-off-by: Oliver Crumrine --- net/ipv6/af_inet6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 368824fe9719..33e92826361f 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -221,6 +221,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, np->mc_all = 1; np->pmtudisc = IPV6_PMTUDISC_WANT; np->repflow = net->ipv6.sysctl.flowlabel_reflect & FLOWLABEL_REFLECT_ESTABLISHED; + np->cork = kzalloc(sizeof(struct inet6_cork), GFP_KERNEL); sk->sk_ipv6only = net->ipv6.sysctl.bindv6only; sk->sk_txrehash = READ_ONCE(net->core.sysctl_txrehash); @@ -234,6 +235,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, inet->mc_index = 0; RCU_INIT_POINTER(inet->mc_list, NULL); inet->rcv_tos = 0; + inet->cork = kzalloc(sizeof(struct inet_cork_full), GFP_KERNEL); if (READ_ONCE(net->ipv4.sysctl_ip_no_pmtu_disc)) inet->pmtudisc = IP_PMTUDISC_DONT; @@ -481,6 +483,9 @@ int inet6_release(struct socket *sock) /* Free ac lists */ ipv6_sock_ac_close(sk); + /* Free cork */ + kfree(inet6_sk(sk)->cork); + return inet_release(sock); } EXPORT_SYMBOL(inet6_release); From patchwork Sun Oct 22 16:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838236vqx; Sun, 22 Oct 2023 09:21:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGy+ez4dULXfNCVN1e1Juy3aZ45f1aQ7+z2rMs0TXFKa1wvZqXLPP6yg1rKrhioUOFG148x X-Received: by 2002:a05:6358:918c:b0:133:7c4:e752 with SMTP id j12-20020a056358918c00b0013307c4e752mr9481803rwa.26.1697991660726; Sun, 22 Oct 2023 09:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991660; cv=none; d=google.com; s=arc-20160816; b=do7JrNZWbTquy2eqPSTKb97Hx5UhtcuChk2QnKy8DOQA3OIf3k+3840fU0vu6wYU28 gJBTJPlBCPpQ+vCQXbfA1xWsempNRNvUip2vL/czSVV2K7c4XM4Tmj3GvZN6PC6ORqTZ WZVgt8+9Pf/JpUICIGTA7IBfHwwkoshAKcYwTgG/UAfiMyQEUsd5/geDC7CZ8ICymh6b 6DVQyunkdLyLFqkcXPqeyLRNQG52roLaZ/45CchKdht4hgeajyeLnAc8ThPVmsGP7UBx B6/fCylqfAYzY0s1JMNz6JBW3mF9OhTl4gxgcNAye4W4hD2OA5sEKJ9jqEnTNyfKqYDN g3zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=fXs6PiW1BKOBdRQHF7f3ZT2KL9Y+20rzJRl4mqpCX+E=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=J8+LGITUHHy2kuRLZYI2s6c9GmLaDV3o+qfPMC+T1kHEUGTt8djNRWPC6+1W+hYUq8 gHHs73JYL2vcns4yM4dgr1PAv/4GP32M6aChrgEL+RtMMhGkA6yYOr8lwcchQ1L25jBv TgpMyyG1WHMoa9hfXrKisipW4UIsvcYMgo/eMmavbybjba8MGkWFkCMbGGON3DPLCv8b QdHloNN1KOKBKqk+ofGifXZzfg8jkWI04FVY/6XfTA6wMhDQJfFalbRFGt8SKR0DZ5f7 bxT7ptW/V7Jin4gFIAslNz0h5bH+kVirDOq1eVj0mWO28vDnGC0+5Tl85JXhyYmynM1o nncA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kcMYC5v8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id u206-20020a6279d7000000b006ba82adb9acsi5101393pfc.332.2023.10.22.09.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kcMYC5v8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 77538809689F; Sun, 22 Oct 2023 09:20:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232536AbjJVQUk (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232462AbjJVQUe (ORCPT ); Sun, 22 Oct 2023 12:20:34 -0400 Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DAB6D66; Sun, 22 Oct 2023 09:20:31 -0700 (PDT) Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-778a47bc09aso177757185a.3; Sun, 22 Oct 2023 09:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991630; x=1698596430; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=fXs6PiW1BKOBdRQHF7f3ZT2KL9Y+20rzJRl4mqpCX+E=; b=kcMYC5v84Txjr+6+AUT8RDyjoUTIZ+0q57/Pb60T51hueGw6J9wd2rUjrYdN4ezyXd 4jIM31n0AraA1kJ/39NOcgYnONUO7yro15NUUDGYlnTYhXcLd90dKwfiHvznF0UrSIjF gKkXjPX+5/B8c8QImaCrUuB+R7MPNMj5rp8AoxoHP76mAuyJ97m2uk99IzE/xgvJVYjy tV193nBuTkq9/ZR8WTXZXjeuiOSlYcoB/xp8bDzxS5KaK0u5I7U0vEL04598JI8HuGUy +vmZJpua6UgQG9jCmi1Ghn1dSTyJ5uLN37CVfuaBjm1TwgmdcBv37V6S25SrFdq8n3jV eJdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991630; x=1698596430; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fXs6PiW1BKOBdRQHF7f3ZT2KL9Y+20rzJRl4mqpCX+E=; b=aNn+Dzo0BtlcMe+2gBdr5r38YmNuXpOXSY1FuQ5lrSTU/vSvlKZg0uqswVGt0gCkZt sDuAErteVA0Wt8CgvkSUABAhl9dAWZRiFugeTAxhCm6TV7EA3M+wc7DBQLhw9htrfNKm /bHf0Qd9zDpXSdbb4KnTeoAIFjwT2KsjWls9WcZS0xcZX53HzhWGauoQkzxq+AQzsxS0 Q4g5arq3RhlaqQskP83du/i+ULZG2Oi8S6KTxY/50l5KUGwl2TGorTkB/v3bbFBhPYLA lPz0+nm6hQcLQJVFYyn6MahOBdVAu9Jz63va/KehXQHGAl2k1tQ2MhIjljIRld7UHa6m HCkQ== X-Gm-Message-State: AOJu0Yx9FPEYT37pK4p2/MPx5T2XxUByifTRr/dyO3UUVjclGdpbeu4b iZ2Lm4Z6bqYnvGmGQA++gq8v3N3w7Za3B1hE X-Received: by 2002:a05:6214:1c44:b0:66d:3474:a93b with SMTP id if4-20020a0562141c4400b0066d3474a93bmr7830628qvb.59.1697991630066; Sun, 22 Oct 2023 09:20:30 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id f8-20020a0cf7c8000000b006564afc5908sm2244755qvo.111.2023.10.22.09.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:29 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:29 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 05/17] Change occurence of cork to pointer Message-ID: <288d695cc29e46c24d750c9897f5443e7bf65717.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:20:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473303576461819 X-GMAIL-MSGID: 1780473303576461819 Change cork to pointer in accordance with the previous patches in the set. Signed-off-by: Oliver Crumrine --- include/net/ip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/ip.h b/include/net/ip.h index 3489a1cca5e7..30bef1828a7d 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -240,7 +240,7 @@ int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl); static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4) { - return __ip_make_skb(sk, fl4, &sk->sk_write_queue, &inet_sk(sk)->cork.base); + return __ip_make_skb(sk, fl4, &sk->sk_write_queue, &inet_sk(sk)->cork->base); } /* Get the route scope that should be used when sending a packet. */ From patchwork Sun Oct 22 16:20:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838276vqx; Sun, 22 Oct 2023 09:21:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcia+/4BT+vZ4DrEHIwC7v9ve6WkJOBmV48M5Y1uCpyOGSTznWOJm+0psBZO3Vg49S6Rt7 X-Received: by 2002:a05:6a20:320b:b0:157:877a:5f5e with SMTP id hl11-20020a056a20320b00b00157877a5f5emr4649901pzc.61.1697991665531; Sun, 22 Oct 2023 09:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991665; cv=none; d=google.com; s=arc-20160816; b=vMgkjsFMtiuLVnYV2jsPg0UfeONXIU1APCBOfAs0D8Sd3bhCpObkP+QN3AaH60g2LR NOJerdHWTZprTdzrOTuug3g7+yfF613FLOM5e1lc1ySTNmg+mCtHiu2gJ3n3f0WdJgbS /37E8o0NHGwsPRhXFZAjktIrxIKsHhISaflzCFGr4MyTHpmUmOm4ksVC6DfGGVOTyElW Ptxv9mF3Or3V6tRXXrnIiB1XdFdpolLfTPnxbPY2me4Cm1oVSIDY8GYAotAq6dQtT3se omhylMwZUoUm+HBpbbRPEX/jTUsZ/dwWzUpE0ZotLu1b65yaq/3kUSR4nvMkOSxhTP4o 8mzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=QjLK10gOjLyBhjnmz7OKoZPoDInuhNvXPFVtbeHVZ/Y=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=zVqna0srzhZYVsNx+UFG6BSyVj/mH3msNwk4MBYt7cfGqxV3Gf2XvjxKZAZd5lZSRv eZs3NucM2zzaZi1qEPXGch61abFWMjBaLpfeBo3wtBtKKgBM5zWZPQROCI9xZ7xSf4rS DTXIjQKf4DoogdDJpWl9qqYxAaOdNw0j9ad96GlolBMDl1ZLnBKWzuC3e9Mni+lfEkEQ Qyh2N+AYNKiImT4yIlv7vjOAwmR6NYxJE42cwTaG1Aqvfycm1v6OIG05vDSx2KjcVsw6 DNAEp4m/zXZ7dcpGgrnQ6X+kqHwwkIo8JnJCSN0iEH1slL2j52zVsUcNkWPJMbJKqAX8 CEvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="g/GlPv0Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id i75-20020a636d4e000000b0058a4883e6casi5308172pgc.225.2023.10.22.09.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="g/GlPv0Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 97BE2806156C; Sun, 22 Oct 2023 09:21:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232556AbjJVQUq (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbjJVQUk (ORCPT ); Sun, 22 Oct 2023 12:20:40 -0400 Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25447D7B; Sun, 22 Oct 2023 09:20:38 -0700 (PDT) Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-7788db95652so182823985a.2; Sun, 22 Oct 2023 09:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991637; x=1698596437; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=QjLK10gOjLyBhjnmz7OKoZPoDInuhNvXPFVtbeHVZ/Y=; b=g/GlPv0Zhl1w3yNguY+dkzDGndcNOurb34FXRRWSrkVGz9zKFS04S6QTmY/FGsCkVW 20+s2rR7JrhiJ/DXxewMwjZotXSmr1VY3YC+YcKk/81QD2ukE26IH8qAuRevLGUSJmeZ sIeNfi5LlSRpN172SsWym+OmEXONlro3ic94ftTDyjmtwf4n1R98HeCRc9AguZ9qGn6f 5SmORnykAxzaElLUV/gZ3ACL73rp0khbyXJsXPqEuqDaLUBDJEg7q0Mp8TbVFOND1cII ItwZ/bR81hktCaA8XvpPeRGGbFg+EU7hU2N4G3Ur1gV4FNkdsY85SUtP9hkloiiAIFwu 5BHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991637; x=1698596437; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QjLK10gOjLyBhjnmz7OKoZPoDInuhNvXPFVtbeHVZ/Y=; b=nseg0BmsfkmJ85sSOp+n7mGhftyraiCF5GLgb5IRsiFns65wYI76uFcZQnEnWd//8o irHR0FPwL51NpWgOP1xvzkOdV3Iw2R+PyLQUL2/Ubj/gNSbXXt+jF6rWEndFvoFnRdHp bdWSRxUQNc8Wddf2shPfF2O/LnvPwOaksH7slvsOTwQZvee/AIKEx2bJSEDRzcDZCdrK 1/cirFAM1uiQFnMeV14zNGVY+SyuqLoNdf55EK3Pfw8hnG11o0IMy7OsTxTCRZYianD3 AMJXerNTpX89CRV1qTOq5hURymtN1Mh22upN+no5AXJmwRxMYkD3am3Ib2tNexc1Fejg zr3Q== X-Gm-Message-State: AOJu0YzjVA3imSjnrQqbsYpWJGjY6ZjMuVOUEAFOrMMfeeGdG1e/ae55 O8y6dD5oP49xU93yDYCXnH5qhOexA3tUe5b0 X-Received: by 2002:a05:620a:4550:b0:76f:839:6bdd with SMTP id u16-20020a05620a455000b0076f08396bddmr9931828qkp.3.1697991636887; Sun, 22 Oct 2023 09:20:36 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id a24-20020a05620a103800b00767da10efb6sm2110025qkk.97.2023.10.22.09.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:36 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:35 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 06/17] Update code for cork as a pointer Message-ID: <29d13b7a3b74d7922b199ab70baa15569f453fe8.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473308670237608 X-GMAIL-MSGID: 1780473308670237608 Because the corks are pointers, they don't need to be referenced to be passed into __ip6_make_skb. Signed-off-by: Oliver Crumrine --- include/net/ipv6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index c6932d1a3fa8..88eded2662ff 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -1122,8 +1122,8 @@ struct sk_buff *ip6_make_skb(struct sock *sk, static inline struct sk_buff *ip6_finish_skb(struct sock *sk) { - return __ip6_make_skb(sk, &sk->sk_write_queue, &inet_sk(sk)->cork, - &inet6_sk(sk)->cork); + return __ip6_make_skb(sk, &sk->sk_write_queue, inet_sk(sk)->cork, + inet6_sk(sk)->cork); } int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst, From patchwork Sun Oct 22 16:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838501vqx; Sun, 22 Oct 2023 09:21:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEF9JXyV2b0E4RB/V8JTVLEO/zmo+kfAbykOs52BjLQ46xsSQNNRWT2I7VBPlksXryxpWnd X-Received: by 2002:a17:902:c942:b0:1c9:dcea:33e5 with SMTP id i2-20020a170902c94200b001c9dcea33e5mr7341901pla.67.1697991700363; Sun, 22 Oct 2023 09:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991700; cv=none; d=google.com; s=arc-20160816; b=oJmpjyWIjLoVsv7LKFnAPT8THk2XOGLv1Wv57H+wzVu63gAUnUL+NIukoA0WJfaJDp uiHWP5yd9IXIL0VNgB2v3Zst1A0YjuSCyyj+mTe+6zJp0ct/aT+tXVz60IuJM0VdXn8/ WwZojCPP9D5/CERGcN/FSmwWDWb2+e+R8b0tpKTHfxQPzDZergvRg2KlT0dHYWFaIiPX BDPpbEmGSHuUMb2gIPPfpkrDsmONylvO3pGas9Q5Y65gujNOR2TT/4chCSYck6wgd9DF +ruB6XpIO13mI59dkA0lsPdcvhPDb5/3rDA9b/8TWZ+e74BNuP7HXAE5cKU+YxrcgY8a wQ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=BYImHNNj9WGJXlAd2ryp9uRI8Yo5lJEye56bNVn17+DVDOKUcHrQgmi97mwKGaB+Vm vFkZ1oGw/KRRum1ieeqhPEPnjUg61Zh8dlItGVkFpXzKKokNSYF9kuSDqaT/tQGh2d2R xteDkp4MAqp+zdn5yoeffp2rUSF5blps5hcRucjiMd/PZJ0a0LfBtQdZ3VLZ/mBFHHqD m1Opn0q9uyooGJsLdwfU4Cj4zNgFguGNymT3xPjK0eXuWcDglowHvFpOT+mEzR45H7BB +vP9fj0uJq3AwM9lHT9ZuDubIVQD+MnWBfWBmisPcloLv1MyRkIU5xuuLXh24M1AFhJ4 MNwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aPNL8Wmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y22-20020a1709027c9600b001ca85b797c9si4839508pll.624.2023.10.22.09.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aPNL8Wmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A5901807617D; Sun, 22 Oct 2023 09:21:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232568AbjJVQU7 (ORCPT + 27 others); Sun, 22 Oct 2023 12:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232500AbjJVQUt (ORCPT ); Sun, 22 Oct 2023 12:20:49 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D62CD52; Sun, 22 Oct 2023 09:20:45 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-777719639adso153413685a.3; Sun, 22 Oct 2023 09:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991643; x=1698596443; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; b=aPNL8Wmdv02ptk8uFNKKJwbRENvPKZkD40/cnEH5tGvRyaiLqFEchMzU+96w5QrYSO GQHhly9jbhNw0+V0XAEp9EQVmZMR6xDwTmDmQNkwPMgpwtSoboJTh7HzqAM6muGBBMPo OA8FP7gIsb/0kTkAWPojR3Oi+n8ChV42Q8nLyR77s0/DUCbA0+9iM8M+vElasDn+J9hT IyJAT9ugS9vyv3qIoLjLpjnD+oeqhfWtztSeBcn+t9FSOG99jBrRhyPhVcL2mI0+k2he LJUyRIb+kUcJtivDpq9dP0zM9l5qSIdONc0dSwaVxmnRCz/lK3Rc10rpqDCEOJZlhBnK tsZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991643; x=1698596443; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; b=C/b1fD3mevJvgHfpm3KN9J2WabrbHOvuMEX7dfdSbvqDQ2c12ooGv5DoPeswBcrxYa /COx66KLoKjROKGue+GQ+IA5T9lrYzsyu0R1U1u+UhHRPRLfXe/J1xToiyzEwqzZ4ax+ YSQRMRs7BBGwnrk4sk6UXEyMK2zQeDR1WaIfnR2NcOlcsUevOS1pzLv/zR3FgEV6h0Or CR3nHGzkrK3GlwMNX0N0v59VJZefpTFodO1bB2GIS6HHNoX78cW218zdQSzdIG/dq/LC Cnp2hkI7XA0ooRhJcvG2i1LAyi+7RWVx4abQ2cUWa/qY0hn0TOrBQkQB+Yvna/ZGDIzF DxNQ== X-Gm-Message-State: AOJu0YyOFFozDDYW1rsYd/nuiujbKAR6qkzBpsFT8qbjdRiIVPHZFKD3 RsJ6TqTy19xyvsqGA4qUWZ2f4wSn4UyU+3Vv X-Received: by 2002:ae9:e912:0:b0:774:3235:4e6d with SMTP id x18-20020ae9e912000000b0077432354e6dmr6496497qkf.21.1697991643257; Sun, 22 Oct 2023 09:20:43 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id vq6-20020a05620a558600b0076e672f535asm2095914qkn.57.2023.10.22.09.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:43 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:42 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 07/17] Change occurences of cork to pointer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473345290130833 X-GMAIL-MSGID: 1780473345290130833 Change two occurences of cork to a pointer in both inet_sk_reselect_saddr, and inet_sk_rebuild_header. Signed-off-by: Oliver Crumrine --- net/ipv4/af_inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 3edfd8737715..60f693040a2c 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1263,7 +1263,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) daddr = inet_opt->opt.faddr; /* Query new route. */ - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_connect(fl4, daddr, 0, sk->sk_bound_dev_if, sk->sk_protocol, inet->inet_sport, inet->inet_dport, sk); @@ -1321,7 +1321,7 @@ int inet_sk_rebuild_header(struct sock *sk) if (inet_opt && inet_opt->opt.srr) daddr = inet_opt->opt.faddr; rcu_read_unlock(); - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr, inet->inet_saddr, inet->inet_dport, inet->inet_sport, sk->sk_protocol, RT_CONN_FLAGS(sk), From patchwork Sun Oct 22 16:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838511vqx; Sun, 22 Oct 2023 09:21:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEoGiOl6c/ISAHAwavTbNaAwKxxS7P1xmzVSXBmOGf5R7SYu2i1UXWUFO7RoRRkt4ALcx1X X-Received: by 2002:a17:903:3093:b0:1c3:749f:6a5d with SMTP id u19-20020a170903309300b001c3749f6a5dmr4105128plc.4.1697991701511; Sun, 22 Oct 2023 09:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991701; cv=none; d=google.com; s=arc-20160816; b=kg4ri8k9FbYAB6pbV/BXm1+zrSC0Hz5uRr/3oOoT9G6psHQXS3gqunCcE9hQbAjb29 M572L+AQ1Yg/NK1j5pHb8MNBIccM+ZTjVD11O/pETjMZIqOm075FNMflFLp/VEAxh0Ha llbLzXgrc6pkxmccFahWMsckX5LaeKQC6xXDHOCMCBcNY645ps9gRl7Ch0ayHMeycYAo UTf/+6H8vdk0kxJk3U/B8KFlVzAXJFAgP4VBC6XqNU94ZwYMHTjUazcE2MFt/wYBiUkz tigF8xSeflj+OqibqTOuP9OOBG5dtO4JkfoCLNlc4DoWnpSq6ym5kjqCUz3BvJeDHhis e/sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=9Yqf8xOcyNNZs+GLw9aGZ5FbGSaK8bs1qBlvW4RYacI=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=YFVo5B+JeDibdhUKYekuC4d9AbE1HTZwvOfOsPutjP9oCv2rK2jrkmfg4mNWqoEIHd BCMeZ4PhDNnEpwUuBHpmvndk0kncK8I6TfpIDJ8XhHWWMuv1oVIVHtVhx7hrX9wdd/0O 6tjgXjzKf2M2RVrLUZLj/MzJzPnjonW+mvOKBjfD78YUPxoz2rIr4JUh1LuOjjyI23Rp xPDYOUfDAF/ki39mYvD8EfPQnV/JwxwUAI6SzrnqjBZoUBqP/tOKfO+dex0IIcFJeuFr 7bMCm5MijVObzrMAh7comzVHv3XgG4REHBe4lP4AfUWJhz4oHhDLLtlZV5fBtfnf/Pjn MKvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="eSO/eL8b"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id z7-20020a1709028f8700b001c9c89fd36dsi4836861plo.203.2023.10.22.09.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="eSO/eL8b"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 7EFE9806AA05; Sun, 22 Oct 2023 09:21:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232370AbjJVQVJ (ORCPT + 27 others); Sun, 22 Oct 2023 12:21:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232351AbjJVQU4 (ORCPT ); Sun, 22 Oct 2023 12:20:56 -0400 Received: from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com [IPv6:2607:f8b0:4864:20::e2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B04610F4; Sun, 22 Oct 2023 09:20:50 -0700 (PDT) Received: by mail-vs1-xe2c.google.com with SMTP id ada2fe7eead31-457cb7f53afso875407137.3; Sun, 22 Oct 2023 09:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991649; x=1698596449; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9Yqf8xOcyNNZs+GLw9aGZ5FbGSaK8bs1qBlvW4RYacI=; b=eSO/eL8boPEF/QsYprRX0Robfp0EMZ6zP2Js9SzYKr6yhAwLqXLMwgEp2PrukQOH3p d4SNgCR57PTqRD8bfx8t5VBBxtySeNT76NknHR+SmfJ+IxEW8NplMDiDoUFJvlso4nsr 2lCzpVJgTSMIM+2wfbOc04gr+4XxGxiJThjVS7FPBaR1nF88c1TZr9bdXAKyVJSQShhz QoVzNlkiS2erMbjGCvEfS7trdgv4mm8BDnUJgL39qD5wnuC/He3oUqI/c1CU+7T6+TQ6 Pec0YRZX4wSdpzBbJUQ3zqxtQIkh35G+oNoR/HRtB6eRcVu7x9EXD0GRLe2AosfbaQJ0 2B0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991649; x=1698596449; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9Yqf8xOcyNNZs+GLw9aGZ5FbGSaK8bs1qBlvW4RYacI=; b=dBpvbyv5amGw0BlWcv0CFC+iAk9DUybF3v4XlMoB4TeSovLe6BVZu4tEdIEmNJGHfN NgQFR2+DNi97H8h8FBKp7BYptrHA6qj7BwrXU4YRyIsc+xAUZemYR+VsC336c8hiz2cV dYkMjBF1Fk7/cCKvdLDSA7cQtW5oLoSxywh246z0Mr32LzZ6MhytqVWtJb6v/gSM1Z5k I6mW7beA1v84iuwBJ9HBycNjSngpUdgwRQFP/0oUCj/ZFKZhdNkyea8ydxGe6L1KsSbw D6t/o65Ubw07lULRgb2pKjdPnNi6HMzYg3EiM+UKjIWDEm8y93kkStACarT/lDHnYsJA 93zA== X-Gm-Message-State: AOJu0Yyektluw63TzDl4J11cqwsEIkBooXLGTGzvAlzbx8aMFIlHcS/Y n9SX1eJ5+mROJ0qnXfpSYbu1iZoOBTt8nDjN X-Received: by 2002:a67:e156:0:b0:450:f5cb:c3ce with SMTP id o22-20020a67e156000000b00450f5cbc3cemr5758220vsl.17.1697991649192; Sun, 22 Oct 2023 09:20:49 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id m1-20020ae9e701000000b00767da9b6ae9sm2112629qka.11.2023.10.22.09.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:48 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:48 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 08/17] Update cork to pointer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473346082424130 X-GMAIL-MSGID: 1780473346082424130 Updates cork to a pointer in the __ip4_datagram_connect function in accordance with the previous patches. Signed-off-by: Oliver Crumrine --- net/ipv4/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index cb5dbee9e018..bb73eae9de25 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -45,7 +45,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len } else if (!oif) { oif = inet->uc_index; } - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr, oif, sk->sk_protocol, inet->inet_sport, usin->sin_port, sk); From patchwork Sun Oct 22 16:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156555 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838826vqx; Sun, 22 Oct 2023 09:22:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGI6aKXzkiZTFWdnFlsr/KTcz7WEWfujS1I1l9dIFSfRM7ZQgDMIbnFNp2ylqjDFzx3KSO0 X-Received: by 2002:a17:90a:1a:b0:27d:ba5b:f0bd with SMTP id 26-20020a17090a001a00b0027dba5bf0bdmr4768175pja.25.1697991751350; Sun, 22 Oct 2023 09:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991751; cv=none; d=google.com; s=arc-20160816; b=e9+VOymHZ55VncZ+jXkJyLRaTAzGM3WvkBSg99SNp2il0dcU1GJV8B6bgCnHQnGe8Z LPW1k5pZ3Yl6H9Fe9sJhK/pK4AZH1KCL0C3Y5fnvVOgP0t6j1qabmRvA1pWJ012eTDhg 8y1p9wa1sF/J2FKEpxscSWN7wStQclIkX7q/hACiQ58eJz2jRA2THP+hNc0Y/5JECnUr Y2fTf/llzuTN2HlNad8DBAIsFzPWs+/GIhvqhr2j0LxLQ1dHqJIFYiTdwy0TNP8GY2bN OspL/9ipIohaUGujmCgg2UaU/yiI6+ADTCMFQxKe67Oh+YBcd+mrmbo5Vh/pszAu6edZ vM1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=X7eLz35l5Nf9Om7hfb3vkAc0IkNehpomp6V283kIBDRCZhkjX149aQ2+38rbGYhpMn DEDsdUpnvt61uvf0Zzp5m+DlPgMdMct3b/C+h1dwQk8uMlo/tgDiZQS7XXGeitdTsyhh ZbVk1/iwmbQxFMWRRLU+Y04PjsAGwCO3NAoYrX0m5mmir09QrvB7zehlKCO5vz4egsnx 0GZg6jE9Kkbix5wNGv2xb7Vv3hZYyrxZKXNTBwOKRgBXOuHkebI5Z/u+I1EHRBj9LkKl ssCLQrPv1R4386tW3LGPKomdAYpQjc8oEvup9U+35aGDScknQB93yOjMdwPCIIH10ak5 AFWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NB5qujsP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v14-20020a17090abb8e00b0027cdee52324si7312445pjr.74.2023.10.22.09.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NB5qujsP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 65E9580781E9; Sun, 22 Oct 2023 09:21:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232517AbjJVQVN (ORCPT + 27 others); Sun, 22 Oct 2023 12:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232711AbjJVQVB (ORCPT ); Sun, 22 Oct 2023 12:21:01 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE5FB197; Sun, 22 Oct 2023 09:20:55 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1dd71c0a41fso1937190fac.2; Sun, 22 Oct 2023 09:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991654; x=1698596454; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; b=NB5qujsPEKObiA4r2K/tZFDisjEdeLRvf6pjMQ/G0U4HMlKkTJ4k2hieOvkJXQA739 0958QWJhR973Ymopjl3t+ChwwU/3axT+/4/slAuzrunLu6HSmpvf8wy4/iJ147cubwIa F529COGDB+cR46cp/aMVvr1nzklJJg2kUxBLDR5oWwIC/gF5GCISbjvpMAAzP7+zeR/s jqMR2Zj2GuPP+60aRW28VQB/A6To34JmrQYO58A104KlF66Pf3me536lEt4cX4upZa7h mnHd5qZhiYK1oHCNnNAkxUjaqoGNdOJvsSmNkpMW/4xN003ANcVESuaJJC6L5RsTnxxf F8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991654; x=1698596454; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; b=PIYT5ZjYbpSQBbp4T3KlMgIry/NEkp/yIrK4HSPLnTKTKzXH/cRgw/4YHe0k9QPbwb fgB7nwSNkPexkRa1gX5kxee7nLqTmGoMkSwGxx1Bzry4SM1kTjx7lYT8S0q9oX11IMP2 8mkaXp+Ov7B55dK/irt5aAbRNzitpJf0fNOct5spDgQH9lkcnLZoIFYc6N6PT5rL89Ej lYSLkRG1xaz/Sv8HA+WCNUsBhi9aoJzKr9B8yDl1gPH5qIWnx/Lz9gGGly7SQ/tZzEU8 EeOUByVMqKYAX45qOphLepanJ+6m5PaN7iGP1721nDSaDs36704/53yzVE2oHGzYPkF1 szdw== X-Gm-Message-State: AOJu0YzAePUf72aHh94uRhRLuEB8FiafzGjhDi7QyfRNiOsKdFajyZW9 KVeAXy/pX9s5lInmm298ae/oL/6iVhZsynZg X-Received: by 2002:a05:6870:57:b0:1e9:bb7b:6dd0 with SMTP id 23-20020a056870005700b001e9bb7b6dd0mr7603909oaz.55.1697991654564; Sun, 22 Oct 2023 09:20:54 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id h12-20020a05620a10ac00b00765ab6d3e81sm2108047qkk.122.2023.10.22.09.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:54 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:53 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 09/17] Change instances of cork to a pointer Message-ID: <37fb362cff69dc98dcd1a8bcaab0560964120117.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473398818820329 X-GMAIL-MSGID: 1780473398818820329 Make these usages of the cork a pointer in accordance with the previous patches. Signed-off-by: Oliver Crumrine --- net/ipv4/inet_connection_sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 394a498c2823..99eb394ba0a3 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -830,7 +830,7 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, struct rtable *rt; opt = rcu_dereference(ireq->ireq_opt); - fl4 = &newinet->cork.fl.u.ip4; + fl4 = &newinet->cork->fl.u.ip4; flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark, ip_sock_rt_tos(sk), ip_sock_rt_scope(sk), @@ -1482,7 +1482,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) struct inet_sock *inet = inet_sk(sk); if (!dst) { - dst = inet_csk_rebuild_route(sk, &inet->cork.fl); + dst = inet_csk_rebuild_route(sk, &inet->cork->fl); if (!dst) goto out; } @@ -1490,7 +1490,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) dst = __sk_dst_check(sk, 0); if (!dst) - dst = inet_csk_rebuild_route(sk, &inet->cork.fl); + dst = inet_csk_rebuild_route(sk, &inet->cork->fl); out: return dst; } From patchwork Sun Oct 22 16:21:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838686vqx; Sun, 22 Oct 2023 09:22:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXyoOKav8NGvDP5peG2JTs4qJTDKiERY6xKD1sPi0Fx9ibExZsGzdVQCCt7F/MPCGsLJo5 X-Received: by 2002:a05:6359:4296:b0:168:d346:ce5e with SMTP id kp22-20020a056359429600b00168d346ce5emr2157491rwb.8.1697991730474; Sun, 22 Oct 2023 09:22:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991730; cv=none; d=google.com; s=arc-20160816; b=BWdPaJ3FE6uSywZ8KfKdBc7KfG3kDt5on/SK8XLTZmkQqO9QniGePsHRe+5YzRDAk7 St4/dgL7UUbXPpI/1NpueaA4T79ieB9YSpn0FQr8wdUZMVI8VCYyP0IfU2ZvgT62ZUUF QxkIpL7A84a1ldNf4Ttic23bQyTROVeCwwmNq7bLmtY0UUbHwWy0sKc2NNTgLZRDQG4b fVwpglTjRXkkokVwLpd5oecG9TvC0crf5ckfUbNMmLLgcyVE0iYqqGMBzJWGFEvNxPCa Iciaq4Ky6CxNCwRCPz9Vax/l1EJjVL5hKWOfeLP3wUWGCim6/9ajsiNRyLuNJ21jnB8D d7+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=hgjSE66tE6JZzaSVNRveIcOcsT4Kj5DPZibrG3bgtDk=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=jwyMH1T2iJqBqBT8obXFGV/rmUH114CbeYDQGKkcoEBovd6UqanxSG4JxDL/tcy1ic H0QATfvZU9hbHHmeqjS6KGSTh6nvNDovQ3+OP4B7tIdktgO7hEId6a/4E7b6J9/+Wsjd TpowX6+vEeFGEPcAeVS8mPqVl3f6AJd97vwbJVcdpl31jEZI9GkLDtewXaB+zzpdULMY 4Ui7BDyB7+84SGhoQsd4PCGFBUdv9gE2fkw6FL9iGha2dTXeQEqFw7GJtJ6t8W31WCT9 CYDNtPHgSNfF55J7pKS7EMD2w/A84rjVgTybLPdBEs7BaHXapMGVGL92F2CcOV3LBSLS yiCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fMRgLTgD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id c18-20020a637252000000b00578a2da998asi5246880pgn.304.2023.10.22.09.22.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:22:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fMRgLTgD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 70475805574D; Sun, 22 Oct 2023 09:22:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232578AbjJVQVY (ORCPT + 27 others); Sun, 22 Oct 2023 12:21:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbjJVQVJ (ORCPT ); Sun, 22 Oct 2023 12:21:09 -0400 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF1E210F8; Sun, 22 Oct 2023 09:21:04 -0700 (PDT) Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-778a20df8c3so182632985a.3; Sun, 22 Oct 2023 09:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991663; x=1698596463; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=hgjSE66tE6JZzaSVNRveIcOcsT4Kj5DPZibrG3bgtDk=; b=fMRgLTgDCcKkgPYu+FQMBqi63sEtiqcCOwvRbdL9vkHSvPUtvGgIGomfeVtCCw1ASC A8ckRs8LaGbl1OGMGOaLn6HNipC9wwRaJp1kMDh5GwmKByOwZp0AlxB1QiKziEsljs9p VcVxtxZf6uukrJAaesAG2ZhuUsn1Y7AV6qOhIFz2jIFefqdiX1CecHCgmKr+ZTqWjOqa p64zge+W7VZfOGmykDh3XWh1HBzqkMvgCPuAyS2zxf3OUbUUOsN+DAWNKDVnMAN5uqIR YYVpqcwDh8C36f4tB1Y7YvUoyCM2ICUE7J3f0uTZJBZFZFl1Tu+dPv8apZKmKhCiaVGG 8A0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991663; x=1698596463; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hgjSE66tE6JZzaSVNRveIcOcsT4Kj5DPZibrG3bgtDk=; b=LvBnUafB7QqTFlQC29P4X8v7phtRuDAmDCmIlUUKCW+0sCnhzlJVEgDcDb1+s1ZJCi D0mke+Itwao7sO0TDXnRfaBOYr5E0/1L83VFmZ6++NASVa4R/Fe/Stf/CNMaDAYiLS2D V0SiYTMPsRts6ut+u81c/9ZjXbT9KS7DacceUZRY2+3j5bNva4WeotE0+8XcA4uhkZXq fzk96rsn2iEakFJB5ia6rkiELEQdSIgH4zBeVC368JubsVRpwp2ZYMDqdMWEsOerc+4l Racwv00E8jEBE7/+uArXKE6r5mrkEQnox3CzAnCInhLntJ2Y/lB+02DJH97iGpOeQjxC MfEg== X-Gm-Message-State: AOJu0YzdjJkrygQyn9RlG/vKFUIAKkGZ61w163b9xR9+JlFPQNilhw6m P2OA/kNE9IzGrYCoZ/qxqhoNu2yEZhBDh8U6 X-Received: by 2002:a05:620a:3710:b0:76e:f638:bcd9 with SMTP id de16-20020a05620a371000b0076ef638bcd9mr8966868qkb.38.1697991663249; Sun, 22 Oct 2023 09:21:03 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id e6-20020a05620a208600b007742218dc42sm2094338qka.119.2023.10.22.09.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:03 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:02 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 11/17] Update occurences of cork to pointer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:22:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473376599010486 X-GMAIL-MSGID: 1780473376599010486 Updates an occurence of cork to a pointer in accordance with the previous patches in the set Signed-off-by: Oliver Crumrine --- net/ipv4/syncookies.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index dc478a0574cb..4354a4decb51 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -450,6 +450,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) * Normal sockets get it right from inet_csk_route_child_sock() */ if (ret) - inet_sk(ret)->cork.fl.u.ip4 = fl4; + inet_sk(ret)->cork->fl.u.ip4 = fl4; out: return ret; } From patchwork Sun Oct 22 16:21:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838563vqx; Sun, 22 Oct 2023 09:21:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEP86z2DeyU/jR0iYU7/OhwilHdIzhkxXA2hEbahkR1EgXumd20dOB7Qk7H+oRrx+X32H2J X-Received: by 2002:a05:6358:cd04:b0:168:d0a3:202f with SMTP id gv4-20020a056358cd0400b00168d0a3202fmr3191624rwb.15.1697991712146; Sun, 22 Oct 2023 09:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991712; cv=none; d=google.com; s=arc-20160816; b=s0zmPKKe2EURAC9ajZAIz6q3qT5xpXyYqVfNbG8m9rShXHZ0yxKlWzfm75YIo4JnCR 8N/KH/7nuJIMWqcDaXzE5rDxlLJydf22yWQeCzhug1f3QIZ1BJc5BUI8kRsqnIkXntoC HlJTA5gojivJHFVKLu03vUoqp1OLHjlO6N1pxHtIR8jwJPEBZ3uYE6A+fxAJZXpbjuB6 63oHf7sBDKvymqsZ/qmXjeA54RGhGlCucE/9An7PPVhCpveDj6RWFP6r2HJ/7vkF1Zze eppr+gIUdqGy103BSmaguwJlcIUfg0Bwav0w/+f/mMoXfR04cUW27GT8TedwOM05DZ+r JERA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=qZ+QqSzcJMgWzu6ORVRR0lMQFkEKfiANjxuAOwUhzpk=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=Ns+MiWHvs4mua+D8OJ2Tfl+GePxt1+Kr0NqUunTj29QUaVzXT++sBkl9YosnHDJV2c vvEq/2HwZ0KwKA2nYh0E+OXAs2tyyCxp9/FhWIqz5x6JGfyM33lJljJJ07YxW2u7Hjdr fQCEtc7/X8nfgUlZqvEs+Q16G6XXMNTrYgyNjeqdrduC355SEriWnIyWhXv6BhVwUmUD L98VCZXsdlwvSA3Q+Zgmh19zXbAaCOq/WD4lkIriIqeUJesb867L5g13KgFy2zs2A5lz F5dl0jCSL0yzcts72wqY9GXC0qcVrJDuvjk8AU0yvJJw3P9WT5xRgnq20UMyZJp960E9 cvzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HcHKJrAe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id s24-20020a056a00179800b006bd7cfa8497si5178848pfg.83.2023.10.22.09.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HcHKJrAe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 6F7EE8053654; Sun, 22 Oct 2023 09:21:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232588AbjJVQVg (ORCPT + 27 others); Sun, 22 Oct 2023 12:21:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232524AbjJVQVO (ORCPT ); Sun, 22 Oct 2023 12:21:14 -0400 Received: from mail-ua1-x92d.google.com (mail-ua1-x92d.google.com [IPv6:2607:f8b0:4864:20::92d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51011114; Sun, 22 Oct 2023 09:21:10 -0700 (PDT) Received: by mail-ua1-x92d.google.com with SMTP id a1e0cc1a2514c-7b7205bc5a3so785633241.2; Sun, 22 Oct 2023 09:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991669; x=1698596469; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=qZ+QqSzcJMgWzu6ORVRR0lMQFkEKfiANjxuAOwUhzpk=; b=HcHKJrAeifV9gPbuBKQNY32Df0f1W1ZHZBsooxe84eZnUVRoXwWuUWFQJ/fPGNXk6w gqn7Ki1rsWlP19hZLrheo0TD8hog2RP7JsldEwVnMX6zQSo1RjuoGF33hwoPG0TFxq4N 5HS6jdtxnhTq2HPcr61kZqXoL6X7GX1PmImEqtu+QbBgSzQmI1y+DMmJVGe43m061TwC PwdsIcYWm1Qye6IMVWllxviIirrAHNGEHP/Br5kkzswAlMUQooBegmnDrwLWToQJoY35 asVAFtH3+HD2GkjBLfJcJOdody2WVqGIlAVvI6M2UAyTUreZzuyKBYwiSUKWwap8HKdg aGUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991669; x=1698596469; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qZ+QqSzcJMgWzu6ORVRR0lMQFkEKfiANjxuAOwUhzpk=; b=sMkwPfPl8kDsbqo75wlzKD7srMf6qnTFyOlbiLSyRKyWeP4GoQcE2/g1ks/EFrsvqw IL7nfWaeIWQnPzytAOpdkp8yh63dBXLpZJrggcfR2cOwmiFNq+HP9lp753V5bvm2JhyY E0iIHa5su2VRYyzbzIGrfohd0jmb/gVf2L2yimuyyBLYkKcSeP1AiXWrSDW4TmMenoxD jyFg578kZb2Uq4Ve4m/XZtku/gO2iJl2c9+nwnUJGxpXRHwx/PnkKCSHzj/TiBy9aQR1 jkta0Zd9JsLw2JoYd0jT2IJZYx8tVlO3HLFkutUj2KgywlzjcXzW8H0Zs+3rkPc8wO2B WfdQ== X-Gm-Message-State: AOJu0YxpjMkbbTqA6TWCyuzaW/0FDbledgLJ9wmbo8wf21LAxfHWjk1B /yE4h8qXwcDNc17zvl//KtYzgLQDDfBpKiZY X-Received: by 2002:a05:6102:204e:b0:457:d3ef:cbe5 with SMTP id q14-20020a056102204e00b00457d3efcbe5mr6410944vsr.20.1697991669465; Sun, 22 Oct 2023 09:21:09 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id g2-20020ad45142000000b0066d23395d27sm2240698qvq.123.2023.10.22.09.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:09 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:08 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 12/17] Change an occurence of cork to pointer Message-ID: <51d5932025b92446e63c72192194fc2ffe9f30a0.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473357554687941 X-GMAIL-MSGID: 1780473357554687941 Changes this occurence of cork to a pointer Signed-off-by: Oliver Crumrine --- net/ipv4/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index f0723460753c..9672eaeb3ec1 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1414,7 +1414,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, err = INDIRECT_CALL_INET(icsk->icsk_af_ops->queue_xmit, inet6_csk_xmit, ip_queue_xmit, - sk, skb, &inet->cork.fl); + sk, skb, &inet->cork->fl); if (unlikely(err > 0)) { tcp_enter_cwr(sk); From patchwork Sun Oct 22 16:21:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838660vqx; Sun, 22 Oct 2023 09:22:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHm4Ci09X5Owdi6Qpk3FJJCwHzIwgiRQPj6frTQaeDH8WCB5JLJHaPlpT44vHHHlVo2AyWn X-Received: by 2002:a17:902:e548:b0:1c9:b187:4d84 with SMTP id n8-20020a170902e54800b001c9b1874d84mr7226502plf.14.1697991727204; Sun, 22 Oct 2023 09:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991727; cv=none; d=google.com; s=arc-20160816; b=v/dW4mZYzTd4XGkIaAEW9oV0wTF+shoNVgaicgXp0gl6Wx8ky4xGV7eArYEfpe3q+E +vN94YunDlsZhji3G5t8nrMRdkfGbdHPzx430KKJIMZjn7zf5s6I/8u9OXw71EICS9sw YFhL69dGGNxK9xPK8EYalcIBl2rDJduqMVON0/SR+KZods0e9PmN3dT1tCD8114qgxIC 3AlteyPXG8hEXSLZP1BDbHnNl1W0s1wK86v/qin2cMfX3mUfgR/XwFnw5KP31yRKiIop 5TJ4ki6aZEFxN+pfxxvswedUtdjO4KIQ2K1rFk4J4Ka7jwvPFjA0cYy8GDJKuXtuplD5 rohg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=dLAq6YzQjNIuqyApWRKxm5OD/P3XILlIc8qEYqCP7cA=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=ZWtUM95Jw3M3NfRKFCzSVV49muwmdJSfkusVxvP8HC3O0y1hhG3D37wnq35hvtKcLc H+oW0LBrJunG8Sm7wJF70OVoe1WEup/TQ3821ZEkKQNVac++rQKC/RoQA5gQmh/65ezP WvVVR9fKFFBbYhOLD58Jh8qGjeFzO1pW6KEjlh7Eh9UkmBRi5gDQNu0Fx+gnwoQXZg7s guHaBn7aIeaJE/z/Z+kl2KF1IdiVafjcO4eRyHycxtcg+7Fab60AYTnKYRQy34mqapnD kWEYeM7TKIV97vu6e/a6InRacC9EokW6oZFSd02R+v+rEsdRxUsQm6+Mez7p0roD5uBd GNPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GnTnI8fP; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id p11-20020a170902eacb00b001b8698149fbsi4759521pld.477.2023.10.22.09.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:22:07 -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=@gmail.com header.s=20230601 header.b=GnTnI8fP; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 28633806114F; Sun, 22 Oct 2023 09:22:01 -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 S232856AbjJVQVy (ORCPT + 27 others); Sun, 22 Oct 2023 12:21:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232749AbjJVQV1 (ORCPT ); Sun, 22 Oct 2023 12:21:27 -0400 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EAFDD41; Sun, 22 Oct 2023 09:21:25 -0700 (PDT) Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-777754138bdso172322485a.1; Sun, 22 Oct 2023 09:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991684; x=1698596484; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=dLAq6YzQjNIuqyApWRKxm5OD/P3XILlIc8qEYqCP7cA=; b=GnTnI8fPh8bN/9uYZ1OYptJ33BVg0Quoacfm7EY48V4V9aDp50riOJ0jYkY7FSr/S/ YDQxgb/smb0laZglv1PX2TlsiwLhmEpJq3ZmWb9J/xSUSuL9QRF9Jd6JmfJbeSRnlJ6k N+KxqsS7jr5m8C5qQqfdKMwMiMpvJFVRy/V9nXWssP0uT/X899sphT7LUqrxkFwaHG1s b9TITtKD4Ft9amJkQTEIiw+TbluksMbxyWP1tsrls8CObwDRLLTrg1dfTV0k1P2dZ0li fkw5WW544lAc09xcVCFSf7WLSKrLSeTOBN+kp/C0WtNPvSgXvgrbuKlJb2kQoh/dDRzR BilQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991684; x=1698596484; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dLAq6YzQjNIuqyApWRKxm5OD/P3XILlIc8qEYqCP7cA=; b=kX9xGEEWM/bZvnLC9Aeivrmgoj/ofetKl8WTuKvY8Rb5w3aq4WV+Qw0OQW3Ijif59+ +Fhk3yT4zjvI5JURktmuQpYXNF5i+JcpyNiNDqZA/BqDK2uj9WduoT/IwuELbZkB6cBh mq+nRpBM/S/HTKeQuby6h3PnufxSyxWocUKzmWl20VttchgnoS753OVvf7rfokY2kkPR iz9BVA8zKYruKnJblXxvE2YOmT3Thh2mKkeTstf2IvEqLKLSdEn+j4WhawfySu4lpWDq +c0xKMqbIilChXrM9jHy7YFKd9LL33/R/LQ2+NnDYWjeKjfjpV0JP+sqPEiZlhfKwcUR jiuw== X-Gm-Message-State: AOJu0YwxeZnN2i9qhQjWoWGI6UZtM1LW4ZyyXuwihaLEDKi+6z4O6mlO 99zkEkAcIl0KRN/h1lCga1ySi9e3llFfF8mU X-Received: by 2002:a05:620a:22a2:b0:770:72c3:dbbc with SMTP id p2-20020a05620a22a200b0077072c3dbbcmr6394314qkh.18.1697991683933; Sun, 22 Oct 2023 09:21:23 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id a1-20020a05620a16c100b0077411a459a8sm2126191qkn.4.2023.10.22.09.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:23 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:23 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 14/17] Update usages of cork to a pointer Message-ID: <6b6cc028300b69b1f201b02e67e4fcf68aa7fff1.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Sun, 22 Oct 2023 09:22:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473373465570891 X-GMAIL-MSGID: 1780473373465570891 Modify a few instances of cork to be a pointer Signed-off-by: Oliver Crumrine --- net/ipv6/ip6_output.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 54fc4c711f2c..5f24087bc9e2 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1878,12 +1878,12 @@ int ip6_append_data(struct sock *sk, * setup for corking */ dst_hold(&rt->dst); - err = ip6_setup_cork(sk, &inet->cork, &np->cork, + err = ip6_setup_cork(sk, inet->cork, np->cork, ipc6, rt); if (err) return err; - inet->cork.fl.u.ip6 = *fl6; + inet->cork->fl.u.ip6 = *fl6; exthdrlen = (ipc6->opt ? ipc6->opt->opt_flen : 0); length += exthdrlen; transhdrlen += exthdrlen; @@ -1891,8 +1891,8 @@ int ip6_append_data(struct sock *sk, transhdrlen = 0; } - return __ip6_append_data(sk, &sk->sk_write_queue, &inet->cork, - &np->cork, sk_page_frag(sk), getfrag, + return __ip6_append_data(sk, &sk->sk_write_queue, inet->cork, + np->cork, sk_page_frag(sk), getfrag, from, length, transhdrlen, flags, ipc6); } EXPORT_SYMBOL_GPL(ip6_append_data); @@ -2058,7 +2058,7 @@ static void __ip6_flush_pending_frames(struct sock *sk, void ip6_flush_pending_frames(struct sock *sk) { __ip6_flush_pending_frames(sk, &sk->sk_write_queue, - &inet_sk(sk)->cork, &inet6_sk(sk)->cork); + inet_sk(sk)->cork, inet6_sk(sk)->cork); } EXPORT_SYMBOL_GPL(ip6_flush_pending_frames); From patchwork Sun Oct 22 16:21:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838833vqx; Sun, 22 Oct 2023 09:22:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWOZ7Hg8ybRVWIk68JCliTNKChFlYhTcqX/ntgsRy55xIG+829ziufz6x0vOHX00jJXgDH X-Received: by 2002:a05:6a00:985:b0:68e:417c:ed5c with SMTP id u5-20020a056a00098500b0068e417ced5cmr5860352pfg.32.1697991752092; Sun, 22 Oct 2023 09:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991752; cv=none; d=google.com; s=arc-20160816; b=GxNramNPmawmBbvfZ4fmZE0NrauZlIWXeDG8tKNE7BP2YwS+qvXQat/lZPOcI19Qaf XteNQMwOFgaV6kwA0XMZO3uusW/iImEoMvgZhOlsW6ZPkzM0mEaYnnCuEKOoexjLdQBm qPcTRfCBgjaEy3QnX0hoMuAF4Jg0Gc0hSoltU3I53eeSqnPorK9IZiSydS9YZq2b5CI3 CDTXN+nBZ1EAjURulARRiGPms1GEJxhACJ+6c2H7xSBkM4XFZ/yv6NEd8FIYXdYNswIj x4xqpEG3k/xGNeK83MOKyAtWrxlDsdcn8gbmTJs2wYGv2NfUwdyDup6lPQrAW2g/7Ak/ et9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=B42kI3To7XoU3GKwYbYl8vB8ggJa0kdJgAmvrJnzDMo=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=VLrZ83cuE4FE9WQJJsmRHP+15Jwvco4ExSOzl+dIoIVmuHzl+qVWi51WuUm/FM1zl2 zRe3OQpjeOhbQX7rk32Vxv/FGQJqDpCdmVGekAHjeVUggFpXvp0o+uIu8dyqbDgpOXat b1hr4ptFjFgwfcsvLHyrwnkQ/OSKV7TIdvWD4HN3/F6UpDwNQzDmIizZp/M0AzhbUr59 zcQP1uULMETgEHHcudnMmK8nv5EDkck2K3jI/5TsqC2jBKS6TiftypG3kuOnhfi4r2Do IQss4A1zPTrFGdUmZ/Jx855XkDJYvvfSwp5WbfIVJXH541SYwfKphzm9ZmC/kNLP8jWY nB2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O3q+6Bn3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v18-20020a056a00149200b006be0e90200dsi5294670pfu.374.2023.10.22.09.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:22:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=O3q+6Bn3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 92BA6806117B; Sun, 22 Oct 2023 09:22:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232649AbjJVQWD (ORCPT + 27 others); Sun, 22 Oct 2023 12:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232598AbjJVQVg (ORCPT ); Sun, 22 Oct 2023 12:21:36 -0400 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECC51D73; Sun, 22 Oct 2023 09:21:31 -0700 (PDT) Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7789a4c01ddso178163785a.1; Sun, 22 Oct 2023 09:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991691; x=1698596491; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=B42kI3To7XoU3GKwYbYl8vB8ggJa0kdJgAmvrJnzDMo=; b=O3q+6Bn3rOx07jtmBxKm/7MhBSDDyxqyc3t3vQcbwRkanpUGJhJDVoakYl9goRufJ+ ItJaH5V/AtPrn5l+8rNoW4FlqIreK3i131ZjuWoMneFnhmIeaNBYxkfiWPF+SsIIG0aW TNZOLXtPnmkA+xslOJ8nBNOH45tlKqFvJZDGV4q2Ce8DavXWAE+95VeVI7nDxO1Ui59U rxV3oyVcZrjeXtxEik1XBf/CVAT5pGyyBo0umc+1hlbcnVYE+baUXBo3xY6FT4TTpyCn V7YcrMxZxwZWYHWafzpGNFjghUQ8TqIbvy79zwHnGouO4xIBkcpfdEa1H7sBKszCLXrA 4Zow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991691; x=1698596491; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=B42kI3To7XoU3GKwYbYl8vB8ggJa0kdJgAmvrJnzDMo=; b=e4BPgrkFVVsWsWhU2H4Pz+NTUSPXG5IpfSUfomXu34TgYDB9EEwNDBc+l6PYuZ+Aot bGEpa4G84MpWh1sxtOObwkhToTedK+jV6H4chj4PoIJ8WpaTsaNRJZUJqcMNgeqZhwj+ NIdgdfWCYQwjzsMb0LA4riTUkoQyOYztClxN6Gw0S5jx0qgPnfACygjuClh4KRfY89Wk 9a/qAd33r8/E51l5nm9RHLkIp/pNhogRC6UqW+Gu58sTThFbLDI2YdTKmNnqC/Zai60y On5qNaPdyqtOcEG4iat9OPRlZpAgSfvY0/LDGOCvMq9sZWuRxwiJ5ZDy9uFk98WxlJ/q QTzw== X-Gm-Message-State: AOJu0YwR8Ecnf9407CnEG0Hoa1zq/xv9+QbdEv67QC6ffZeeaMeM3mN+ XFRqRpTLABnew4MnkDS1ZG/uoOvYRtuGOK9B X-Received: by 2002:a05:620a:27d4:b0:777:ac06:ed91 with SMTP id i20-20020a05620a27d400b00777ac06ed91mr6766124qkp.23.1697991690683; Sun, 22 Oct 2023 09:21:30 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id x9-20020a05620a14a900b0076f1d8b1c2dsm2107244qkj.12.2023.10.22.09.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:30 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:29 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 15/17] Modify occurences of cork to make it a pointer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:22:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473399164024774 X-GMAIL-MSGID: 1780473399164024774 Update an occurence of ockr to make it a pointer, just like all the previous patches Signed-off-by: Oliver Crumrine --- net/ipv6/raw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 42fcec3ecf5e..3ef5a75dcb79 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -520,8 +520,8 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, goto out; offset = rp->offset; - total_len = inet_sk(sk)->cork.base.length; - opt = inet6_sk(sk)->cork.opt; + total_len = inet_sk(sk)->cork->base.length; + opt = inet6_sk(sk)->cork->opt; total_len -= opt ? opt->opt_flen : 0; if (offset >= total_len - 1) { From patchwork Sun Oct 22 16:21:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838780vqx; Sun, 22 Oct 2023 09:22:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGY2V16Qp7J9QvenqG0EVNajtiLgrL7k9j/HBiwKjeTRs26g+xvTV9sW7CInIDePXIh/oag X-Received: by 2002:a17:90a:c58e:b0:27d:192f:1dc3 with SMTP id l14-20020a17090ac58e00b0027d192f1dc3mr4461250pjt.19.1697991745588; Sun, 22 Oct 2023 09:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991745; cv=none; d=google.com; s=arc-20160816; b=Hf0FYFEqk2sVaN9+bigLX0zb8kOFig9sP1SeJ6h3tBwSR1waX17R5WrC1ZdhpKqoFv q+bmWxySvi9FPevDfr3Yp4dRJVW8k0Pm9/i9cIoyRJXHTdX1xFE5b6NEW7w0pHjHEc4o oEtmRklk/W4BeFdwvUkcwqYRMmxXgB8ztnWYDxDRMUfDGxlY1Ov6+XNzZ4MQB9idhqso 8FAb2bFz4WvoU1/b76/nLy7twaNozsC+WMU10AQWENyBJxQX9QM2LoPxEPvOp7WNZdui mEPFwz4LfM9/4Yv+UZDWgXDbRImXHVNVboRe4QcRoqAU3IY1sJB1+KdwI33S7A9Sv3CH QvdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=e1t3NzgvnykrzyWG2jYSDsYGX1rxwy4sDeziu8k461s=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=SFLgPYTldvrLZjYpZrjYkXk9DWg1CSm+OxIS+0vRQYVqeFUxelGYpaBHOIYddyXHdu hQmLTRyAwKQJpa2JGLTCmWaJZAvWt7wYjUaSM1VWyzzu32v9hFrM8MX35cXt4dIaUDyT DlGD0s5tL+vvEeQMnYq7w5HoaxzrTy4E8yY0Bk3if/rDlLxjKWE/ZSIbFiUHwE7KoONA hFW/G60mB7/as6tpxoEUKH3itI5EPJw6RhPZ09ODgSP56Hquga4I2QZ8p1MI8hwErc8d EirmM5hj/B/PD6gZnRKBNIvXabNNv2dnL+1wqNMk7pQRKU7ecGan09Om9sIL7hT01jIN jkwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DmX2Vy6h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id nw17-20020a17090b255100b002774aec6805si5014206pjb.68.2023.10.22.09.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:22:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DmX2Vy6h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 79EFE808BDBE; Sun, 22 Oct 2023 09:22:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232473AbjJVQWN (ORCPT + 27 others); Sun, 22 Oct 2023 12:22:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232903AbjJVQVk (ORCPT ); Sun, 22 Oct 2023 12:21:40 -0400 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0612AD70; Sun, 22 Oct 2023 09:21:37 -0700 (PDT) Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-778af1b5b1eso146346885a.2; Sun, 22 Oct 2023 09:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991697; x=1698596497; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=e1t3NzgvnykrzyWG2jYSDsYGX1rxwy4sDeziu8k461s=; b=DmX2Vy6hFVAF3ml5Kz7nH7lQW8nCz01AHZ/kJHGvNgYwBkjPG3YF53Bq9n0mZnMdQV OMRTqI+muTDO0mUdvlqZw7TeixHVSu/HL0ykx0emU8cDYSBDx8cDKzFBvLrPWo1prynW BbgvIFFLC+WXCe1nYyrARgQsLA+oBq7S/9PHvs4xv+qeE6kkbSQCSNCiS665rT47Mymy zqZvtxqaZnR7Hf7IRH/ZPatjvjGKL9t8TPBh43BeMdMlwCbjjF0X1q7ud9M9m2sI4UEB IKGRvb+PoI5D1vHMYPlefQ27YuGntBg7u/wXti2B/BjD2dOsq73rHWTU8alFQKm8zZWZ jVQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991697; x=1698596497; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=e1t3NzgvnykrzyWG2jYSDsYGX1rxwy4sDeziu8k461s=; b=MZgfsm3Qzjwe++kD7wi17BlCPBBgK7w+6PXE2RZUYHEy7d7YsNe/z7GUS2tV2BNxTN 8c1/BoNPFpRo12pqWT6thnWdj6Et/yW/cMJi7t7GA5pcWi1QA7mjtBX877BH5hF6ROFW BKg3EJKlyL++ltXaTJ0MfrQtE0QagdRD+gyoQAZrK0PrF3LZbEUpVMCE9b8RRtzzWkLh tSOEHlAoIQJDrtIcnRSapwt+wMqJcrJ/+Fb8ZKknBRxFfjyTm9fhp9zsJzwqaRukAZM5 Y6lFh/36OYlrI9A7FlSEAL4WoByazZM1nmOikjo6DS6iuqh75eRqGdD1kyYOrrYXZgNC iAkg== X-Gm-Message-State: AOJu0YzYTOuAV+Z371OGNfB/XRgpnTWExsiJokkhHa/NxOKtFspJxxR+ POs3aV3m2wAUt+YDgu+46HwSLTd3yUJtyd2m X-Received: by 2002:a05:620a:8292:b0:778:953e:3433 with SMTP id ox18-20020a05620a829200b00778953e3433mr6198102qkn.31.1697991696808; Sun, 22 Oct 2023 09:21:36 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id g27-20020a05620a13db00b00767d8e12ce3sm2116768qkl.49.2023.10.22.09.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:36 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:35 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 16/17] Change a usage of cork to pointer Message-ID: <5d0e218ee92a742a9a8e77690b0fc9f0079b6dc7.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:22:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473392877306985 X-GMAIL-MSGID: 1780473392877306985 Change an instance of cork to a pointer in accordance with the other patches in this set Signed-off-by: Oliver Crumrine --- net/ipv6/udp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 86b5d509a468..191d21d12a98 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1306,8 +1306,8 @@ static int udp_v6_push_pending_frames(struct sock *sk) if (!skb) goto out; - err = udp_v6_send_skb(skb, &inet_sk(sk)->cork.fl.u.ip6, - &inet_sk(sk)->cork.base); + err = udp_v6_send_skb(skb, &inet_sk(sk)->cork->fl.u.ip6, + &inet_sk(sk)->cork->base); out: up->len = 0; up->pending = 0; From patchwork Sun Oct 22 16:21:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Crumrine X-Patchwork-Id: 156557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp839469vqx; Sun, 22 Oct 2023 09:24:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKb5Gy8BrEerT28wQwuSgdW7Y+lAtX/V2AnHtrwpujOVFq3pzs5BxMmC8QeDq+MLgLYWej X-Received: by 2002:a05:6a00:1796:b0:6bd:d884:df00 with SMTP id s22-20020a056a00179600b006bdd884df00mr9267305pfg.9.1697991850733; Sun, 22 Oct 2023 09:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991850; cv=none; d=google.com; s=arc-20160816; b=cFpQbqWJ6A1y/Q1BdvSs8P37nlHZckdMzcjXJFu4PVM5u/leyRdHH7nQ1TtW7ikdVk VJKsuQBUhRm/T/wjwl64plnGUcUxWHkg+ei8KIQkQlprjxYpi7XAJ7dWiF2iYgemajlY ++MkuYnA/excA73Kr+XcfuN5HNPLuCT1p+TTGqTB7GYElKE/F1Hb19dDk65hpdViqOdN mIsBOv8gCuLvYBgfrLKABa0UI+dQnzEpcwKcRaTJGwIuyD/Vcw9HpohmzpniHLdo/hyN VSrH3nHoVEYkQcwWH+7n164BEyMZRGj4f50Bh32nuLvqENYeUBWLa2gyzJYVHarM7Vr7 UJpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=72AhzVLybZCwgkt6DnIQrNHlCAgAiR46KQFBjLYqMNU=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=pAxZBsIIV0WQJUvfR0l7etqndV5h+T+VVKX65fzih8cS/vDlcCfQXAj+kESrsHoHvl KPQQvNMK8qUNvcCTPrYq3+brWIZ2NwkxTweOY5DEq8/Ka5+WfOXBoblux0MJijrHHTd2 t7qS8bndcD8MX8REeHI3T6/43xHEGsOgvRR1wH6HGObGU1IL4gJO5ArJu9WZSgJ2fhFX 0rvVE+YEi4UVoqIJ4EWl73/JvpMLfDYoBCoGgXU7+VBHlNmole0sM07SFVED72hfLqky YkAUmf3/LF1ulCrjmhsRGXnFyfKM4YgpsrA1KGPlnk9k7y5p9OysHxy0bA9iFylPn/So kqgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SpTELPWd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n62-20020a632741000000b00578b40703bcsi5082384pgn.885.2023.10.22.09.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:24:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SpTELPWd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id EABFD80A5FBF; Sun, 22 Oct 2023 09:24:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232442AbjJVQYH (ORCPT + 27 others); Sun, 22 Oct 2023 12:24:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232509AbjJVQVy (ORCPT ); Sun, 22 Oct 2023 12:21:54 -0400 Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 181491998; Sun, 22 Oct 2023 09:21:45 -0700 (PDT) Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-66cfef11a25so14017606d6.3; Sun, 22 Oct 2023 09:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991704; x=1698596504; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=72AhzVLybZCwgkt6DnIQrNHlCAgAiR46KQFBjLYqMNU=; b=SpTELPWdXE+PmHGmgyoQ9p1HZ757f5XxlDEJuNdSEvqiPMWYB+h1PzpyBf+QBoaRbt 1nuSBXi8Pg3LF2GVBm0LqKpCmxDZWr1e+pKCenlExBV1wJ0cJI1pEZw0nuUsAcZtSBBD 3m2WyDAavJVdzY7eZZ1BLCNg+tw5AvI/TIbM7dE3pq0+X5DSm0Naehh1mpWvuxNPImMd jokF/iPEddAIdskEnIwYmmpVOU/CGlG50uSrtAANMXkyBG3lhbAOacoD5h+KYabxkpE5 AegA8X5F/U/GATq23RNFOi1i357pXNVUZXPg9Ht0LWGKJa1opklL3j0N4qW8bC3LlkMb l5vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991704; x=1698596504; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=72AhzVLybZCwgkt6DnIQrNHlCAgAiR46KQFBjLYqMNU=; b=t6aRudTqsgHov30MNnGfMp/kEthhNUswBlGkjvXhRHp3bzm/MWg0Jgm5LVD1tIBSkA NeFoDKpbWwInWHo6bHdBMh8bAS+w/6i25dMy4xLoossbcucAODYIz5d6xwEQNiJegJ6Z teViDFcXFr7sfxg/vO7eV1oxul9l3XWg+WkUv5fnio8/BapWDCXdOCMjm88Mjp1gBM34 Dnk76wb+3//bab75BXJ26QKKrHALvlLZNlh7brHo62RblZT/WxUs2wMW38dg9PY3cOSg DsgiSID7q/YIJqxa0NFOnUlYOiv5RmfRKh1AMt3yR5ShLt68/Ituu6BRPeGZkWjblmHZ g70A== X-Gm-Message-State: AOJu0Yz/SlOt/m1Js4JqNBCKy95NfgYR/Kv+98zRGrc6AJiavphFHDAd RFNRiUmjVgXDvZcMkKhH/tEl6RqO3Pez747U X-Received: by 2002:a05:6214:29e6:b0:66d:4db7:4b6d with SMTP id jv6-20020a05621429e600b0066d4db74b6dmr7244166qvb.24.1697991703757; Sun, 22 Oct 2023 09:21:43 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id bj37-20020a05620a192500b0076efaec147csm2106837qkb.45.2023.10.22.09.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:43 -0700 (PDT) Date: Sun, 22 Oct 2023 12:21:42 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 17/17] Change the last instance of cork to pointer Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:24:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473502926003445 X-GMAIL-MSGID: 1780473502926003445 Change the last of the instances of cork to a pointer. Signed-off-by: Oliver Crumrine --- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 4167e8a48b60..b6729817378f 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -229,7 +229,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) orig_sport = inet->inet_sport; orig_dport = usin->sin_port; - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_connect(fl4, nexthop, inet->inet_saddr, sk->sk_bound_dev_if, IPPROTO_TCP, orig_sport, orig_dport, sk);