From patchwork Fri Mar 27 08:04:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 6103951 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ABC5ABF90F for ; Fri, 27 Mar 2015 08:06:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73927203E5 for ; Fri, 27 Mar 2015 08:06:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22BCE203F7 for ; Fri, 27 Mar 2015 08:06:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753215AbbC0IGb (ORCPT ); Fri, 27 Mar 2015 04:06:31 -0400 Received: from mail-oi0-f50.google.com ([209.85.218.50]:34677 "EHLO mail-oi0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753218AbbC0IGM (ORCPT ); Fri, 27 Mar 2015 04:06:12 -0400 Received: by oigz129 with SMTP id z129so25139484oig.1 for ; Fri, 27 Mar 2015 01:06:11 -0700 (PDT) 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=WmU6j9bfV+PENiALRhFhMGw0yA8z3Twjs29tSDp3/RM=; b=CuXpncgMtIhKPlBqglwSrhKMzgOIABB6qseeMUbH2F+FZFzfdLdEH7z7yWA7n3lPc3 1basStnUUYTG2JL0kDdHFuREmUPwXG/GguwLUwMheoUf+lJpv6ldD+qOkPv120dVhydl yIrpmm3TH3ERuiZY8YbyqA5UADRef4f8AOM9MdhmL9twY567ZT7LYI3I9c6+jY0eGrhk Ez/rVhhNm+jK+XTEwRXYt7HnPONZLHMdivB5ELGD185AKhWrWc0+pvo6Jmqn1lAr3IZv 2rGvfIf2nO9g7K0geLYIFgDzBZX4I5hRiDBF6u8b7+61sgIGctQz1nCwgG89MzHipV7+ 7zkw== X-Gm-Message-State: ALoCoQkJywatE0VxxXxO5PwvV+kwkpCsl6eYmDCKb7CpIX320szEk5ouVgaVVbZfHVqCK/9sjoSu X-Received: by 10.202.102.216 with SMTP id m85mr14683088oik.22.1427443571228; Fri, 27 Mar 2015 01:06:11 -0700 (PDT) Received: from localhost.localdomain (mail.linux-iscsi.org. [67.23.28.174]) by mx.google.com with ESMTPSA id h4sm711520obr.18.2015.03.27.01.06.10 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 27 Mar 2015 01:06:10 -0700 (PDT) From: "Nicholas A. Bellinger" To: target-devel Cc: linux-scsi , Hannes Reinecke , Christoph Hellwig , Sagi Grimberg , Nicholas Bellinger Subject: [RFC 07/22] target/pscsi: Convert MODE_SENSE special case to RCU reader Date: Fri, 27 Mar 2015 08:04:57 +0000 Message-Id: <1427443512-8925-8-git-send-email-nab@daterainc.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1427443512-8925-1-git-send-email-nab@daterainc.com> References: <1427443512-8925-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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 converts the MODE_SENSE special case in pscsi_transport_complete() to use RCU read path macros for se_node_acl->lun_entry_hlist[] access. Cc: Hannes Reinecke Cc: Christoph Hellwig Cc: Sagi Grimberg Signed-off-by: Nicholas Bellinger --- drivers/target/target_core_pscsi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index f6c954c..8bffcd8 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -634,12 +634,22 @@ static void pscsi_transport_complete(struct se_cmd *cmd, struct scatterlist *sg, * Hack to make sure that Write-Protect modepage is set if R/O mode is * forced. */ - if (!cmd->se_deve || !cmd->data_length) + if (!cmd->data_length) goto after_mode_sense; if (((cdb[0] == MODE_SENSE) || (cdb[0] == MODE_SENSE_10)) && (status_byte(result) << 1) == SAM_STAT_GOOD) { - if (cmd->se_deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY) { + struct se_session *sess = cmd->se_sess; + struct se_dev_entry *deve; + u32 lun = cmd->orig_fe_lun; + bool read_only; + + rcu_read_lock(); + deve = rcu_dereference(sess->se_node_acl->lun_entry_hlist[lun]); + read_only = (deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY); + rcu_read_unlock(); + + if (read_only) { unsigned char *buf; buf = transport_kmap_data_sg(cmd);