April 2019 - Linux-stable-mirror

[PATCH 3/5] sbitmap: fix improper use of smp_mb__before_atomic()

by Andrea Parri

This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive. Replace the barrier with an smp_mb(). Fixes: 6c0ca7ae292ad ("sbitmap: fix wakeup hang after sbq resize") Cc: stable(a)vger.kernel.org Reported-by: "Paul E. McKenney" <paulmck(a)linux.ibm.com> Reported-by: Peter Zijlstra <peterz(a)infradead.org> Signed-off-by: Andrea Parri <andrea.parri(a)amarulasolutions.com> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Omar Sandoval <osandov(a)fb.com> Cc: linux-block(a)vger.kernel.org --- lib/sbitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 155fe38756ecf..4a7fc4915dfc6 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -435,7 +435,7 @@ static void sbitmap_queue_update_wake_batch(struct sbitmap_queue *sbq, * to ensure that the batch size is updated before the wait * counts. */ - smp_mb__before_atomic(); + smp_mb(); for (i = 0; i < SBQ_WAIT_QUEUES; i++) atomic_set(&sbq->ws[i].wait_cnt, 1); } -- 2.7.4

5 years, 7 months

2
1
0 0

[PATCH 2/5] bio: fix improper use of smp_mb__before_atomic()

by Andrea Parri

This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive. Replace the barrier with an smp_mb(). Fixes: dac56212e8127 ("bio: skip atomic inc/dec of ->bi_cnt for most use cases") Cc: stable(a)vger.kernel.org Reported-by: "Paul E. McKenney" <paulmck(a)linux.ibm.com> Reported-by: Peter Zijlstra <peterz(a)infradead.org> Signed-off-by: Andrea Parri <andrea.parri(a)amarulasolutions.com> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: linux-block(a)vger.kernel.org --- include/linux/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index e584673c18814..5becbafb84e8a 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -224,7 +224,7 @@ static inline void bio_cnt_set(struct bio *bio, unsigned int count) { if (count != 1) { bio->bi_flags |= (1 << BIO_REFFED); - smp_mb__before_atomic(); + smp_mb(); } atomic_set(&bio->__bi_cnt, count); } -- 2.7.4

5 years, 7 months

3
2
0 0

Re: [PATCH] ASoC: Intel: avoid Oops if DMA setup fails

by Ross Zwisler

On Fri, Apr 26, 2019 at 06:52:45PM +0000, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.0.9, v4.19.36, v4.14.113, v4.9.170, v4.4.178, v3.18.138. > > v5.0.9: Build OK! > v4.19.36: Build OK! > v4.14.113: Build OK! > v4.9.170: Build OK! > v4.4.178: Failed to apply! Possible dependencies: > 2bd5bd15a518 ("ASoC: Intel: add bytct-rt5651 machine driver") > 2dcffcee23a2 ("ASoC: Intel: Create independent acpi match module") > 595788e475d0 ("ASoC: Intel: tag byt-rt5640 machine driver as deprecated") > 95f098014815 ("ASoC: Intel: Move apci find machine routines") > a395bdd6b24b ("ASoC: intel: Fix sst-dsp dependency on dw stuff") > a92ea59b74e2 ("ASoC: Intel: sst: only select sst-firmware when DW DMAC is built-in") > cfffcc66a89a ("ASoC: Intel: Load the atom DPCM driver only") > > v3.18.138: Failed to apply! Possible dependencies: > 0d2135ecadb0 ("ASoC: Intel: Work around to fix HW D3 potential crash issue") > 13735d1cecec ("ASoC: intel - kconfig: remove SND_SOC_INTEL_SST prompt") > 161aa49ef1b9 ("ASoC: Intel: Add new dependency for Haswell machine") > 2106241a6803 ("ASoC: Intel: create common folder and move common files in") > 282a331fe25c ("ASoC: Intel: Add new dependency for Broadwell machine") > 2e4f75919e5a ("ASoC: Intel: Add PM support to HSW/BDW PCM driver") > 34084a436703 ("ASoC: intel: Remove superfluous backslash in Kconfig") > 544c55c810a5 ("ASoC: Intel: Delete an unnecessary check before the function call "sst_dma_free"") > 63ae1fe7739e ("ASoC: Intel: Add dependency on DesignWare DMA controller") > 7dd6bd8926f3 ("ASoC: intel: kconfig - Move DW_DMAC_CORE dependency to machines") > 85b88a8dd0c7 ("ASoC: Intel: Store the entry_point read from FW file") > 9449d39b990d ("ASoC: Intel: add function to load firmware image") > a395bdd6b24b ("ASoC: intel: Fix sst-dsp dependency on dw stuff") > a92ea59b74e2 ("ASoC: Intel: sst: only select sst-firmware when DW DMAC is built-in") > aed3c7b77c85 ("ASoC: Intel: Add PM support to HSW/BDW IPC driver") > d96c53a193dd ("ASoC: Intel: Add generic support for DSP wake, sleep and stall") > e9600bc166d5 ("ASoC: Intel: Make ADSP memory block allocation more generic") > > > How should we proceed with this patch? After reviews I'll send backport patches for v4.4.X and v3.18.X as necessary.

5 years, 7 months

3
4
0 0

[PATCH 1/2] drm/i915: Fix fastset vs. pfit on/off on HSW EDP transcoder

by Ville Syrjala

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> On HSW the pipe A panel fitter lives inside the display power well, and the input MUX for the EDP transcoder needs to be configured appropriately to route the data through the power well as needed. Changing the MUX setting is not allowed while the pipe is active, so we need to force a full modeset whenever we need to change it. Currently we may end up doing a fastset which won't change the MUX settings, but it will drop the power well reference, and that kills the pipe. Cc: stable(a)vger.kernel.org Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Fixes: d19f958db23c ("drm/i915: Enable fastset for non-boot modesets.") Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ drivers/gpu/drm/i915/intel_pipe_crc.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c67f165b466c..691c9a929164 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12133,6 +12133,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, struct intel_crtc_state *pipe_config, bool adjust) { + struct intel_crtc *crtc = to_intel_crtc(current_config->base.crtc); bool ret = true; bool fixup_inherited = adjust && (current_config->base.mode.private_flags & I915_MODE_FLAG_INHERITED) && @@ -12354,6 +12355,14 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, PIPE_CONF_CHECK_X(gmch_pfit.pgm_ratios); PIPE_CONF_CHECK_X(gmch_pfit.lvds_border_bits); + /* + * Changing the EDP transcoder input mux + * (A_ONOFF vs. A_ON) requires a full modeset. + */ + if (IS_HASWELL(dev_priv) && crtc->pipe == PIPE_A && + current_config->cpu_transcoder == TRANSCODER_EDP) + PIPE_CONF_CHECK_BOOL(pch_pfit.enabled); + if (!adjust) { PIPE_CONF_CHECK_I(pipe_src_w); PIPE_CONF_CHECK_I(pipe_src_h); diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c index e94b5b1bc1b7..e7c7be4911c1 100644 --- a/drivers/gpu/drm/i915/intel_pipe_crc.c +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c @@ -311,10 +311,17 @@ intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable) pipe_config->base.mode_changed = pipe_config->has_psr; pipe_config->crc_enabled = enable; - if (IS_HASWELL(dev_priv) && crtc->pipe == PIPE_A) { + if (IS_HASWELL(dev_priv) && + pipe_config->base.active && crtc->pipe == PIPE_A && + pipe_config->cpu_transcoder == TRANSCODER_EDP) { + bool old_need_power_well = pipe_config->pch_pfit.enabled || + pipe_config->pch_pfit.force_thru; + bool new_need_power_well = pipe_config->pch_pfit.enabled || + enable; + pipe_config->pch_pfit.force_thru = enable; - if (pipe_config->cpu_transcoder == TRANSCODER_EDP && - pipe_config->pch_pfit.enabled != enable) + + if (old_need_power_well != new_need_power_well) pipe_config->base.connectors_changed = true; } -- 2.21.0

