June 2019 - Linux-stable-mirror

[to-be-updated] libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields has been removed from the -mm tree. Its filename was libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Dan Williams <dan.j.williams(a)intel.com> Subject: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields At namespace creation time there is the potential for the "expected to be zero" fields of a 'pfn' info-block to be filled with indeterminate data. While the kernel buffer is zeroed on allocation it is immediately overwritten by nd_pfn_validate() filling it with the current contents of the on-media info-block location. For fields like, 'flags' and the 'padding' it potentially means that future implementations can not rely on those fields being zero. In preparation to stop using the 'start_pad' and 'end_trunc' fields for section alignment, arrange for fields that are not explicitly initialized to be guaranteed zero. Bump the minor version to indicate it is safe to assume the 'padding' and 'flags' are zero. Otherwise, this corruption is expected to be benign since all other critical fields are explicitly initialized. Link: http://lkml.kernel.org/r/155977193862.2443951.10284714500308539570.stgit@dw… Fixes: 32ab0a3f5170 ("libnvdimm, pmem: 'struct page' for pmem") Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: David Hildenbrand <david(a)redhat.com> Cc: Jane Chu <jane.chu(a)oracle.com> Cc: Jeff Moyer <jmoyer(a)redhat.com> Cc: Jérôme Glisse <jglisse(a)redhat.com> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Logan Gunthorpe <logang(a)deltatee.com> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Mike Rapoport <rppt(a)linux.ibm.com> Cc: Oscar Salvador <osalvador(a)suse.de> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Pavel Tatashin <pasha.tatashin(a)soleen.com> Cc: Toshi Kani <toshi.kani(a)hpe.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/nvdimm/dax_devs.c | 2 +- drivers/nvdimm/pfn.h | 1 + drivers/nvdimm/pfn_devs.c | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) --- a/drivers/nvdimm/dax_devs.c~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/dax_devs.c @@ -118,7 +118,7 @@ int nd_dax_probe(struct device *dev, str nvdimm_bus_unlock(&ndns->dev); if (!dax_dev) return -ENOMEM; - pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); nd_pfn->pfn_sb = pfn_sb; rc = nd_pfn_validate(nd_pfn, DAX_SIG); dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>"); --- a/drivers/nvdimm/pfn_devs.c~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/pfn_devs.c @@ -412,6 +412,15 @@ static int nd_pfn_clear_memmap_errors(st return 0; } +/** + * nd_pfn_validate - read and validate info-block + * @nd_pfn: fsdax namespace runtime state / properties + * @sig: 'devdax' or 'fsdax' signature + * + * Upon return the info-block buffer contents (->pfn_sb) are + * indeterminate when validation fails, and a coherent info-block + * otherwise. + */ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) { u64 checksum, offset; @@ -557,7 +566,7 @@ int nd_pfn_probe(struct device *dev, str nvdimm_bus_unlock(&ndns->dev); if (!pfn_dev) return -ENOMEM; - pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); nd_pfn = to_nd_pfn(pfn_dev); nd_pfn->pfn_sb = pfn_sb; rc = nd_pfn_validate(nd_pfn, PFN_SIG); @@ -694,7 +703,7 @@ static int nd_pfn_init(struct nd_pfn *nd u64 checksum; int rc; - pfn_sb = devm_kzalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL); if (!pfn_sb) return -ENOMEM; @@ -703,11 +712,14 @@ static int nd_pfn_init(struct nd_pfn *nd sig = DAX_SIG; else sig = PFN_SIG; + rc = nd_pfn_validate(nd_pfn, sig); if (rc != -ENODEV) return rc; /* no info block, do init */; + memset(pfn_sb, 0, sizeof(*pfn_sb)); + nd_region = to_nd_region(nd_pfn->dev.parent); if (nd_region->ro) { dev_info(&nd_pfn->dev, @@ -760,7 +772,7 @@ static int nd_pfn_init(struct nd_pfn *nd memcpy(pfn_sb->uuid, nd_pfn->uuid, 16); memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16); pfn_sb->version_major = cpu_to_le16(1); - pfn_sb->version_minor = cpu_to_le16(2); + pfn_sb->version_minor = cpu_to_le16(3); pfn_sb->start_pad = cpu_to_le32(start_pad); pfn_sb->end_trunc = cpu_to_le32(end_trunc); pfn_sb->align = cpu_to_le32(nd_pfn->align); --- a/drivers/nvdimm/pfn.h~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/pfn.h @@ -28,6 +28,7 @@ struct nd_pfn_sb { __le32 end_trunc; /* minor-version-2 record the base alignment of the mapping */ __le32 align; + /* minor-version-3 guarantee the padding and flags are zero */ u8 padding[4000]; __le64 checksum; }; _ Patches currently in -mm which might be from dan.j.williams(a)intel.com are drivers-base-devres-introduce-devm_release_action.patch mm-devm_memremap_pages-introduce-devm_memunmap_pages.patch pci-p2pdma-fix-the-gen_pool_add_virt-failure-path.patch lib-genalloc-introduce-chunk-owners.patch pci-p2pdma-track-pgmap-references-per-resource-not-globally.patch mm-devm_memremap_pages-fix-final-page-put-race.patch libnvdimm-pfn-stop-padding-pmem-namespaces-to-section-alignment.patch

