|
 |
86635eb |
From c6f081c88ab76d5a40365b94c1f5839e099b2b2b Mon Sep 17 00:00:00 2001
|
|
|
86635eb |
From: "sumit.saxena@avagotech.com" <sumit.saxena@avagotech.com>
|
|
|
86635eb |
Date: Thu, 15 Oct 2015 13:40:04 +0530
|
|
|
86635eb |
Subject: [PATCH] megaraid_sas: Do not use PAGE_SIZE for max_sectors
|
|
|
86635eb |
|
|
|
86635eb |
Do not use PAGE_SIZE marco to calculate max_sectors per I/O
|
|
|
86635eb |
request. Driver code assumes PAGE_SIZE will be always 4096 which can
|
|
|
86635eb |
lead to wrongly calculated value if PAGE_SIZE is not 4096. This issue
|
|
|
86635eb |
was reported in Ubuntu Bugzilla Bug #1475166.
|
|
|
86635eb |
|
|
|
86635eb |
Cc: <stable@vger.kernel.org>
|
|
|
86635eb |
Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
|
|
|
86635eb |
Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
|
|
|
86635eb |
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
|
|
|
86635eb |
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
86635eb |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
86635eb |
---
|
|
|
86635eb |
drivers/scsi/megaraid/megaraid_sas.h | 2 ++
|
|
|
86635eb |
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
|
|
|
86635eb |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
86635eb |
|
|
|
86635eb |
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
|
|
|
86635eb |
index 20c37541963f..ebf821b94cb6 100644
|
|
|
86635eb |
--- a/drivers/scsi/megaraid/megaraid_sas.h
|
|
|
86635eb |
+++ b/drivers/scsi/megaraid/megaraid_sas.h
|
|
|
86635eb |
@@ -364,6 +364,8 @@ enum MR_EVT_ARGS {
|
|
|
86635eb |
MR_EVT_ARGS_GENERIC,
|
|
|
86635eb |
};
|
|
|
86635eb |
|
|
|
86635eb |
+
|
|
|
86635eb |
+#define SGE_BUFFER_SIZE 4096
|
|
|
86635eb |
/*
|
|
|
86635eb |
* define constants for device list query options
|
|
|
86635eb |
*/
|
|
|
86635eb |
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
86635eb |
index eaa81e552fd2..a9eb10ebc6ed 100644
|
|
|
86635eb |
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
86635eb |
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
|
86635eb |
@@ -4752,7 +4752,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
|
|
|
86635eb |
|
|
|
86635eb |
|
|
|
86635eb |
instance->max_sectors_per_req = instance->max_num_sge *
|
|
|
86635eb |
- PAGE_SIZE / 512;
|
|
|
86635eb |
+ SGE_BUFFER_SIZE / 512;
|
|
|
86635eb |
if (tmp_sectors && (instance->max_sectors_per_req > tmp_sectors))
|
|
|
86635eb |
instance->max_sectors_per_req = tmp_sectors;
|
|
|
86635eb |
|
|
|
86635eb |
--
|
|
|
86635eb |
2.4.3
|
|
|
86635eb |
|