5 years, 7 months

3
3
0 0

[PATCH] [v2] x86/mpx: fix recursive munmap() corruption

by Dave Hansen

Changes from v1: * Fix compile errors on UML and non-x86 arches * Clarify commit message and Fixes about the origin of the bug and add the impact to powerpc / uml / unicore32 -- This is a bit of a mess, to put it mildly. But, it's a bug that only seems to have showed up in 4.20 but wasn't noticed until now because nobody uses MPX. MPX has the arch_unmap() hook inside of munmap() because MPX uses bounds tables that protect other areas of memory. When memory is unmapped, there is also a need to unmap the MPX bounds tables. Barring this, unused bounds tables can eat 80% of the address space. But, the recursive do_munmap() that gets called vi arch_unmap() wreaks havoc with __do_munmap()'s state. It can result in freeing populated page tables, accessing bogus VMA state, double-freed VMAs and more. To fix this, call arch_unmap() before __do_unmap() has a chance to do anything meaningful. Also, remove the 'vma' argument and force the MPX code to do its own, independent VMA lookup. == UML / unicore32 impact == Remove unused 'vma' argument to arch_unmap(). No functional change. I compile tested this on UML but not unicore32. == powerpc impact == powerpc uses arch_unmap() well to watch for munmap() on the VDSO and zeroes out 'current->mm->context.vdso_base'. Moving arch_unmap() makes this happen earlier in __do_munmap(). But, 'vdso_base' seems to only be used in perf and in the signal delivery that happens near the return to userspace. I can not find any likely impact to powerpc, other than the zeroing happening a little earlier. powerpc does not use the 'vma' argument and is unaffected by its removal. I compile-tested a 64-bit powerpc defconfig. == x86 impact == For the common success case this is functionally identical to what was there before. For the munmap() failure case, it's possible that some MPX tables will be zapped for memory that continues to be in use. But, this is an extraordinarily unlikely scenario and the harm would be that MPX provides no protection since the bounds table got reset (zeroed). I can't imagine anyone doing this: ptr = mmap(); // use ptr ret = munmap(ptr); if (ret) // oh, there was an error, I'll // keep using ptr. Because if you're doing munmap(), you are *done* with the memory. There's probably no good data in there _anyway_. This passes the original reproducer from Richard Biener as well as the existing mpx selftests/. ==== The long story: munmap() has a couple of pieces: 1. Find the affected VMA(s) 2. Split the start/end one(s) if neceesary 3. Pull the VMAs out of the rbtree 4. Actually zap the memory via unmap_region(), including freeing page tables (or queueing them to be freed). 5. Fixup some of the accounting (like fput()) and actually free the VMA itself. This specific ordering was actually introduced by: dd2283f2605e ("mm: mmap: zap pages with read mmap_sem in munmap") during the 4.20 merge window. The previous __do_munmap() code was actually safe because the only thing after arch_unmap() was remove_vma_list(). arch_unmap() could not see 'vma' in the rbtree because it was detached, so it is not even capable of doing operations unsafe for remove_vma_list()'s use of 'vma'. Richard Biener reported a test that shows this in dmesg: [1216548.787498] BUG: Bad rss-counter state mm:0000000017ce560b idx:1 val:551 [1216548.787500] BUG: non-zero pgtables_bytes on freeing mm: 24576 What triggered this was the recursive do_munmap() called via arch_unmap(). It was freeing page tables that has not been properly zapped. But, the problem was bigger than this. For one, arch_unmap() can free VMAs. But, the calling __do_munmap() has variables that *point* to VMAs and obviously can't handle them just getting freed while the pointer is still in use. I tried a couple of things here. First, I tried to fix the page table freeing problem in isolation, but I then found the VMA issue. I also tried having the MPX code return a flag if it modified the rbtree which would force __do_munmap() to re-walk to restart. That spiralled out of control in complexity pretty fast. Just moving arch_unmap() and accepting that the bonkers failure case might eat some bounds tables seems like the simplest viable fix. This was also reported in the following kernel bugzilla entry: https://bugzilla.kernel.org/show_bug.cgi?id=203123 There are some reports that dd2283f2605 ("mm: mmap: zap pages with read mmap_sem in munmap") triggered this issue. While that commit certainly made the issues easier to hit, I belive the fundamental issue has been with us as long as MPX itself, thus the Fixes: tag below is for one of the original MPX commits. Reported-by: Richard Biener <rguenther(a)suse.de> Reported-by: H.J. Lu <hjl.tools(a)gmail.com> Fixes: dd2283f2605e ("mm: mmap: zap pages with read mmap_sem in munmap") Cc: Yang Shi <yang.shi(a)linux.alibaba.com> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Andy Lutomirski <luto(a)amacapital.net> Cc: x86(a)kernel.org Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: linux-kernel(a)vger.kernel.org Cc: linux-mm(a)kvack.org Cc: stable(a)vger.kernel.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-um(a)lists.infradead.org Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: linux-arch(a)vger.kernel.org Cc: Guan Xuetao <gxt(a)pku.edu.cn> Cc: Jeff Dike <jdike(a)addtoit.com> Cc: Richard Weinberger <richard(a)nod.at> Cc: Anton Ivanov <anton.ivanov(a)cambridgegreys.com> --- b/arch/powerpc/include/asm/mmu_context.h | 1 - b/arch/um/include/asm/mmu_context.h | 1 - b/arch/unicore32/include/asm/mmu_context.h | 1 - b/arch/x86/include/asm/mmu_context.h | 6 +++--- b/arch/x86/include/asm/mpx.h | 5 ++--- b/arch/x86/mm/mpx.c | 10 ++++++---- b/include/asm-generic/mm_hooks.h | 1 - b/mm/mmap.c | 15 ++++++++------- 8 files changed, 19 insertions(+), 21 deletions(-) diff -puN mm/mmap.c~mpx-rss-pass-no-vma mm/mmap.c --- a/mm/mmap.c~mpx-rss-pass-no-vma 2019-04-19 09:31:09.851509404 -0700 +++ b/mm/mmap.c 2019-04-19 09:31:09.864509404 -0700 @@ -2730,9 +2730,17 @@ int __do_munmap(struct mm_struct *mm, un return -EINVAL; len = PAGE_ALIGN(len); + end = start + len; if (len == 0) return -EINVAL; + /* + * arch_unmap() might do unmaps itself. It must be called + * and finish any rbtree manipulation before this code + * runs and also starts to manipulate the rbtree. + */ + arch_unmap(mm, start, end); + /* Find the first overlapping VMA */ vma = find_vma(mm, start); if (!vma) @@ -2741,7 +2749,6 @@ int __do_munmap(struct mm_struct *mm, un /* we have start < vma->vm_end */ /* if it doesn't overlap, we have nothing.. */ - end = start + len; if (vma->vm_start >= end) return 0; @@ -2811,12 +2818,6 @@ int __do_munmap(struct mm_struct *mm, un /* Detach vmas from rbtree */ detach_vmas_to_be_unmapped(mm, vma, prev, end); - /* - * mpx unmap needs to be called with mmap_sem held for write. - * It is safe to call it before unmap_region(). - */ - arch_unmap(mm, vma, start, end); - if (downgrade) downgrade_write(&mm->mmap_sem); diff -puN arch/x86/include/asm/mmu_context.h~mpx-rss-pass-no-vma arch/x86/include/asm/mmu_context.h --- a/arch/x86/include/asm/mmu_context.h~mpx-rss-pass-no-vma 2019-04-19 09:31:09.853509404 -0700 +++ b/arch/x86/include/asm/mmu_context.h 2019-04-19 09:31:09.865509404 -0700 @@ -277,8 +277,8 @@ static inline void arch_bprm_mm_init(str mpx_mm_init(mm); } -static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma, - unsigned long start, unsigned long end) +static inline void arch_unmap(struct mm_struct *mm, unsigned long start, + unsigned long end) { /* * mpx_notify_unmap() goes and reads a rarely-hot @@ -298,7 +298,7 @@ static inline void arch_unmap(struct mm_ * consistently wrong. */ if (unlikely(cpu_feature_enabled(X86_FEATURE_MPX))) - mpx_notify_unmap(mm, vma, start, end); + mpx_notify_unmap(mm, start, end); } /* diff -puN include/asm-generic/mm_hooks.h~mpx-rss-pass-no-vma include/asm-generic/mm_hooks.h --- a/include/asm-generic/mm_hooks.h~mpx-rss-pass-no-vma 2019-04-19 09:31:09.856509404 -0700 +++ b/include/asm-generic/mm_hooks.h 2019-04-19 09:31:09.865509404 -0700 @@ -18,7 +18,6 @@ static inline void arch_exit_mmap(struct } static inline void arch_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { } diff -puN arch/x86/mm/mpx.c~mpx-rss-pass-no-vma arch/x86/mm/mpx.c --- a/arch/x86/mm/mpx.c~mpx-rss-pass-no-vma 2019-04-19 09:31:09.858509404 -0700 +++ b/arch/x86/mm/mpx.c 2019-04-19 09:31:09.866509404 -0700 @@ -881,9 +881,10 @@ static int mpx_unmap_tables(struct mm_st * the virtual address region start...end have already been split if * necessary, and the 'vma' is the first vma in this range (start -> end). */ -void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma, - unsigned long start, unsigned long end) +void mpx_notify_unmap(struct mm_struct *mm, unsigned long start, + unsigned long end) { + struct vm_area_struct *vma; int ret; /* @@ -902,11 +903,12 @@ void mpx_notify_unmap(struct mm_struct * * which should not occur normally. Being strict about it here * helps ensure that we do not have an exploitable stack overflow. */ - do { + vma = find_vma(mm, start); + while (vma && vma->vm_start < end) { if (vma->vm_flags & VM_MPX) return; vma = vma->vm_next; - } while (vma && vma->vm_start < end); + } ret = mpx_unmap_tables(mm, start, end); if (ret) diff -puN arch/x86/include/asm/mpx.h~mpx-rss-pass-no-vma arch/x86/include/asm/mpx.h --- a/arch/x86/include/asm/mpx.h~mpx-rss-pass-no-vma 2019-04-19 09:31:09.860509404 -0700 +++ b/arch/x86/include/asm/mpx.h 2019-04-19 09:31:09.866509404 -0700 @@ -78,8 +78,8 @@ static inline void mpx_mm_init(struct mm */ mm->context.bd_addr = MPX_INVALID_BOUNDS_DIR; } -void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma, - unsigned long start, unsigned long end); +void mpx_notify_unmap(struct mm_struct *mm, unsigned long start, + unsigned long end); unsigned long mpx_unmapped_area_check(unsigned long addr, unsigned long len, unsigned long flags); @@ -100,7 +100,6 @@ static inline void mpx_mm_init(struct mm { } static inline void mpx_notify_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { } diff -puN arch/um/include/asm/mmu_context.h~mpx-rss-pass-no-vma arch/um/include/asm/mmu_context.h --- a/arch/um/include/asm/mmu_context.h~mpx-rss-pass-no-vma 2019-04-19 09:42:05.789507768 -0700 +++ b/arch/um/include/asm/mmu_context.h 2019-04-19 09:42:57.962507638 -0700 @@ -22,7 +22,6 @@ static inline int arch_dup_mmap(struct m } extern void arch_exit_mmap(struct mm_struct *mm); static inline void arch_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { } diff -puN arch/unicore32/include/asm/mmu_context.h~mpx-rss-pass-no-vma arch/unicore32/include/asm/mmu_context.h --- a/arch/unicore32/include/asm/mmu_context.h~mpx-rss-pass-no-vma 2019-04-19 09:42:06.189507767 -0700 +++ b/arch/unicore32/include/asm/mmu_context.h 2019-04-19 09:43:25.425507569 -0700 @@ -88,7 +88,6 @@ static inline int arch_dup_mmap(struct m } static inline void arch_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { } diff -puN arch/powerpc/include/asm/mmu_context.h~mpx-rss-pass-no-vma arch/powerpc/include/asm/mmu_context.h --- a/arch/powerpc/include/asm/mmu_context.h~mpx-rss-pass-no-vma 2019-04-19 09:42:06.388507766 -0700 +++ b/arch/powerpc/include/asm/mmu_context.h 2019-04-19 09:43:27.392507564 -0700 @@ -237,7 +237,6 @@ extern void arch_exit_mmap(struct mm_str #endif static inline void arch_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { if (start <= mm->context.vdso_base && mm->context.vdso_base < end) _