5 years, 12 months

1
0
0 0

RFQ Material INF18002(non-ARAMCO)

by Malik Sajja

Dear Sir, Pls quote the attached RFQ ASAP. Mention the make of each item and MTC 3.1 also. Pipe required welded only Outokumpu make. Thx,/Sajjad Malik

5 years, 12 months

1
0
0 0

[PATCH 1/2] block: Fix a NULL pointer dereference in generic_make_request()

by Song Liu

From: "Guilherme G. Piccoli" <gpiccoli(a)canonical.com> Commit 37f9579f4c31 ("blk-mq: Avoid that submitting a bio concurrently with device removal triggers a crash") introduced a NULL pointer dereference in generic_make_request(). The patch sets q to NULL and enter_succeeded to false; right after, there's an 'if (enter_succeeded)' which is not taken, and then the 'else' will dereference q in blk_queue_dying(q). This patch just moves the 'q = NULL' to a point in which it won't trigger the oops, although the semantics of this NULLification remains untouched. A simple test case/reproducer is as follows: a) Build kernel v5.2-rc1 with CONFIG_BLK_CGROUP=n. b) Create a raid0 md array with 2 NVMe devices as members, and mount it with an ext4 filesystem. c) Run the following oneliner (supposing the raid0 is mounted in /mnt): (dd of=/mnt/tmp if=/dev/zero bs=1M count=999 &); sleep 0.3; echo 1 > /sys/block/nvme0n1/device/device/remove (whereas nvme0n1 is the 2nd array member) This will trigger the following oops: BUG: unable to handle kernel NULL pointer dereference at 0000000000000078 PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI RIP: 0010:generic_make_request+0x32b/0x400 Call Trace: submit_bio+0x73/0x140 ext4_io_submit+0x4d/0x60 ext4_writepages+0x626/0xe90 do_writepages+0x4b/0xe0 [...] This patch has no functional changes and preserves the md/raid0 behavior when a member is removed before kernel v4.17. Cc: stable(a)vger.kernel.org # v4.17 Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Reviewed-by: Ming Lei <ming.lei(a)redhat.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Tested-by: Eric Ren <renzhengeek(a)gmail.com> Fixes: 37f9579f4c31 ("blk-mq: Avoid that submitting a bio concurrently with device removal triggers a crash") Signed-off-by: Guilherme G. Piccoli <gpiccoli(a)canonical.com> Signed-off-by: Song Liu <songliubraving(a)fb.com> --- block/blk-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index a55389ba8779..d24a29244cb8 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1074,10 +1074,8 @@ blk_qc_t generic_make_request(struct bio *bio) flags = 0; if (bio->bi_opf & REQ_NOWAIT) flags = BLK_MQ_REQ_NOWAIT; - if (blk_queue_enter(q, flags) < 0) { + if (blk_queue_enter(q, flags) < 0) enter_succeeded = false; - q = NULL; - } } if (enter_succeeded) { @@ -1108,6 +1106,7 @@ blk_qc_t generic_make_request(struct bio *bio) bio_wouldblock_error(bio); else bio_io_error(bio); + q = NULL; } bio = bio_list_pop(&bio_list_on_stack[0]); } while (bio); -- 2.17.1

5 years, 12 months

6
12
0 0

[PATCH] phy: qcom-qmp: Correct READY_STATUS poll break condition

by Bjorn Andersson

