From nobody Tue Feb 28 21:05:28 2023 X-Original-To: dev-commits-src-all@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 4PR8yw72YCz3twxn; Tue, 28 Feb 2023 21:05:28 +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 4PR8yw6GPnz41FM; Tue, 28 Feb 2023 21:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618328; 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=KY+9NC42Xac+xAYaL6c34hom0mLnjXboZqnyUxDw6rk=; b=izYY6ITz1YOBxUieuVZMgCNBoc4hsOagC+18xazawwbfbm2vhdzQiAT8sDsmw9WpnyNmRQ 3Oq4rgvq4eM91o4JLXdHQ0Gks/SNpCGD15geImum/oSk1+hK9Rbi2by6H9gpiEEvP+PbWW clkKdQ0KKuhqg/NoWSY6qSdgwrlo2Lj/lcdcIpg81mSsDcrIFXi6LKx3/Zxgq2VANhaBCd gUTKCDPHMhwKBr4klJMy472l2iUfC0JRxJXJ3RSHYqijAqQP+N3iwItXRSKnZ/UgwZ2wBW qoJWt12ZWTuGXX52ZVn0mFxJ7+5JhCWM+WH3SLFis86HJ3urWKGR2IoYEfNUTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618328; 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=KY+9NC42Xac+xAYaL6c34hom0mLnjXboZqnyUxDw6rk=; b=KHlIxFvKLwd8Te7pOnmxj5p/Q/r2M2p9N05RzBY937XEK5HHffIo7jQjwdjni8rF62bXkj 9SiJR1wh2bmfyqNWqvUDHuWtwmuhG+GiZEeNSaV3X9bpxTiYT+Bu91Sx/GBUzu/plAqLgJ wAdUIHHJ+X/Jt5Hb7hhNTXZGmixgp+o37vkHcZicwcX3hjyxP55JGCYNnywyjF8ec3i0yJ ukClC5OEpeXMoWBhO3W2nOvpn1jpndbvtdk+CRWR0DPTxyg5VYaVbfrSPPTi7QM9CmZIpZ oE2udt5GHYtFMvhQ80F1HAh5a2TV10W+dhhfUGwT3Pm8VDWkb4KlP5WCFprXMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677618328; a=rsa-sha256; cv=none; b=bAjmctAuKyKJGIObx6aeoKp1XdxsTD7sXu+qagGp0c/AWvnn/HGO4CrbaDKwAppNTYU/YD oyHOjFD4AmM2IBdvqqqKHYQkImwqgLBSXW8Z5P9ZicnXDL2QdktE5BPF+5N+mdxbw83/LE CeVVrNj1geZV2leYL+aryDMhCQQRLh+0QbD69+2h77ARLfuh/KJ5qS2kRqikVUCQl61X4n LYp+oIchwSm5sO9FUIvFmAA6Btm49WrpKgOCT/ywRDFHyxyjO79CPcmlzvVBek0kR35gBn tYlnmK9/K7zpWfKkVbnhXRRWOQkgRRURWGHkdmkYnK80riuQ3dDPJlrTcFI0bA== 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 4PR8yw5HZTz1MMx; Tue, 28 Feb 2023 21:05:28 +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 31SL5SCX080590; Tue, 28 Feb 2023 21:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SL5SHN080589; Tue, 28 Feb 2023 21:05:28 GMT (envelope-from git) Date: Tue, 28 Feb 2023 21:05:28 GMT Message-Id: <202302282105.31SL5SHN080589@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: d1d0ae97ca88 - main - librss: Remove rss_socket_set_rss_bucket() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d1d0ae97ca8837306b2a791829566787d1ac723f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1d0ae97ca8837306b2a791829566787d1ac723f commit d1d0ae97ca8837306b2a791829566787d1ac723f Author: Mark Johnston AuthorDate: 2023-02-28 20:57:11 +0000 Commit: Mark Johnston CommitDate: 2023-02-28 20:57:11 +0000 librss: Remove rss_socket_set_rss_bucket() In preparation for the removal of the IP_RSS_LISTEN_BUCKET socket option. PR: 261398 (exp-run) Reviewed by: glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38821 --- lib/librss/librss.3 | 9 --------- lib/librss/librss.c | 32 -------------------------------- lib/librss/librss.h | 7 ------- 3 files changed, 48 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 302d431b6c28..469132027b26 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_rss_bucket "int fd" "int af" "int rss_bucket" -.Ft int .Fn rss_sock_set_recvrss "int fd" "int af" "int val" .Sh DESCRIPTION The @@ -110,13 +108,6 @@ datagrams/connections that are not initially consumed by a PCB aware socket. .Pp The -.Fn rss_sock_set_rss_bucket -function configures the RSS bucket which a socket belongs in. -Note that TCP sockets created by -.Xr accept 2 -will automatically be assigned to the RSS bucket. -.Pp -The .Fn rss_sock_set_recvrss function enables or disables receiving RSS related information as socket options in. diff --git a/lib/librss/librss.c b/lib/librss/librss.c index 4125e94305e2..fcaac4cc7366 100644 --- a/lib/librss/librss.c +++ b/lib/librss/librss.c @@ -46,38 +46,6 @@ __FBSDID("$FreeBSD$"); #include "librss.h" -int -rss_sock_set_rss_bucket(int fd, int af, int rss_bucket) -{ - int opt; - socklen_t optlen; - int retval; - int f, p; - - switch (af) { - case AF_INET: - p = IPPROTO_IP; - f = IP_RSS_LISTEN_BUCKET; - break; - case AF_INET6: - p = IPPROTO_IPV6; - f = IPV6_RSS_LISTEN_BUCKET; - break; - default: - return (-1); - } - - /* Set RSS bucket */ - opt = rss_bucket; - optlen = sizeof(opt); - retval = setsockopt(fd, p, f, &opt, optlen); - if (retval < 0) { - warn("%s: setsockopt(IP_RSS_LISTEN_BUCKET)", __func__); - return (-1); - } - return (0); -} - int rss_sock_set_recvrss(int fd, int af, int val) { diff --git a/lib/librss/librss.h b/lib/librss/librss.h index 134ae28811a2..c90bff86ae50 100644 --- a/lib/librss/librss.h +++ b/lib/librss/librss.h @@ -46,13 +46,6 @@ typedef enum { typedef void rss_bucket_rebalance_cb_t(void *arg); -/* - * Set the RSS bucket for the given file descriptor. - * - * This must be done before bind(). - */ -extern int rss_sock_set_rss_bucket(int fd, int af, int rss_bucket); - /* * Enable or disable receiving RSS/flowid information on * received UDP frames.