5 years, 7 months

4
3
0 0

[PATCH] drm/cma-helper: Fix drm_gem_cma_free_object()

by Noralf Trønnes

The logic for freeing an imported buffer with a virtual address is broken. It will free the buffer instead of unmapping the dma buf. Fix by reversing the if ladder and first check if the buffer is imported. Fixes: b9068cde51ee ("drm/cma-helper: Add DRM_GEM_CMA_VMAP_DRIVER_OPS") Cc: stable(a)vger.kernel.org Reported-by: "Li, Tingqian" <tingqian.li(a)intel.com> Signed-off-by: Noralf Trønnes <noralf(a)tronnes.org> --- This bug is present in 5.0 and it only affects tinydrm drivers that import buffers, which is rare if anyone at all is doing it. I'll apply this to drm-misc-next and let it trickle down through stable unless someone thinks otherwise. Noralf. drivers/gpu/drm/drm_gem_cma_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index cc26625b4b33..e01ceed09e67 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -186,13 +186,13 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj) cma_obj = to_drm_gem_cma_obj(gem_obj); - if (cma_obj->vaddr) { - dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, - cma_obj->vaddr, cma_obj->paddr); - } else if (gem_obj->import_attach) { + if (gem_obj->import_attach) { if (cma_obj->vaddr) dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr); drm_prime_gem_destroy(gem_obj, cma_obj->sgt); + } else if (cma_obj->vaddr) { + dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, + cma_obj->vaddr, cma_obj->paddr); } drm_gem_object_release(gem_obj); -- 2.20.1

