From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932073AbcAHIwz (ORCPT ); Fri, 8 Jan 2016 03:52:55 -0500 Received: from mail-bn1on0093.outbound.protection.outlook.com ([157.56.110.93]:9952 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750794AbcAHIww (ORCPT ); Fri, 8 Jan 2016 03:52:52 -0500 Authentication-Results: spf=pass (sender IP is 63.163.107.173) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: ac160a69-f797e6d000000b05-7d-568f78de7252 Subject: Re: [PATCH 4/4] ib_srpt: Convert acl lookup to modern get_initiator_node_acl usage To: "Nicholas A. Bellinger" , target-devel References: <1452237348-2277-1-git-send-email-nab@daterainc.com> <1452237348-2277-5-git-send-email-nab@daterainc.com> CC: linux-scsi , lkml , Sagi Grimberg , Christoph Hellwig , Hannes Reinecke , Andy Grover , Vasu Dev , Vu Pham , Nicholas Bellinger From: Bart Van Assche Message-ID: <568F78DB.9090404@sandisk.com> Date: Fri, 8 Jan 2016 09:52:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <1452237348-2277-5-git-send-email-nab@daterainc.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRmVeSWpSXmKPExsWyRoxnke69iv4wg9PXVC32z3rGZLFn0SQm i5WrjzJZXN41h82i+/oONotX51YwWbStPsNocaPtAZtF69K3TBZ7H/lZTD/1kNGB22Pph1XM Hve3H2HymHcy0GP3zQY2j2fTDzN5vN93lc1j8+lqj8+b5AI4orhsUlJzMstSi/TtErgyOi6t ZyxYylux9OdmxgbGR1xdjBwcEgImEps2KXcxcgKZYhIX7q1n62Lk4hASOMEoceLoVEYIZzuj xMZr+9ghqkwkXt94xg6R2Mwocb+1gRUkISwQK9HwsQXMFhGIkzi5eycjiC0kUC7x78YsVpAG ZoETTBJdvQvBEmwCRhLf3s9kAbF5BbQkDv67wgZiswioSLxc2AO2TVQgQuLHhiWMEDWCEidn PgGr5xRwlNg6+TALyAvMAvYSD7aWgYSZBeQltr+dwwyyS0Kgg01i0+zPUEeoS5xcMp9pAqPI LCSjZiG0z0LSvoCReRWjWG5mTnFuemqBoZFecWJeSmZxtl5yfu4mRnAkcmXuYFwxyfwQowAH oxIPL8eOvjAh1sSy4srcQ4wSHMxKIryLivvDhHhTEiurUovy44tKc1KLDzFKc7AoifNat6iF CQmkJ5akZqemFqQWwWSZODilGhiT69IdvS+vvJAs4Ml4UrWY4xqnrvNyFSvbWS8Flh+3fNTc JXXpyMWt52uaZ+8//OuI6acQb87FfI/Et/5YLOhzcdnqo7c8nH62X044IuFxYfaqib+7burH LTL/atoTvOZndsn6D886A83LT11LmxtWIhu66tzkJK/jH49841hg/H+KhLlAan+REktxRqKh FnNRcSIAJ9/sKsACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKLMWRmVeSWpSXmKPExsXCtZEjRfdeRX+YwabD/Bb7Zz1jstizaBKT xcrVR5ksLu+aw2bRfX0Hm8WrcyuYLNpWn2G0uNH2gM2idelbJou9j/wspp96yOjA7bH0wypm j/vbjzB5zDsZ6LH7ZgObx7Pph5k83u+7yuax+XS1x+dNcgEcUVw2Kak5mWWpRfp2CVwZHZfW MxYs5a1Y+nMzYwPjI64uRk4OCQETidc3nrFD2GISF+6tZ+ti5OIQEtjIKHH4zXZGkISwQKxE w8cWVhBbRCBO4tmedywgtpBAucS/G7NYQRqYBU4wSWz5f4QNJMEmYCTx7f1MsCJeAS2Jg/+u gMVZBFQkXi7sAdsmKhAh8WPDEkaIGkGJkzOfgNVzCjhKbJ18GMxmFrCVuDN3NzOELS+x/e0c 5gmM/LOQtMxCUjYLSdkCRuZVjGK5mTnFuemZBYZGesWJeSmZxdl6yfm5mxjBEcEZtYPx+kTz Q4xMHJxSDYyCNwukDp9wfXhnhmyDwnUu82qX+CtzCwwU2xneauicq9+0z9H4+rtDhhs/f/Hg WSkk8fXRwi0hRukPi7e3Oy+/yvO8ddM2e5tbQtl3Tgjtaf13PJrZ/fbxKokjlbx815Zq7a// s2zqqVZrjvJt86u4nsXzLltp45uvdkkHGJ8Gj5JOW1uwyimxFGckGmoxFxUnAgBxvN+vOAIA AA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD052;1:vCgjFXeR76WgPDRXIYhveDwsQMfRt15r9KRQkC4W3BR5cyLiVZc69Iv7Hddu1TyIEb8rqyudsxeno0bC+1oc+nWczdvIpR52BX+hRSzvzJR6LwnJYoPPxxr7s6qm9qjBzKzwfJQLZmMvOiYkPoDikp9Jnu6z/NyjU7SrLNi+2X2gmTy/0y1CvvBJ0dUEmmeDDG2DqrLea7znQr0h7f5fBMRqPacWQyJ74HVYFiNiBQIegr2mtZikn3mfQlJUt/PE2X9zC3efentCMcAMhgggP5EteUfueACl/oxORXGAU6jbFxBaF7r6i2BCFU56iNHflA7DnNnsUKq6ujcv2b3s0E7zS9+NZGaMOAHoNAqM2V/hovVmqQI2CZ2VoneOFfFHbQXHux2gp5Yp11OGF0+bwLUTfVgtB+MXNMbrrmHouN8= X-Forefront-Antispam-Report: CIP:63.163.107.173;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(438002)(24454002)(377454003)(164054003)(189002)(479174004)(199003)(92566002)(87266999)(50466002)(23746002)(54356999)(86362001)(97736004)(64126003)(4326007)(81156007)(77096005)(5001770100001)(2950100001)(36756003)(4001350100001)(2906002)(69596002)(59896002)(80316001)(106466001)(230700001)(65956001)(47776003)(1220700001)(50986999)(5008740100001)(76176999)(65806001)(11100500001)(65816999)(586003)(87936001)(5001960100002)(189998001)(83506001)(33656002)(1096002);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR02MB299;H:milsmgep12.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB299;2:OG0XmxypC1nUYj0V3oUWgrmG0xLNXopdiVTEQxi6ZJAyZw2qNaNdZaZYDmVEpCBvG9BrB6gxKJED4SgPRZ4txnu6vLBLNonShwa/0y+Z8tRIAOlg7Yyd/vYQMv+lRejza5NBGUbc2sgZyJ+oPpGesw==;3:KHAFtEVXGPktKj5hmfyv8j6/HkuQ9jRxWL72OwDCpdGX2oM3+mQJFMKHQMqn9Rc+yxgzLiFmFsHDE6+eSJNPxCuxKmDHnyz2eRCuk6wxJQDM0k5qpakUL3x5wH8yaDWeW+alMMWvoOo5kSt/3UsilSDet5WeI33yDNhSBFyakT4lVi4I9VyOfRqUhY2pbKKS1lFM6/kPKhjsr6uheZwidYPRcHl3ZzDJ3LG0jd8PtE3WvDWSYnU/xJKvvU+KoBInmaEdASRHsdzwi6hq+GgV1Q==;25:fA92BD3Yhj5DEdhcRxkzy8WlYRHlAGRD1o+VqFYHgMCs5BjtwLG9hopEK6V6gDEDn0KmZNMUbqffoZbMvVffgWRtF1mnCqdzMp8F+pJgFe9/t7vP+MyQwlG8TQm+s6StlXv0ap06daSxoc3IXnnEZUra6QIgAxnotSlh5K0UF2MvIky6SDWoOD57xCUlDKR/R7h2XJSan5oFzK5Y5BzTYodnmiO+9ndqnShhksh0f9ZRrxY+sUV9VcmN8bbGji8Q X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501001);SRVR:BY2PR02MB299; X-MS-Office365-Filtering-Correlation-Id: ba7bb2a0-a11c-4ff8-2bae-08d318091545 X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB299;20:KRqn6tZsppmhpV8w1Fv+Qrs9+0DSXQKARFOBUr39DQdvO8lrgF8OVp5J4aLw32pUv02vKhy6oqF89L9MFXmqpzWxbor11iyPrmt0uHIb2ISSMDBBQrCctkcLbB3cdZBtZYjkvCTb0TXwmw/qZCC9/v3PT1ENjZg9+Ro+soGNDl5xz1QPARTZCzB15U5k2dnXEJwEus0TE8qLTujm3h1PUU3hRGfk5o0TW3fJQGWLC8B9bx1c6xHVBnRSsZMecvO7g1WZYGkjvwvsbZBbP6+K+uM2MeAhF1Y5n6glT6IaEb4ILg/QDDXh6d4V6WqqaGziDWPiXYj9tYKTWM4jysT1JgBMaFZJ7wZHRF9oSGUWxBwsHmga5w9q5i1bU8rp3ZJ7nzdC1VginSUZseWdHI5kSTjkbyGL6XS5rvi2A6LDRccwm5OVyKdtxgZDKISQKSD1XRyLk0kAWk0UrYa5RYd3QPhsRUUELon08OGp920euR2S/eohoQ65TbxKDzzg4dmp;4:+XwhhNY2bLkksNh343addSAjHkTSckF867zIhpZwx3jNtzrbl6Wu+Ez2glVW9sehCElRvrY+ilUv4hfBNQg2CI+xByxpsKOyDERF4H2E5YqdU3dhgQoHPZJCunFnvZEhKbNlF+ejbPIPwkkNtjcX7XW2BGoC5z8ja+WGv8Pe+BxwxtHLN8EH+rc+JxFJrMLRjh6OZpEZhXqK3pV2JImo3acuVtuQqoA0K7bGNqvfdNlRl2VRfeywiAuG3vpBJYi06UdksaGxDr8FvTDK9XIn4Ivd3XcnZ1qvutd21EKVhiKOhyNaIGYj5Bfl6qZzWL9nKdcYYewDHkJr31xRl8ShROz5NTVSyXgRsL+PLGT5UG2+nh34D0x5xXd+bnLThbKVFvJgKSO9/daKhPVJsKfNP7vZ0LM0Twe1IeoTUPSGqC0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(13015025)(13017025)(5005006)(8121501046)(3002001)(10201501046);SRVR:BY2PR02MB299;BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB299; X-Forefront-PRVS: 0815F8251E X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BY2PR02MB299;23:cuRVq3X0rvTAj3eLFFyiJSHyP91ihm0CGW7HHw?= =?Windows-1252?Q?XB80agvvS6CvhbaNX7JkYxSKYGcjADkh7iwwjAFAPRPXoa5vOtD7RXzB?= =?Windows-1252?Q?FFKgtSIg35suGUrwVfaXmV/XC1LdRTqC1TwIiE+Y5zc8hi375ESRiuyq?= =?Windows-1252?Q?DreYZb6jM2tjAtdRz14RQx2eLW+Xxt6zlxN6k6veiOO40jEf4VihdHqo?= =?Windows-1252?Q?Zw3fnqyhsXUY+J0Ug9LRPoZwnmOFsShnfHNIvaaHnRaipm6nDnP8pcHv?= =?Windows-1252?Q?+3puHMFaYs4xk4jUMcMr9j5AH981dWwr2xgdUyDNJzKJ8AHG03JC8voj?= =?Windows-1252?Q?QvrCgl6OJN5x2SkyQDpPEINMXRBr2oGz4+orZtnA48pGjKSrYISXh4Zm?= =?Windows-1252?Q?heWU4mDsxvDrHpZc96Pcjdlty6E9aWQwZfmcJuaa8lZ82oFlR7OWVPYS?= =?Windows-1252?Q?Q2CFU/kIBXgdhf8oMZ9tp5+jeoQNPSa6MS3FA44fL8p6L21DiuszL7Xq?= =?Windows-1252?Q?oocZv4vGbzcHmJiMoMGO3zvW66pG3grBnrrFjYK+ilxqjg27WyrwCXqQ?= =?Windows-1252?Q?c9U5659sy7S9r1utoMuK4A+5/d9RR/63/O9E8NtZIV4V2k2jAARQ004N?= =?Windows-1252?Q?qbZzgmbKz0vLIPx3XAOdZ53JOp3daz5wu1POyqasiuFXKNT+dQq9Xibd?= =?Windows-1252?Q?nAtDM2Z3wBuxXDpcnvDaBhQ6EWtX202fF9dZ+AXDo3lyJ0l3k4Fzg40H?= =?Windows-1252?Q?1Mo0fnsHu2VBirAaD6VWDiLAgndirkdzcHFpTu4+TM5Ppa2KTH00xmV5?= =?Windows-1252?Q?HFFMZ2IA2vlrK/hdLqK0Cp7tobu0c7X2OMflpSe64nVYr0RCs9CAZgE4?= =?Windows-1252?Q?Z2PDUlElzf2HBBiw3a+HW/l1P4LtiWrdOq9FfEXFumMT26meqrYUYhDA?= =?Windows-1252?Q?8iHUmLc16laoi+sYkM/LiD1GpsXy0o9rTWnXY7weNNNhz83/jb7DUw4d?= =?Windows-1252?Q?LHW4i0Rrs8N3QTswuhca2Hfi8ruPc48K0qUle4L9GfVDqj7GNz5QFIsk?= =?Windows-1252?Q?DAa/oMV3fyPLU20lFFwHtcb1uj0pOJJwWtlGo56Dhm5B3Lnau0XxKHDp?= =?Windows-1252?Q?G0YFqhz246rqvtPNcfG/4kvqv0cwhv4PqeoyYPzdPHc8rToOirblDCIy?= =?Windows-1252?Q?6/CN/eXqlDyThIGm8s09WqKyQVCipvyg1F+uo67o53HicVaDDEL1o6m+?= =?Windows-1252?Q?vXVZJ1i3x+HhyM8l1m4854QCINn9B61v+kREthAJIqk6KhaI0s5zhMCG?= =?Windows-1252?Q?4a?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB299;5:Lwe8IP6dkkWLcRaLIh1K3Ru+tMkpnmUeFb+jXNbBaW9jGk9vhDOGyfXTHceeUyXN6mVu37FN0G4s1OiJDhqRxCX8XVhVmnUfTwC0RhHJ/6KGhvgabMAZ6oVH8dUPPkEbYxIlnP5TGmK10tmV6gPPKg==;24:mua8CnwJF8pV+6HKBvdVhotR8t/2H6vYp4Wv3TN8/2USJEnLsYyEc3181h2E++iQA9vNFyZ8xbsNKtWfcM1mH+qXoFroLVFLrygruahSstQ=;20:cme/wa+zOEW5GNvoKKz2Z+gQI/jT4dSdZrgCQlugaleed7M+g1erPnfKiC58p2JMSGVLZe5aGQAPF1uzNeHcIxZtv/Tm/9afTveYXBR3eOKtVtrYZfG3aOh4Cc/ZFp2K7OUbvNLnBiNBKk/5HhTb4o7ca8BoLn6f8PDJThynVJou47hbZaGMZKZdSvmp0ig9j6UtrEDhc2DJ19Mp4We2VdBnjNF59w92cRB4+GonBZLljt8lb8RKlyebowM5fLD/ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2016 08:52:47.0326 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d;Ip=[63.163.107.173];Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR02MB299 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/08/2016 08:15 AM, Nicholas A. Bellinger wrote: > @@ -2574,24 +2558,18 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, > > pr_debug("registering session %s\n", ch->sess_name); > > - nacl = srpt_lookup_acl(sport, ch->i_port_id); > - if (!nacl) { > + se_acl = core_tpg_get_initiator_node_acl(&sport->port_tpg_1, ch->sess_name); > + if (!se_acl) { > pr_info("Rejected login because no ACL has been" > " configured yet for initiator %s.\n", ch->sess_name); > rej->reason = cpu_to_be32( > - SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED); > + SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED); > + transport_free_session(ch->sess); > goto destroy_ib; > } > + ch->sess->se_node_acl = se_acl; This is a backwards-incompatible change. Today the ib_srpt target driver accepts initiator port names with and without leading "0x". With this change the "0x" prefix becomes mandatory. > diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h > index 5faad8ac..bb4fbe2 100644 > --- a/drivers/infiniband/ulp/srpt/ib_srpt.h > +++ b/drivers/infiniband/ulp/srpt/ib_srpt.h > @@ -364,11 +364,9 @@ struct srpt_port { > u16 sm_lid; > u16 lid; > union ib_gid gid; > - spinlock_t port_acl_lock; > struct work_struct work; > struct se_portal_group port_tpg_1; > struct se_wwn port_wwn; > - struct list_head port_acl_list; > struct srpt_port_attrib port_attrib; > }; With this patch applied the following srpt_node_acl members are no longer read: i_port_id, sport and list. Hence please remove the srpt_node_acl structure definition and use struct se_node_acl instead. Thanks, Bart.