From patchwork Wed Mar 7 15:41:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 145310 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9BD89B6EEA for ; Thu, 8 Mar 2012 02:42:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932392Ab2CGPmU (ORCPT ); Wed, 7 Mar 2012 10:42:20 -0500 Received: from mail-tul01m020-f174.google.com ([209.85.214.174]:43747 "EHLO mail-tul01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755363Ab2CGPmS (ORCPT ); Wed, 7 Mar 2012 10:42:18 -0500 Received: by obbuo6 with SMTP id uo6so7053785obb.19 for ; Wed, 07 Mar 2012 07:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=duarZQrUcAHXEWV2Wx/3dxouI5gNRWlHsUOeRglUgvg=; b=J0hYQ4GxxtpsieN18BTnJsWr/S+ppTOYishEOm+S0MDyd718TP6QrEWzs/q1P7wjFk FYUWkWgm5qyEuMZdfEFa3ektB8fe65VdGJEYrd0ITQS2N4sQgZD17yn8tjnsfzu5mAGJ nQQb9ONIfJEHNiGuez+MVgCZOJBxVYTg3hEWiEVPt7BOXoA+rCExbFX8Y3FgkRCoNuDF +MsD1SEaT3/AzpDPPpkMlymU3DYprBoAakaw2MQBpiGI3CxjhBZKVi4ERSec4bKihC/v 8pJutglnoBW7kjvejg8zuAOU8wkRYGrxIWRkUXvyZ/2imTni/FooTRAgA9K9Xv+ewOCd vscQ== Received: by 10.60.13.1 with SMTP id d1mr895374oec.41.1331134937629; Wed, 07 Mar 2012 07:42:17 -0800 (PST) Received: from localhost.localdomain (modemcable121.56-203-24.mc.videotron.ca. [24.203.56.121]) by mx.google.com with ESMTPS id x9sm2508931oea.7.2012.03.07.07.42.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 07:42:15 -0800 (PST) From: Benjamin Poirier To: "David S. Miller" Cc: Christine Caulfield , David Teigland , Vlad Yasevich , Sridhar Samudrala , cluster-devel@redhat.com, linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dlm, sctp: Do not allocate a fd for peeloff Date: Wed, 7 Mar 2012 10:41:02 -0500 Message-Id: <1331134862-14812-1-git-send-email-bpoirier@suse.de> X-Mailer: git-send-email 1.7.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 #include #include +#include #include #include @@ -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) {