5 years, 7 months

3
3
0 0

[PATCH 00/14] media: ov6650: A collection of fixes

by Janusz Krzysztofik

Janusz Krzysztofik (14): media: ov6650: Fix MODDULE_DESCRIPTION media: ov6650: Fix control handler not freed on init error media: ov6650: Fix unverified arguments used in .set_fmt() media: ov6650: Fix unverified arguments accepted by .get_fmt() media: ov6650: Fix unverified arguments accepted by .enum_mbus_code() media: ov6650: Fix unverified pad IDs accepted by .get/set_selectioon() media: ov6650: Fix unverified pad IDs accepted by .g/s_frame_interval() media: ov6650: Fix crop rectangle alignment not passed back media: ov6650: Fix incorrect use of JPEG colorspace media: ov6650: Fix some format attributes not under control media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support media: ov6650: Fix default format not applied on device probe media: ov6650: Fix stored frame format not in sync with hardware media: ov6650: Fix stored crop rectangle not in sync with hardware drivers/media/i2c/ov6650.c | 183 ++++++++++++++++++++++++++----------- 1 file changed, 131 insertions(+), 52 deletions(-) -- 2.21.0

5 years, 7 months

2
16
0 0

[PATCH 3.16 00/99] 3.16.65-rc1 review

by Ben Hutchings

