Skip to contentSkip to conversation

blkfront: ioctls/geometry, 2.6

PATCH RESEND In review Jan Beulich 2 participants 4 messages Jun 2, 2006 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 blkfront: ioctls/geometry, 2.6

Add backing support for HDIO_GETGEO ioctl to blkfront.

Inspired by an earlier patch from Charles Coffing.

drivers/xen/blkfront/blkfront.c +17 -4
Index: head-2006-05-11/drivers/xen/blkfront/blkfront.c
===================================================================
@@ -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
  *
drivers/xen/blkfront/block.h +1 -0
Index: head-2006-05-11/drivers/xen/blkfront/block.h
===================================================================
@@ -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);
drivers/xen/blkfront/vbd.c +1 -0
Index: head-2006-05-11/drivers/xen/blkfront/vbd.c
===================================================================
@@ -91,6 +91,7 @@ static struct block_device_operations xl
 	.open = blkif_open,
 	.release = blkif_release,
 	.ioctl  = blkif_ioctl,
+	.getgeo = blkif_getgeo
 };
 
 DEFINE_SPINLOCK(blkif_io_lock);

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 3 lines · Jan Beulich

Add backing support for HDIO_GETGEO ioctl to blkfront.

Inspired by an earlier patch from Charles Coffing.

Does this have any effect? It looks to me as though HDIO_GETGEO is handled by block/ioctl.c:blkdev_ioctl(). I also note that *no* other blkdev drivers define their own HDIO_GETGEO handler. Shouldn't we just remove that case from our ioctl switch statement and define a 'getgeo' function hook?

Given that this patch can't have any effect, what drove you guys to implement it? :-)

-- Keir

#2 lore raw
Quoted 6 lines
Quoted 1 line
Quoted 1 line

Keir Fraser <[email protected]> 02.06.06 12:19 >>>

Quoted 2 lines · Jan Beulich

Add backing support for HDIO_GETGEO ioctl to blkfront.

Quoted 7 lines
Quoted 1 line

Inspired by an earlier patch from Charles Coffing.

Does this have any effect? It looks to me as though HDIO_GETGEO is handled by block/ioctl.c:blkdev_ioctl(). I also note that *no* other blkdev drivers define their own HDIO_GETGEO handler. Shouldn't we just remove that case from our ioctl switch statement and define a 'getgeo' function hook?

But that is exactly what the patch does. It instead adds a getgeo function to vbd, which is what several other drivers also have, and which is what backs blkdev_ioctl()'s handling of HDIO_GETGEO.

Quoted 2 lines

Given that this patch can't have any effect, what drove you guys to implement it? :-)

We saw GrUB failing when used inside a domU.

Jan

#3 lore raw
Quoted 3 lines · Jan Beulich

But that is exactly what the patch does. It instead adds a getgeo function to vbd, which is what several other drivers also have, and which is what backs blkdev_ioctl()'s handling of HDIO_GETGEO.

Huh, so it does. It looks okay then. :-) I'll apply to -unstable and -testing.

-- Keir