---- linux-5.1/net/sunrpc/Kconfig~ 2019-05-06 02:42:58.000000000 +0200
-+++ linux-5.1/net/sunrpc/Kconfig 2019-05-10 12:54:36.566903892 +0200
-@@ -34,7 +34,7 @@ config RPCSEC_GSS_KRB5
-
- If unsure, say Y.
-
--config CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES
-+config SUNRPC_DISABLE_INSECURE_ENCTYPES
- bool "Secure RPC: Disable insecure Kerberos encryption types"
- depends on RPCSEC_GSS_KRB5
- default n
-Move setting up operation and write hint to xfs_alloc_ioend, and
-then just copy over all needed information from the previous bio
-in xfs_chain_bio and stop passing various parameters to it.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
----
- fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
-index a6f0f4761a37..9cceb90e77c5 100644
---- a/fs/xfs/xfs_aops.c
-+++ b/fs/xfs/xfs_aops.c
-@@ -665,7 +665,6 @@ xfs_submit_ioend(
-
- ioend->io_bio->bi_private = ioend;
- ioend->io_bio->bi_end_io = xfs_end_bio;
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-
- /*
- * If we are failing the IO now, just mark the ioend with an
-@@ -679,7 +678,6 @@ xfs_submit_ioend(
- return status;
- }
-
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
- submit_bio(ioend->io_bio);
- return 0;
- }
-@@ -691,7 +689,8 @@ xfs_alloc_ioend(
- xfs_exntst_t state,
- xfs_off_t offset,
- struct block_device *bdev,
-- sector_t sector)
-+ sector_t sector,
-+ struct writeback_control *wbc)
+; https://lkml.org/lkml/2019/7/10/244
+diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h
+--- linux-5.3/drivers/scsi/aacraid.org/aacraid.h 2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/aacraid.h 2019-11-04 09:29:51.321486211 +0100
+@@ -2740,17 +2740,6 @@
+ int aac_rx_deliver_producer(struct fib * fib);
+ void aac_reinit_aif(struct aac_dev *aac, unsigned int index);
+
+-static inline int aac_is_src(struct aac_dev *dev)
+-{
+- u16 device = dev->pdev->device;
+-
+- if (device == PMC_DEVICE_S6 ||
+- device == PMC_DEVICE_S7 ||
+- device == PMC_DEVICE_S8)
+- return 1;
+- return 0;
+-}
+-
+ static inline int aac_supports_2T(struct aac_dev *dev)
{
- struct xfs_ioend *ioend;
- struct bio *bio;
-@@ -699,6 +698,8 @@ xfs_alloc_ioend(
- bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
- bio_set_dev(bio, bdev);
- bio->bi_iter.bi_sector = sector;
-+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-+ bio->bi_write_hint = inode->i_write_hint;
-
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
- INIT_LIST_HEAD(&ioend->io_list);
-@@ -719,24 +720,22 @@ xfs_alloc_ioend(
- * so that the bi_private linkage is set up in the right direction for the
- * traversal in xfs_destroy_ioend().
- */
--static void
-+static struct bio *
- xfs_chain_bio(
-- struct xfs_ioend *ioend,
-- struct writeback_control *wbc,
-- struct block_device *bdev,
-- sector_t sector)
-+ struct bio *prev)
+ return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
+diff -ur linux-5.3/drivers/scsi/aacraid.org/comminit.c linux-5.3/drivers/scsi/aacraid/comminit.c
+--- linux-5.3/drivers/scsi/aacraid.org/comminit.c 2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/comminit.c 2019-11-04 09:29:51.321486211 +0100
+@@ -41,8 +41,11 @@
{
- struct bio *new;
-
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
-- bio_set_dev(new, bdev);
-- new->bi_iter.bi_sector = sector;
-- bio_chain(ioend->io_bio, new);
-- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
-- submit_bio(ioend->io_bio);
-- ioend->io_bio = new;
-+ bio_copy_dev(new, prev);
-+ new->bi_iter.bi_sector = bio_end_sector(prev);
-+ new->bi_opf = prev->bi_opf;
-+ new->bi_write_hint = prev->bi_write_hint;
-+
-+ bio_chain(prev, new);
-+ bio_get(prev); /* for xfs_destroy_ioend */
-+ submit_bio(prev);
-+ return new;
+ u32 status = 0;
+
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ status = src_readl(dev, MUnit.OMR);
++ }
+ return (status & AAC_INT_MODE_MSIX);
}
- /*
-@@ -772,7 +772,7 @@ xfs_add_to_ioend(
- if (wpc->ioend)
- list_add(&wpc->ioend->io_list, iolist);
- wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
-- wpc->imap.br_state, offset, bdev, sector);
-+ wpc->imap.br_state, offset, bdev, sector, wbc);
- }
-
- merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff,
-@@ -783,7 +783,7 @@ xfs_add_to_ioend(
-
- if (!merged) {
- if (bio_full(wpc->ioend->io_bio, len))
-- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
-+ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
- bio_add_page(wpc->ioend->io_bio, page, len, poff);
- }
-
---
-2.20.1
-
-
-Link every newly allocated writeback bio to cgroup pointed to by the
-writeback control structure, and charge every byte written back to it.
-
-Tested-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
----
- fs/xfs/xfs_aops.c | 4 +++-
- fs/xfs/xfs_super.c | 2 ++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
-index 9cceb90e77c5..73c291aeae17 100644
---- a/fs/xfs/xfs_aops.c
-+++ b/fs/xfs/xfs_aops.c
-@@ -700,6 +700,7 @@ xfs_alloc_ioend(
- bio->bi_iter.bi_sector = sector;
- bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
- bio->bi_write_hint = inode->i_write_hint;
-+ wbc_init_bio(wbc, bio);
-
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
- INIT_LIST_HEAD(&ioend->io_list);
-@@ -727,7 +728,7 @@ xfs_chain_bio(
- struct bio *new;
-
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
-- bio_copy_dev(new, prev);
-+ bio_copy_dev(new, prev);/* also copies over blkcg information */
- new->bi_iter.bi_sector = bio_end_sector(prev);
- new->bi_opf = prev->bi_opf;
- new->bi_write_hint = prev->bi_write_hint;
-@@ -782,6 +783,7 @@ xfs_add_to_ioend(
+@@ -349,7 +352,8 @@
+ /* FIB should be freed only after getting the response from the F/W */
+ if (status != -ERESTARTSYS)
+ aac_fib_free(fibctx);
+- if (aac_is_src(dev) &&
++ if ((dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) &&
+ dev->msi_enabled)
+ aac_set_intx_mode(dev);
+ return status;
+@@ -610,7 +614,8 @@
+ dev->max_fib_size = status[1] & 0xFFE0;
+ host->sg_tablesize = status[2] >> 16;
+ dev->sg_tablesize = status[2] & 0xFFFF;
+- if (aac_is_src(dev)) {
++ if (dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ if (host->can_queue > (status[3] >> 16) -
+ AAC_NUM_MGT_FIB)
+ host->can_queue = (status[3] >> 16) -
+@@ -629,7 +634,9 @@
+ pr_warn("numacb=%d ignored\n", numacb);
}
- wpc->ioend->io_size += len;
-+ wbc_account_io(wbc, page, len);
- }
-
- STATIC void
-diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
-index 594c119824cc..ee0df8f611ff 100644
---- a/fs/xfs/xfs_super.c
-+++ b/fs/xfs/xfs_super.c
-@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(
- sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
- sb->s_max_links = XFS_MAXLINK;
- sb->s_time_gran = 1;
-+ sb->s_iflags |= SB_I_CGROUPWB;
-+
- set_posix_acl_flag(sb);
-
- /* version 5 superblocks support inode version counters. */
---
-2.20.1
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8)
+ aac_define_int_mode(dev);
+ /*
+ * Ok now init the communication subsystem
+diff -ur linux-5.3/drivers/scsi/aacraid.org/commsup.c linux-5.3/drivers/scsi/aacraid/commsup.c
+--- linux-5.3/drivers/scsi/aacraid.org/commsup.c 2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/commsup.c 2019-11-04 09:29:51.321486211 +0100
+@@ -2593,7 +2593,9 @@
+ {
+ int i;
+
+- if (aac_is_src(dev)) {
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ if (dev->max_msix > 1) {
+ for (i = 0; i < dev->max_msix; i++)
+ free_irq(pci_irq_vector(dev->pdev, i),
+diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacraid/linit.c
+--- linux-5.3/drivers/scsi/aacraid.org/linit.c 2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/linit.c 2019-11-04 09:29:51.321486211 +0100
+@@ -1567,8 +1567,9 @@
+ aac_send_shutdown(aac);
+
+ aac_adapter_disable_int(aac);
+-
+- if (aac_is_src(aac)) {
++ if (aac->pdev->device == PMC_DEVICE_S6 ||
++ aac->pdev->device == PMC_DEVICE_S7 ||
++ aac->pdev->device == PMC_DEVICE_S8) {
+ if (aac->max_msix > 1) {
+ for (i = 0; i < aac->max_msix; i++) {
+ free_irq(pci_irq_vector(aac->pdev, i),
+@@ -1858,7 +1859,8 @@
+ aac_adapter_enable_int(dev);
+
+
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8)
+ aac_define_int_mode(dev);
+
+ if (dev->msi_enabled)
projects / packages / kernel.git / blobdiff