This is the start of the stable review cycle for the 3.16.65 release. There are 99 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu Apr 04 13:38:27 UTC 2019. Anything received after that time might be too late. All the patches have also been committed to the linux-3.16.y-rc branch of https://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-stable-rc.git . A shortlog and diffstat can be found below. Ben. ------------- Anand Jain (1): btrfs: dev-replace: go back to suspended state if target device is missing [0d228ece59a35a9b9e8ff0d40653234a6d90f61e] Arnaldo Carvalho de Melo (4): perf help: Remove needless use of strncpy() [b6313899f4ed2e76b8375cf8069556f5b94fbff0] perf parse-events: Fix unchecked usage of strncpy() [bd8d57fb7e25e9fcf67a9eef5fa13aabe2016e07] perf svghelper: Fix unchecked usage of strncpy() [2f5302533f306d5ee87bd375aef9ca35b91762cb] perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul [4d0f16d059ddb91424480d88473f7392f24aebdc] Bart Van Assche (1): tools/lib/lockdep: Rename "trywlock" into "trywrlock" [7f3c7952d111ac93573fb86f4d5aeff527a07fcc] Ben Hutchings (2): Revert "cifs: empty TargetInfo leads to crash on recovery" [not upstream; reverts bad backport] perf pmu: Suppress potential format-truncation warning [11a64a05dc649815670b1be9fe63d205cb076401] Breno Leitao (2): powerpc/tm: Set MSR[TS] just prior to recheckpoint [e1c3743e1a20647c53b719dbf28b48f45d23f2cd] powerpc/tm: Unset MSR[TS] if not recheckpointing [6f5b9f018f4c7686fd944d920209d1382d320e4e] Chris Wilson (1): drm/i915/ringbuffer: Delay after EMIT_INVALIDATE for gen4/gen5 [55f99bf2a9c331838c981694bc872cd1ec4070b2] Christian Borntraeger (1): genwqe: Fix size check [fdd669684655c07dacbdb0d753fd13833de69a33] Christoffer Dall (1): KVM: arm/arm64: Fix VMID alloc race by reverting to lock-less [fb544d1ca65a89f7a3895f7531221ceeed74ada7] Colin Ian King (3): altera-stapl: check for a null key before strcasecmp'ing it [9ccb645683ef46e3c52c12c088a368baa58447d4] pcrypt: use format specifier in kobject_add [b1e3874c75ab15288f573b3532e507c37e8e7656] x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux) [53bb565fc5439f2c8c57a786feea5946804aa3e9] Dan Carpenter (4): IB/qib: Fix an error code in qib_sdma_verbs_send() [5050ae5fa3d54c8e83e1e447cc7e3591110a7f57] Input: nomadik-ske-keypad - fix a loop timeout test [4d8f727b83bcd6702c2d210330872c9122d2d360] misc: vexpress: Off by one in vexpress_syscfg_exec() [f8a70d8b889f180e6860cb1f85fed43d37844c5a] wireless: airo: potential buffer overflow in sprintf() [3d39e1bb1c88f32820c5f9271f2c8c2fb9a52bac] Dmitry Monakhov (1): ext4: ext4_inline_data_fiemap should respect callers argument [d952d69e268f833c85c0bafee9f67f9dba85044b] Dmitry Safonov (1): tty/ldsem: Wake up readers after timed out down_write() [231f8fd0cca078bd4396dd7e380db813ac5736e2] Dominique Martinet (1): 9p/net: put a lower bound on msize [574d356b7a02c7e1b01a1d9cba8a26b3c2888f45] Eric Biggers (1): crypto: user - support incremental algorithm dumps [0ac6b8fb23c724b015d9ca70a89126e8d1563166] Eric Dumazet (1): net/hamradio/6pack: use mod_timer() to rearm timers [202700e30740c6568b5a6943662f3829566dd533] Filipe Manana (2): Btrfs: fix fsync of files with multiple hard links in new directories [41bd60676923822de1df2c50b3f9a10171f4338a] Btrfs: fix stale dir entries after unlink, inode eviction and fsync [bde6c242027b0f1d697d5333950b3a05761d40e4] Finn Thain (1): block/swim3: Fix -EBUSY error when re-opening device after unmount [296dcc40f2f2e402facf7cd26cf3f2c8f4b17d47] Geert Uytterhoeven (10): pinctrl: sh-pfc: r8a7740: Add missing LCD0 marks to lcd0_data24_1 group [96bb2a6ab4eca10e5b6490b3f0738e9f7ec22c2b] pinctrl: sh-pfc: r8a7740: Add missing REF125CK pin to gether_gmii group [1ebc589a7786f17f97b9e87b44e0fb4d0290d8f8] pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group [884fa25fb6e5e63ab970d612a628313bb68f37cc] pinctrl: sh-pfc: r8a7791: Remove bogus marks from vin1_b_data18 group [0d6256cb880166a4111bebce35790019e56b6e1b] pinctrl: sh-pfc: sh7264: Fix PFCR3 and PFCR0 register configuration [1b99d0c80bbe1810572c2cb77b90f67886adfa8d] pinctrl: sh-pfc: sh7269: Add missing PCIOR0 field [9540cbdfcd861caf67a6f0e4bb7f46d41c4aad86] pinctrl: sh-pfc: sh73a0: Add missing TO pin to tpu4_to3 group [124cde98f856b6206b804acbdec3b7c80f8c3427] pinctrl: sh-pfc: sh7734: Add missing IPSR11 field [94482af7055e1ffa211c1135256b85590ebcac99] pinctrl: sh-pfc: sh7734: Fix shifted values in IPSR10 [054f2400f706327f96770219c3065b5131f8f154] pinctrl: sh-pfc: sh7734: Remove bogus IPSR10 value [4d374bacd7c9665179f9752a52d5d602c45d8190] Georgy A Bystrenin (1): CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem [9a596f5b39593414c0ec80f71b94a226286f084e] Gustavo A. R. Silva (4): ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities [5ae4f61f012a097df93de2285070ec8e34716d29] ALSA: emux: Fix potential Spectre v1 vulnerabilities [4aea96f4237cea0c51a8bc87c0db31f0f932f1f0] ALSA: pcm: Fix potential Spectre v1 vulnerability [94ffb030b6d31ec840bb811be455dd2e26a4f43e] ALSA: rme9652: Fix potential Spectre v1 vulnerability [0b84304ef5da92add8dc75a1b07879c5374cdb05] Huacai Chen (2): MIPS: Align kernel load address to 64KB [bec0de4cfad21bd284dbddee016ed1767a5d2823] MIPS: Ensure pmd_present() returns false after pmd_mknotpresent() [92aa0718c9fa5160ad2f0e7b5bffb52f1ea1e51a] Hugh Dickins (2): mm Documentation: undoc non-linear vmas [7a14239a8fff45a241b6943a3ac444d5b67fcbed] mm: rmap use pte lock not mmap_sem to set PageMlocked [b87537d9e2feb30f6a962f27eb32768682698d3b] Jia-Ju Bai (1): usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable() [c85400f886e3d41e69966470879f635a2b50084c] Jim Mattson (2): kvm: Disallow wraparound in kvm_gfn_to_hva_cache_init [f1b9dd5eb86cec1fcf66aad17e7701d98d024a9a] kvm: vmx: Set IA32_TSC_AUX for legacy mode guests [0023ef39dc35c773c436eaa46ca539a26b308b55] Jiong Wang (1): mips: bpf: fix encoding bug for mm_srlv32_op [17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428] Jonas Gorski (1): MIPS: BCM63XX: fix switch core reset on BCM6368 [8a38dacf87180738d42b058334c951eba15d2d47] Kai-Heng Feng (1): igb: Fix an issue that PME is not enabled during runtime suspend [1fb3a7a75e2efcc83ef21f2434069cddd6fae6f5] Krzysztof Kozlowski (1): gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB [c5510b8dafce5f3f5a039c9b262ebcae0092c462] Kyle Roeschley (1): ath6kl: Only use match sets when firmware supports it [fb376a495fbdb886f38cfaf5a3805401b9e46f13] Larry Finger (1): b43: Fix error in cordic routine [8ea3819c0bbef57a51d8abe579e211033e861677] Laurent Pinchart (1): drm: rcar-du: Fix vblank initialization [3d61fe5f59dd3e6f96fc0772156d257cb04dc656] Leon Romanovsky (1): net/mlx5: Continue driver initialization despite debugfs failure [199fa087dc6b503baad06712716fac645a983e8a] Lubomir Rintel (1): power: supply: olpc_battery: correct the temperature units [ed54ffbe554f0902689fd6d1712bbacbacd11376] Maciej W. Rozycki (1): MIPS: SiByte: Enable ZONE_DMA32 for LittleSur [756d6d836dbfb04a5a486bc2ec89397aa4533737] Macpaul Lin (1): cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader. [eafb27fa5283599ce6c5492ea18cf636a28222bb] Maurizio Lombardi (1): ext4: missing unlock/put_page() in ext4_try_to_write_inline_data() [132d00becb31e88469334e1e62751c81345280e0] Michael Ellerman (1): powerpc/configs: Don't enable PPC_EARLY_DEBUG in defconfigs [2b874a5c7b75fdc90fdd1e2ffaa3ec5a9d21e253] Michal Hocko (2): hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined [b15c87263a69272423771118c653e9a1d0672caa] mm, memory_hotplug: do not clear numa_node association after hot_remove [46a3679b8190101e4ebdfe252ef79e6150a4f2ac] Mike Kravetz (1): mm: migration: fix migration of huge PMD shared pages [017b1660df89f5fb4bfe66c34e35f7d2031100c7] Noralf Trønnes (1): fbdev: fbcon: Fix unregister crash when more than one framebuffer [2122b40580dd9d0620398739c773d07a7b7939d0] Pan Bian (1): f2fs: read page index before freeing [0ea295dd853e0879a9a30ab61f923c26be35b902] Paul Burton (1): MIPS: Expand MIPS32 ASIDs to 64 bits [ff4dd232ec45a0e45ea69f28f069f2ab22b4908a] Pavel Shilovsky (1): CIFS: Enable encryption during session setup phase [cabfb3680f78981d26c078a26e5c748531257ebb] Peter Rosin (1): fbdev: fbmem: behave better with small rotated displays and many CPUs [f75df8d4b4fabfad7e3cba2debfad12741c6fde7] Rasmus Villemoes (1): lib/string.c: remove duplicated function [cd514e727b18ff4d189b8e268db13729a4175091] Sameer Pujar (1): ALSA: hda/tegra: clear pending irq handlers [63d2a9ec310d8bcc955574220d4631aa55c1a80c] Scott Chen (1): USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays [8d503f206c336677954160ac62f0c7d9c219cd89] Sean Christopherson (1): KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup [e81434995081fd7efb755fd75576b35dbb0850b1] Sergei Shtylyov (1): sata_rcar: fix deferred probing [9f83cfdb1ace3ef268ecc6fda50058d2ec37d603] Sergey Senozhatsky (1): panic: avoid deadlocks in re-entrant console drivers [c7c3f05e341a9a2bd1a92993d4f996cfd6e7348e] Shivasharan S (1): scsi: megaraid_sas: Use 63-bit DMA addressing [894169db12463cea08d0e2a9e35f42b291340e5a] Shrikrishna Khare (1): Driver: Vmxnet3: Fix regression caused by 5738a09 [58caf637365fef97c8e84ea5699a8e34d68fce93] Stefan Agner (1): serial: imx: fix error handling in console_setup [63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad] Steffen Maier (1): scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown [60a161b7e5b2a252ff0d4c622266a7d8da1120ce] Theodore Ts'o (8): ext4: avoid declaring fs inconsistent due to invalid file handles [8a363970d1dc38c4ec4ad575c862f776f468d057] ext4: avoid kernel warning when writing the superblock to a dead device [e86807862e6880809f191c4cea7f88a489f0ed34] ext4: check for shutdown and r/o file system in ext4_write_inode() [18f2c4fcebf2582f96cbd5f2238f4f354a0e4847] ext4: fix a potential fiemap/page fault deadlock w/ inline_data [2b08b1f12cd664dc7d5c84ead9ff25ae97ad5491] ext4: fix special inode number checks in __ext4_iget() [191ce17876c9367819c4b0a25b503c0f6d9054d8] ext4: force inode writes when nfsd calls commit_metadata() [fde872682e175743e0c3ef939c89e3c6008a1529] ext4: include terminating u32 in size of xattr entries when expanding inodes [a805622a757b6d7f65def4141d29317d8e37b8a1] ext4: make sure enough credits are reserved for dioread_nolock writes [812c0cab2c0dfad977605dbadf9148490ca5d93f] Tyrel Datwyler (1): ibmveth: fix DMA unmap error in ibmveth_xmit_start error path [756af9c642329d54f048bac2a62f829b391f6944] Vasily Averin (6): dlm: fixed memory leaks after failed ls_remove_names allocation [b982896cdb6e6a6b89d86dfb39df489d9df51e14] dlm: lost put_lkb on error path in receive_convert() and receive_unlock() [c0174726c3976e67da8649ac62cae43220ae173a] dlm: memory leaks on error path in dlm_user_request() [d47b41aceeadc6b58abc9c7c6485bef7cfb75636] dlm: possible memory leak on error path in create_lkb() [23851e978f31eda8b2d01bd410d3026659ca06c7] sunrpc: fix cache_head leak due to queued request [4ecd55ea074217473f94cfee21bb72864d39f8d7] sunrpc: use SVC_NET() in svcauth_gss_* functions [b8be5674fa9a6f3677865ea93f7803c4212f3e10] Yang Dongsheng (1): Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode. [6e17d30bfaf43e04d991392d8484f1c556810c33] Zheng Yan (1): ceph: don't update importing cap's mseq when handing cap export [3c1392d4c49962a31874af14ae9ff289cb2b3851] Zhengbin (1): 9p/net: fix memory leak in p9_client_create [bb06c388fa20ae24cfe80c52488de718a7e3a53f] Documentation/filesystems/proc.txt | 1 - Documentation/vm/page_migration | 10 +- Documentation/vm/unevictable-lru.txt | 120 ++++----------------- Makefile | 4 +- arch/arm/kvm/arm.c | 23 ++-- arch/mips/Kconfig | 1 + arch/mips/bcm63xx/reset.c | 2 +- arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 +- arch/mips/include/asm/cpu-info.h | 2 +- arch/mips/include/asm/mmu.h | 2 +- arch/mips/include/asm/mmu_context.h | 8 +- arch/mips/include/asm/pgtable-64.h | 5 + arch/mips/include/uapi/asm/inst.h | 2 +- arch/mips/mm/c-r3k.c | 2 +- arch/powerpc/configs/g5_defconfig | 1 - arch/powerpc/configs/maple_defconfig | 1 - arch/powerpc/configs/pmac32_defconfig | 1 - arch/powerpc/configs/ppc64_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/powerpc/kernel/signal_32.c | 38 +++++-- arch/powerpc/kernel/signal_64.c | 44 ++++++-- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/vmx.c | 6 +- arch/x86/pci/broadcom_bus.c | 4 +- crypto/crypto_user.c | 37 ++++--- crypto/pcrypt.c | 2 +- drivers/ata/sata_rcar.c | 4 +- drivers/block/swim3.c | 6 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 40 ++++++- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/infiniband/hw/qib/qib_sdma.c | 4 +- drivers/input/keyboard/nomadik-ske-keypad.c | 2 +- drivers/misc/altera-stapl/altera.c | 3 +- drivers/misc/genwqe/card_utils.c | 2 +- drivers/misc/vexpress-syscfg.c | 2 +- drivers/net/ethernet/ibm/ibmveth.c | 6 +- drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 +- drivers/net/hamradio/6pack.c | 24 ++--- drivers/net/vmxnet3/vmxnet3_drv.c | 6 +- drivers/net/vmxnet3/vmxnet3_int.h | 4 +- drivers/net/wireless/airo.c | 2 +- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- drivers/net/wireless/b43/phy_common.c | 2 +- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 +- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 6 +- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2 +- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 1 + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 20 ++-- drivers/power/olpc_battery.c | 4 +- drivers/s390/scsi/zfcp_aux.c | 6 +- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- drivers/tty/serial/imx.c | 2 +- drivers/tty/tty_ldsem.c | 10 ++ drivers/usb/class/cdc-acm.c | 10 ++ drivers/usb/class/cdc-acm.h | 1 + drivers/usb/host/r8a66597-hcd.c | 5 +- drivers/usb/serial/pl2303.c | 5 + drivers/usb/serial/pl2303.h | 5 + drivers/video/console/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 8 +- fs/btrfs/btrfs_inode.h | 6 ++ fs/btrfs/delayed-inode.c | 2 + fs/btrfs/dev-replace.c | 2 + fs/btrfs/inode.c | 65 +++++++++-- fs/btrfs/tree-log.c | 16 +++ fs/ceph/caps.c | 1 - fs/cifs/sess.c | 22 ++-- fs/cifs/smb2maperror.c | 4 +- fs/cifs/smb2pdu.c | 11 +- fs/dlm/lock.c | 17 +-- fs/dlm/lockspace.c | 2 +- fs/ext4/ext4.h | 17 ++- fs/ext4/extents.c | 3 +- fs/ext4/ialloc.c | 2 +- fs/ext4/inline.c | 26 +++-- fs/ext4/inode.c | 61 +++++++---- fs/ext4/ioctl.c | 2 +- fs/ext4/namei.c | 4 +- fs/ext4/resize.c | 5 +- fs/ext4/super.c | 32 +++--- fs/ext4/xattr.c | 2 +- fs/f2fs/node.c | 4 +- include/linux/gpio/consumer.h | 2 +- include/linux/hugetlb.h | 14 +++ include/linux/mm.h | 6 ++ include/trace/events/ext4.h | 20 ++++ kernel/panic.c | 6 +- lib/string.c | 27 ++--- mm/hugetlb.c | 37 ++++++- mm/memory_hotplug.c | 46 +++----- mm/rmap.c | 92 +++++++++++----- net/9p/client.c | 21 ++++ net/sunrpc/auth_gss/svcauth_gss.c | 8 +- net/sunrpc/cache.c | 9 +- sound/core/pcm.c | 2 + sound/pci/emu10k1/emufx.c | 5 + sound/pci/hda/hda_tegra.c | 2 + sound/pci/rme9652/hdsp.c | 10 +- sound/synth/emux/emux_hwdep.c | 7 +- tools/lib/lockdep/include/liblockdep/rwlock.h | 6 +- tools/perf/builtin-help.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/pmu.c | 4 +- tools/perf/util/svghelper.c | 2 +- virt/kvm/kvm_main.c | 40 +++---- 108 files changed, 771 insertions(+), 460 deletions(-) -- Ben Hutchings Klipstein's 4th Law of Prototyping and Production: A fail-safe circuit will destroy others.