After issuing a PHY_START request to the QMP, the hardware documentation states that the software should wait for the PCS_READY_STATUS to become 1. With the introduction of c9b589791fc1 ("phy: qcom: Utilize UFS reset controller") an additional 1ms delay was introduced between the start request and the check of the status bit. This greatly increases the chances for the hardware to actually becoming ready before the status bit is read. The result can be seen in that UFS PHY enabling is now reported as a failure in 10% of the boots on SDM845, which is a clear regression from the previous rare/occasional failure. This patch fixes the "break condition" of the poll to check for the correct state of the status bit. Unfortunately PCIe on 8996 and 8998 does not specify the mask_pcs_ready register, which means that the code checks a bit that's always 0. So the patch also fixes these, in order to not regress these targets. Cc: stable(a)vger.kernel.org Cc: Evan Green <evgreen(a)chromium.org> Cc: Marc Gonzalez <marc.w.gonzalez(a)free.fr> Cc: Vivek Gautam <vivek.gautam(a)codeaurora.org> Fixes: 73d7ec899bd8 ("phy: qcom-qmp: Add msm8998 PCIe QMP PHY support") Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets") Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- @Kishon, this is a regression spotted in v5.2-rc1, so please consider applying this towards v5.2. drivers/phy/qualcomm/phy-qcom-qmp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index cd91b4179b10..43abdfd0deed 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -1074,6 +1074,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { .start_ctrl = PCS_START | PLL_READY_GATE_EN, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, + .mask_pcs_ready = PHYSTATUS, .mask_com_pcs_ready = PCS_READY, .has_phy_com_ctrl = true, @@ -1253,6 +1254,7 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, + .mask_pcs_ready = PHYSTATUS, .mask_com_pcs_ready = PCS_READY, }; @@ -1547,7 +1549,7 @@ static int qcom_qmp_phy_enable(struct phy *phy) status = pcs + cfg->regs[QPHY_PCS_READY_STATUS]; mask = cfg->mask_pcs_ready; - ret = readl_poll_timeout(status, val, !(val & mask), 1, + ret = readl_poll_timeout(status, val, val & mask, 1, PHY_INIT_COMPLETE_TIMEOUT); if (ret) { dev_err(qmp->dev, "phy initialization timed-out\n"); -- 2.18.0

5 years, 12 months

3
3
0 0

