From nobody Fri Dec 24 01:16:25 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 62E8F190DB11; Fri, 24 Dec 2021 01:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JKpzt154sz3C3P; Fri, 24 Dec 2021 01:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05FEF1A8E6; Fri, 24 Dec 2021 01:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BO1GPOW030745; Fri, 24 Dec 2021 01:16:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BO1GPJq030744; Fri, 24 Dec 2021 01:16:25 GMT (envelope-from git) Date: Fri, 24 Dec 2021 01:16:25 GMT Message-Id: <202112240116.1BO1GPJq030744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 93ce10ed2628 - stable/13 - hptiop: Remove Giant locking around ioctls. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 93ce10ed26282edc9647be20ad72d62f855f4bd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640308586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKp8x1xb0KoJEDwNa3vNkKA/XA9aF9oDa0y6pY4KP5A=; b=vcq6n6fkjPjinKNU4/d2yYMSYhYb70QNWVWmjxUS9BCeDJhUhgLOOZdaeRlpZDFfKoV2ra FS1Se01eOkwmM6MXgJFcbhb5XxYFs2GblFkAia/AFJvmax/RsAhZirVTWALa61zdTiTnFz f5A75nLNuevIfa5/xhn35OWWNPEImaJUOoXP/beJvYSlsFmiV+GCr6cJOGguuzIPpgxOyJ EKH7S3JIeswZMw5urb+Zo0CoeAQlLAPbSDvFzXOgdTz2afrRkPnUj7rPekIVWKr++ODqiC YuZ/w4IvzQ3aCeq71KCVzvMsloSx0PKyPtUqtkpJ5Fv6rC+p4AnQopVxVKN5hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640308586; a=rsa-sha256; cv=none; b=gHm6bqU1MwK8TnluIqBtMa24nsgCMVJlBnI/vKA/AtGmVRCLG7urLupPp3ORVkRHqm4uOH PP9cKpDIxjVpSsYea/kLzwnlO90BX1r/6gpGLwOoz8R5bMYwtxDsa2nPmDqkKEVXfBtBU2 KU8RYXF80CR90su8HD/NfM7EO/1oQae0MYKE04ovni4GOpqwaZ+O067UfkwnMxSCLXAe9a A3cNI8/hbmAX1mBvdo38mRHn3iAwzi6WmEZmfBcZ8k/DXe3Bm04wGfWLSfnLoU4DdAthzo Rtl44sBVVOEclxKmMWNhSOR9GABkNnYFmA7VU51az7qQmEIus2lAAz7HCY45qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=93ce10ed26282edc9647be20ad72d62f855f4bd1 commit 93ce10ed26282edc9647be20ad72d62f855f4bd1 Author: Alexander Motin AuthorDate: 2021-12-10 01:35:21 +0000 Commit: Alexander Motin CommitDate: 2021-12-24 01:05:03 +0000 hptiop: Remove Giant locking around ioctls. The methods have their own locking and don't require Giant. MFC after: 2 weeks (cherry picked from commit e06c67eef8faae3322c06056960562fde88fd7aa) --- sys/dev/hptiop/hptiop.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c index 50d26231a91c..eddc8da5bd8e 100644 --- a/sys/dev/hptiop/hptiop.c +++ b/sys/dev/hptiop/hptiop.c @@ -214,8 +214,6 @@ static int hptiop_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int ret = EFAULT; struct hpt_iop_hba *hba = hba_from_dev(dev); - mtx_lock(&Giant); - switch (cmd) { case HPT_DO_IOCONTROL: ret = hba->ops->do_ioctl(hba, @@ -225,9 +223,6 @@ static int hptiop_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, ret = hptiop_rescan_bus(hba); break; } - - mtx_unlock(&Giant); - return ret; }