January 2021 - Linux-stable-mirror

[PATCH 1/3] drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes

by Lyude Paul

Nvidia hardware doesn't actually support using tiling formats with the cursor plane, only linear is allowed. In the future, we should write a testcase for this. Fixes: c586f30bf74c ("drm/nouveau/kms: Add format mod prop to base/ovly/nvdisp") Cc: James Jones <jajones(a)nvidia.com> Cc: Martin Peres <martin.peres(a)free.fr> Cc: Jeremy Cline <jcline(a)redhat.com> Cc: Simon Ser <contact(a)emersion.fr> Cc: <stable(a)vger.kernel.org> # v5.8+ Signed-off-by: Lyude Paul <lyude(a)redhat.com> --- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index ce451242f79e..271de3a63f21 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -702,6 +702,11 @@ nv50_wndw_init(struct nv50_wndw *wndw) nvif_notify_get(&wndw->notify); } +static const u64 nv50_cursor_format_modifiers[] = { + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID, +}; + int nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, enum drm_plane_type type, const char *name, int index, @@ -713,6 +718,7 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, struct nvif_mmu *mmu = &drm->client.mmu; struct nv50_disp *disp = nv50_disp(dev); struct nv50_wndw *wndw; + const u64 *format_modifiers; int nformat; int ret; @@ -728,10 +734,13 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, for (nformat = 0; format[nformat]; nformat++); - ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw, - format, nformat, - nouveau_display(dev)->format_modifiers, - type, "%s-%d", name, index); + if (type == DRM_PLANE_TYPE_CURSOR) + format_modifiers = nv50_cursor_format_modifiers; + else + format_modifiers = nouveau_display(dev)->format_modifiers; + + ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw, format, nformat, + format_modifiers, type, "%s-%d", name, index); if (ret) { kfree(*pwndw); *pwndw = NULL; -- 2.29.2

4 years, 4 months

4
4
0 0

Re: [PATCH v2] xen-blkfront: allow discard-* nodes to be optional

by Roger Pau Monné

