From patchwork Fri Jan 8 07:15:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 7982971 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 056F19F54F for ; Fri, 8 Jan 2016 07:19:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CFCE2014A for ; Fri, 8 Jan 2016 07:19:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EADFA20138 for ; Fri, 8 Jan 2016 07:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754264AbcAHHSw (ORCPT ); Fri, 8 Jan 2016 02:18:52 -0500 Received: from mail-oi0-f45.google.com ([209.85.218.45]:33141 "EHLO mail-oi0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754115AbcAHHR5 (ORCPT ); Fri, 8 Jan 2016 02:17:57 -0500 Received: by mail-oi0-f45.google.com with SMTP id y66so329783428oig.0 for ; Thu, 07 Jan 2016 23:17:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daterainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/evp5FTUWzz/J14VOqGcpH2IDGVhnEH5EQ7WOOlzi7s=; b=TfNZ1PnYqWvx/40etHwyo4fdZ3oV67pdxM5GAI5zR7AFI3WMte3Woz2U+9K6f9o4ms 5vIInKbuT+OcH1O8Rm3CTs/3RKh6bTPWpxmAvvy/LsizTVti0+/kaImwmc1IoYoEl79b bT7GiCz7Jm4pb4zrxXxVl97PLzibCN4YHTmFhB9Sg9JPmQ2cUWUT5P8+zof+nVwmmvCP jGl6/agU9WoQAeZ6dGMmvPEuU5nq0ycDdb7Qyr9hSZSwg6kuZB4QyiB2T0dR5Ny/VJB8 94bAfhuA/S6DcPFuoDOAxIjEZG6Ef9iBEla7RqNDxmC8HRH/XkuldVXkhv9DAYio1O76 fMLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/evp5FTUWzz/J14VOqGcpH2IDGVhnEH5EQ7WOOlzi7s=; b=WNTKQr6hOthUyoFE+llXzlfY+1Io/dmkcGaiITlf8Yq6Vh/zhDJT/z47r+VdMVQbPl PtuCcVf35BTKzE0gvisOQtTwYlOQv6tsxgP0fcAt7hMxBU825tfevrCSiWKil2IskDTk V+1aoJfPAr05paw7NW9sx0MqyoYayNTrCWL1ac/KL/sJSNFUpP1KJFsO3MPk1yIJgB6e 9+zJsDovpb2n/lnsXwFr4pRRPAx5aH0LjrwCbtLDCVUTwLqlYSlaBWFIMWCIVXoJAO4T P8nnEOLucHuEkfYwPZSbT5M8wzPdCwjwdz4hDyGyQhs2SUj3pnSpFfQ5chLdPgfD0vgz Mjdw== X-Gm-Message-State: ALoCoQnUnvivJMsOMzc/VttyGOdjWA6afNQJ786GOtIHxZuAl4iyrF3NzMHBBDsGqVMNMdkD+g/tYeLxXs9v0aS0QxJfZ+fVZA== X-Received: by 10.202.79.137 with SMTP id d131mr76848709oib.37.1452237476597; Thu, 07 Jan 2016 23:17:56 -0800 (PST) Received: from localhost.localdomain (mail.linux-iscsi.org. [67.23.28.174]) by smtp.gmail.com with ESMTPSA id l19sm5788137oig.27.2016.01.07.23.17.55 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Jan 2016 23:17:56 -0800 (PST) From: "Nicholas A. Bellinger" To: target-devel Cc: linux-scsi , lkml , Sagi Grimberg , Christoph Hellwig , Hannes Reinecke , Andy Grover , Vasu Dev , Vu Pham , Nicholas Bellinger Subject: [PATCH 3/4] tcm_fc: Convert acl lookup to modern get_initiator_node_acl usage Date: Fri, 8 Jan 2016 07:15:47 +0000 Message-Id: <1452237348-2277-4-git-send-email-nab@daterainc.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1452237348-2277-1-git-send-email-nab@daterainc.com> References: <1452237348-2277-1-git-send-email-nab@daterainc.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nicholas Bellinger This patch does a simple conversion of tcm_fc code to use proper modern core_tpg_get_initiator_node_acl() lookup using se_node_acl->acl_kref, and drops the legacy list walk from ft_acl_get(). Note the original lookup also took node_name into account, but since ft_init_nodeacl() only ever sets port_name for se_node_acl->acl_group within configfs, this is purely a mechanical change. Cc: Vasu Dev Cc: Sagi Grimberg Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Andy Grover Signed-off-by: Nicholas Bellinger --- drivers/target/tcm_fc/tfc_conf.c | 26 ++++++++------------------ drivers/target/tcm_fc/tfc_sess.c | 18 +++++++++++------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c index 9cdb2ac..9389ba3 100644 --- a/drivers/target/tcm_fc/tfc_conf.c +++ b/drivers/target/tcm_fc/tfc_conf.c @@ -222,27 +222,17 @@ static int ft_init_nodeacl(struct se_node_acl *nacl, const char *name) struct ft_node_acl *ft_acl_get(struct ft_tpg *tpg, struct fc_rport_priv *rdata) { - struct ft_node_acl *found = NULL; - struct ft_node_acl *acl; struct se_portal_group *se_tpg = &tpg->se_tpg; struct se_node_acl *se_acl; + unsigned char initiatorname[TRANSPORT_IQN_LEN]; - mutex_lock(&se_tpg->acl_node_mutex); - list_for_each_entry(se_acl, &se_tpg->acl_node_list, acl_list) { - acl = container_of(se_acl, struct ft_node_acl, se_node_acl); - pr_debug("acl %p port_name %llx\n", - acl, (unsigned long long)acl->node_auth.port_name); - if (acl->node_auth.port_name == rdata->ids.port_name || - acl->node_auth.node_name == rdata->ids.node_name) { - pr_debug("acl %p port_name %llx matched\n", acl, - (unsigned long long)rdata->ids.port_name); - found = acl; - /* XXX need to hold onto ACL */ - break; - } - } - mutex_unlock(&se_tpg->acl_node_mutex); - return found; + ft_format_wwn(&initiatorname[0], TRANSPORT_IQN_LEN, rdata->ids.port_name); + + se_acl = core_tpg_get_initiator_node_acl(se_tpg, &initiatorname[0]); + if (!se_acl) + return NULL; + + return container_of(se_acl, struct ft_node_acl, se_node_acl); } /* diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c index 45947e2..b3db638 100644 --- a/drivers/target/tcm_fc/tfc_sess.c +++ b/drivers/target/tcm_fc/tfc_sess.c @@ -191,9 +191,10 @@ out: * Caller holds ft_lport_lock. */ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id, - struct ft_node_acl *acl) + struct fc_rport_priv *rdata) { struct ft_sess *sess; + struct ft_node_acl *acl; struct hlist_head *head; head = &tport->hash[ft_sess_hash(port_id)]; @@ -212,6 +213,14 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id, kfree(sess); return NULL; } + + acl = ft_acl_get(tport->tpg, rdata); + if (!acl) { + transport_free_session(sess->se_sess); + kfree(sess); + return NULL; + } + sess->se_sess->se_node_acl = &acl->se_node_acl; sess->tport = tport; sess->port_id = port_id; @@ -349,17 +358,12 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len, { struct ft_tport *tport; struct ft_sess *sess; - struct ft_node_acl *acl; u32 fcp_parm; tport = ft_tport_get(rdata->local_port); if (!tport) goto not_target; /* not a target for this local port */ - acl = ft_acl_get(tport->tpg, rdata); - if (!acl) - goto not_target; /* no target for this remote */ - if (!rspp) goto fill; @@ -381,7 +385,7 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len, spp->spp_flags |= FC_SPP_EST_IMG_PAIR; if (!(fcp_parm & FCP_SPPF_INIT_FCN)) return FC_SPP_RESP_CONF; - sess = ft_sess_create(tport, rdata->ids.port_id, acl); + sess = ft_sess_create(tport, rdata->ids.port_id, rdata); if (!sess) return FC_SPP_RESP_RES; if (!sess->params)