From nobody Mon Feb 27 15:03:44 2023 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 4PQP01221cz3vDDF; Mon, 27 Feb 2023 15:03:45 +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 4PQP006ZLQz3L1H; Mon, 27 Feb 2023 15:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510224; 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=NszezxFtt7owVDff+bNSJlx5fNOnjp53KuFopdTKpFc=; b=lcLozjwWxn7DXye5wwJ5OrHBdbbOYjinmV/kdNlCKXS6PMoaygMxobYJKGXo07R1EfYPxI +fuOPQZop56s4kSVTsirS9DZWkISHGwovWcOJ/V+9t8fB6MGhvM3MPkEDGko849iJ1rDqx a1tmnE1Cg+hSo8ZPgYOqPfabq7bgbC+8VXJawdfzswPBMDW1dPUjXBGKdfeVmpd2X4TsPE JrBRYHqmP5Eo9/aiPgG8GuwyOLTD8makJEYk6fOPRiYZsw0GHtHQgATXjcYmwS7Uvu4Q1v 1Xay/xIbPXPokAeGut5ytI5y2kku5QymMn1gTJZwwJ47XWtEOecLDH99U5YJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510224; 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=NszezxFtt7owVDff+bNSJlx5fNOnjp53KuFopdTKpFc=; b=Ay3wUp71SzJjivTwAxQd6xdMB/QuqPjnb65VEeOUGFaK1GH5gMYhkozPjW38O7VPPzxfXg kmHaEOJHTBVYxOIGmb7+nhw/e9rdk3AZyH4wXhl4t96yhZV/9EqCbHhmVVIrPB4TcGU7sd Pwn/wOnCJE2uq03r/UaPefQuEIovyle1Q0gtyRLP7vCyS5dglyT0SVf43wfRxIkZkiSQPj 1D9g/B8TgFyJk0achsD1800veQ/TCGXu9MBEy97u0YIdjzVbVqq4dj6h/d4KFGR6ehtrCz Qar1JRzkG3qtypjX9uf6cGU2kwGseg+9clJ/3TjPtyLdiwydvP5aPZK94Jc5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677510224; a=rsa-sha256; cv=none; b=r7CupYuGgM6xuE+TtNcXJLScHtHGQtv8NAdi2fMpwPoMQf90wpkSnto6KcNmtmQsrjgipO mtTywWXWCFa+DKPvAC3uDt/b6AwgKyYIYwNqaQvS/8lL/GU8+EdLdyPsJU/BJJv7KEX8LU MIyY8ZY2z6rC6HH4LqXDbbgWU1fihBO6HOj7/S38IKgRw0sWskIt8gPIDADrcT8B8pRuJi +sL7cWD/38FW/O22x5iP/tUrxApFgJ1g/mNwDqDTTVUR1b+FFN/TXrQyWC5rp9ZQtBa9CX VJIIC+XQVtDnlK+T8v/pRJmuu+fVXgFMJd4vmLlVMcGbmYJf6MMhZuVINpm87w== 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 4PQP005RvBzW1Y; Mon, 27 Feb 2023 15:03:44 +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 31RF3i7H019993; Mon, 27 Feb 2023 15:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RF3ihX019992; Mon, 27 Feb 2023 15:03:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:03:44 GMT Message-Id: <202302271503.31RF3ihX019992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b9199d152f3d - main - librss: Remove rss_sock_set_bindmulti() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9199d152f3d61f93c21d63e3c85a5863f9d71e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9199d152f3d61f93c21d63e3c85a5863f9d71e9 commit b9199d152f3d61f93c21d63e3c85a5863f9d71e9 Author: Mark Johnston AuthorDate: 2023-02-27 14:50:25 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 15:03:11 +0000 librss: Remove rss_sock_set_bindmulti() In preparation for the removal of the IP(V6)_BINDMULTI option. PR: 261398 (exp-run) Reviewed by: glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38574 --- lib/librss/librss.3 | 12 ------------ lib/librss/librss.c | 22 ---------------------- lib/librss/librss.h | 8 -------- 3 files changed, 42 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 5e52482db5ed..302d431b6c28 100644 --- a/lib/librss/librss.3 +++ b/lib/librss/librss.3 @@ -23,8 +23,6 @@ .Ft int .Fn rss_set_bucket_rebalance_cb "rss_bucket_rebalance_cb_t *cb" "void *cbdata" .Ft int -.Fn rss_sock_set_bindmulti "int fd" "int af" "int val" -.Ft int .Fn rss_sock_set_rss_bucket "int fd" "int af" "int rss_bucket" .Ft int .Fn rss_sock_set_recvrss "int fd" "int af" "int val" @@ -102,16 +100,6 @@ Once RSS setup is completed, .Fn rss_config_free is called to free the RSS configuration structure. .Pp -To make a -.Vt bind -socket RSS aware, the -.Fn rss_sock_set_bindmulti -function is used to enable or disable per-RSS bucket -behaviour. -The socket filedescriptor, address family and enable flag -.Vt val -are passed in. -.Pp If .Vt val is set to 1, the socket can be placed in an RSS bucket and will only accept diff --git a/lib/librss/librss.c b/lib/librss/librss.c index f8e16c27a4a1..4125e94305e2 100644 --- a/lib/librss/librss.c +++ b/lib/librss/librss.c @@ -46,28 +46,6 @@ __FBSDID("$FreeBSD$"); #include "librss.h" -int -rss_sock_set_bindmulti(int fd, int af, int val) -{ - int opt; - socklen_t optlen; - int retval; - - /* Set bindmulti */ - opt = val; - optlen = sizeof(opt); - retval = setsockopt(fd, - af == AF_INET ? IPPROTO_IP : IPPROTO_IPV6, - af == AF_INET ? IP_BINDMULTI : IPV6_BINDMULTI, - &opt, - optlen); - if (retval < 0) { - warn("%s: setsockopt(IP_BINDMULTI)", __func__); - return (-1); - } - return (0); -} - int rss_sock_set_rss_bucket(int fd, int af, int rss_bucket) { diff --git a/lib/librss/librss.h b/lib/librss/librss.h index d0d03df9d5ea..134ae28811a2 100644 --- a/lib/librss/librss.h +++ b/lib/librss/librss.h @@ -46,14 +46,6 @@ typedef enum { typedef void rss_bucket_rebalance_cb_t(void *arg); -/* - * Enable/disable whether to allow for multiple bind()s to the - * given PCB entry. - * - * This must be done before bind(). - */ -extern int rss_sock_set_bindmulti(int fd, int af, int val); - /* * Set the RSS bucket for the given file descriptor. *