From patchwork Wed Aug 14 14:59:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Ledford X-Patchwork-Id: 11094141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C43921398 for ; Wed, 14 Aug 2019 14:59:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B12A828622 for ; Wed, 14 Aug 2019 14:59:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF8C028871; Wed, 14 Aug 2019 14:59:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CF9028893 for ; Wed, 14 Aug 2019 14:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726551AbfHNO7O (ORCPT ); Wed, 14 Aug 2019 10:59:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59584 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726166AbfHNO7O (ORCPT ); Wed, 14 Aug 2019 10:59:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0BEB641C9; Wed, 14 Aug 2019 14:59:13 +0000 (UTC) Received: from linux-ws.nc.xsintricity.com (ovpn-112-57.rdu2.redhat.com [10.10.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF0BA27BB8; Wed, 14 Aug 2019 14:59:12 +0000 (UTC) Message-ID: <09bcafaab07dfde728357bfe61b6a7edfa3b25c9.camel@redhat.com> Subject: [PULL REQUEST] Please pull rdma.git From: Doug Ledford To: "Torvalds, Linus" Cc: "Gunthorpe, Jason" , linux-rdma , linux-kernel Date: Wed, 14 Aug 2019 10:59:07 -0400 Organization: Red Hat, Inc. User-Agent: Evolution 3.32.4 (3.32.4-1.fc30) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 14 Aug 2019 14:59:13 +0000 (UTC) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Fairly small pull request for -rc3. I'm out of town the rest of this week, so I made sure to clean out as much as possible from patchworks in enough time for 0-day to chew through it (Yay! for 0-day being back online! :-)). Jason might send through any emergency stuff that could pop up, otherwise I'm back next week. The only real thing of note is the siw ABI change. Since we just merged siw *this* release, there are no prior kernel releases to maintain kernel ABI with. I told Bernard that if there is anything else about the siw ABI he thinks he might want to change before it goes set in stone, he should get it in ASAP. The siw module was around for several years outside the kernel tree, and it had to be revamped considerably for inclusion upstream, so we are making no attempts to be backward compatible with the out of tree version. Once 5.3 is actually released, we will have our baseline ABI to maintain. Here's the boiler plate: The following changes since commit e21a712a9685488f5ce80495b37b9fdbe96c230d: Linux 5.3-rc3 (2019-08-04 18:40:12 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git tags/for-linus for you to fetch changes up to 2c8ccb37b08fe364f02a9914daca474d43151453: RDMA/siw: Change CQ flags from 64->32 bits (2019-08-13 12:22:06 -0400) ---------------------------------------------------------------- Pull request for 5.3-rc3 - Fix a memory registration release flow issue that was causing a WARN_ON (mlx5) - If the counters for a port aren't allocated, then we can't do operations on the non-existent counters (core) - Check the right variable for error code result (mlx5) - Fix a use after free issue (mlx5) - Fix an off by one memory leak (siw) - Actually return an error code on error (core) - Allow siw to be built on 32bit arches (siw, ABI change, but OK since siw was just merged this merge window and there is no prior released kernel to maintain compatibility with and we also updated the rdma-core user space package to match) Signed-off-by: Doug Ledford ---------------------------------------------------------------- Bernard Metzler (1): RDMA/siw: Change CQ flags from 64->32 bits Dan Carpenter (3): IB/mlx5: Check the correct variable in error handling code RDMA/siw: Fix a memory leak in siw_init_cpulist() RDMA/core: Fix error code in stat_get_doit_qp() Mark Zhang (1): RDMA/counter: Prevent QP counter binding if counters unsupported Yishai Hadas (2): IB/mlx5: Fix implicit MR release flow IB/mlx5: Fix use-after-free error while accessing ev_file pointer drivers/infiniband/core/counters.c | 6 ++++++ drivers/infiniband/core/nldev.c | 8 ++++++-- drivers/infiniband/core/umem_odp.c | 4 ---- drivers/infiniband/hw/mlx5/devx.c | 11 ++++++----- drivers/infiniband/hw/mlx5/odp.c | 24 +++++++++--------------- drivers/infiniband/sw/siw/Kconfig | 2 +- drivers/infiniband/sw/siw/siw.h | 2 +- drivers/infiniband/sw/siw/siw_main.c | 4 +--- drivers/infiniband/sw/siw/siw_qp.c | 14 ++++++++++---- drivers/infiniband/sw/siw/siw_verbs.c | 16 +++++++++++----- include/uapi/rdma/siw-abi.h | 3 ++- 11 files changed, 53 insertions(+), 41 deletions(-)