* [PATCH] blkfront: ioctls/geometry, 2.6
@ 2006-05-15 18:15 Pascal Bouchareine
2006-05-16 7:18 ` Jan Beulich
0 siblings, 1 reply; 4+ messages in thread
From: Pascal Bouchareine @ 2006-05-15 18:15 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
Hi,
Adds HDIO_GETGEO, BLKGETSIZE, BLKGETSIZE64 support to blkfront.
An attempt to merge in the following sent previously by Ian Pratt :
http://lists.xensource.com/archives/html/xen-devel/2005-01/msg00659.html
Taking into account the block_device_operations for get_geom.
Regards,
Pascal
--
\o/ Pascal Bouchareine - Gandi
g 0170393757 15, place de la Nation - 75011 Paris
[-- Attachment #2: blkfront_ioctl_getgeo-2.6.patch --]
[-- Type: text/plain, Size: 3158 bytes --]
Signed-off-by: Pascal Bouchareine <pascal@gandi.net>
diff -ru xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Sun Apr 30 13:36:52 2006
+++ xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Mon May 15 20:01:07 2006
@@ -424,7 +424,6 @@
return 0;
}
-
int blkif_release(struct inode *inode, struct file *filep)
{
struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
@@ -442,19 +441,46 @@
return 0;
}
+int blkif_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+ struct gendisk *gd;
+ struct hd_struct *part;
+ int dpart;
+
+ DPRINTK_IOCTL("blkif ioctl(HDIO_GETGEO)\n");
+ gd = bdev->bd_disk;
+
+ geo->start = 0x00;
+ geo->heads = 0xff;
+ geo->sectors = 0x3f;
+ geo->cylinders = (gd->capacity >> 14) + (geo->heads + geo->sectors + 1);
+
+ return 0;
+}
int blkif_ioctl(struct inode *inode, struct file *filep,
unsigned command, unsigned long argument)
{
- int i;
+ dev_t dev = inode->i_rdev;
+ struct gendisk *gd;
+ struct hd_struct *part;
+ int i, num, dpart;
DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
command, (long)argument, inode->i_rdev);
+ gd = get_gendisk(dev, &dpart);
+ part = gd->part[MINOR(dev)];
+
switch (command) {
- case HDIO_GETGEO:
- /* return ENOSYS to use defaults */
- return -ENOSYS;
+ case BLKGETSIZE:
+ DPRINTK_IOCTL(" BLKGETSIZE: %x %lx\n", BLKGETSIZE, part->nr_sects);
+ return put_user(part->nr_sects, (unsigned long *) argument);
+
+ case BLKGETSIZE64:
+ DPRINTK_IOCTL(" BLKGETSIZE64: %x %lx\n", BLKGETSIZE64,
+ (u64)part->nr_sects * 512);
+ return put_user((u64)part->nr_sects * 512, (u64 *) argument);
case CDROMMULTISESSION:
DPRINTK("FIXME: support multisession CDs later\n");
diff -ru xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Sun Apr 30 13:36:52 2006
+++ xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Mon May 15 15:57:58 2006
@@ -138,6 +138,7 @@
extern int blkif_open(struct inode *inode, struct file *filep);
extern int blkif_release(struct inode *inode, struct file *filep);
+extern int blkif_getgeo(struct block_device *bdev, struct hd_geometry *geo);
extern int blkif_ioctl(struct inode *inode, struct file *filep,
unsigned command, unsigned long argument);
extern int blkif_check(dev_t dev);
diff -ru xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
--- xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Sun Apr 30 13:36:52 2006
+++ xen-unstable.hg.new/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Mon May 15 15:57:58 2006
@@ -91,6 +91,7 @@
.open = blkif_open,
.release = blkif_release,
.ioctl = blkif_ioctl,
+ .getgeo = blkif_getgeo,
};
spinlock_t blkif_io_lock = SPIN_LOCK_UNLOCKED;
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] blkfront: ioctls/geometry, 2.6
2006-05-15 18:15 [PATCH] blkfront: ioctls/geometry, 2.6 Pascal Bouchareine
@ 2006-05-16 7:18 ` Jan Beulich
2006-05-16 7:35 ` Pascal Bouchareine
0 siblings, 1 reply; 4+ messages in thread
From: Jan Beulich @ 2006-05-16 7:18 UTC (permalink / raw)
To: Pascal Bouchareine; +Cc: xen-devel
We did a similar patch recently here (not submitted, yet) - so I immediately see some concerns with your patch:
- Why do you need to add BLKGETSIZE and BLKGETSIZE64? block/ioctl.c is already taking care of those, they should never
arrive at the driver.
- The calculation of the cylinder value seems odd to me. Why don't you use sector_div() here?
- There is an apparently unused variable 'dpart' left in blkif_getgeo().
Jan
>>> Pascal Bouchareine <pascal@gandi.net> 15.05.06 20:15 >>>
Hi,
Adds HDIO_GETGEO, BLKGETSIZE, BLKGETSIZE64 support to blkfront.
An attempt to merge in the following sent previously by Ian Pratt :
http://lists.xensource.com/archives/html/xen-devel/2005-01/msg00659.html
Taking into account the block_device_operations for get_geom.
Regards,
Pascal
--
\o/ Pascal Bouchareine - Gandi
g 0170393757 15, place de la Nation - 75011 Paris
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] blkfront: ioctls/geometry, 2.6
2006-05-16 7:18 ` Jan Beulich
@ 2006-05-16 7:35 ` Pascal Bouchareine
2006-05-16 7:49 ` Jan Beulich
0 siblings, 1 reply; 4+ messages in thread
From: Pascal Bouchareine @ 2006-05-16 7:35 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
On Tue, May 16, 2006 at 09:18:39AM +0200, Jan Beulich wrote:
> We did a similar patch recently here (not submitted, yet) - so I immediately see some concerns with your patch:
Thanks for your reply. When do you plan to submit the said patch ?
Understood for the 3 cons, I can remove the odd calls if required,
just let me know if a modified patch is needed.
Regards,
Pascal
--
\o/ Pascal Bouchareine - Gandi
g 0170393757 15, place de la Nation - 75011 Paris
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] blkfront: ioctls/geometry, 2.6
2006-05-16 7:35 ` Pascal Bouchareine
@ 2006-05-16 7:49 ` Jan Beulich
0 siblings, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2006-05-16 7:49 UTC (permalink / raw)
To: Pascal Bouchareine; +Cc: xen-devel
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Attaching our patch. Jan
>>> Pascal Bouchareine <pascal@gandi.net> 16.05.06 09:35 >>>
On Tue, May 16, 2006 at 09:18:39AM +0200, Jan Beulich wrote:
> We did a similar patch recently here (not submitted, yet) - so I immediately see some concerns with your patch:
Thanks for your reply. When do you plan to submit the said patch ?
Understood for the 3 cons, I can remove the odd calls if required,
just let me know if a modified patch is needed.
Regards,
Pascal
--
\o/ Pascal Bouchareine - Gandi
g 0170393757 15, place de la Nation - 75011 Paris
[-- Attachment #2: xenlinux-blkfront-getgeo.patch --]
[-- Type: text/plain, Size: 2682 bytes --]
Add backing support for HDIO_GETGEO ioctl to blkfront.
Inspired by an earlier patch from Charles Coffing.
Signed-Off-By: Jan Beulich <jbeulich@novell.com>
Index: head-2006-05-11/drivers/xen/blkfront/blkfront.c
===================================================================
--- head-2006-05-11.orig/drivers/xen/blkfront/blkfront.c 2006-05-12 09:39:21.000000000 +0200
+++ head-2006-05-11/drivers/xen/blkfront/blkfront.c 2006-05-15 09:59:52.000000000 +0200
@@ -452,10 +452,6 @@ int blkif_ioctl(struct inode *inode, str
command, (long)argument, inode->i_rdev);
switch (command) {
- case HDIO_GETGEO:
- /* return ENOSYS to use defaults */
- return -ENOSYS;
-
case CDROMMULTISESSION:
DPRINTK("FIXME: support multisession CDs later\n");
for (i = 0; i < sizeof(struct cdrom_multisession); i++)
@@ -473,6 +469,23 @@ int blkif_ioctl(struct inode *inode, str
}
+int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
+{
+ /* We don't have real geometry info, but let's at least return
+ values consistent with the size of the device */
+ sector_t nsect = get_capacity(bd->bd_disk);
+ sector_t cylinders = nsect;
+
+ hg->heads = 0xff;
+ hg->sectors = 0x3f;
+ sector_div(cylinders, hg->heads * hg->sectors);
+ hg->cylinders = cylinders;
+ if ((sector_t)(hg->cylinders + 1) * hg->heads * hg->sectors < nsect)
+ hg->cylinders = 0xffff;
+ return 0;
+}
+
+
/*
* blkif_queue_request
*
Index: head-2006-05-11/drivers/xen/blkfront/block.h
===================================================================
--- head-2006-05-11.orig/drivers/xen/blkfront/block.h 2006-05-12 09:39:21.000000000 +0200
+++ head-2006-05-11/drivers/xen/blkfront/block.h 2006-05-10 11:06:51.000000000 +0200
@@ -140,6 +140,7 @@ extern int blkif_open(struct inode *inod
extern int blkif_release(struct inode *inode, struct file *filep);
extern int blkif_ioctl(struct inode *inode, struct file *filep,
unsigned command, unsigned long argument);
+extern int blkif_getgeo(struct block_device *, struct hd_geometry *);
extern int blkif_check(dev_t dev);
extern int blkif_revalidate(dev_t dev);
extern void do_blkif_request (request_queue_t *rq);
Index: head-2006-05-11/drivers/xen/blkfront/vbd.c
===================================================================
--- head-2006-05-11.orig/drivers/xen/blkfront/vbd.c 2006-05-12 09:39:21.000000000 +0200
+++ head-2006-05-11/drivers/xen/blkfront/vbd.c 2006-05-10 11:07:16.000000000 +0200
@@ -91,6 +91,7 @@ static struct block_device_operations xl
.open = blkif_open,
.release = blkif_release,
.ioctl = blkif_ioctl,
+ .getgeo = blkif_getgeo
};
spinlock_t blkif_io_lock = SPIN_LOCK_UNLOCKED;
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-05-16 7:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-15 18:15 [PATCH] blkfront: ioctls/geometry, 2.6 Pascal Bouchareine
2006-05-16 7:18 ` Jan Beulich
2006-05-16 7:35 ` Pascal Bouchareine
2006-05-16 7:49 ` Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.