From owner-svn-src-all@FreeBSD.ORG Sat Nov 22 04:40:25 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BE2CCFC; Sat, 22 Nov 2014 04:40:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 088E8D6E; Sat, 22 Nov 2014 04:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAM4eOuF010806; Sat, 22 Nov 2014 04:40:24 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAM4eOwY010805; Sat, 22 Nov 2014 04:40:24 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201411220440.sAM4eOwY010805@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 22 Nov 2014 04:40:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274840 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 04:40:25 -0000 Author: mav Date: Sat Nov 22 04:40:24 2014 New Revision: 274840 URL: https://svnweb.freebsd.org/changeset/base/274840 Log: Make iSCSI frontend less chatty while waiting for tasks termination. MFC after: 1 week Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Sat Nov 22 03:03:11 2014 (r274839) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sat Nov 22 04:40:24 2014 (r274840) @@ -1058,7 +1058,7 @@ cfiscsi_session_terminate_tasks(struct c { struct cfiscsi_data_wait *cdw; union ctl_io *io; - int error, last; + int error, last, wait; if (cs->cs_target == NULL) return; /* No target yet, so nothing to do. */ @@ -1103,16 +1103,20 @@ cfiscsi_session_terminate_tasks(struct c /* * Wait for CTL to terminate all the tasks. */ + wait = cs->cs_outstanding_ctl_pdus; + if (wait > 0) + CFISCSI_SESSION_WARN(cs, + "waiting for CTL to terminate %d tasks", wait); for (;;) { refcount_acquire(&cs->cs_outstanding_ctl_pdus); last = refcount_release(&cs->cs_outstanding_ctl_pdus); if (last != 0) break; - CFISCSI_SESSION_WARN(cs, "waiting for CTL to terminate tasks, " - "%d remaining", cs->cs_outstanding_ctl_pdus); tsleep(__DEVOLATILE(void *, &cs->cs_outstanding_ctl_pdus), 0, "cfiscsi_terminate", hz / 100); } + if (wait > 0) + CFISCSI_SESSION_WARN(cs, "tasks terminated"); } static void