✅ PASS: Stable queue: queue-4.19

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 768292d05361 - Linux 4.19.50 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 768292d05361 - Linux 4.19.50 We then merged the patchset with `git am`: rapidio-fix-a-null-pointer-dereference-when-create_w.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 fs-fat-file.c-issue-flush-after-the-writeback-of-fat.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 sysctl-return-einval-if-val-violates-minmax.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-pl111-initialize-clock-spinlock-early.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-prevent-tracing-ipi_cpu_backtrace.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-hmm-select-mmu-notifier-when-selecting-hmm.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-cma.c-fix-crash-on-cma-allocation-if-bitmap-alloc.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 initramfs-free-initrd-memory-if-opening-initrd.image.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-page_mkclean-vs-madv_dontneed-race.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drivers-thermal-tsens-don-t-print-error-message-on-e.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mfd-tps65912-spi-add-missing-of-table-registration.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mfd-intel-lpss-set-the-device-in-reset-state-when-in.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mfd-twl6040-fix-device-init-errors-for-accctl-regist.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 perf-x86-intel-allow-pebs-multi-entry-in-watermark-m.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-nouveau-kms-gf119-gp10x-push-headsetcontroloutpu.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-bridge-adv7511-fix-low-refresh-rate-selection.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 objtool-don-t-use-ignore-flag-for-fake-jumps.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 bpf-fix-undefined-behavior-in-narrow-load-handling.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 edac-mpc85xx-prevent-building-as-a-module.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pwm-meson-use-the-spin-lock-only-to-protect-register.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mailbox-stm32-ipcc-check-invalid-irq.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 ntp-allow-tai-utc-offset-to-be-set-to-zero.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-avoid-panic-in-do_recover_data.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-do-sanity-check-on-free-nid.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-avoid-panic-in-dec_valid_block_count.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 f2fs-fix-to-do-checksum-even-if-inode-page-is-uptoda.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 percpu-remove-spurious-lock-dependency-between-percp.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 configfs-fix-possible-use-after-free-in-configfs_reg.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-dwc-free-msi-in-dw_pcie_host_init-error-path.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-dwc-free-msi-irq-page-in-dw_pcie_free_msi.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 ovl-do-not-generate-duplicate-fsnotify-events-for-fa.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mmc-mmci-prevent-polling-for-busy-detection-in-irq-c.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 netfilter-nf_flow_table-fix-missing-error-check-for-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 netfilter-nf_conntrack_h323-restore-boundary-check-c.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 mips-make-sure-dt-memory-regions-are-valid.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 netfilter-nf_tables-fix-base-chain-stat-rcu_derefere.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 watchdog-fix-compile-time-error-of-pretimeout-govern.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 iommu-vt-d-set-intel_iommu_gfx_mapped-correctly.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 misc-pci_endpoint_test-fix-test_reg_bar-to-be-update.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-designware-ep-use-aligned-atu-window-for-raising.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nvme-pci-unquiesce-admin-queue-on-shutdown.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nvme-pci-shutdown-on-timeout-during-deletion.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 alsa-hda-register-irq-handler-after-the-chip-initial.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nvmem-core-fix-read-buffer-in-place.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nvmem-sunxi_sid-support-sid-on-a83t-and-h5.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nfsd-allow-fh_want_write-to-be-called-twice.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 nfsd-avoid-uninitialized-variable-warning.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 vfio-fix-warning-do-not-call-blocking-ops-when-task_.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 iommu-arm-smmu-v3-don-t-disable-smmu-in-kdump-kernel.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 switchtec-fix-unintended-mask-of-mrpc-event.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 net-thunderbolt-unregister-thunderboltip-protocol-ha.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 x86-pci-fix-pci-irq-routing-table-memory-leak.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 i40e-queues-are-reserved-despite-invalid-argument-er.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 platform-chrome-cros_ec_proto-check-for-null-transfe.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-keystone-prevent-arm32-specific-code-to-be-compi.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 soc-mediatek-pwrap-zero-initialize-rdata-in-pwrap_in.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 clk-rockchip-turn-on-aclk_dmac1-for-suspend-on-rk328.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 soc-rockchip-set-the-proper-pwm-for-rk3288.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx51-specify-imx5_clk_ipg-as-ahb-clock-to-s.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx50-specify-imx5_clk_ipg-as-ahb-clock-to-s.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx53-specify-imx5_clk_ipg-as-ahb-clock-to-s.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx6sx-specify-imx6sx_clk_ipg-as-ahb-clock-t.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx6sll-specify-imx6sll_clk_ipg-as-ipg-clock.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx7d-specify-imx7d_clk_ipg-as-ipg-clock-to-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx6ul-specify-imx6ul_clk_ipg-as-ipg-clock-t.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx6sx-specify-imx6sx_clk_ipg-as-ipg-clock-t.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-imx6qdl-specify-imx6qdl_clk_ipg-as-ipg-clock.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-rpadlpar-fix-leaked-device_node-references-in-ad.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 drm-amd-display-use-plane-color_space-for-dpp-if-spe.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-omap2-pm33xx-core-do-not-turn-off-cefuse-as-ppa-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 platform-x86-intel_pmc_ipc-adding-error-handling.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 power-supply-max14656-fix-potential-use-before-alloc.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 net-hns3-return-0-and-print-warning-when-hit-duplica.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-rcar-fix-a-potential-null-pointer-dereference.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-rcar-fix-64bit-msi-message-address-handling.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 scsi-qla2xxx-reset-the-fcf_async_-sent-active-flags.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 video-hgafb-fix-potential-null-pointer-dereference.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 video-imsttfb-fix-potential-null-pointer-dereference.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 block-bfq-increase-idling-for-weight-raised-queues.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pci-xilinx-check-for-__get_free_pages-failure.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 ice-add-missing-case-in-print_link_msg-for-printing-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 dmaengine-idma64-use-actual-device-for-dma-transfers.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pwm-tiehrpwm-update-shadow-register-for-disabling-pw.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-dts-exynos-always-enable-necessary-apio_1v8-and-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 pwm-fix-deadlock-warning-when-removing-pwm-device.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 arm-exynos-fix-undefined-instruction-during-exynos54.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 usb-typec-fusb302-check-vconn-is-off-when-we-start-t.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 soc-renesas-identify-r-car-m3-w-es1.3.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 gpio-vf610-do-not-share-irq_chip.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 percpu-do-not-search-past-bitmap-when-allocating-an-.patch?id=67c62f8dfe91c623f7105e941258790b2ac2b500 Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ lvm thinp sanity [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ storage: SCSI VPD [12] 🚧 ✅ storage: software RAID testing [13] 🚧 ✅ Libhugetlbfs - version 2.2.1 [14] Host 2: ✅ Boot test [0] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] ppc64le: Host 1: ✅ Boot test [0] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] Host 2: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ lvm thinp sanity [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ storage: software RAID testing [13] 🚧 ✅ Libhugetlbfs - version 2.2.1 [14] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [16] Host 2: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ lvm thinp sanity [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ storage: software RAID testing [13] x86_64: Host 1: ✅ Boot test [0] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] Host 2: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ lvm thinp sanity [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ storage: SCSI VPD [12] 🚧 ✅ storage: software RAID testing [13] 🚧 ✅ Libhugetlbfs - version 2.2.1 [14] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/lvm/… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/scsi… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/swra… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#vm/hugepage/… [15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 12 months

1
0
0 0

Betreff: crashed linux mdadm raid

by Alexander Sommer

Hello, after a problem with my external disk enclosure my md-raid is broken. if I do an assemble I got this: root@server:~ # mdadm --assemble /dev/md2 /dev/sd[lmnop]1 mdadm: /dev/md2 assembled from 2 drives - not enough to start the array. I assume the broblem is that the disks events counter has different states: root@server:~ # mdadm --examine /dev/sd[lmpno]1 | egrep -e "/dev/sd" -e "Raid Level" -e Events -e "Device Role" -e "Array State" /dev/sdl1: Raid Level : raid5 Events : 253626 Device Role : Active device 0 Array State : AA.AA ('A' == active, '.' == missing, 'R' == replacing) /dev/sdm1: Raid Level : raid5 Events : 253626 Device Role : Active device 1 Array State : AA.AA ('A' == active, '.' == missing, 'R' == replacing) /dev/sdn1: Raid Level : raid5 Events : 253618 Device Role : Active device 2 Array State : AAAAA ('A' == active, '.' == missing, 'R' == replacing) /dev/sdo1: Raid Level : raid5 Events : 253618 Device Role : Active device 3 Array State : AAAAA ('A' == active, '.' == missing, 'R' == replacing) /dev/sdp1: Raid Level : raid5 Events : 253618 Device Role : Active device 4 Array State : AAAAA ('A' == active, '.' == missing, 'R' == replacing) This raid is used for backup, I do rsync to this device and have for every day on directory and I need some of the old data, so I need only a way, to read some old files, and than it is no problem to clean the disks and create it new. So I do not need the realy last state. If I got the files which are some days old it will be ok, on this device normaly I do not delete something, there come only new files and hardlinks to the old ones. So, do I have a chance to start it? Gruß Alex

5 years, 12 months

2
1
0 0

[PATCH] selinux: log raw contexts as untrusted strings

by Ondrej Mosnacek

These strings may come from untrusted sources (e.g. file xattrs) so they need to be properly escaped. Reproducer: # setenforce 0 # touch /tmp/test # setfattr -n security.selinux -v 'kuřecí řízek' /tmp/test # runcon system_u:system_r:sshd_t:s0 cat /tmp/test (look at the generated AVCs) Actual result: type=AVC [...] trawcon=kuřecí řízek Expected result: type=AVC [...] trawcon=6B75C5996563C3AD20C599C3AD7A656B Fixes: fede148324c3 ("selinux: log invalid contexts in AVCs") Cc: stable(a)vger.kernel.org # v5.1+ Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- security/selinux/avc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 8346a4f7c5d7..a99be508f93d 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -739,14 +739,20 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a) rc = security_sid_to_context_inval(sad->state, sad->ssid, &scontext, &scontext_len); if (!rc && scontext) { - audit_log_format(ab, " srawcon=%s", scontext); + if (scontext_len && scontext[scontext_len - 1] == '\0') + scontext_len--; + audit_log_format(ab, " srawcon="); + audit_log_n_untrustedstring(ab, scontext, scontext_len); kfree(scontext); } rc = security_sid_to_context_inval(sad->state, sad->tsid, &scontext, &scontext_len); if (!rc && scontext) { - audit_log_format(ab, " trawcon=%s", scontext); + if (scontext_len && scontext[scontext_len - 1] == '\0') + scontext_len--; + audit_log_format(ab, " trawcon="); + audit_log_n_untrustedstring(ab, scontext, scontext_len); kfree(scontext); } } -- 2.20.1

5 years, 12 months

3
4
0 0

[PATCH BACKPORT Android 4.9]: mm: memcontrol: fix NULL pointer crash in test_clear_page_writeback()

by Joel Fernandes (Google)

From: Joel Fernandes <joelaf(a)google.com> Johannes, all, could you take a look at the below backport of this fix which I am apply for our Android 4.9 kernel? Since lruvec stats are not present in the kernel and I did not want to backport that, I added my own mem_cgroup_update_stat functions which should be sufficient for this fix. Does this patch look good to you? Thanks for the help. (Joel: Fixed conflicts and added new memcg stats functions) (Cherry-picked from 739f79fc9db1) Jaegeuk and Brad report a NULL pointer crash when writeback ending tries to update the memcg stats: BUG: unable to handle kernel NULL pointer dereference at 00000000000003b0 IP: test_clear_page_writeback+0x12e/0x2c0 [...] RIP: 0010:test_clear_page_writeback+0x12e/0x2c0 Call Trace: <IRQ> end_page_writeback+0x47/0x70 f2fs_write_end_io+0x76/0x180 [f2fs] bio_endio+0x9f/0x120 blk_update_request+0xa8/0x2f0 scsi_end_request+0x39/0x1d0 scsi_io_completion+0x211/0x690 scsi_finish_command+0xd9/0x120 scsi_softirq_done+0x127/0x150 __blk_mq_complete_request_remote+0x13/0x20 flush_smp_call_function_queue+0x56/0x110 generic_smp_call_function_single_interrupt+0x13/0x30 smp_call_function_single_interrupt+0x27/0x40 call_function_single_interrupt+0x89/0x90 RIP: 0010:native_safe_halt+0x6/0x10 (gdb) l *(test_clear_page_writeback+0x12e) 0xffffffff811bae3e is in test_clear_page_writeback (./include/linux/memcontrol.h:619). 614 mod_node_page_state(page_pgdat(page), idx, val); 615 if (mem_cgroup_disabled() || !page->mem_cgroup) 616 return; 617 mod_memcg_state(page->mem_cgroup, idx, val); 618 pn = page->mem_cgroup->nodeinfo[page_to_nid(page)]; 619 this_cpu_add(pn->lruvec_stat->count[idx], val); 620 } 621 622 unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, 623 gfp_t gfp_mask, The issue is that writeback doesn't hold a page reference and the page might get freed after PG_writeback is cleared (and the mapping is unlocked) in test_clear_page_writeback(). The stat functions looking up the page's node or zone are safe, as those attributes are static across allocation and free cycles. But page->mem_cgroup is not, and it will get cleared if we race with truncation or migration. It appears this race window has been around for a while, but less likely to trigger when the memcg stats were updated first thing after PG_writeback is cleared. Recent changes reshuffled this code to update the global node stats before the memcg ones, though, stretching the race window out to an extent where people can reproduce the problem. Update test_clear_page_writeback() to look up and pin page->mem_cgroup before clearing PG_writeback, then not use that pointer afterward. It is a partial revert of 62cccb8c8e7a ("mm: simplify lock_page_memcg()") but leaves the pageref-holding callsites that aren't affected alone. Change-Id: I692226d6f183c11c27ed096967e6a5face3b9741 Link: http://lkml.kernel.org/r/20170809183825.GA26387@cmpxchg.org Fixes: 62cccb8c8e7a ("mm: simplify lock_page_memcg()") Signed-off-by: Johannes Weiner <hannes(a)cmpxchg.org> Reported-by: Jaegeuk Kim <jaegeuk(a)kernel.org> Tested-by: Jaegeuk Kim <jaegeuk(a)kernel.org> Reported-by: Bradley Bolen <bradleybolen(a)gmail.com> Tested-by: Brad Bolen <bradleybolen(a)gmail.com> Cc: Vladimir Davydov <vdavydov(a)virtuozzo.com> Cc: Michal Hocko <mhocko(a)suse.cz> Cc: <stable(a)vger.kernel.org> [4.6+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Joel Fernandes <joelaf(a)google.com> --- include/linux/memcontrol.h | 31 +++++++++++++++++++++++++-- mm/memcontrol.c | 43 +++++++++++++++++++++++++++----------- mm/page-writeback.c | 14 ++++++++++--- 3 files changed, 71 insertions(+), 17 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 8b35bdbdc214c..f9e02fd7e86b7 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -490,7 +490,8 @@ bool mem_cgroup_oom_synchronize(bool wait); extern int do_swap_account; #endif -void lock_page_memcg(struct page *page); +struct mem_cgroup *lock_page_memcg(struct page *page); +void __unlock_page_memcg(struct mem_cgroup *memcg); void unlock_page_memcg(struct page *page); /** @@ -529,6 +530,27 @@ static inline void mem_cgroup_dec_page_stat(struct page *page, mem_cgroup_update_page_stat(page, idx, -1); } +static inline void mem_cgroup_update_stat(struct mem_cgroup *memcg, + enum mem_cgroup_stat_index idx, int val) +{ + VM_BUG_ON(!(rcu_read_lock_held())); + + if (memcg) + this_cpu_add(memcg->stat->count[idx], val); +} + +static inline void mem_cgroup_inc_stat(struct mem_cgroup *memcg, + enum mem_cgroup_stat_index idx) +{ + mem_cgroup_update_stat(memcg, idx, 1); +} + +static inline void mem_cgroup_dec_stat(struct mem_cgroup *memcg, + enum mem_cgroup_stat_index idx) +{ + mem_cgroup_update_stat(memcg, idx, -1); +} + unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, gfp_t gfp_mask, unsigned long *total_scanned); @@ -709,7 +731,12 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) { } -static inline void lock_page_memcg(struct page *page) +static inline struct mem_cgroup *lock_page_memcg(struct page *page) +{ + return NULL; +} + +static inline void __unlock_page_memcg(struct mem_cgroup *memcg) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 86a6b331b9648..8dfd048ca1602 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1619,9 +1619,13 @@ bool mem_cgroup_oom_synchronize(bool handle) * @page: the page * * This function protects unlocked LRU pages from being moved to - * another cgroup and stabilizes their page->mem_cgroup binding. + * another cgroup. + * + * It ensures lifetime of the returned memcg. Caller is responsible + * for the lifetime of the page; __unlock_page_memcg() is available + * when @page might get freed inside the locked section. */ -void lock_page_memcg(struct page *page) +struct mem_cgroup *lock_page_memcg(struct page *page) { struct mem_cgroup *memcg; unsigned long flags; @@ -1630,18 +1634,24 @@ void lock_page_memcg(struct page *page) * The RCU lock is held throughout the transaction. The fast * path can get away without acquiring the memcg->move_lock * because page moving starts with an RCU grace period. - */ + * + * The RCU lock also protects the memcg from being freed when + * the page state that is going to change is the only thing + * preventing the page itself from being freed. E.g. writeback + * doesn't hold a page reference and relies on PG_writeback to + * keep off truncation, migration and so forth. + */ rcu_read_lock(); if (mem_cgroup_disabled()) - return; + return NULL; again: memcg = page->mem_cgroup; if (unlikely(!memcg)) - return; + return NULL; if (atomic_read(&memcg->moving_account) <= 0) - return; + return memcg; spin_lock_irqsave(&memcg->move_lock, flags); if (memcg != page->mem_cgroup) { @@ -1657,18 +1667,18 @@ void lock_page_memcg(struct page *page) memcg->move_lock_task = current; memcg->move_lock_flags = flags; - return; + return memcg; } EXPORT_SYMBOL(lock_page_memcg); /** - * unlock_page_memcg - unlock a page->mem_cgroup binding - * @page: the page + * __unlock_page_memcg - unlock and unpin a memcg + * @memcg: the memcg + * + * Unlock and unpin a memcg returned by lock_page_memcg(). */ -void unlock_page_memcg(struct page *page) +void __unlock_page_memcg(struct mem_cgroup *memcg) { - struct mem_cgroup *memcg = page->mem_cgroup; - if (memcg && memcg->move_lock_task == current) { unsigned long flags = memcg->move_lock_flags; @@ -1680,6 +1690,15 @@ void unlock_page_memcg(struct page *page) rcu_read_unlock(); } + +/** + * unlock_page_memcg - unlock a page->mem_cgroup binding + * @page: the page + */ +void unlock_page_memcg(struct page *page) +{ + __unlock_page_memcg(page->mem_cgroup); +} EXPORT_SYMBOL(unlock_page_memcg); /* diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 46e36366a03a7..9225827230d8c 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2704,9 +2704,10 @@ EXPORT_SYMBOL(clear_page_dirty_for_io); int test_clear_page_writeback(struct page *page) { struct address_space *mapping = page_mapping(page); + struct mem_cgroup *memcg; int ret; - lock_page_memcg(page); + memcg = lock_page_memcg(page); if (mapping && mapping_use_writeback_tags(mapping)) { struct inode *inode = mapping->host; struct backing_dev_info *bdi = inode_to_bdi(inode); @@ -2734,13 +2735,20 @@ int test_clear_page_writeback(struct page *page) } else { ret = TestClearPageWriteback(page); } + + /* + * NOTE: Page might be free now! Writeback doesn't hold a page + * reference on its own, it relies on truncation to wait for + * the clearing of PG_writeback. The below can only access + * page state that is static across allocation cycles. + */ if (ret) { - mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_WRITEBACK); + mem_cgroup_dec_stat(memcg, MEM_CGROUP_STAT_WRITEBACK); dec_node_page_state(page, NR_WRITEBACK); dec_zone_page_state(page, NR_ZONE_WRITE_PENDING); inc_node_page_state(page, NR_WRITTEN); } - unlock_page_memcg(page); + __unlock_page_memcg(memcg); return ret; } -- 2.22.0.rc2.383.gf4fbbf30c2-goog