Forgot to Cc stable for the Fixes tag. Doing it now. On Tue, Jan 19, 2021 at 11:57:27AM +0100, Roger Pau Monne wrote: > This is inline with the specification described in blkif.h: > > * discard-granularity: should be set to the physical block size if > node is not present. > * discard-alignment, discard-secure: should be set to 0 if node not > present. > > This was detected as QEMU would only create the discard-granularity > node but not discard-alignment, and thus the setup done in > blkfront_setup_discard would fail. > > Fix blkfront_setup_discard to not fail on missing nodes, and also fix > blkif_set_queue_limits to set the discard granularity to the physical > block size if none is specified in xenbus. > > Fixes: ed30bf317c5ce ('xen-blkfront: Handle discard requests.') > Reported-by: Arthur Borsboom <arthurborsboom(a)gmail.com> > Signed-off-by: Roger Pau Monné <roger.pau(a)citrix.com> > --- > Cc: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> > Cc: Juergen Gross <jgross(a)suse.com> > Cc: Stefano Stabellini <sstabellini(a)kernel.org> > Cc: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> > Cc: "Roger Pau Monné" <roger.pau(a)citrix.com> > Cc: Jens Axboe <axboe(a)kernel.dk> > Cc: xen-devel(a)lists.xenproject.org > Cc: linux-block(a)vger.kernel.org > Cc: Arthur Borsboom <arthurborsboom(a)gmail.com> > --- > Changes since v2: > - Allow all discard-* nodes to be optional. > --- > drivers/block/xen-blkfront.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c > index 5265975b3fba..e1c6798889f4 100644 > --- a/drivers/block/xen-blkfront.c > +++ b/drivers/block/xen-blkfront.c > @@ -945,7 +945,8 @@ static void blkif_set_queue_limits(struct blkfront_info *info) > if (info->feature_discard) { > blk_queue_flag_set(QUEUE_FLAG_DISCARD, rq); > blk_queue_max_discard_sectors(rq, get_capacity(gd)); > - rq->limits.discard_granularity = info->discard_granularity; > + rq->limits.discard_granularity = info->discard_granularity ?: > + info->physical_sector_size; > rq->limits.discard_alignment = info->discard_alignment; > if (info->feature_secdiscard) > blk_queue_flag_set(QUEUE_FLAG_SECERASE, rq); > @@ -2179,19 +2180,12 @@ static void blkfront_closing(struct blkfront_info *info) > > static void blkfront_setup_discard(struct blkfront_info *info) > { > - int err; > - unsigned int discard_granularity; > - unsigned int discard_alignment; > - > info->feature_discard = 1; > - err = xenbus_gather(XBT_NIL, info->xbdev->otherend, > - "discard-granularity", "%u", &discard_granularity, > - "discard-alignment", "%u", &discard_alignment, > - NULL); > - if (!err) { > - info->discard_granularity = discard_granularity; > - info->discard_alignment = discard_alignment; > - } > + info->discard_granularity = xenbus_read_unsigned(info->xbdev->otherend, > + "discard-granularity", > + 0); > + info->discard_alignment = xenbus_read_unsigned(info->xbdev->otherend, > + "discard-alignment", 0); > info->feature_secdiscard = > !!xenbus_read_unsigned(info->xbdev->otherend, "discard-secure", > 0); > -- > 2.29.2 >

4 years, 4 months

2
1
0 0

[PATCH v1 2/4] s390/kvm: extend guest_translate for MVPG interpretation

by Claudio Imbrenda

Extend guest_translate to optionally return the address of the guest DAT table which caused the exception, and change the return value to int. Also return the appropriate values in the low order bits of the address indicating protection or EDAT. Cc: stable(a)vger.kernel.org Signed-off-by: Claudio Imbrenda <imbrenda(a)linux.ibm.com> --- arch/s390/kvm/gaccess.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c index 6d6b57059493..8e256a233583 100644 --- a/arch/s390/kvm/gaccess.c +++ b/arch/s390/kvm/gaccess.c @@ -598,6 +598,10 @@ static int deref_table(struct kvm *kvm, unsigned long gpa, unsigned long *val) * @asce: effective asce * @mode: indicates the access mode to be used * @prot: returns the type for protection exceptions + * @entryptr: returns the physical address of the last DAT table entry + * processed, additionally setting a few flags in the lower bits + * to indicate whether a translation exception or a protection + * exception were encountered during the address translation. * * Translate a guest virtual address into a guest absolute address by means * of dynamic address translation as specified by the architecture. @@ -611,9 +615,10 @@ static int deref_table(struct kvm *kvm, unsigned long gpa, unsigned long *val) * the returned value is the program interruption code as defined * by the architecture */ -static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, - unsigned long *gpa, const union asce asce, - enum gacc_mode mode, enum prot_type *prot) +static int guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, + unsigned long *gpa, const union asce asce, + enum gacc_mode mode, enum prot_type *prot, + unsigned long *entryptr) { union vaddress vaddr = {.addr = gva}; union raddress raddr = {.addr = gva}; @@ -628,6 +633,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, edat1 = ctlreg0.edat && test_kvm_facility(vcpu->kvm, 8); edat2 = edat1 && test_kvm_facility(vcpu->kvm, 78); iep = ctlreg0.iep && test_kvm_facility(vcpu->kvm, 130); + if (entryptr) + *entryptr = 0; if (asce.r) goto real_address; ptr = asce.origin * PAGE_SIZE; @@ -667,6 +674,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, return PGM_ADDRESSING; if (deref_table(vcpu->kvm, ptr, &rfte.val)) return -EFAULT; + if (entryptr) + *entryptr = ptr; if (rfte.i) return PGM_REGION_FIRST_TRANS; if (rfte.tt != TABLE_TYPE_REGION1) @@ -685,6 +694,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, return PGM_ADDRESSING; if (deref_table(vcpu->kvm, ptr, &rste.val)) return -EFAULT; + if (entryptr) + *entryptr = ptr; if (rste.i) return PGM_REGION_SECOND_TRANS; if (rste.tt != TABLE_TYPE_REGION2) @@ -703,6 +714,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, return PGM_ADDRESSING; if (deref_table(vcpu->kvm, ptr, &rtte.val)) return -EFAULT; + if (entryptr) + *entryptr = ptr; if (rtte.i) return PGM_REGION_THIRD_TRANS; if (rtte.tt != TABLE_TYPE_REGION3) @@ -713,6 +726,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, dat_protection |= rtte.fc1.p; iep_protection = rtte.fc1.iep; raddr.rfaa = rtte.fc1.rfaa; + if (entryptr) + *entryptr |= dat_protection ? 6 : 4; goto absolute_address; } if (vaddr.sx01 < rtte.fc0.tf) @@ -731,6 +746,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, return PGM_ADDRESSING; if (deref_table(vcpu->kvm, ptr, &ste.val)) return -EFAULT; + if (entryptr) + *entryptr = ptr; if (ste.i) return PGM_SEGMENT_TRANSLATION; if (ste.tt != TABLE_TYPE_SEGMENT) @@ -741,6 +758,8 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, dat_protection |= ste.fc1.p; iep_protection = ste.fc1.iep; raddr.sfaa = ste.fc1.sfaa; + if (entryptr) + *entryptr |= dat_protection ? 6 : 4; goto absolute_address; } dat_protection |= ste.fc0.p; @@ -751,10 +770,14 @@ static unsigned long guest_translate(struct kvm_vcpu *vcpu, unsigned long gva, return PGM_ADDRESSING; if (deref_table(vcpu->kvm, ptr, &pte.val)) return -EFAULT; + if (entryptr) + *entryptr = ptr; if (pte.i) return PGM_PAGE_TRANSLATION; if (pte.z) return PGM_TRANSLATION_SPEC; + if (entryptr && dat_protection) + *entryptr |= 2; dat_protection |= pte.p; iep_protection = pte.iep; raddr.pfra = pte.pfra; @@ -810,7 +833,7 @@ static int guest_page_range(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, PROT_TYPE_LA); ga &= PAGE_MASK; if (psw_bits(*psw).dat) { - rc = guest_translate(vcpu, ga, pages, asce, mode, &prot); + rc = guest_translate(vcpu, ga, pages, asce, mode, &prot, NULL); if (rc < 0) return rc; } else { @@ -920,7 +943,7 @@ int guest_translate_address(struct kvm_vcpu *vcpu, unsigned long gva, u8 ar, } if (psw_bits(*psw).dat && !asce.r) { /* Use DAT? */ - rc = guest_translate(vcpu, gva, gpa, asce, mode, &prot); + rc = guest_translate(vcpu, gva, gpa, asce, mode, &prot, NULL); if (rc > 0) return trans_exc(vcpu, rc, gva, 0, mode, prot); } else { -- 2.26.2

4 years, 4 months

2
1
0 0

[PATCH 5.4 00/75] 5.4.91-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.91 release. There are 75 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 20 Jan 2021 15:24:42 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.91-rc2… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.91-rc2 Florian Westphal <fw(a)strlen.de> netfilter: nft_compat: remove flush counter optimization Dinghao Liu <dinghao.liu(a)zju.edu.cn> netfilter: nf_nat: Fix memleak in nf_nat_init Jesper Dangaard Brouer <brouer(a)redhat.com> netfilter: conntrack: fix reading nf_conntrack_buckets Geert Uytterhoeven <geert+renesas(a)glider.be> ALSA: firewire-tascam: Fix integer overflow in midi_port_work() Geert Uytterhoeven <geert+renesas(a)glider.be> ALSA: fireface: Fix integer overflow in transmit_midi_msg() Mike Snitzer <snitzer(a)redhat.com> dm: eliminate potential source of excessive kernel log noise j.nixdorf(a)avm.de <j.nixdorf(a)avm.de> net: sunrpc: interpret the return value of kstrtou32 correctly Lu Baolu <baolu.lu(a)linux.intel.com> iommu/vt-d: Fix unaligned addresses for intel_flush_svm_range_dev() Jann Horn <jannh(a)google.com> mm, slub: consider rest of partial list if acquire_slab() fails Hans de Goede <hdegoede(a)redhat.com> drm/i915/dsi: Use unconditional msleep for the panel_on_delay when there is no reset-deassert MIPI-sequence Parav Pandit <parav(a)nvidia.com> IB/mlx5: Fix error unwinding when set_has_smi_cap fails Mark Bloch <mbloch(a)nvidia.com> RDMA/mlx5: Fix wrong free of blue flame register on error Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Improve stats context resource accounting with RDMA driver loaded. Dinghao Liu <dinghao.liu(a)zju.edu.cn> RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp Leon Romanovsky <leonro(a)nvidia.com> RDMA/restrack: Don't treat as an error allocation ID wrapping Jan Kara <jack(a)suse.cz> ext4: fix superblock checksum failure when setting password salt Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: nfs_igrab_and_active must first reference the superblock Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter Trond Myklebust <trond.myklebust(a)hammerspace.com> pNFS: Stricter ordering of layoutget and layoutreturn Trond Myklebust <trond.myklebust(a)hammerspace.com> pNFS: Mark layout for return if return-on-close was not sent Trond Myklebust <trond.myklebust(a)hammerspace.com> pNFS: We want return-on-close to complete when evicting the inode Dave Wysochanski <dwysocha(a)redhat.com> NFS4: Fix use-after-free in trace_event_raw_event_nfs4_set_lock Sagi Grimberg <sagi(a)grimberg.me> nvme-tcp: fix possible data corruption with bio merges Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: Intel: fix error code cnl_set_dsp_D0() Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: axg-tdmin: fix axg skew offset Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: axg-tdm-interface: fix loopback Al Viro <viro(a)zeniv.linux.org.uk> dump_common_audit_data(): fix racy accesses to ->d_name Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix 'CPU too large' error Arnd Bergmann <arnd(a)arndb.de> ARM: picoxcell: fix missing interrupt-parent properties Craig Tatlor <ctatlor97(a)gmail.com> drm/msm: Call msm_init_vram before binding the gpu Shawn Guo <shawn.guo(a)linaro.org> ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI Peter Robinson <pbrobinson(a)gmail.com> usb: typec: Fix copy paste error for NVIDIA alt-mode description Dennis Li <Dennis.Li(a)amd.com> drm/amdgpu: fix a GPU hang issue when remove device Israel Rukshin <israelr(a)nvidia.com> nvmet-rdma: Fix list_del corruption on queue establishment failure Gopal Tiwari <gtiwari(a)redhat.com> nvme-pci: mark Samsung PM1725a as IGNORE_DEV_SUBNQN Po-Hsu Lin <po-hsu.lin(a)canonical.com> selftests: fix the return value for UDP GRO test Michael Ellerman <mpe(a)ellerman.id.au> net: ethernet: fs_enet: Add missing MODULE_LICENSE Arnd Bergmann <arnd(a)arndb.de> misdn: dsp: select CONFIG_BITREVERSE Randy Dunlap <rdunlap(a)infradead.org> arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC Jan Kara <jack(a)suse.cz> bfq: Fix computation of shallow depth John Millikin <john(a)john-millikin.com> lib/raid6: Let $(UNROLL) rules work with macOS userland Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> hwmon: (pwm-fan) Ensure that calculation doesn't discard big period values Dinghao Liu <dinghao.liu(a)zju.edu.cn> habanalabs: Fix memleak in hl_device_reset Oded Gabbay <ogabbay(a)kernel.org> habanalabs: register to pci shutdown callback Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram Guido Günther <agx(a)sigxcpu.org> regulator: bd718x7: Add enable times Filipe Manana <fdmanana(a)suse.com> btrfs: fix transaction leak and crash after RO remount caused by qgroup rescan Vasily Averin <vvs(a)virtuozzo.com> netfilter: ipset: fixes possible oops in mtype_resize Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: move symlink creation to arch/arc/Makefile to avoid race Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: add boot_targets to PHONY Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: add uImage.lzma to the top-level target Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: remove non-existing bootpImage from KBUILD_IMAGE Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix flush with external metadata device Paulo Alcantara <pc(a)cjr.nz> cifs: fix interrupted close commands Steve French <stfrench(a)microsoft.com> smb3: remove unused flag passed into close functions Theodore Ts'o <tytso(a)mit.edu> ext4: don't leak old mountpoint samples yangerkun <yangerkun(a)huawei.com> ext4: fix bug for rename with RENAME_WHITEOUT Jani Nikula <jani.nikula(a)intel.com> drm/i915/backlight: fix CPU mode backlight takeover on LPT Su Yue <l(a)damenly.su> btrfs: tree-checker: check if chunk item end overflows Leon Schuermann <leon(a)is.currently.online> r8152: Add Lenovo Powered USB-C Travel Hub Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix the maximum number of arguments Akilesh Kailash <akailash(a)google.com> dm snapshot: flush merged data before committing metadata Mike Snitzer <snitzer(a)redhat.com> dm raid: fix discard limits for raid1 Miaohe Lin <linmiaohe(a)huawei.com> mm/hugetlb: fix potential missing huge page size info Dexuan Cui <decui(a)microsoft.com> ACPI: scan: Harden acpi_device_add() against device ID overflows Tom Rix <trix(a)redhat.com> RDMA/ocrdma: Fix use after free in ocrdma_dealloc_ucontext_pd() Alexander Lobakin <alobakin(a)pm.me> MIPS: relocatable: fix possible boot hangup with KASLR enabled Paul Cercueil <paul(a)crapouillou.net> MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB Anders Roxell <anders.roxell(a)linaro.org> mips: lib: uncached: fix non-standard usage of variable 'sp' Anders Roxell <anders.roxell(a)linaro.org> mips: fix Section mismatch in reference Masami Hiramatsu <mhiramat(a)kernel.org> tracing/kprobes: Do the notrace functions check without kprobes on ftrace Wei Liu <wei.liu(a)kernel.org> x86/hyperv: check cpu mask after interrupt has been disabled Thomas Hebb <tommyhebb(a)gmail.com> ASoC: dapm: remove widget from dirty list on free Su Yue <l(a)damenly.su> btrfs: prevent NULL pointer dereference in extent_io_tree_panic Olaf Hering <olaf(a)aepfle.de> kbuild: enforce -Werror=return-type ------------- Diffstat: Makefile | 6 +-- arch/arc/Makefile | 20 +++++--- arch/arc/boot/Makefile | 11 +--- arch/arc/include/asm/page.h | 1 + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 4 ++ arch/mips/boot/compressed/decompress.c | 3 +- arch/mips/kernel/relocate.c | 10 +++- arch/mips/lib/uncached.c | 4 +- arch/mips/mm/c-r4k.c | 2 +- arch/mips/mm/sc-mips.c | 4 +- arch/x86/hyperv/mmu.c | 12 +++-- block/bfq-iosched.c | 8 +-- drivers/acpi/internal.h | 2 +- drivers/acpi/scan.c | 15 +++++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.c | 9 ++-- drivers/gpu/drm/i915/display/vlv_dsi.c | 16 ++++-- drivers/gpu/drm/msm/msm_drv.c | 8 +-- drivers/hwmon/pwm-fan.c | 12 ++++- drivers/infiniband/core/restrack.c | 1 + drivers/infiniband/hw/mlx5/main.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 3 ++ drivers/iommu/intel-svm.c | 22 +++++++- drivers/isdn/mISDN/Kconfig | 1 + drivers/md/dm-bufio.c | 6 +++ drivers/md/dm-integrity.c | 58 ++++++++++++++++++---- drivers/md/dm-raid.c | 6 +-- drivers/md/dm-snap.c | 24 +++++++++ drivers/md/dm.c | 2 +- drivers/misc/habanalabs/device.c | 2 + drivers/misc/habanalabs/habanalabs_drv.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 8 ++- .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 1 + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 1 + drivers/net/ethernet/freescale/ucc_geth.h | 9 +++- drivers/net/usb/cdc_ether.c | 7 +++ drivers/net/usb/r8152.c | 1 + drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/tcp.c | 2 +- drivers/nvme/target/rdma.c | 10 ++++ drivers/regulator/bd718x7-regulator.c | 57 +++++++++++++++++++++ drivers/usb/typec/altmodes/Kconfig | 2 +- fs/btrfs/extent_io.c | 4 +- fs/btrfs/qgroup.c | 13 +++-- fs/btrfs/super.c | 8 +++ fs/btrfs/tree-checker.c | 7 +++ fs/cifs/smb2pdu.c | 21 +++----- fs/cifs/smb2proto.h | 2 - fs/ext4/file.c | 2 +- fs/ext4/ioctl.c | 3 ++ fs/ext4/namei.c | 16 +++--- fs/nfs/internal.h | 12 +++-- fs/nfs/nfs4proc.c | 28 ++++------- fs/nfs/pnfs.c | 58 ++++++++++++---------- fs/nfs/pnfs.h | 8 ++- include/linux/acpi.h | 7 +++ include/linux/dm-bufio.h | 1 + kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- lib/raid6/Makefile | 2 +- mm/hugetlb.c | 2 +- mm/slub.c | 2 +- net/netfilter/ipset/ip_set_hash_gen.h | 22 ++++---- net/netfilter/nf_conntrack_standalone.c | 3 ++ net/netfilter/nf_nat_core.c | 1 + net/netfilter/nft_compat.c | 37 ++++++-------- net/sunrpc/addr.c | 2 +- security/lsm_audit.c | 7 ++- sound/firewire/fireface/ff-transaction.c | 2 +- sound/firewire/tascam/tascam-transaction.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 1 + sound/soc/meson/axg-tdm-interface.c | 14 +++++- sound/soc/meson/axg-tdmin.c | 13 +---- sound/soc/soc-dapm.c | 1 + tools/perf/util/machine.c | 4 +- tools/perf/util/session.c | 2 +- tools/testing/selftests/net/udpgro.sh | 34 +++++++++++++ 78 files changed, 513 insertions(+), 216 deletions(-)

4 years, 4 months

4
3
0 0

[PATCH v1 1/4] s390/kvm: VSIE: stop leaking host addresses

by Claudio Imbrenda

The addresses in the SIE control block of the host should not be forwarded to the guest. They are only meaningful to the host, and moreover it would be a clear security issue. Subsequent patches will actually put the right values in the guest SIE control block. Fixes: a3508fbe9dc6d ("KVM: s390: vsie: initial support for nested virtualization") Cc: stable(a)vger.kernel.org Signed-off-by: Claudio Imbrenda <imbrenda(a)linux.ibm.com> --- arch/s390/kvm/vsie.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 4f3cbf6003a9..ada49583e530 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -416,11 +416,6 @@ static void unshadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) memcpy((void *)((u64)scb_o + 0xc0), (void *)((u64)scb_s + 0xc0), 0xf0 - 0xc0); break; - case ICPT_PARTEXEC: - /* MVPG only */ - memcpy((void *)((u64)scb_o + 0xc0), - (void *)((u64)scb_s + 0xc0), 0xd0 - 0xc0); - break; } if (scb_s->ihcpu != 0xffffU) -- 2.26.2

4 years, 4 months

3
4
0 0

✅ PASS: Test report for kernel 5.10.8 (stable-queue)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: 5a3312a9b6dc - netfilter: nf_nat: Fix memleak in nf_nat_init The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK All kernel binaries, config files, and logs are available for download here: https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?prefi… 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 `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: make options: make -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: make -j30 INSTALL_MOD_STRIP=1 targz-pkg s390x: make options: make -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: make -j30 INSTALL_MOD_STRIP=1 targz-pkg Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ xfstests - ext4 🚧 ✅ xfstests - xfs 🚧 ✅ xfstests - btrfs 🚧 ❌ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests 🚧 ✅ Storage block - filesystem fio test 🚧 ✅ Storage block - queue scheduler test 🚧 ✅ Storage nvme - tcp 🚧 ✅ Storage: swraid mdadm raid_module test Host 2: ✅ Boot test ✅ ACPI table test ✅ ACPI enabled test ✅ LTP ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ Firmware test suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Ethernet drivers sanity 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ❌ kdump - kexec_boot ppc64le: Host 1: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Networking socket: fuzz ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Ethernet drivers sanity 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer Host 2: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ⚡⚡⚡ Boot test ⚡⚡⚡ selinux-policy: serge-testsuite ⚡⚡⚡ storage: software RAID testing 🚧 ⚡⚡⚡ xfstests - ext4 🚧 ⚡⚡⚡ xfstests - xfs 🚧 ⚡⚡⚡ xfstests - btrfs 🚧 ⚡⚡⚡ IPMI driver test 🚧 ⚡⚡⚡ IPMItool loop stress test 🚧 ⚡⚡⚡ Storage blktests 🚧 ⚡⚡⚡ Storage block - filesystem fio test 🚧 ⚡⚡⚡ Storage block - queue scheduler test 🚧 ⚡⚡⚡ Storage nvme - tcp 🚧 ⚡⚡⚡ Storage: swraid mdadm raid_module test Host 3: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ⚡⚡⚡ Boot test ⚡⚡⚡ selinux-policy: serge-testsuite ⚡⚡⚡ storage: software RAID testing 🚧 ⚡⚡⚡ xfstests - ext4 🚧 ⚡⚡⚡ xfstests - xfs 🚧 ⚡⚡⚡ xfstests - btrfs 🚧 ⚡⚡⚡ IPMI driver test 🚧 ⚡⚡⚡ IPMItool loop stress test 🚧 ⚡⚡⚡ Storage blktests 🚧 ⚡⚡⚡ Storage block - filesystem fio test 🚧 ⚡⚡⚡ Storage block - queue scheduler test 🚧 ⚡⚡⚡ Storage nvme - tcp 🚧 ⚡⚡⚡ Storage: swraid mdadm raid_module test Host 4: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ⏱ xfstests - ext4 ⏱ xfstests - xfs ⏱ xfstests - btrfs ⏱ IPMI driver test ⏱ IPMItool loop stress test ⏱ Storage blktests ⏱ Storage block - filesystem fio test ⏱ Storage block - queue scheduler test ⏱ Storage nvme - tcp ⏱ Storage: swraid mdadm raid_module test s390x: Host 1: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Ethernet drivers sanity 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ❌ kdump - kexec_boot Host 2: ✅ Boot test ✅ kdump - sysrq-c 🚧 ✅ kdump - file-load Host 3: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ stress: stress-ng 🚧 ✅ Storage blktests 🚧 ❌ Storage nvme - tcp 🚧 ✅ Storage: swraid mdadm raid_module test x86_64: Host 1: ✅ Boot test 🚧 ✅ kdump - sysrq-c 🚧 ✅ kdump - file-load Host 2: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ❌ CPU: Frequency Driver Test 🚧 ✅ CPU: Idle Test 🚧 ✅ xfstests - ext4 🚧 ✅ xfstests - xfs 🚧 ✅ xfstests - btrfs 🚧 ❌ xfstests - nfsv4.2 🚧 ✅ xfstests - cifsv3.11 🚧 ❌ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests 🚧 ✅ Storage block - filesystem fio test 🚧 ✅ Storage block - queue scheduler test 🚧 ✅ Storage nvme - tcp 🚧 ✅ Storage: swraid mdadm raid_module test Host 3: ✅ Boot test ✅ ACPI table test ✅ LTP ✅ Loopdev Sanity ✅ Memory: fork_mem ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: sanity smoke test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ Firmware test suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Ethernet drivers sanity 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ❌ kdump - kexec_boot Test sources: https://gitlab.com/cki-project/kernel-tests 💚 Pull requests are welcome for new tests or improvements to existing tests! Aborted tests ------------- Tests that didn't complete running successfully are marked with ⚡⚡⚡. If this was caused by an infrastructure issue, we try to mark that explicitly in the report. Waived tests ------------ If the test run included waived tests, they are marked with 🚧. 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. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running yet are marked with ⏱.

4 years, 4 months

1
0
0 0

patch "usb: bdc: Make bdc pci driver depend on BROKEN" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: bdc: Make bdc pci driver depend on BROKEN to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From ef02684c4e67d8c35ac83083564135bc7b1d3445 Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson <patrik.r.jakobsson(a)gmail.com> Date: Mon, 18 Jan 2021 21:36:15 +0100 Subject: usb: bdc: Make bdc pci driver depend on BROKEN The bdc pci driver is going to be removed due to it not existing in the wild. This patch turns off compilation of the driver so that stable kernels can also pick up the change. This helps the out-of-tree facetimehd webcam driver as the pci id conflicts with bdc. Cc: Al Cooper <alcooperx(a)gmail.com> Cc: <stable(a)vger.kernel.org> Acked-by: Felipe Balbi <balbi(a)kernel.org> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson(a)gmail.com> Link: https://lore.kernel.org/r/20210118203615.13995-1-patrik.r.jakobsson@gmail.c… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/gadget/udc/bdc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/bdc/Kconfig b/drivers/usb/gadget/udc/bdc/Kconfig index 3e88c7670b2e..fb01ff47b64c 100644 --- a/drivers/usb/gadget/udc/bdc/Kconfig +++ b/drivers/usb/gadget/udc/bdc/Kconfig @@ -17,7 +17,7 @@ if USB_BDC_UDC comment "Platform Support" config USB_BDC_PCI tristate "BDC support for PCIe based platforms" - depends on USB_PCI + depends on USB_PCI && BROKEN default USB_BDC_UDC help Enable support for platforms which have BDC connected through PCIe, such as Lego3 FPGA platform. -- 2.30.0

4 years, 4 months

1
0
0 0

[PATCH 4.19 00/42] 4.19.169-rc2 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.169 release. There are 42 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 20 Jan 2021 15:24:51 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.169-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.169-rc2 Olaf Hering <olaf(a)aepfle.de> kbuild: enforce -Werror=return-type Dinghao Liu <dinghao.liu(a)zju.edu.cn> netfilter: nf_nat: Fix memleak in nf_nat_init Jesper Dangaard Brouer <brouer(a)redhat.com> netfilter: conntrack: fix reading nf_conntrack_buckets Geert Uytterhoeven <geert+renesas(a)glider.be> ALSA: fireface: Fix integer overflow in transmit_midi_msg() Geert Uytterhoeven <geert+renesas(a)glider.be> ALSA: firewire-tascam: Fix integer overflow in midi_port_work() Mike Snitzer <snitzer(a)redhat.com> dm: eliminate potential source of excessive kernel log noise j.nixdorf(a)avm.de <j.nixdorf(a)avm.de> net: sunrpc: interpret the return value of kstrtou32 correctly Jann Horn <jannh(a)google.com> mm, slub: consider rest of partial list if acquire_slab() fails Mark Bloch <mbloch(a)nvidia.com> RDMA/mlx5: Fix wrong free of blue flame register on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp Jan Kara <jack(a)suse.cz> ext4: fix superblock checksum failure when setting password salt Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: nfs_igrab_and_active must first reference the superblock Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter Trond Myklebust <trond.myklebust(a)hammerspace.com> pNFS: Mark layout for return if return-on-close was not sent Dave Wysochanski <dwysocha(a)redhat.com> NFS4: Fix use-after-free in trace_event_raw_event_nfs4_set_lock Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: Intel: fix error code cnl_set_dsp_D0() Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: axg-tdm-interface: fix loopback Al Viro <viro(a)zeniv.linux.org.uk> dump_common_audit_data(): fix racy accesses to ->d_name Roberto Sassu <roberto.sassu(a)huawei.com> ima: Remove __init annotation from ima_pcrread() Arnd Bergmann <arnd(a)arndb.de> ARM: picoxcell: fix missing interrupt-parent properties Craig Tatlor <ctatlor97(a)gmail.com> drm/msm: Call msm_init_vram before binding the gpu Shawn Guo <shawn.guo(a)linaro.org> ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI Michael Ellerman <mpe(a)ellerman.id.au> net: ethernet: fs_enet: Add missing MODULE_LICENSE Arnd Bergmann <arnd(a)arndb.de> misdn: dsp: select CONFIG_BITREVERSE Randy Dunlap <rdunlap(a)infradead.org> arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC Jan Kara <jack(a)suse.cz> bfq: Fix computation of shallow depth Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram Filipe Manana <fdmanana(a)suse.com> btrfs: fix transaction leak and crash after RO remount caused by qgroup rescan Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: add boot_targets to PHONY Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: add uImage.lzma to the top-level target Masahiro Yamada <masahiroy(a)kernel.org> ARC: build: remove non-existing bootpImage from KBUILD_IMAGE yangerkun <yangerkun(a)huawei.com> ext4: fix bug for rename with RENAME_WHITEOUT Leon Schuermann <leon(a)is.currently.online> r8152: Add Lenovo Powered USB-C Travel Hub Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix the maximum number of arguments Akilesh Kailash <akailash(a)google.com> dm snapshot: flush merged data before committing metadata Miaohe Lin <linmiaohe(a)huawei.com> mm/hugetlb: fix potential missing huge page size info Dexuan Cui <decui(a)microsoft.com> ACPI: scan: Harden acpi_device_add() against device ID overflows Alexander Lobakin <alobakin(a)pm.me> MIPS: relocatable: fix possible boot hangup with KASLR enabled Paul Cercueil <paul(a)crapouillou.net> MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB Masami Hiramatsu <mhiramat(a)kernel.org> tracing/kprobes: Do the notrace functions check without kprobes on ftrace Wei Liu <wei.liu(a)kernel.org> x86/hyperv: check cpu mask after interrupt has been disabled Thomas Hebb <tommyhebb(a)gmail.com> ASoC: dapm: remove widget from dirty list on free ------------- Diffstat: Makefile | 6 +++--- arch/arc/Makefile | 9 ++------ arch/arc/include/asm/page.h | 1 + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 4 ++++ arch/mips/boot/compressed/decompress.c | 3 ++- arch/mips/kernel/relocate.c | 10 +++++++-- arch/x86/hyperv/mmu.c | 12 ++++++++--- block/bfq-iosched.c | 8 ++++---- drivers/acpi/internal.h | 2 +- drivers/acpi/scan.c | 15 +++++++++++++- drivers/gpu/drm/msm/msm_drv.c | 8 ++++---- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 3 +++ drivers/isdn/mISDN/Kconfig | 1 + drivers/md/dm-integrity.c | 2 +- drivers/md/dm-snap.c | 24 ++++++++++++++++++++++ drivers/md/dm.c | 2 +- .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 1 + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 1 + drivers/net/ethernet/freescale/ucc_geth.h | 9 +++++++- drivers/net/usb/cdc_ether.c | 7 +++++++ drivers/net/usb/r8152.c | 1 + fs/btrfs/qgroup.c | 13 +++++++++--- fs/btrfs/super.c | 8 ++++++++ fs/ext4/ioctl.c | 3 +++ fs/ext4/namei.c | 16 ++++++++------- fs/nfs/internal.h | 12 ++++++----- fs/nfs/nfs4proc.c | 2 +- fs/nfs/pnfs.c | 7 +++++++ include/linux/acpi.h | 7 +++++++ kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- mm/hugetlb.c | 2 +- mm/slub.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 3 +++ net/netfilter/nf_nat_core.c | 1 + net/sunrpc/addr.c | 2 +- security/integrity/ima/ima_crypto.c | 2 +- security/lsm_audit.c | 7 +++++-- sound/firewire/fireface/ff-transaction.c | 2 +- sound/firewire/tascam/tascam-transaction.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 1 + sound/soc/meson/axg-tdm-interface.c | 14 ++++++++++++- sound/soc/soc-dapm.c | 1 + 44 files changed, 185 insertions(+), 57 deletions(-)

4 years, 4 months

5
4
0 0

[PATCH -fixes] drm/i915: Only enable DFP 4:4:4->4:2:0 conversion when outputting YCbCr 4:4:4

by Ville Syrjala

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Let's not enable the 4:4:4->4:2:0 conversion bit in the DFP unless we're actually outputting YCbCr 4:4:4. It would appear some protocol converters blindy consult this bit even when the source is outputting RGB, resulting in a visual mess. Cc: stable(a)vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2914 Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210111164111.13302-1-ville.… Fixes: 181567aa9f0d ("drm/i915: Do YCbCr 444->420 conversion via DP protocol converters") Reviewed-by: Jani Nikula <jani.nikula(a)intel.com> (cherry picked from commit 3170a21f7059c4660c469f59bf529f372a57da5f) --- Unfortunately the crtc_state plumbing to intel_dp_configure_protocol_converter() was part of the HDMI 2.1 PCON stuff, so couldn't just cherry-pick it alone. drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_dp.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 92940a0c5ef8..d5ace48b1ace 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3725,7 +3725,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, intel_ddi_init_dp_buf_reg(encoder, crtc_state); if (!is_mst) intel_dp_set_power(intel_dp, DP_SET_POWER_D0); - intel_dp_configure_protocol_converter(intel_dp); + intel_dp_configure_protocol_converter(intel_dp, crtc_state); intel_dp_sink_set_decompression_state(intel_dp, crtc_state, true); intel_dp_sink_set_fec_ready(intel_dp, crtc_state); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 37f1a10fd021..09123e8625c4 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4014,7 +4014,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, intel_de_posting_read(dev_priv, intel_dp->output_reg); } -void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp) +void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state) { struct drm_i915_private *i915 = dp_to_i915(intel_dp); u8 tmp; @@ -4033,8 +4034,8 @@ void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp) drm_dbg_kms(&i915->drm, "Failed to set protocol converter HDMI mode to %s\n", enableddisabled(intel_dp->has_hdmi_sink)); - tmp = intel_dp->dfp.ycbcr_444_to_420 ? - DP_CONVERSION_TO_YCBCR420_ENABLE : 0; + tmp = crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444 && + intel_dp->dfp.ycbcr_444_to_420 ? DP_CONVERSION_TO_YCBCR420_ENABLE : 0; if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_PROTOCOL_CONVERTER_CONTROL_1, tmp) != 1) @@ -4088,7 +4089,7 @@ static void intel_enable_dp(struct intel_atomic_state *state, } intel_dp_set_power(intel_dp, DP_SET_POWER_D0); - intel_dp_configure_protocol_converter(intel_dp); + intel_dp_configure_protocol_converter(intel_dp, pipe_config); intel_dp_start_link_train(intel_dp, pipe_config); intel_dp_stop_link_train(intel_dp, pipe_config); diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index b871a09b6901..05f7ddf7a795 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -51,7 +51,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, int intel_dp_retrain_link(struct intel_encoder *encoder, struct drm_modeset_acquire_ctx *ctx); void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode); -void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp); +void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp, + const struct intel_crtc_state *crtc_state); void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, bool enable); -- 2.26.2

4 years, 4 months

2
1
0 0

[PATCH] usb: bdc: Make bdc pci driver depend on BROKEN

by Patrik Jakobsson

The bdc pci driver is going to be removed due to it not existing in the wild. This patch turns off compilation of the driver so that stable kernels can also pick up the change. This helps the out-of-tree facetimehd webcam driver as the pci id conflicts with bdc. Cc: Al Cooper <alcooperx(a)gmail.com> Cc: Felipe Balbi <balbi(a)kernel.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson(a)gmail.com> --- drivers/usb/gadget/udc/bdc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/bdc/Kconfig b/drivers/usb/gadget/udc/bdc/Kconfig index 3e88c7670b2e..fb01ff47b64c 100644 --- a/drivers/usb/gadget/udc/bdc/Kconfig +++ b/drivers/usb/gadget/udc/bdc/Kconfig @@ -17,7 +17,7 @@ if USB_BDC_UDC comment "Platform Support" config USB_BDC_PCI tristate "BDC support for PCIe based platforms" - depends on USB_PCI + depends on USB_PCI && BROKEN default USB_BDC_UDC help Enable support for platforms which have BDC connected through PCIe, such as Lego3 FPGA platform. -- 2.29.2

4 years, 4 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2021