From nobody Wed Oct 19 22:18:42 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mt4rL5vVCz4ftDk; Wed, 19 Oct 2022 22:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mt4rL5Pv8z3Pty; Wed, 19 Oct 2022 22:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666217922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTYfApeD/oTp4zC/iUZ2Mx85vExFTdb6fY2oYTtsSzk=; b=gIrgYBxxSOFsWH71/nJv67uv/vs9I3XuEbuelmRz2sg56BTQ+Z+XXMDmvq2A0/ONg5K+E4 ZYH/058IfnR607k4Bnf1k5lGSrsYGlWi7mevzMYXXB2W5hypcnas61I+XMA2Z3sh/iDap3 g1JwSRoM0sE3w64X7uwBUovHowjPCccfRn5oRYWkPJvE34eTeRDBI4QfZaOM2oH3h+4eAe VE7K0vWLWBndki1W8oMJn5qr/hejDcUSpSfblLocjzjw5jmUAP57CUgzoZiABRkpPpG2a0 wHOqsXZiAgsRyzLN3qCCkJAli05mJRr5kR+P9TKBAhOyG+X3F1yFnTyHGFWT9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mt4rL4Q8mzgHl; Wed, 19 Oct 2022 22:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JMIgUc035838; Wed, 19 Oct 2022 22:18:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JMIg44035837; Wed, 19 Oct 2022 22:18:42 GMT (envelope-from git) Date: Wed, 19 Oct 2022 22:18:42 GMT Message-Id: <202210192218.29JMIg44035837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 24cf7a8d6285 - main - inpcb: provide pcbinfo pointer argument to inp_apply_all() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24cf7a8d62856552fa800ad81b6f89ec9cdf91be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666217922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTYfApeD/oTp4zC/iUZ2Mx85vExFTdb6fY2oYTtsSzk=; b=RBymJ4vOqOTOQL6By4v7xWac+VJWqyFSUa1vpS2HlHt7NcwPepRxIv9Xo/2pS18xrfCI49 FGxkH9siISObv8B3pu9JrqV5HZIM/d6y+V/6weehMkrCChfRR1Frw4p+8ttOc7Hyfp2lE2 rGIWIAYbKVMnDPBy1ZAPZn9M9VeF9JW7a+Bqt7+5f0m8wUtEEJX+xayitv42+npiaatbyW p2Lw24i7htXMKBUQkhvXZv2usQEIqOdIw3Nyb8jp0BmRUmPCAw5q+wDCG2h/fQIdldEZX3 cFbt4qZuyIU2O+gou1kyR4tLl6ddYzSukhSOJvcvN0qy/XG7ICb0yXJIKQS1tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666217922; a=rsa-sha256; cv=none; b=HExdQIqnvxAvGbN6+P83NTHNWkJ6BweatjI/3z4RSG9qoImFmGd8b/NwtL6fR4bsAy6GMr pXoe9jy0l6cgGcnD/3m3DbMz/hJqnNrdoYo7S7gKRE6mx2VZKhQGe+nb3GQQ/JPx1JTEx1 FpJffui8dCZD1bv6/dUECVOH+Pj17cFmIalBPGjDalZCbGBiJBVku0bvmZXdAX8I+dedxK Ak3WfLEUj4GkMAY9pPgYYlPde8O4Eu5TW9r7osDsgN3OTdFZGuzt2oHSOZ8Lkblz66nxnR x79Wx1R17sf5MDbCVa/MvBVVRFedoLiYApJ9TKhEaNh5qFqxw2ww6h9Oif7uww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=24cf7a8d62856552fa800ad81b6f89ec9cdf91be commit 24cf7a8d62856552fa800ad81b6f89ec9cdf91be Author: Gleb Smirnoff AuthorDate: 2022-10-19 22:15:53 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-19 22:15:53 +0000 inpcb: provide pcbinfo pointer argument to inp_apply_all() Allows to clear inpcb layer of TCP knowledge. --- sys/netinet/in_pcb.c | 5 +++-- sys/netinet/in_pcb.h | 3 ++- sys/netinet/toecore.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 10e36760825b..3348526b144e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2694,9 +2694,10 @@ inp_unlock_assert(struct inpcb *inp) #endif void -inp_apply_all(void (*func)(struct inpcb *, void *), void *arg) +inp_apply_all(struct inpcbinfo *pcbinfo, + void (*func)(struct inpcb *, void *), void *arg) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_tcbinfo, + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_WLOCKPCB); struct inpcb *inp; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index a72ae5742d4e..2ac1bb227613 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -546,7 +546,8 @@ void inp_unlock_assert(struct inpcb *); #define inp_unlock_assert(inp) do {} while (0) #endif -void inp_apply_all(void (*func)(struct inpcb *, void *), void *arg); +void inp_apply_all(struct inpcbinfo *, void (*func)(struct inpcb *, void *), + void *arg); int inp_ip_tos_get(const struct inpcb *inp); void inp_ip_tos_set(struct inpcb *inp, int val); struct socket * diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c index a078d9cea51f..892c0e71a0be 100644 --- a/sys/netinet/toecore.c +++ b/sys/netinet/toecore.c @@ -322,7 +322,7 @@ register_toedev(struct toedev *tod) registered_toedevs++; mtx_unlock(&toedev_lock); - inp_apply_all(toe_listen_start, tod); + inp_apply_all(&V_tcbinfo, toe_listen_start, tod); return (0); }