From patchwork Wed Apr 27 11:10:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 8955521 Return-Path: X-Original-To: patchwork-dm-devel@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 48D9EBF9E6 for ; Wed, 27 Apr 2016 11:15:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A0F7200F0 for ; Wed, 27 Apr 2016 11:15:29 +0000 (UTC) Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ECA1A202A1 for ; Wed, 27 Apr 2016 11:15:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3RBBm1K012403; Wed, 27 Apr 2016 07:11:48 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3RBBHc9012292 for ; Wed, 27 Apr 2016 07:11:17 -0400 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3RBBHoO008851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 27 Apr 2016 07:11:17 -0400 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 32CFB5D; Wed, 27 Apr 2016 11:11:15 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 268D6AC89; Wed, 27 Apr 2016 11:11:09 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Wed, 27 Apr 2016 13:10:04 +0200 Message-Id: <1461755458-29225-4-git-send-email-hare@suse.de> In-Reply-To: <1461755458-29225-1-git-send-email-hare@suse.de> References: <1461755458-29225-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -0.607 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Mike Snitzer Subject: [dm-devel] [PATCH 03/57] kpartx: parse emulated DASD devices X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Emulated DASD devices do not support the DASDINFO ioctl, so we need to generate the information by hand. After all, fdasd does the same. Signed-off-by: Hannes Reinecke --- kpartx/dasd.c | 39 +++++++++++++++++++++++++++++++++------ kpartx/dasd.h | 1 + 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/kpartx/dasd.c b/kpartx/dasd.c index 1fcf778..14c35b1 100644 --- a/kpartx/dasd.c +++ b/kpartx/dasd.c @@ -46,6 +46,21 @@ unsigned long long sectors512(unsigned long long sectors, int blocksize) return sectors * (blocksize >> 9); } +/* + * Magic records per track calculation, copied from fdasd.c + */ +static unsigned int ceil_quot(unsigned int d1, unsigned int d2) +{ + return (d1 + (d2 - 1)) / d2; +} + +unsigned int recs_per_track(unsigned int dl) +{ + int dn = ceil_quot(dl + 6, 232) + 1; + return 1729 / (10 + 9 + ceil_quot(dl + 6 * dn, 34)); +} + + typedef unsigned int __attribute__((__may_alias__)) label_ints_t; /* @@ -124,19 +139,31 @@ read_dasd_pt(int fd, struct slice all, struct slice *sp, int ns) } if (ioctl(fd_dasd, BIODASDINFO, (unsigned long)&info) != 0) { - goto out; + info.label_block = 2; + info.FBA_layout = 0; + memcpy(info.type, "ECKD", sizeof(info.type)); } - if (ioctl(fd_dasd, HDIO_GETGEO, (unsigned long)&geo) != 0) { + if (ioctl(fd_dasd, BLKSSZGET, &blocksize) != 0) goto out; - } if (ioctl(fd_dasd, BLKGETSIZE64, &disksize) != 0) goto out; - disksize >>= 9; - if (ioctl(fd_dasd, BLKSSZGET, &blocksize) != 0) - goto out; + if (ioctl(fd_dasd, HDIO_GETGEO, (unsigned long)&geo) != 0) { + unsigned int cyl; + + geo.heads = 15; + geo.sectors = recs_per_track(blocksize); + cyl = disksize / (blocksize * geo.heads * geo.sectors); + if (cyl < LV_COMPAT_CYL) + geo.cylinders = cyl; + else + geo.cylinders = LV_COMPAT_CYL; + geo.start = 0; + } + + disksize >>= 9; if (blocksize < 512 || blocksize > 4096) goto out; diff --git a/kpartx/dasd.h b/kpartx/dasd.h index 42f94db..6fa64e6 100644 --- a/kpartx/dasd.h +++ b/kpartx/dasd.h @@ -164,6 +164,7 @@ typedef struct dasd_information_t { #define BLKGETSIZE _IO(0x12,96) #define BLKSSZGET _IO(0x12,104) #define BLKGETSIZE64 _IOR(0x12,114,size_t) /* device size in bytes (u64 *arg)*/ +#define LV_COMPAT_CYL 0xFFFE /* * Only compile this on S/390. Doesn't make any sense