5 years, 7 months

3
105
0 0

[REPOST, PATCH] scsi: sd: block: Fix regressions in read-only block device handling

by Martin K. Petersen

Some devices come online in write protected state and switch to read-write once they are ready to process I/O requests. These devices broke with commit 20bd1d026aac ("scsi: sd: Keep disk read-only when re-reading partition") because we had no way to distinguish between a user decision to set a block_device read-only and the actual hardware device being write-protected. Because partitions are dropped and recreated on revalidate we are unable to persist any user-provided policy in hd_struct. Introduce a bitmap in struct gendisk to track the user configuration. This bitmap is updated when BLKROSET is called on a given disk or partition. A helper function, get_user_ro(), is provided to determine whether the ioctl has forced read-only state for a given block device. This helper is used by set_disk_ro() and add_partition() to ensure that both existing and newly created partitions will get the correct state. - If BLKROSET sets a whole disk device read-only, all partitions will now end up in a read-only state. - If BLKROSET sets a given partition read-only, that partition will remain read-only post revalidate. - Otherwise both the whole disk device and any partitions will reflect the write protect state of the underlying device. Since nobody knows what "policy" means, rename the field to "read_only" for clarity. Cc: Jeremy Cline <jeremy(a)jcline.org> Cc: Oleksii Kurochko <olkuroch(a)cisco.com> Cc: stable(a)vger.kernel.org # v4.16+ Reported-by: Oleksii Kurochko <olkuroch(a)cisco.com> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201221 Fixes: 20bd1d026aac ("scsi: sd: Keep disk read-only when re-reading partition") Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> --- v3: - Drop ?: since gcc complains about mixing int and bool (zeroday) - Drop EXPORT_SYMBOL (hch) - s/policy/read_only/ and make it a boolean v2: - Track user read-only state in a bitmap - Work around the regression that caused us to drop user preferences on revalidate --- block/blk-core.c | 2 +- block/genhd.c | 34 ++++++++++++++++++++++++---------- block/ioctl.c | 4 ++++ block/partition-generic.c | 7 +++++-- drivers/scsi/sd.c | 4 +--- include/linux/genhd.h | 11 +++++++---- 6 files changed, 42 insertions(+), 20 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 4673ebe42255..932f179a9095 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -792,7 +792,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) { const int op = bio_op(bio); - if (part->policy && op_is_write(op)) { + if (part->read_only && op_is_write(op)) { char b[BDEVNAME_SIZE]; if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) diff --git a/block/genhd.c b/block/genhd.c index 703267865f14..9f3a93ca1851 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1539,26 +1539,40 @@ static void set_disk_ro_uevent(struct gendisk *gd, int ro) kobject_uevent_env(&disk_to_dev(gd)->kobj, KOBJ_CHANGE, envp); } -void set_device_ro(struct block_device *bdev, int flag) +void set_device_ro(struct block_device *bdev, bool state) { - bdev->bd_part->policy = flag; + bdev->bd_part->read_only = state; } EXPORT_SYMBOL(set_device_ro); -void set_disk_ro(struct gendisk *disk, int flag) +bool get_user_ro(struct gendisk *disk, unsigned int partno) +{ + /* Is the user read-only bit set for the whole disk device? */ + if (test_bit(0, disk->user_ro_bitmap)) + return true; + + /* Is the user read-only bit set for this particular partition? */ + if (test_bit(partno, disk->user_ro_bitmap)) + return true; + + return false; +} + +void set_disk_ro(struct gendisk *disk, bool state) { struct disk_part_iter piter; struct hd_struct *part; - if (disk->part0.policy != flag) { - set_disk_ro_uevent(disk, flag); - disk->part0.policy = flag; - } + if (disk->part0.read_only != state) + set_disk_ro_uevent(disk, state); - disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); + disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY_PART0); while ((part = disk_part_iter_next(&piter))) - part->policy = flag; + if (get_user_ro(disk, part->partno)) + part->read_only = true; + else + part->read_only = state; disk_part_iter_exit(&piter); } @@ -1568,7 +1582,7 @@ int bdev_read_only(struct block_device *bdev) { if (!bdev) return 0; - return bdev->bd_part->policy; + return bdev->bd_part->read_only; } EXPORT_SYMBOL(bdev_read_only); diff --git a/block/ioctl.c b/block/ioctl.c index 4825c78a6baa..41206df89485 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -451,6 +451,10 @@ static int blkdev_roset(struct block_device *bdev, fmode_t mode, return ret; if (get_user(n, (int __user *)arg)) return -EFAULT; + if (n) + set_bit(bdev->bd_partno, bdev->bd_disk->user_ro_bitmap); + else + clear_bit(bdev->bd_partno, bdev->bd_disk->user_ro_bitmap); set_device_ro(bdev, n); return 0; } diff --git a/block/partition-generic.c b/block/partition-generic.c index 8e596a8dff32..2bade849cc5c 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -98,7 +98,7 @@ static ssize_t part_ro_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); - return sprintf(buf, "%d\n", p->policy ? 1 : 0); + return sprintf(buf, "%u\n", p->read_only ? 1 : 0); } static ssize_t part_alignment_offset_show(struct device *dev, @@ -338,7 +338,10 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, queue_limit_discard_alignment(&disk->queue->limits, start); p->nr_sects = len; p->partno = partno; - p->policy = get_disk_ro(disk); + if (get_user_ro(disk, partno)) + p->read_only = true; + else + p->read_only = get_disk_ro(disk); if (info) { struct partition_meta_info *pinfo = alloc_part_info(disk); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 251db30d0882..9d8e15d03d2b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2608,10 +2608,8 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer) int res; struct scsi_device *sdp = sdkp->device; struct scsi_mode_data data; - int disk_ro = get_disk_ro(sdkp->disk); int old_wp = sdkp->write_prot; - set_disk_ro(sdkp->disk, 0); if (sdp->skip_ms_page_3f) { sd_first_printk(KERN_NOTICE, sdkp, "Assuming Write Enabled\n"); return; @@ -2649,7 +2647,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer) "Test WP failed, assume Write Enabled\n"); } else { sdkp->write_prot = ((data.device_specific & 0x80) != 0); - set_disk_ro(sdkp->disk, sdkp->write_prot || disk_ro); + set_disk_ro(sdkp->disk, sdkp->write_prot); if (sdkp->first_scan || old_wp != sdkp->write_prot) { sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n", sdkp->write_prot ? "on" : "off"); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 06c0fd594097..1abde0e88ccb 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -118,7 +118,8 @@ struct hd_struct { unsigned int discard_alignment; struct device __dev; struct kobject *holder_dir; - int policy, partno; + bool read_only; + int partno; struct partition_meta_info *info; #ifdef CONFIG_FAIL_MAKE_REQUEST int make_it_fail; @@ -194,6 +195,7 @@ struct gendisk { */ struct disk_part_tbl __rcu *part_tbl; struct hd_struct part0; + DECLARE_BITMAP(user_ro_bitmap, DISK_MAX_PARTS); const struct block_device_operations *fops; struct request_queue *queue; @@ -431,12 +433,13 @@ extern void del_gendisk(struct gendisk *gp); extern struct gendisk *get_gendisk(dev_t dev, int *partno); extern struct block_device *bdget_disk(struct gendisk *disk, int partno); -extern void set_device_ro(struct block_device *bdev, int flag); -extern void set_disk_ro(struct gendisk *disk, int flag); +extern void set_device_ro(struct block_device *bdev, bool state); +extern void set_disk_ro(struct gendisk *disk, bool state); +extern bool get_user_ro(struct gendisk *disk, unsigned int partno); static inline int get_disk_ro(struct gendisk *disk) { - return disk->part0.policy; + return disk->part0.read_only; } extern void disk_block_events(struct gendisk *disk); -- 2.21.0

