From patchwork Mon Oct 18 02:40:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhang X-Patchwork-Id: 12564885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B28CDC433F5 for ; Mon, 18 Oct 2021 02:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D22561250 for ; Mon, 18 Oct 2021 02:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344966AbhJRCmg (ORCPT ); Sun, 17 Oct 2021 22:42:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59499 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243172AbhJRCmf (ORCPT ); Sun, 17 Oct 2021 22:42:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634524824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ylU6ZB+fS3KofqmNGAXE9o2W3GSxPdfIECPtC78E914=; b=NYtKpTdHTr2A8RLj50W/hQ8yRGHW5i/j35KL/q1JF7Zg1lAdrPk6rCibVCwHgTxgbLVx2a 6XcR6rlT4Om68370WgvMnqWR1KJ37roJhj6j/UiCsv6vN3MaJQV4Ux0Gfr3eKCW43aEgFP SlRqYzHtbzcnoBXiYzL1ymMdDiD9XzA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-jqteLvmSPSOOhJy4YMwcrA-1; Sun, 17 Oct 2021 22:40:20 -0400 X-MC-Unique: jqteLvmSPSOOhJy4YMwcrA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC5CB800685; Mon, 18 Oct 2021 02:40:19 +0000 (UTC) Received: from dhcp-12-105.nay.redhat.com (unknown [10.66.61.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B83F4180; Mon, 18 Oct 2021 02:40:18 +0000 (UTC) From: Yi Zhang To: osandov@osandov.com, bvanassche@acm.org Cc: linux-block@vger.kernel.org Subject: [PATCH blktests V2] tests/srp: fix module loading issue during srp tests Date: Mon, 18 Oct 2021 10:40:07 +0800 Message-Id: <20211018024007.6014-1-yi.zhang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The ib_isert/ib_srpt modules will be automatically loaded after the first time rdma_rxe/siw setup, which will lead srp tests fail. $ modprobe rdma_rxe $ echo eno1 >/sys/module/rdma_rxe/parameters/add $ lsmod | grep -E "ib_srpt|iscsi_target_mod|ib_isert" ib_srpt 167936 0 ib_isert 139264 0 iscsi_target_mod 843776 1 ib_isert target_core_mod 1069056 3 iscsi_target_mod,ib_srpt,ib_isert rdma_cm 315392 5 rpcrdma,ib_srpt,ib_iser,ib_isert,rdma_ucm ib_cm 344064 2 rdma_cm,ib_srpt ib_core 1101824 10 rdma_cm,rdma_rxe,rpcrdma,ib_srpt,iw_cm,ib_iser,ib_isert,rdma_ucm,ib_uverbs,ib_cm $ ./check srp/001 srp/001 (Create and remove LUNs) [failed] runtime ... 3.675s --- tests/srp/001.out 2021-10-13 01:18:50.846740093 -0400 +++ /root/blktests/results/nodev/srp/001.out.bad 2021-10-14 03:24:18.593852208 -0400 @@ -1,3 +1 @@ -Configured SRP target driver -count_luns(): 3 <> 3 -Passed +insmod: ERROR: could not insert module /lib/modules/5.15.0-rc5.fix+/kernel/drivers/infiniband/ulp/srpt/ib_srpt.ko: File exists modprobe: FATAL: Module iscsi_target_mod is in use. Signed-off-by: Yi Zhang --- tests/srp/rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/srp/rc b/tests/srp/rc index 7239d87..16638a4 100755 --- a/tests/srp/rc +++ b/tests/srp/rc @@ -497,7 +497,8 @@ start_lio_srpt() { if modinfo ib_srpt | grep -q '^parm:[[:blank:]]*rdma_cm_port:'; then opts+=("rdma_cm_port=${srp_rdma_cm_port}") fi - insmod "/lib/modules/$(uname -r)/kernel/drivers/infiniband/ulp/srpt/ib_srpt."* "${opts[@]}" || return $? + unload_module ib_srpt && + insmod "/lib/modules/$(uname -r)/kernel/drivers/infiniband/ulp/srpt/ib_srpt."* "${opts[@]}" || return $? i=0 for r in "${vdev_path[@]}"; do if [ -b "$(readlink -f "$r")" ]; then @@ -554,7 +555,7 @@ stop_lio_srpt() { rmdir /sys/kernel/config/target/*/* >&/dev/null rmdir /sys/kernel/config/target/* >&/dev/null - for m in ib_srpt iscsi_target_mod target_core_pscsi target_core_iblock \ + for m in ib_srpt ib_isert iscsi_target_mod target_core_pscsi target_core_iblock \ target_core_file target_core_stgt target_core_user \ target_core_mod do