Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: GKI: scsi: add Android ABI padding to some structures

Browse Source 
Try to mitigate potential future driver core api changes by adding a
padding to struct scsi_cmnd, struct scsi_device, and struct
scsi_host_template.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie6a2b91970e8f9063bf00e96a0dff661f77b8e8d
This commit is contained in:
Greg Kroah-Hartman
2020-04-22 15:35:08 +02:00
parent 7285789223
commit fa1f82f61b
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/scsi/scsi_cmnd.h
View File

@ -11,6 +11,7 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
#include <scsi/scsi_request.h> #include <scsi/scsi_request.h>
#include <linux/android_kabi.h>
struct Scsi_Host; struct Scsi_Host;
struct scsi_driver; struct scsi_driver;
@ -147,6 +148,11 @@ struct scsi_cmnd {
int flags; /* Command flags */ int flags; /* Command flags */
unsigned char tag; /* SCSI-II queued command tag */ unsigned char tag; /* SCSI-II queued command tag */
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
/* /*

6
include/scsi/scsi_device.h
View File

@ -8,6 +8,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/android_kabi.h>
struct device; struct device;
struct request_queue; struct request_queue;
@ -232,6 +233,11 @@ struct scsi_device {
enum scsi_device_state sdev_state; enum scsi_device_state sdev_state;
struct task_struct *quiesced_by; struct task_struct *quiesced_by;
unsigned long sdev_data[0]; unsigned long sdev_data[0];
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
} __attribute__((aligned(sizeof(unsigned long)))); } __attribute__((aligned(sizeof(unsigned long))));
#define to_scsi_device(d) \ #define to_scsi_device(d) \

6
include/scsi/scsi_host.h
View File

@ -10,6 +10,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <linux/android_kabi.h>
struct request_queue; struct request_queue;
struct block_device; struct block_device;
@ -487,6 +488,11 @@ struct scsi_host_template {
/* Delay for runtime autosuspend */ /* Delay for runtime autosuspend */
int rpm_autosuspend_delay; int rpm_autosuspend_delay;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
/* /*