DASD: fix discard for FBA devices
Subsystems (3)
Stefan Haberland
maintainercover DASD: fix discard for FBA devices
Hi Jens,
please see the following patch that fixes zero writes for DASD FBA devices under certain conditions.
Do you mind to take this for 5.9?
Jan Höppner (1):
s390/dasd: Fix zero write for FBA devices
drivers/s390/block/dasd_fba.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
Stefan Haberland
maintainerPATCH 1/1 s390/dasd: Fix zero write for FBA devices
From: Jan Höppner <[email protected]>
A discard request that writes zeros using the global kernel internal ZERO_PAGE will fail for machines with more than 2GB of memory due to the location of the ZERO_PAGE.
Fix this by using a driver owned global zero page allocated with GFP_DMA flag set.
Fixes 28b841b3a7cb ("s390/dasd: Add discard support for FBA devices")
Cc <[email protected]> # 4.14+
Signed-off-by Jan Höppner <[email protected]>
Reviewed-by Stefan Haberland <[email protected]>
--- drivers/s390/block/dasd_fba.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/s390/block/dasd_fba.c +8 -1
@@ -40,6 +40,7 @@MODULE_LICENSE ("GPL" );static struct dasd_discipline dasd_fba_discipline; +static void *dasd_fba_zero_page;struct dasd_fba_private {struct dasd_fba_characteristics rdc_data;
@@ -270,7 +271,7 @@ static void ccw_write_zero(struct ccw1 *ccw, int count) ccw->cmd_code =DASD_FBA_CCW_WRITE ; ccw->flags |=CCW_FLAG_SLI ; ccw->count = count; - ccw->cda = (__u32 ) (addr_t )page_to_phys (ZERO_PAGE (0 )); + ccw->cda = (__u32 ) (addr_t ) dasd_fba_zero_page; }/*
@@ -830,6 +831,11 @@ dasd_fba_init(void)int ret;ASCEBC (dasd_fba_discipline.ebcname,4 ); + + dasd_fba_zero_page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); +if (!dasd_fba_zero_page) +return -ENOMEM ; + ret =ccw_driver_register (&dasd_fba_driver);if (!ret)wait_for_device_probe ();
@@ -841,6 +847,7 @@ static void __exitdasd_fba_cleanup (void) {ccw_driver_unregister (&dasd_fba_driver); +free_page ((unsigned long )dasd_fba_zero_page); }module_init (dasd_fba_init);
Signature · 1 line
2.17.1
Quoted 5 lines · Stefan Haberland
Hi Jens,
please see the following patch that fixes zero writes for DASD FBA devices under certain conditions.
Do you mind to take this for 5.9?
Applied, thanks.
Signature · 1 line
Jens Axboe