* [PATCH] dlm, sctp: Do not allocate a fd for peeloff
@ 2012-03-07 15:41 Benjamin Poirier
2012-03-07 16:29 ` Vladislav Yasevich
0 siblings, 1 reply; 9+ messages in thread
From: Benjamin Poirier @ 2012-03-07 15:41 UTC (permalink / raw)
To: David S. Miller
Cc: Christine Caulfield, David Teigland, Vlad Yasevich,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
avoids allocating a fd that a) propagates to every kernel thread and
usermodehelper b) is not properly released.
References: http://article.gmane.org/gmane.linux.network.drbd/22529
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
---
fs/dlm/lowcomms.c | 28 ++++++++++++++--------------
include/net/sctp/sctp.h | 1 +
net/sctp/socket.c | 5 +++--
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 0b3109e..f6645b2 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -52,6 +52,7 @@
#include <linux/mutex.h>
#include <linux/sctp.h>
#include <linux/slab.h>
+#include <net/sctp/sctp.h>
#include <net/sctp/user.h>
#include <net/ipv6.h>
@@ -474,9 +475,8 @@ static void process_sctp_notification(struct connection *con,
int prim_len, ret;
int addr_len;
struct connection *new_con;
- sctp_peeloff_arg_t parg;
- int parglen = sizeof(parg);
- int err;
+ sctp_assoc_t associd;
+ struct sctp_association *asoc;
/*
* We get this before any data for an association.
@@ -525,23 +525,23 @@ static void process_sctp_notification(struct connection *con,
return;
/* Peel off a new sock */
- parg.associd = sn->sn_assoc_change.sac_assoc_id;
- ret = kernel_getsockopt(con->sock, IPPROTO_SCTP,
- SCTP_SOCKOPT_PEELOFF,
- (void *)&parg, &parglen);
+ sctp_lock_sock(con->sock->sk);
+ associd = sn->sn_assoc_change.sac_assoc_id;
+ asoc = sctp_id2assoc(con->sock->sk, associd);
+ if (!asoc) {
+ log_print("sctp_id2assoc error");
+ sctp_release_sock(con->sock->sk);
+ return;
+ }
+ ret = sctp_do_peeloff(asoc, &new_con->sock);
+ sctp_release_sock(con->sock->sk);
if (ret < 0) {
log_print("Can't peel off a socket for "
"connection %d to node %d: err=%d",
- parg.associd, nodeid, ret);
- return;
- }
- new_con->sock = sockfd_lookup(parg.sd, &err);
- if (!new_con->sock) {
- log_print("sockfd_lookup error %d", err);
+ associd, nodeid, ret);
return;
}
add_sock(new_con->sock, new_con);
- sockfd_put(new_con->sock);
log_print("connecting to %d sctp association %d",
nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index d368561..31e36db 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -413,6 +413,7 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
/* Look up the association by its id. */
struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
+int sctp_do_peeloff(struct sctp_association *asoc, struct socket **sockp);
/* A macro to walk a list of skbs. */
#define sctp_skb_for_each(pos, head, tmp) \
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 408ebd0..ae8944c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -239,6 +239,7 @@ struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id)
return asoc;
}
+EXPORT_SYMBOL(sctp_id2assoc);
/* Look up the transport from an address and an assoc id. If both address and
* id are specified, the associations matching the address and the id should be
@@ -4170,8 +4171,7 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
}
/* Helper routine to branch off an association to a new socket. */
-SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
- struct socket **sockp)
+int sctp_do_peeloff(struct sctp_association *asoc, struct socket **sockp)
{
struct sock *sk = asoc->base.sk;
struct socket *sock;
@@ -4206,6 +4206,7 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
return err;
}
+EXPORT_SYMBOL(sctp_do_peeloff);
static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
--
1.7.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] dlm, sctp: Do not allocate a fd for peeloff
2012-03-07 15:41 [PATCH] dlm, sctp: Do not allocate a fd for peeloff Benjamin Poirier
@ 2012-03-07 16:29 ` Vladislav Yasevich
2012-03-08 8:24 ` David Miller
0 siblings, 1 reply; 9+ messages in thread
From: Vladislav Yasevich @ 2012-03-07 16:29 UTC (permalink / raw)
To: Benjamin Poirier
Cc: David S. Miller, Christine Caulfield, David Teigland,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
On 03/07/2012 10:41 AM, Benjamin Poirier wrote:
> avoids allocating a fd that a) propagates to every kernel thread and
> usermodehelper b) is not properly released.
>
> References: http://article.gmane.org/gmane.linux.network.drbd/22529
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
It might make sense to change sctp_do_peeloff to take the association id as
the first argument and not do the mapping from id to association yourself.
It's a bit ugly to expose internal sctp structures outside of SCTP.
-vlad
> ---
> fs/dlm/lowcomms.c | 28 ++++++++++++++--------------
> include/net/sctp/sctp.h | 1 +
> net/sctp/socket.c | 5 +++--
> 3 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
> index 0b3109e..f6645b2 100644
> --- a/fs/dlm/lowcomms.c
> +++ b/fs/dlm/lowcomms.c
> @@ -52,6 +52,7 @@
> #include <linux/mutex.h>
> #include <linux/sctp.h>
> #include <linux/slab.h>
> +#include <net/sctp/sctp.h>
> #include <net/sctp/user.h>
> #include <net/ipv6.h>
>
> @@ -474,9 +475,8 @@ static void process_sctp_notification(struct connection *con,
> int prim_len, ret;
> int addr_len;
> struct connection *new_con;
> - sctp_peeloff_arg_t parg;
> - int parglen = sizeof(parg);
> - int err;
> + sctp_assoc_t associd;
> + struct sctp_association *asoc;
>
> /*
> * We get this before any data for an association.
> @@ -525,23 +525,23 @@ static void process_sctp_notification(struct connection *con,
> return;
>
> /* Peel off a new sock */
> - parg.associd = sn->sn_assoc_change.sac_assoc_id;
> - ret = kernel_getsockopt(con->sock, IPPROTO_SCTP,
> - SCTP_SOCKOPT_PEELOFF,
> - (void *)&parg, &parglen);
> + sctp_lock_sock(con->sock->sk);
> + associd = sn->sn_assoc_change.sac_assoc_id;
> + asoc = sctp_id2assoc(con->sock->sk, associd);
> + if (!asoc) {
> + log_print("sctp_id2assoc error");
> + sctp_release_sock(con->sock->sk);
> + return;
> + }
> + ret = sctp_do_peeloff(asoc, &new_con->sock);
> + sctp_release_sock(con->sock->sk);
> if (ret < 0) {
> log_print("Can't peel off a socket for "
> "connection %d to node %d: err=%d",
> - parg.associd, nodeid, ret);
> - return;
> - }
> - new_con->sock = sockfd_lookup(parg.sd, &err);
> - if (!new_con->sock) {
> - log_print("sockfd_lookup error %d", err);
> + associd, nodeid, ret);
> return;
> }
> add_sock(new_con->sock, new_con);
> - sockfd_put(new_con->sock);
>
> log_print("connecting to %d sctp association %d",
> nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index d368561..31e36db 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -413,6 +413,7 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
> /* Look up the association by its id. */
> struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
>
> +int sctp_do_peeloff(struct sctp_association *asoc, struct socket **sockp);
>
> /* A macro to walk a list of skbs. */
> #define sctp_skb_for_each(pos, head, tmp) \
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 408ebd0..ae8944c 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -239,6 +239,7 @@ struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id)
>
> return asoc;
> }
> +EXPORT_SYMBOL(sctp_id2assoc);
>
> /* Look up the transport from an address and an assoc id. If both address and
> * id are specified, the associations matching the address and the id should be
> @@ -4170,8 +4171,7 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
> }
>
> /* Helper routine to branch off an association to a new socket. */
> -SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
> - struct socket **sockp)
> +int sctp_do_peeloff(struct sctp_association *asoc, struct socket **sockp)
> {
> struct sock *sk = asoc->base.sk;
> struct socket *sock;
> @@ -4206,6 +4206,7 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
>
> return err;
> }
> +EXPORT_SYMBOL(sctp_do_peeloff);
>
> static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
> {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] dlm, sctp: Do not allocate a fd for peeloff
2012-03-07 16:29 ` Vladislav Yasevich
@ 2012-03-08 8:24 ` David Miller
2012-03-08 15:55 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Benjamin Poirier
0 siblings, 1 reply; 9+ messages in thread
From: David Miller @ 2012-03-08 8:24 UTC (permalink / raw)
To: vladislav.yasevich
Cc: bpoirier, ccaulfie, teigland, sri, cluster-devel, linux-sctp,
netdev, linux-kernel
From: Vladislav Yasevich <vladislav.yasevich@hp.com>
Date: Wed, 07 Mar 2012 11:29:20 -0500
> On 03/07/2012 10:41 AM, Benjamin Poirier wrote:
>> avoids allocating a fd that a) propagates to every kernel thread and
>> usermodehelper b) is not properly released.
>>
>> References: http://article.gmane.org/gmane.linux.network.drbd/22529
>> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
>
> It might make sense to change sctp_do_peeloff to take the association id as
> the first argument and not do the mapping from id to association yourself.
> It's a bit ugly to expose internal sctp structures outside of SCTP.
Agreed.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/2] sctp: Export sctp_do_peeloff
2012-03-08 8:24 ` David Miller
@ 2012-03-08 15:55 ` Benjamin Poirier
2012-03-08 15:55 ` [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff Benjamin Poirier
2012-03-08 20:07 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Vladislav Yasevich
0 siblings, 2 replies; 9+ messages in thread
From: Benjamin Poirier @ 2012-03-08 15:55 UTC (permalink / raw)
To: David S. Miller
Cc: Christine Caulfield, David Teigland, Vlad Yasevich,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
lookup sctp_association within sctp_do_peeloff() to enable its use outside of
the sctp code with minimal knowledge of the former.
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
---
Changes from v1:
* make sctp_do_peeloff() take the assoc id as argument so that the dlm code
doesn't need to do the id to struct lookup itself
* split those sctp changes to their own patch
include/net/sctp/sctp.h | 1 +
net/sctp/socket.c | 24 +++++++++---------------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index d368561..6ee44b2 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -413,6 +413,7 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
/* Look up the association by its id. */
struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
+int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp);
/* A macro to walk a list of skbs. */
#define sctp_skb_for_each(pos, head, tmp) \
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 408ebd0..06b42b7 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4170,14 +4170,16 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
}
/* Helper routine to branch off an association to a new socket. */
-SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
- struct socket **sockp)
+int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
{
- struct sock *sk = asoc->base.sk;
+ struct sctp_association *asoc = sctp_id2assoc(sk, id);
struct socket *sock;
struct sctp_af *af;
int err = 0;
+ if (!asoc)
+ return -EINVAL;
+
/* An association cannot be branched off from an already peeled-off
* socket, nor is this supported for tcp style sockets.
*/
@@ -4206,13 +4208,13 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
return err;
}
+EXPORT_SYMBOL(sctp_do_peeloff);
static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
sctp_peeloff_arg_t peeloff;
struct socket *newsock;
int retval = 0;
- struct sctp_association *asoc;
if (len < sizeof(sctp_peeloff_arg_t))
return -EINVAL;
@@ -4220,15 +4222,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
if (copy_from_user(&peeloff, optval, len))
return -EFAULT;
- asoc = sctp_id2assoc(sk, peeloff.associd);
- if (!asoc) {
- retval = -EINVAL;
- goto out;
- }
-
- SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p\n", __func__, sk, asoc);
-
- retval = sctp_do_peeloff(asoc, &newsock);
+ retval = sctp_do_peeloff(sk, peeloff.associd, &newsock);
if (retval < 0)
goto out;
@@ -4239,8 +4233,8 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
goto out;
}
- SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p newsk: %p sd: %d\n",
- __func__, sk, asoc, newsock->sk, retval);
+ SCTP_DEBUG_PRINTK("%s: sk: %p newsk: %p sd: %d\n",
+ __func__, sk, newsock->sk, retval);
/* Return the fd mapped to the new socket. */
peeloff.sd = retval;
--
1.7.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff
2012-03-08 15:55 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Benjamin Poirier
@ 2012-03-08 15:55 ` Benjamin Poirier
2012-03-08 20:08 ` Vladislav Yasevich
2012-03-08 20:07 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Vladislav Yasevich
1 sibling, 1 reply; 9+ messages in thread
From: Benjamin Poirier @ 2012-03-08 15:55 UTC (permalink / raw)
To: David S. Miller
Cc: Christine Caulfield, David Teigland, Vlad Yasevich,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
avoids allocating a fd that a) propagates to every kernel thread and
usermodehelper b) is not properly released.
References: http://article.gmane.org/gmane.linux.network.drbd/22529
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
---
fs/dlm/lowcomms.c | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 0b3109e..ca0c59a 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -52,6 +52,7 @@
#include <linux/mutex.h>
#include <linux/sctp.h>
#include <linux/slab.h>
+#include <net/sctp/sctp.h>
#include <net/sctp/user.h>
#include <net/ipv6.h>
@@ -474,9 +475,6 @@ static void process_sctp_notification(struct connection *con,
int prim_len, ret;
int addr_len;
struct connection *new_con;
- sctp_peeloff_arg_t parg;
- int parglen = sizeof(parg);
- int err;
/*
* We get this before any data for an association.
@@ -525,23 +523,19 @@ static void process_sctp_notification(struct connection *con,
return;
/* Peel off a new sock */
- parg.associd = sn->sn_assoc_change.sac_assoc_id;
- ret = kernel_getsockopt(con->sock, IPPROTO_SCTP,
- SCTP_SOCKOPT_PEELOFF,
- (void *)&parg, &parglen);
+ sctp_lock_sock(con->sock->sk);
+ ret = sctp_do_peeloff(con->sock->sk,
+ sn->sn_assoc_change.sac_assoc_id,
+ &new_con->sock);
+ sctp_release_sock(con->sock->sk);
if (ret < 0) {
log_print("Can't peel off a socket for "
"connection %d to node %d: err=%d",
- parg.associd, nodeid, ret);
- return;
- }
- new_con->sock = sockfd_lookup(parg.sd, &err);
- if (!new_con->sock) {
- log_print("sockfd_lookup error %d", err);
+ (int)sn->sn_assoc_change.sac_assoc_id,
+ nodeid, ret);
return;
}
add_sock(new_con->sock, new_con);
- sockfd_put(new_con->sock);
log_print("connecting to %d sctp association %d",
nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
--
1.7.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] sctp: Export sctp_do_peeloff
2012-03-08 15:55 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Benjamin Poirier
2012-03-08 15:55 ` [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff Benjamin Poirier
@ 2012-03-08 20:07 ` Vladislav Yasevich
2012-03-08 21:52 ` David Miller
1 sibling, 1 reply; 9+ messages in thread
From: Vladislav Yasevich @ 2012-03-08 20:07 UTC (permalink / raw)
To: Benjamin Poirier
Cc: David S. Miller, Christine Caulfield, David Teigland,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
On 03/08/2012 10:55 AM, Benjamin Poirier wrote:
> lookup sctp_association within sctp_do_peeloff() to enable its use outside of
> the sctp code with minimal knowledge of the former.
>
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
-vlad
> ---
> Changes from v1:
> * make sctp_do_peeloff() take the assoc id as argument so that the dlm code
> doesn't need to do the id to struct lookup itself
> * split those sctp changes to their own patch
>
> include/net/sctp/sctp.h | 1 +
> net/sctp/socket.c | 24 +++++++++---------------
> 2 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index d368561..6ee44b2 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -413,6 +413,7 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
> /* Look up the association by its id. */
> struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
>
> +int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp);
>
> /* A macro to walk a list of skbs. */
> #define sctp_skb_for_each(pos, head, tmp) \
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 408ebd0..06b42b7 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -4170,14 +4170,16 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
> }
>
> /* Helper routine to branch off an association to a new socket. */
> -SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
> - struct socket **sockp)
> +int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
> {
> - struct sock *sk = asoc->base.sk;
> + struct sctp_association *asoc = sctp_id2assoc(sk, id);
> struct socket *sock;
> struct sctp_af *af;
> int err = 0;
>
> + if (!asoc)
> + return -EINVAL;
> +
> /* An association cannot be branched off from an already peeled-off
> * socket, nor is this supported for tcp style sockets.
> */
> @@ -4206,13 +4208,13 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
>
> return err;
> }
> +EXPORT_SYMBOL(sctp_do_peeloff);
>
> static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
> {
> sctp_peeloff_arg_t peeloff;
> struct socket *newsock;
> int retval = 0;
> - struct sctp_association *asoc;
>
> if (len < sizeof(sctp_peeloff_arg_t))
> return -EINVAL;
> @@ -4220,15 +4222,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
> if (copy_from_user(&peeloff, optval, len))
> return -EFAULT;
>
> - asoc = sctp_id2assoc(sk, peeloff.associd);
> - if (!asoc) {
> - retval = -EINVAL;
> - goto out;
> - }
> -
> - SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p\n", __func__, sk, asoc);
> -
> - retval = sctp_do_peeloff(asoc, &newsock);
> + retval = sctp_do_peeloff(sk, peeloff.associd, &newsock);
> if (retval < 0)
> goto out;
>
> @@ -4239,8 +4233,8 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
> goto out;
> }
>
> - SCTP_DEBUG_PRINTK("%s: sk: %p asoc: %p newsk: %p sd: %d\n",
> - __func__, sk, asoc, newsock->sk, retval);
> + SCTP_DEBUG_PRINTK("%s: sk: %p newsk: %p sd: %d\n",
> + __func__, sk, newsock->sk, retval);
>
> /* Return the fd mapped to the new socket. */
> peeloff.sd = retval;
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff
2012-03-08 15:55 ` [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff Benjamin Poirier
@ 2012-03-08 20:08 ` Vladislav Yasevich
2012-03-08 21:52 ` David Miller
0 siblings, 1 reply; 9+ messages in thread
From: Vladislav Yasevich @ 2012-03-08 20:08 UTC (permalink / raw)
To: Benjamin Poirier
Cc: David S. Miller, Christine Caulfield, David Teigland,
Sridhar Samudrala, cluster-devel, linux-sctp, netdev,
linux-kernel
On 03/08/2012 10:55 AM, Benjamin Poirier wrote:
> avoids allocating a fd that a) propagates to every kernel thread and
> usermodehelper b) is not properly released.
>
> References: http://article.gmane.org/gmane.linux.network.drbd/22529
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Looks much better.
-vlad
> ---
> fs/dlm/lowcomms.c | 22 ++++++++--------------
> 1 files changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
> index 0b3109e..ca0c59a 100644
> --- a/fs/dlm/lowcomms.c
> +++ b/fs/dlm/lowcomms.c
> @@ -52,6 +52,7 @@
> #include <linux/mutex.h>
> #include <linux/sctp.h>
> #include <linux/slab.h>
> +#include <net/sctp/sctp.h>
> #include <net/sctp/user.h>
> #include <net/ipv6.h>
>
> @@ -474,9 +475,6 @@ static void process_sctp_notification(struct connection *con,
> int prim_len, ret;
> int addr_len;
> struct connection *new_con;
> - sctp_peeloff_arg_t parg;
> - int parglen = sizeof(parg);
> - int err;
>
> /*
> * We get this before any data for an association.
> @@ -525,23 +523,19 @@ static void process_sctp_notification(struct connection *con,
> return;
>
> /* Peel off a new sock */
> - parg.associd = sn->sn_assoc_change.sac_assoc_id;
> - ret = kernel_getsockopt(con->sock, IPPROTO_SCTP,
> - SCTP_SOCKOPT_PEELOFF,
> - (void *)&parg, &parglen);
> + sctp_lock_sock(con->sock->sk);
> + ret = sctp_do_peeloff(con->sock->sk,
> + sn->sn_assoc_change.sac_assoc_id,
> + &new_con->sock);
> + sctp_release_sock(con->sock->sk);
> if (ret < 0) {
> log_print("Can't peel off a socket for "
> "connection %d to node %d: err=%d",
> - parg.associd, nodeid, ret);
> - return;
> - }
> - new_con->sock = sockfd_lookup(parg.sd, &err);
> - if (!new_con->sock) {
> - log_print("sockfd_lookup error %d", err);
> + (int)sn->sn_assoc_change.sac_assoc_id,
> + nodeid, ret);
> return;
> }
> add_sock(new_con->sock, new_con);
> - sockfd_put(new_con->sock);
>
> log_print("connecting to %d sctp association %d",
> nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] sctp: Export sctp_do_peeloff
2012-03-08 20:07 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Vladislav Yasevich
@ 2012-03-08 21:52 ` David Miller
0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2012-03-08 21:52 UTC (permalink / raw)
To: vladislav.yasevich
Cc: bpoirier, ccaulfie, teigland, sri, cluster-devel, linux-sctp,
netdev, linux-kernel
From: Vladislav Yasevich <vladislav.yasevich@hp.com>
Date: Thu, 08 Mar 2012 15:07:40 -0500
> On 03/08/2012 10:55 AM, Benjamin Poirier wrote:
>> lookup sctp_association within sctp_do_peeloff() to enable its use outside of
>> the sctp code with minimal knowledge of the former.
>>
>> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
>>
>
> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Applied to net-next.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff
2012-03-08 20:08 ` Vladislav Yasevich
@ 2012-03-08 21:52 ` David Miller
0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2012-03-08 21:52 UTC (permalink / raw)
To: vladislav.yasevich
Cc: bpoirier, ccaulfie, teigland, sri, cluster-devel, linux-sctp,
netdev, linux-kernel
From: Vladislav Yasevich <vladislav.yasevich@hp.com>
Date: Thu, 08 Mar 2012 15:08:17 -0500
> On 03/08/2012 10:55 AM, Benjamin Poirier wrote:
>> avoids allocating a fd that a) propagates to every kernel thread and
>> usermodehelper b) is not properly released.
>>
>> References: http://article.gmane.org/gmane.linux.network.drbd/22529
>> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
>
> Looks much better.
Also applied to net-next, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-03-08 21:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-07 15:41 [PATCH] dlm, sctp: Do not allocate a fd for peeloff Benjamin Poirier
2012-03-07 16:29 ` Vladislav Yasevich
2012-03-08 8:24 ` David Miller
2012-03-08 15:55 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Benjamin Poirier
2012-03-08 15:55 ` [PATCH v2 2/2] dlm: Do not allocate a fd for peeloff Benjamin Poirier
2012-03-08 20:08 ` Vladislav Yasevich
2012-03-08 21:52 ` David Miller
2012-03-08 20:07 ` [PATCH v2 1/2] sctp: Export sctp_do_peeloff Vladislav Yasevich
2012-03-08 21:52 ` David Miller
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).