5 years, 7 months

2
1
0 0

[PATCH v2 1/5] mtd: rawnand: mtk: Correct low level time calculation of r/w cycle

by Xiaolei Li

At present, the flow of calculating AC timing of read/write cycle in SDR mode is that: At first, calculate high hold time which is valid for both read and write cycle using the max value between tREH_min and tWH_min. Secondly, calculate WE# pulse width using tWP_min. Thridly, calculate RE# pulse width using the bigger one between tREA_max and tRP_min. But NAND SPEC shows that Controller should also meet write/read cycle time. That is write cycle time should be more than tWC_min and read cycle should be more than tRC_min. Obviously, we do not achieve that now. This patch corrects the low level time calculation to meet minimum read/write cycle time required. After getting the high hold time, WE# low level time will be promised to meet tWP_min and tWC_min requirement, and RE# low level time will be promised to meet tREA_max, tRP_min and tRC_min requirement. Fixes: edfee3619c49 ("mtd: nand: mtk: add ->setup_data_interface() hook") Cc: stable(a)vger.kernel.org Signed-off-by: Xiaolei Li <xiaolei.li(a)mediatek.com> --- drivers/mtd/nand/raw/mtk_nand.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c index b6b4602f5132..4fbb0c6ecae3 100644 --- a/drivers/mtd/nand/raw/mtk_nand.c +++ b/drivers/mtd/nand/raw/mtk_nand.c @@ -508,7 +508,8 @@ static int mtk_nfc_setup_data_interface(struct nand_chip *chip, int csline, { struct mtk_nfc *nfc = nand_get_controller_data(chip); const struct nand_sdr_timings *timings; - u32 rate, tpoecs, tprecs, tc2r, tw2r, twh, twst, trlt; + u32 rate, tpoecs, tprecs, tc2r, tw2r, twh, twst = 0, trlt = 0; + u32 thold; timings = nand_get_sdr_timings(conf); if (IS_ERR(timings)) @@ -544,11 +545,28 @@ static int mtk_nfc_setup_data_interface(struct nand_chip *chip, int csline, twh = DIV_ROUND_UP(twh * rate, 1000000) - 1; twh &= 0xf; - twst = timings->tWP_min / 1000; + /* Calculate real WE#/RE# hold time in nanosecond */ + thold = (twh + 1) * 1000000 / rate; + /* nanosecond to picosecond */ + thold *= 1000; + + /** + * WE# low level time should be expaned to meet WE# pulse time + * and WE# cycle time at the same time. + */ + if (thold < timings->tWC_min) + twst = timings->tWC_min - thold; + twst = max(timings->tWP_min, twst) / 1000; twst = DIV_ROUND_UP(twst * rate, 1000000) - 1; twst &= 0xf; - trlt = max(timings->tREA_max, timings->tRP_min) / 1000; + /** + * RE# low level time should be expaned to meet RE# pulse time, + * RE# access time and RE# cycle time at the same time. + */ + if (thold < timings->tRC_min) + trlt = timings->tRC_min - thold; + trlt = max3(trlt, timings->tREA_max, timings->tRP_min) / 1000; trlt = DIV_ROUND_UP(trlt * rate, 1000000) - 1; trlt &= 0xf; -- 2.18.0

5 years, 7 months

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2019