exit
fi
done
+From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001
+From: Eric Work <work.eric@gmail.com>
+Date: Mon, 18 May 2015 23:26:23 -0700
+Subject: md/raid0: fix restore to sector variable in raid0_make_request
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
- for (i = 0; i < ETH_ALEN; i++)
- dev->dev_addr[i] = RTL_R8(MAC0 + i);
-
-+ if (!is_valid_ether_addr(dev->dev_addr)) {
-+ /* Report it and use a random ethernet address instead */
-+ netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+ random_ether_addr(dev->dev_addr);
-+ netdev_info(dev, "Using random MAC address: %pM\n",
-+ dev->dev_addr);
-+ }
-+
- SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
- dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
-
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
+The variable "sector" in "raid0_make_request()" was improperly updated
+by a call to "sector_div()" which modifies its first argument in place.
+Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
+after the call for later re-use. Unfortunetly the restore was done after
+the referenced variable "bio" was advanced. This lead to the original
+value and the restored value being different. Here we move this line to
+the proper place.
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
+One observed side effect of this bug was discarding a file though
+unlinking would cause an unrelated file's contents to be discarded.
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
+Signed-off-by: NeilBrown <neilb@suse.de>
+Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
+Cc: stable@vger.kernel.org (any that received above backport)
+URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@
- {
- int i, result;
+diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
+index 6a68ef5..efb654e 100644
+--- a/drivers/md/raid0.c
++++ b/drivers/md/raid0.c
+@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
+ ? (sector & (chunk_sects-1))
+ : sector_div(sector, chunk_sects));
-+ if (sdev->skip_vpd_pages)
-+ goto fail;
-+
- /* Ask for all the pages supported by this device */
- result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- if (result)
-
-David Vrabel identified a regression when using automatic NUMA balancing
-under Xen whereby page table entries were getting corrupted due to the
-use of native PTE operations. Quoting him
-
- Xen PV guest page tables require that their entries use machine
- addresses if the preset bit (_PAGE_PRESENT) is set, and (for
- successful migration) non-present PTEs must use pseudo-physical
- addresses. This is because on migration MFNs in present PTEs are
- translated to PFNs (canonicalised) so they may be translated back
- to the new MFN in the destination domain (uncanonicalised).
-
- pte_mknonnuma(), pmd_mknonnuma(), pte_mknuma() and pmd_mknuma()
- set and clear the _PAGE_PRESENT bit using pte_set_flags(),
- pte_clear_flags(), etc.
-
- In a Xen PV guest, these functions must translate MFNs to PFNs
- when clearing _PAGE_PRESENT and translate PFNs to MFNs when setting
- _PAGE_PRESENT.
-
-His suggested fix converted p[te|md]_[set|clear]_flags to using
-paravirt-friendly ops but this is overkill. He suggested an alternative of
-using p[te|md]_modify in the NUMA page table operations but this is does
-more work than necessary and would require looking up a VMA for protections.
-
-This patch modifies the NUMA page table operations to use paravirt friendly
-operations to set/clear the flags of interest. Unfortunately this will take
-a performance hit when updating the PTEs on CONFIG_PARAVIRT but I do not
-see a way around it that does not break Xen.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mel Gorman <mgorman@suse.de>
-Acked-by: David Vrabel <david.vrabel@citrix.com>
-Tested-by: David Vrabel <david.vrabel@citrix.com>
----
- include/asm-generic/pgtable.h | 31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
-diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 34c7bdc..38a7437 100644
---- a/include/asm-generic/pgtable.h
-+++ b/include/asm-generic/pgtable.h
-@@ -680,24 +680,35 @@ static inline int pmd_numa(pmd_t pmd)
- #ifndef pte_mknonnuma
- static inline pte_t pte_mknonnuma(pte_t pte)
- {
-- pte = pte_clear_flags(pte, _PAGE_NUMA);
-- return pte_set_flags(pte, _PAGE_PRESENT|_PAGE_ACCESSED);
-+ pteval_t val = pte_val(pte);
-+
-+ val &= ~_PAGE_NUMA;
-+ val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
-+ return __pte(val);
- }
- #endif
-
- #ifndef pmd_mknonnuma
- static inline pmd_t pmd_mknonnuma(pmd_t pmd)
- {
-- pmd = pmd_clear_flags(pmd, _PAGE_NUMA);
-- return pmd_set_flags(pmd, _PAGE_PRESENT|_PAGE_ACCESSED);
-+ pmdval_t val = pmd_val(pmd);
-+
-+ val &= ~_PAGE_NUMA;
-+ val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
-+
-+ return __pmd(val);
- }
- #endif
-
- #ifndef pte_mknuma
- static inline pte_t pte_mknuma(pte_t pte)
- {
-- pte = pte_set_flags(pte, _PAGE_NUMA);
-- return pte_clear_flags(pte, _PAGE_PRESENT);
-+ pteval_t val = pte_val(pte);
-+
-+ val &= ~_PAGE_PRESENT;
-+ val |= _PAGE_NUMA;
-+
-+ return __pte(val);
- }
- #endif
-
-@@ -716,8 +727,12 @@ static inline void ptep_set_numa(struct mm_struct *mm, unsigned long addr,
- #ifndef pmd_mknuma
- static inline pmd_t pmd_mknuma(pmd_t pmd)
- {
-- pmd = pmd_set_flags(pmd, _PAGE_NUMA);
-- return pmd_clear_flags(pmd, _PAGE_PRESENT);
-+ pmdval_t val = pmd_val(pmd);
-+
-+ val &= ~_PAGE_PRESENT;
-+ val |= _PAGE_NUMA;
++ /* Restore due to sector_div */
++ sector = bio->bi_iter.bi_sector;
+
-+ return __pmd(val);
- }
- #endif
+ if (sectors < bio_sectors(bio)) {
+ split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
+ bio_chain(split, bio);
+@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
+ split = bio;
+ }
+- sector = bio->bi_iter.bi_sector;
+ zone = find_zone(mddev->private, §or);
+ tmp_dev = map_sector(mddev, zone, sector, §or);
+ split->bi_bdev = tmp_dev->bdev;
--
-1.8.4.5
+cgit v0.10.2
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at http://www.tux.org/lkml/
projects / packages / kernel.git / blobdiff