5 years, 12 months

1
0
0 0

[PATCH v3 1/3] i3c: fix i2c and i3c scl rate by bus mode

by Vitor Soares

Currently the I3C framework limits SCL frequency to FM speed when dealing with a mixed slow bus, even if all I2C devices are FM+ capable. The core was also not accounting for I3C speed limitations when operating in mixed slow mode and was erroneously using FM+ speed as the max I2C speed when operating in mixed fast mode. Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure") Signed-off-by: Vitor Soares <vitor.soares(a)synopsys.com> Cc: Boris Brezillon <bbrezillon(a)kernel.org> Cc: <stable(a)vger.kernel.org> Cc: <linux-kernel(a)vger.kernel.org> --- Changes in v3: Change dev_warn() to dev_dbg() Changes in v2: Enhance commit message Add dev_warn() in case user-defined i2c rate doesn't match LVR constraint Add dev_warn() in case user-defined i3c rate lower than i2c rate drivers/i3c/master.c | 61 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 5f4bd52..f8e580e 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -91,6 +91,12 @@ void i3c_bus_normaluse_unlock(struct i3c_bus *bus) up_read(&bus->lock); } +static struct i3c_master_controller * +i3c_bus_to_i3c_master(struct i3c_bus *i3cbus) +{ + return container_of(i3cbus, struct i3c_master_controller, bus); +} + static struct i3c_master_controller *dev_to_i3cmaster(struct device *dev) { return container_of(dev, struct i3c_master_controller, dev); @@ -565,20 +571,48 @@ static const struct device_type i3c_masterdev_type = { .groups = i3c_masterdev_groups, }; -int i3c_bus_set_mode(struct i3c_bus *i3cbus, enum i3c_bus_mode mode) +int i3c_bus_set_mode(struct i3c_bus *i3cbus, enum i3c_bus_mode mode, + unsigned long max_i2c_scl_rate) { - i3cbus->mode = mode; - if (!i3cbus->scl_rate.i3c) - i3cbus->scl_rate.i3c = I3C_BUS_TYP_I3C_SCL_RATE; + struct i3c_master_controller *master = i3c_bus_to_i3c_master(i3cbus); - if (!i3cbus->scl_rate.i2c) { - if (i3cbus->mode == I3C_BUS_MODE_MIXED_SLOW) - i3cbus->scl_rate.i2c = I3C_BUS_I2C_FM_SCL_RATE; - else - i3cbus->scl_rate.i2c = I3C_BUS_I2C_FM_PLUS_SCL_RATE; + i3cbus->mode = mode; + + switch (i3cbus->mode) { + case I3C_BUS_MODE_PURE: + if (!i3cbus->scl_rate.i3c) + i3cbus->scl_rate.i3c = I3C_BUS_TYP_I3C_SCL_RATE; + break; + case I3C_BUS_MODE_MIXED_FAST: + if (!i3cbus->scl_rate.i3c) + i3cbus->scl_rate.i3c = I3C_BUS_TYP_I3C_SCL_RATE; + if (!i3cbus->scl_rate.i2c) + i3cbus->scl_rate.i2c = max_i2c_scl_rate; + break; + case I3C_BUS_MODE_MIXED_SLOW: + if (!i3cbus->scl_rate.i2c) + i3cbus->scl_rate.i2c = max_i2c_scl_rate; + if (!i3cbus->scl_rate.i3c || + i3cbus->scl_rate.i3c > i3cbus->scl_rate.i2c) + i3cbus->scl_rate.i3c = i3cbus->scl_rate.i2c; + break; + default: + return -EINVAL; } + if (i3cbus->scl_rate.i3c < i3cbus->scl_rate.i2c) + dev_dbg(&master->dev, + "i3c-scl-hz=%ld lower than i2c-scl-hz=%ld\n", + i3cbus->scl_rate.i3c, i3cbus->scl_rate.i2c); + + if (i3cbus->scl_rate.i2c != I3C_BUS_I2C_FM_SCL_RATE && + i3cbus->scl_rate.i2c != I3C_BUS_I2C_FM_PLUS_SCL_RATE && + i3cbus->mode != I3C_BUS_MODE_PURE) + dev_dbg(&master->dev, + "i2c-scl-hz=%ld not defined according MIPI I3C spec\n", + i3cbus->scl_rate.i2c); + /* * I3C/I2C frequency may have been overridden, check that user-provided * values are not exceeding max possible frequency. @@ -1966,9 +2000,6 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, /* LVR is encoded in reg[2]. */ boardinfo->lvr = reg[2]; - if (boardinfo->lvr & I3C_LVR_I2C_FM_MODE) - master->bus.scl_rate.i2c = I3C_BUS_I2C_FM_SCL_RATE; - list_add_tail(&boardinfo->node, &master->boardinfo.i2c); of_node_get(node); @@ -2417,6 +2448,7 @@ int i3c_master_register(struct i3c_master_controller *master, const struct i3c_master_controller_ops *ops, bool secondary) { + unsigned long i2c_scl_rate = I3C_BUS_I2C_FM_PLUS_SCL_RATE; struct i3c_bus *i3cbus = i3c_master_get_bus(master); enum i3c_bus_mode mode = I3C_BUS_MODE_PURE; struct i2c_dev_boardinfo *i2cbi; @@ -2466,9 +2498,12 @@ int i3c_master_register(struct i3c_master_controller *master, ret = -EINVAL; goto err_put_dev; } + + if (i2cbi->lvr & I3C_LVR_I2C_FM_MODE) + i2c_scl_rate = I3C_BUS_I2C_FM_SCL_RATE; } - ret = i3c_bus_set_mode(i3cbus, mode); + ret = i3c_bus_set_mode(i3cbus, mode, i2c_scl_rate); if (ret) goto err_put_dev; -- 2.7.4

5 years, 12 months

2
5
0 0

Re: [v5] x86/mm/KASLR: Fix the size of vmemmap section

by Sedat Dilek

[ CC me I am not subscribed to linux-stable ML ] [ CC Greg and Sasha ] Hi Baoquan, that should be s/Fiexes/Fixes for the "Fixes tag". OLD: Fiexes: eedb92abb9bb ("x86/mm: Make virtual memory layout dynamic for CONFIG_X86_5LEVEL=y") NEW: Fixes: eedb92abb9bb ("x86/mm: Make virtual memory layout dynamic for CONFIG_X86_5LEVEL=y") Also, you can add... Cc: stable(a)vger.kernel.org # v4.19+ ...to catch the below. [ QUOTE ] You can see that it was added in kernel 4.17-rc1, as above. Can we just apply this patch to stable trees after 4.17? > > v5.1.4: Build OK! > v5.0.18: Build OK! > v4.19.45: Build OK! [ /QUOTE ] I had an early patchset of you tested (which included this one IIRC), so feel free to add my... Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com> Hope this lands in tip or linux-stable Git. Thanks. Regards, - Sedat - [1] https://lore.kernel.org/patchwork/patch/1077557/

5 years, 12 months

2
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2019