Patch "s390/pci: enforce fmb page boundary rule" has been added to the 4.5-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
s390/pci: enforce fmb page boundary rule
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-pci-enforce-fmb-page-boundary-rule.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
80c544ded25ac14d7cc3e555abb8ed2c2da99b84Mon Sep 17 00:00:00 2001
From: Sebastian Ott <[email protected]>
Date: Mon, 14 Mar 2016 15:47:23 +0100
Subject: s390/pci: enforce fmb page boundary rule
From: Sebastian Ott <[email protected]>
commit 80c544ded25ac14d7cc3e555abb8ed2c2da99b84 upstream.
The function measurement block must not cross a page boundary. Ensure that by raising the alignment requirement to the smallest power of 2 larger than the size of the fmb.
--- arch/s390/include/asm/pci.h | 2 +- arch/s390/pci/pci.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/s390/include/asm/pci.h +1 -1
@@ -45,7 +45,7 @@ struct zpci_fmb {u64 rpcit_ops;u64 dma_rbytes;u64 dma_wbytes; -} __packed__aligned(16) ; +} __packed__aligned(64) ;enum zpci_state {ZPCI_FN_STATE_RESERVED ,
arch/s390/pci/pci.c +4 -1
@@ -864,8 +864,11 @@ static inline int barsize(u8 size)static int zpci_mem_init (void ) { +BUILD_BUG_ON (!is_power_of_2 (__alignof__(struct zpci_fmb )) || + __alignof__(struct zpci_fmb ) <sizeof (struct zpci_fmb )); + zdev_fmb_cache =kmem_cache_create ("PCI_FMB_cache" ,sizeof (struct zpci_fmb ), -16 ,0 ,NULL ); + __alignof__(struct zpci_fmb ),0 ,NULL );if (!zdev_fmb_cache) goto error_fmb;
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/s390-pci-enforce-fmb-page-boundary-rule.patch