From patchwork Fri May 31 01:59:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 10969445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27C51112C for ; Fri, 31 May 2019 01:59:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1776828BFE for ; Fri, 31 May 2019 01:59:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC4F28C3E; Fri, 31 May 2019 01:59:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA1228C21 for ; Fri, 31 May 2019 01:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726372AbfEaB7R (ORCPT ); Thu, 30 May 2019 21:59:17 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:19074 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbfEaB7R (ORCPT ); Thu, 30 May 2019 21:59:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1559267957; x=1590803957; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P2x5tPTzPIYYfXqv4G+vKwWTkNH/JdH1Duf2QwNcKDc=; b=Ol+FDtqv7fdf6wmWhIJ0eFXIC60wb65X2wqVuCd/64wUBXhgnDs+P+lM jq3PQ0kaAZCheZorC0q+nulwzASDLNxSrdBEkNZxrPxisgCkdBoFcSb68 Q99Q2yy4EYMKVKsXgsoYLds61PVy8+fUGJYuAA44gig0y27CGh6VDx8qu RxYqlCHksMO5E5jhqa40GCd2HxgKRh0kL9zT7hXfSbHvkoI2UTVLC0+Kp ehlZ1RX10tQufUyrRXTdIgx7qCv5ymCdLlA1rDhhzwbFqiM9B+4KgUsQi 3m8UNfI6+vyZeKtTH4IOkozvG/uB/cdHg6111U1W/EU09owHfCjuX4VrH g==; X-IronPort-AV: E=Sophos;i="5.60,533,1549900800"; d="scan'208";a="111145552" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 31 May 2019 09:59:17 +0800 IronPort-SDR: VxVcnjKtcS7xCKVXg7ywbbreqlyhYkewHLO6ch4FBqk1YVex7finoHty0jFZqCJOcldCKDLmYG arbReOY0wyaUFPVh6vtMKmm45LD43Od5FonHLtAPy5vey31kNT3lGLuOE6zExAhopD4E7tICuJ vLnCBFWHB7TLA+zja2tYyIz1urtVHBw7x9tWuVznz4RyFBiUxinqrOZSSCPBLE7TxBxFGEdYi1 +nsmq4osQeQ5BFxERleX7IGQgIhNhO3OLlnm9EEpZNwW2+OUxTfc7OIIrwVtuXN9n3xRbXM8QS IRrgOTUclmKoPLx/Hqk3SNUK Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP; 30 May 2019 18:36:46 -0700 IronPort-SDR: p7ZzSZCRqWM5USzLWoZWDkfd2LUPuIeUGrvl4+0KinGxQRtHDIuTGmFtWoHlQkTK4wcp26zMZ3 eKMrLJu9p3FHtmpf3tENG9ppeA8gQ7WTgxRNz+O2h8dK/f0P4sSo+AejC5MIl42IJmmoG4pRmc Zak9/ecl3xvnYpDEbYgaFnXI5It0qb58P09KOZkzD0tEwtSR/4juzMEU2oRL1P4DFUq3nZep+k l4+5eyH6w+AmTASV3RGXjabF9aTydrifq38wP3O7IA7YZwgNeO8pi7RSqEFAy73XTU57ckEAZ8 6+M= Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.166]) by uls-op-cesaip01.wdc.com with ESMTP; 30 May 2019 18:59:15 -0700 From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, Omar Sandoval Cc: Shinichiro Kawasaki , Masato Suzuki , Damien Le Moal , Omar Sandoval , Chaitanya Kulkarni Subject: [PATCH blktests v2 1/2] zbd/rc: Introduce helper functions for zone mapping test Date: Fri, 31 May 2019 10:59:12 +0900 Message-Id: <20190531015913.5560-2-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190531015913.5560-1-shinichiro.kawasaki@wdc.com> References: <20190531015913.5560-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As a preparation for the zone mapping test case, add several helper functions. _find_last_sequential_zone() and _find_sequential_zone_in_middle() help to select test target zones. _test_dev_is_logical() checks TEST_DEV is the valid test target. _test_dev_has_dm_map() helps to check that the dm target is linear or flakey. _get_dev_container_and_sector() helps to get the container device and sector mappings. Reviewed-by: Chaitanya Kulkarni --- tests/zbd/rc | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/tests/zbd/rc b/tests/zbd/rc index 5f04c84..792b83d 100644 --- a/tests/zbd/rc +++ b/tests/zbd/rc @@ -193,6 +193,42 @@ _find_first_sequential_zone() { return 1 } +_find_last_sequential_zone() { + for ((idx = REPORTED_COUNT - 1; idx > 0; idx--)); do + if ((ZONE_TYPES[idx] == ZONE_TYPE_SEQ_WRITE_REQUIRED)); then + echo "${idx}" + return 0 + fi + done + + echo "-1" + return 1 +} + +# Try to find a sequential required zone between given two zone indices +_find_sequential_zone_in_middle() { + local -i s=${1} + local -i e=${2} + local -i idx=$(((s + e) / 2)) + local -i i=1 + + while ((idx != s && idx != e)); do + if ((ZONE_TYPES[idx] == ZONE_TYPE_SEQ_WRITE_REQUIRED)); then + echo "${idx}" + return 0 + fi + if ((i%2 == 0)); then + $((idx += i)) + else + $((idx -= i)) + fi + $((i++)) + done + + echo "-1" + return 1 +} + # Search zones and find two contiguous sequential required zones. # Return index of the first zone of the found two zones. # Call _get_blkzone_report() beforehand. @@ -210,3 +246,100 @@ _find_two_contiguous_seq_zones() { echo "Contiguous sequential write required zones not found" return 1 } + +_test_dev_is_dm() { + if [[ ! -r "${TEST_DEV_SYSFS}/dm/name" ]]; then + SKIP_REASON="$TEST_DEV is not device-mapper" + return 1 + fi + return 0 +} + +_test_dev_is_logical() { + if ! _test_dev_is_partition && ! _test_dev_is_dm; then + SKIP_REASON="$TEST_DEV is not a logical device" + return 1 + fi + return 0 +} + +_test_dev_has_dm_map() { + local target_type=${1} + local dm_name + + dm_name=$(<"${TEST_DEV_SYSFS}/dm/name") + if ! dmsetup status "${dm_name}" | grep -qe "${target_type}"; then + SKIP_REASON="$TEST_DEV does not have ${target_type} map" + return 1 + fi + if dmsetup status "${dm_name}" | grep -v "${target_type}"; then + SKIP_REASON="$TEST_DEV has map other than ${target_type}" + return 1 + fi + return 0 +} + +# Get device file path from the device ID "major:minor". +_get_dev_path_by_id() { + for d in /sys/block/*; do + if [[ ! -r "${d}/dev" ]]; then + continue + fi + if [[ "${1}" == "$(<"${d}/dev")" ]]; then + echo "/dev/${d##*/}" + return 0 + fi + done + return 1 +} + +# Given sector of TEST_DEV, return the device which contain the sector and +# corresponding sector of the container device. +_get_dev_container_and_sector() { + local -i sector=${1} + local cont_dev + local -i offset + local -a tbl_line + + if _test_dev_is_partition; then + offset=$(<"${TEST_DEV_PART_SYSFS}/start") + cont_dev=$(_get_dev_path_by_id "$(<"${TEST_DEV_SYSFS}/dev")") + echo "${cont_dev}" "$((offset + sector))" + return 0 + fi + + if ! _test_dev_is_dm; then + echo "${TEST_DEV} is not a logical device" + return 1 + fi + if ! _test_dev_has_dm_map linear && + ! _test_dev_has_dm_map flakey; then + echo -n "dm mapping test other than linear/flakey is" + echo "not implemented" + return 1 + fi + + # Parse dm table lines for dm-linear or dm-flakey target + while read -r -a tbl_line; do + local -i map_start=${tbl_line[0]} + local -i map_end=$((tbl_line[0] + tbl_line[1])) + + if ((sector < map_start)) || (((map_end) <= sector)); then + continue + fi + + offset=${tbl_line[4]} + if ! cont_dev=$(_get_dev_path_by_id "${tbl_line[3]}"); then + echo -n "Cannot access to container device: " + echo "${tbl_line[3]}" + return 1 + fi + + echo "${cont_dev}" "$((offset + sector - map_start))" + return 0 + + done < <(dmsetup table "$(<"${TEST_DEV_SYSFS}/dm/name")") + + echo -n "Cannot find container device of ${TEST_DEV}" + return 1 +} From patchwork Fri May 31 01:59:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 10969447 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 409496C5 for ; Fri, 31 May 2019 01:59:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 314D128BFE for ; Fri, 31 May 2019 01:59:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25AFF28C3E; Fri, 31 May 2019 01:59:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9905F28BFE for ; Fri, 31 May 2019 01:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726546AbfEaB7S (ORCPT ); Thu, 30 May 2019 21:59:18 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:19081 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726540AbfEaB7S (ORCPT ); Thu, 30 May 2019 21:59:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1559267958; x=1590803958; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7+v6Hriunm8Fd9nXJ1gCGxP92bdszOqe2KswdIsWdcA=; b=YyJDgJsAy1JgUWW4pbV7dDerVMHyWv9V+I4Odm/zdmy8RqlUEpQuNxf8 OsNiIUh8hNk5GP0LIV4xuUD4Hv+PVHoAVin5c9u0tBXEpCkrPoYt2h0He v3EHuI9/mRC0L8J/wcdoVeov9R8sjXuncK4q8T+H058KUA3DFSl0mCxyZ M3XVAE0A2G2DfMWoR56BUDMjHD9S9PILfvo8aNCW9iNO3cTlxiwjeH6pV pRYae6zdc6jLxIMHL5518yoEeAnQU7oBJfjqZV1cP4ZGaykwcvn1LyQru OnZappxvwwJtNID5ZUubBVer6pYddbM4A5fxGv7q6bYLRBtAOwyE6vLDy w==; X-IronPort-AV: E=Sophos;i="5.60,533,1549900800"; d="scan'208";a="111145554" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 31 May 2019 09:59:18 +0800 IronPort-SDR: BMhXKz56nO6+BZh03RjzRBLBgsHa4g0tso3xr0wZJpLNu6R4S2Xup/uZZlnqa3yQE5qiH6N5iC 4AZmVDB7phAiJTj0R3y1bXMHiqRXPA6vvh/o9K2KUTkiT3hO0rEfw5L1BjBe4AgSY0n91EVC8U yw2Ew0rgbVwjUSQT/sT9A+Lw6SaF9p6PfYmu4DSQ64j6Lo2DeO7cmKBUrDH8n2VRiB8J0IRwjx pix3PfWwwATpaXQWWL2mua3hy1FFM5MwMbRnkYMMJ0g839l2GiCR4lgkvBC8ajr6pXafM9mFGu 6rc0ixsJctGolBxu0TYB1TMj Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP; 30 May 2019 18:36:47 -0700 IronPort-SDR: 3NzPdq8n66ceQGiUaIIoBUOa9KJdhtjCUsDKsNmV2y6ZhYOlrbaNiDvjUFeouhJSJAaA4OoGTN M9opnoQrV0KQfTDkxBhgdpx3xBWUtxerX6sPb57E+3gbXvpQfLrbXOvS2XJnhFcnWKVYMbq8BO NwQBYbvQ2drNazqVro1Xt2rxSPTu3nlU1nlf4RfmvRao3XYFPUAJCD8MV+vjUquqn4ewwRods9 9hM14rzrSNTrDrslU2gmaMhM6GIips7j1fEt3qgt+1ADawF0R6bRg+PjWhVKSVoJYstcBPkTR/ 7dw= Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.166]) by uls-op-cesaip01.wdc.com with ESMTP; 30 May 2019 18:59:16 -0700 From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, Omar Sandoval Cc: Shinichiro Kawasaki , Masato Suzuki , Damien Le Moal , Omar Sandoval , Chaitanya Kulkarni Subject: [PATCH blktests v2 2/2] zbd/007: Add zone mapping test for logical devices Date: Fri, 31 May 2019 10:59:13 +0900 Message-Id: <20190531015913.5560-3-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190531015913.5560-1-shinichiro.kawasaki@wdc.com> References: <20190531015913.5560-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the test case to check zones sector mapping of logical devices. This test case requires that such a logical device be specified in TEST_DEVS in config. The test is skipped for devices that are identified as not logically created. To test that the zone mapping is correct, select a few sequential write required zones of the logical device and move the write pointers of these zones through the container device of the logical device, using the physical sector mapping of the zones. The write pointers position of the selected zones is then checked through a zone report of the logical device using the logical sector mapping of the zones. The test reports a success if the position of the zone write pointers relative to the zone start sector must be identical for both the logical and physical locations of the zones. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Chaitanya Kulkarni --- tests/zbd/007 | 110 ++++++++++++++++++++++++++++++++++++++++++++++ tests/zbd/007.out | 2 + 2 files changed, 112 insertions(+) create mode 100755 tests/zbd/007 create mode 100644 tests/zbd/007.out diff --git a/tests/zbd/007 b/tests/zbd/007 new file mode 100755 index 0000000..b4dcbd8 --- /dev/null +++ b/tests/zbd/007 @@ -0,0 +1,110 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0+ +# Copyright (C) 2019 Western Digital Corporation or its affiliates. +# +# Test zones are mapped correctly between a logical device and its container +# device. Move write pointers of sequential write required zones on the +# container devices, and confirm same write pointer positions of zones on the +# logical devices. + +. tests/zbd/rc + +DESCRIPTION="zone mapping between logical and container devices" +CAN_BE_ZONED=1 +QUICK=1 + +requires() { + _have_program dmsetup +} + +device_requires() { + _test_dev_is_logical +} + +# Select test target zones. Pick up the first sequential required zones. If +# available, add one or two more sequential required zones. One is at the last +# end of TEST_DEV. The other is in middle between the first and the last zones. +select_zones() { + local -i zone_idx + local -a zones + + zone_idx=$(_find_first_sequential_zone) || return $? + zones=( "${zone_idx}" ) + if zone_idx=$(_find_last_sequential_zone); then + zones+=( "${zone_idx}" ) + if zone_idx=$(_find_sequential_zone_in_middle \ + "${zones[0]}" "${zones[1]}"); then + zones+=( "${zone_idx}" ) + fi + fi + echo "${zones[@]}" +} + +test_device() { + local -i bs + local -a test_z # test target zones + local -a test_z_start + + echo "Running ${TEST_NAME}" + + # Get physical block size to meet zoned block device I/O requirement + _get_sysfs_variable "${TEST_DEV}" || return $? + bs=${SYSFS_VARS[SV_PHYS_BLK_SIZE]} + _put_sysfs_variable + + # Get test target zones + _get_blkzone_report "${TEST_DEV}" || return $? + read -r -a test_z < <(select_zones) + for ((i = 0; i < ${#test_z[@]}; i++)); do + test_z_start+=("${ZONE_STARTS[test_z[i]]}") + done + echo "${test_z[*]}" >> "$FULL" + echo "${test_z_start[*]}" >> "$FULL" + _put_blkzone_report + if ((!${#test_z[@]})); then + echo "Test target zones not available on ${TEST_DEV}" + return 1 + fi + + # Reset and move write pointers of the container device + for ((i=0; i < ${#test_z[@]}; i++)); do + local -a arr + + read -r -a arr < <(_get_dev_container_and_sector \ + "${test_z_start[i]}") + container_dev="${arr[0]}" + container_start="${arr[1]}" + + echo "${container_dev}" "${container_start}" >> "$FULL" + + if ! blkzone reset -o "${container_start}" -c 1 \ + "${container_dev}"; then + echo "Reset zone failed" + return 1 + fi + + if ! dd if=/dev/zero of="${container_dev}" bs="${bs}" \ + count=$((4096 * (i + 1) / bs)) oflag=direct \ + seek=$((container_start * 512 / bs)) \ + >> "$FULL" 2>&1 ; then + echo "dd failed" + fi + + # Wait for partition table re-read event settles + udevadm settle + done + + # Check write pointer positions on the logical device + _get_blkzone_report "${TEST_DEV}" || return $? + for ((i=0; i < ${#test_z[@]}; i++)); do + if ((ZONE_WPTRS[test_z[i]] != 8 * (i + 1))); then + echo "Unexpected write pointer position" + echo -n "zone=${i}, wp=${ZONE_WPTRS[i]}, " + echo "dev=${TEST_DEV}" + fi + echo "${ZONE_WPTRS[${test_z[i]}]}" >> "$FULL" + done + _put_blkzone_report + + echo "Test complete" +} diff --git a/tests/zbd/007.out b/tests/zbd/007.out new file mode 100644 index 0000000..28a1395 --- /dev/null +++ b/tests/zbd/007.out @@ -0,0 +1,2 @@ +Running zbd/007 +Test complete