netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@osdl.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH 4/5] tcp: allow autoloading of congestion control via setsockopt
Date: Tue, 31 Oct 2006 15:01:44 -0800	[thread overview]
Message-ID: <20061031230214.056079805@osdl.org> (raw)
In-Reply-To: 20061031230140.191929094@osdl.org

[-- Attachment #1: tcp-setsocktopt-autoload.patch --]
[-- Type: text/plain, Size: 1068 bytes --]

If user has permision to load modules, then autoload then attempt
autoload of TCP congestion module.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

---
 net/ipv4/tcp_cong.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- tcp.orig/net/ipv4/tcp_cong.c	2006-10-31 15:00:26.000000000 -0800
+++ tcp/net/ipv4/tcp_cong.c	2006-10-31 15:00:54.000000000 -0800
@@ -113,7 +113,7 @@
 	spin_lock(&tcp_cong_list_lock);
 	ca = tcp_ca_find(name);
 #ifdef CONFIG_KMOD
-	if (!ca) {
+	if (!ca && capable(CAP_SYS_MODULE)) {
 		spin_unlock(&tcp_cong_list_lock);
 
 		request_module("tcp_%s", name);
@@ -236,9 +236,19 @@
 
 	rcu_read_lock();
 	ca = tcp_ca_find(name);
+	/* no change asking for existing value */
 	if (ca == icsk->icsk_ca_ops)
 		goto out;
 
+#ifdef CONFIG_KMOD
+	/* not found attempt to autoload module */
+	if (!ca && capable(CAP_SYS_MODULE)) {
+		rcu_read_unlock();
+		request_module("tcp_%s", name);
+		rcu_read_lock();
+		ca = tcp_ca_find(name);
+	}
+#endif
 	if (!ca)
 		err = -ENOENT;
 

--
Stephen Hemminger <shemminger@osdl.org>


  parent reply	other threads:[~2006-10-31 23:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-31 23:01 [PATCH 0/5] TCP related patches Stephen Hemminger
2006-10-31 23:01 ` [PATCH 1/5] tcp: set default congestion control when no sysctl Stephen Hemminger
2006-11-01  1:31   ` David Miller
2006-10-31 23:01 ` [PATCH 2/5] tcp: add tcp_available_congestion_control sysctl Stephen Hemminger
2006-11-10  0:32   ` David Miller
2006-10-31 23:01 ` [PATCH 3/5] tcp: restrict congestion control choices Stephen Hemminger
2006-11-10  0:35   ` David Miller
2006-10-31 23:01 ` Stephen Hemminger [this message]
2006-11-10  0:36   ` [PATCH 4/5] tcp: allow autoloading of congestion control via setsockopt David Miller
2006-10-31 23:01 ` [PATCH 5/5] ip-sysctl.txt alphabetize Stephen Hemminger
2006-11-10  0:37   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061031230214.056079805@osdl.org \
    --to=shemminger@osdl.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).