Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp986283pxb; Fri, 14 Jan 2022 23:18:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0HNBwY0fIW/d6sehJPOanfbmcu6tvDpWh1W1cyE8ekr+61jKqgfTvULrYWNZM76PLeMNE X-Received: by 2002:a17:903:283:b0:14a:8e80:cc85 with SMTP id j3-20020a170903028300b0014a8e80cc85mr6677897plr.99.1642231099813; Fri, 14 Jan 2022 23:18:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642231099; cv=none; d=google.com; s=arc-20160816; b=zS+IxWZehvH0qK47HCS5oVvVPwD3wRLXdDHnLJp3yjpCWsXCOpoiO7k4CIgxLv5ZCP vM+wqieCkWo5ZLfO4M79u3JmBPNwU89iD/ShmHD5UzMNqPKQfbaw3OeUFUV5H8IbZZiw yGMQiH7sF08VYDzNWrswdw5o73uKvud98jCLqFA3AKfvtfpMlPH7v7TKXnwq4U39adJh QuSvQgPt7WdlrTcB+xXJcPnFA3Hvw7HkJ/Tahi+tL/Q7OqBs7xEO1wBBbSq9oEFZhybG xMV3Iu8G8DpdJx1EabMi7lixXAEKITR7LWkSWiIonMIShs13GxZbnPb+YL7cmPPlSf5F fHzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=D+0bgpxBAVMxLpxGa7wCKNbdJo62rz8/YJW57GNylKk=; b=JKTot8ywCe7gY/hCxoKXNkS9BnM0GSILCIXqjssne1+3miRuy/NmM1rP5aZ1j/58e4 w+WiPk2tEPRYorNL9RngmY6WmTU0yto2zJ/i54PElwmGu/x2V9AKUfVCEsJ5PrSw44VT kKswpnIfI0t0WXYry8YKhPvwVUJ6+HbMvN9prEppT7XUHMt+mbbIprticz7VDdiDJrLF aU3ohljksjQM+MoJzHGKdrcu/Nflq+nstBjkPwT5AAeHL7OOxoxfmuV9UY/S/HM1DbuZ wdurfWKmzwfrOzu7FTD/FOFmZddOkTk6Drj4ykqEvx9DVo7ntYcpZycLcIScIN0tMoN+ UaQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TSzDohZX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w23si7547784pfn.329.2022.01.14.23.17.45; Fri, 14 Jan 2022 23:18:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TSzDohZX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229945AbiANX5o (ORCPT + 99 others); Fri, 14 Jan 2022 18:57:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32817 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbiANX5m (ORCPT ); Fri, 14 Jan 2022 18:57:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642204662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+0bgpxBAVMxLpxGa7wCKNbdJo62rz8/YJW57GNylKk=; b=TSzDohZXoJaB+36LlS8G1oFJoOCB42lTq3WS8bX/cQbCxLoev+0XXE7FUY89Bp8Zhoy8PN GqL8jcRxudPAPh2IV0sOOjLYDX8f8PcgcC848xCHL0jP6T+m7ZUXED/bcXJQQ42O9jEj9y ehn4pjqcSzO0qwNDO8CCwMXrMbupRbI= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-h3KW_UsTMU6CBqQ8wbqCOg-1; Fri, 14 Jan 2022 18:57:41 -0500 X-MC-Unique: h3KW_UsTMU6CBqQ8wbqCOg-1 Received: by mail-ed1-f69.google.com with SMTP id h1-20020aa7cdc1000000b0040042dd2fe4so8204499edw.17 for ; Fri, 14 Jan 2022 15:57:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=D+0bgpxBAVMxLpxGa7wCKNbdJo62rz8/YJW57GNylKk=; b=7RrUNwZmII7pJ1K39jeF8RZabJn1wzueJgJgz3KcAZewbfuWXwY2j0Uk4UQqf0gOfn vG7Zp8oWFfpmpYQQqL7Ne4wGoeE7vjVF4Uy1IGy4dTg14FVIF91v448t4cDoWdrdDT2N +TuAyjRctkSQwqfHPCfJzdpOgyEPeTLWAPoQ+X2911Xp4UQqfG1q0lobOifzBxJz9iS9 MK+8FNgwXXy6clu38g+TVzthUEiRw26lRuStP8c3dwdUKvs6iHxtVaEFZiAb10f6nyuK nM4LZNQnaoiTF/p6sAry5rE2sqtN0EDedpMuFOL/pOtw1G/En8ns3x0h0nhhWXHi1YWx AisA== X-Gm-Message-State: AOAM532W09zoKzQPhFWUIx2xTkD84PGJdTLkgK0rRxpC4tMG66AUHJmy Z5ZamOEfKqR60akEP7sUbAYmKse448hE6dnHlqBHMaVw+Q6r2l+aStq8DSqIgv1a3gEvAOx3kKi 9elUadOUvonChvZ0VgFFlGttA X-Received: by 2002:a17:906:5603:: with SMTP id f3mr8930240ejq.272.1642204659687; Fri, 14 Jan 2022 15:57:39 -0800 (PST) X-Received: by 2002:a17:906:5603:: with SMTP id f3mr8930206ejq.272.1642204659427; Fri, 14 Jan 2022 15:57:39 -0800 (PST) Received: from redhat.com ([2.55.154.210]) by smtp.gmail.com with ESMTPSA id y7sm2277626edq.27.2022.01.14.15.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 15:57:38 -0800 (PST) Date: Fri, 14 Jan 2022 18:57:34 -0500 From: "Michael S. Tsirkin" To: Linus Torvalds Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, christophe.jaillet@wanadoo.fr, dapeng1.mi@intel.com, david@redhat.com, elic@nvidia.com, eperezma@redhat.com, flyingpenghao@gmail.com, flyingpeng@tencent.com, gregkh@linuxfoundation.org, guanjun@linux.alibaba.com, jasowang@redhat.com, jiasheng@iscas.ac.cn, johan@kernel.org, keescook@chromium.org, labbott@kernel.org, lingshan.zhu@intel.com, lkp@intel.com, luolikang@nsfocus.com, lvivier@redhat.com, mst@redhat.com, sgarzare@redhat.com, somlo@cmu.edu, trix@redhat.com, wu000273@umn.edu, xianting.tian@linux.alibaba.com, xuanzhuo@linux.alibaba.com, yun.wang@linux.alibaba.com Subject: [GIT PULL v2] virtio,vdpa,qemu_fw_cfg: features, cleanups, fixes Message-ID: <20220114185734-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Mutt-Fcc: =sent Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changes from v1: Dropped iommu changes at author's request. Pity this was only requested after I sent pull v1 :( Note that since these were the first in queue other hashes do not match what was in linux-next, however as the changes are in a separate driver, this should not matter. The following changes since commit c9e6606c7fe92b50a02ce51dda82586ebdf99b48: Linux 5.16-rc8 (2022-01-02 14:23:25 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus for you to fetch changes up to b03fc43e73877e180c1803a33aea3e7396642367: vdpa/mlx5: Fix tracking of current number of VQs (2022-01-14 18:50:54 -0500) ---------------------------------------------------------------- virtio,vdpa,qemu_fw_cfg: features, cleanups, fixes partial support for < MAX_ORDER - 1 granularity for virtio-mem driver_override for vdpa sysfs ABI documentation for vdpa multiqueue config support for mlx5 vdpa Misc fixes, cleanups. Signed-off-by: Michael S. Tsirkin ---------------------------------------------------------------- Christophe JAILLET (1): eni_vdpa: Simplify 'eni_vdpa_probe()' Dapeng Mi (1): virtio: fix a typo in function "vp_modern_remove" comments. David Hildenbrand (2): virtio-mem: prepare page onlining code for granularity smaller than MAX_ORDER - 1 virtio-mem: prepare fake page onlining code for granularity smaller than MAX_ORDER - 1 Eli Cohen (20): net/mlx5_vdpa: Offer VIRTIO_NET_F_MTU when setting MTU vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 vdpa: Provide interface to read driver features vdpa/mlx5: Distribute RX virtqueues in RQT object vdpa: Sync calls set/get config/status with cf_mutex vdpa: Read device configuration only if FEATURES_OK vdpa: Allow to configure max data virtqueues vdpa/mlx5: Fix config_attr_mask assignment vdpa/mlx5: Support configuring max data virtqueue vdpa: Add support for returning device configuration information vdpa/mlx5: Restore cur_num_vqs in case of failure in change_num_qps() vdpa: Support reporting max device capabilities vdpa/mlx5: Report max device capabilities vdpa/vdpa_sim: Configure max supported virtqueues vdpa: Use BIT_ULL for bit operations vdpa/vdpa_sim_net: Report max device capabilities vdpa: Avoid taking cf_mutex lock on get status vdpa: Protect vdpa reset with cf_mutex vdpa/mlx5: Fix is_index_valid() to refer to features vdpa/mlx5: Fix tracking of current number of VQs Eugenio Pérez (2): vdpa: Avoid duplicate call to vp_vdpa get_status vdpa: Mark vdpa_config_ops.get_vq_notification as optional Guanjun (1): vduse: moving kvfree into caller Johan Hovold (4): firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries firmware: qemu_fw_cfg: fix kobject leak in probe error path firmware: qemu_fw_cfg: fix sysfs information leak firmware: qemu_fw_cfg: remove sysfs entries explicitly Laura Abbott (1): vdpa: clean up get_config_size ret value handling Michael S. Tsirkin (3): virtio: wrap config->reset calls hwrng: virtio - unregister device before reset virtio_ring: mark ring unused on error Peng Hao (2): virtio/virtio_mem: handle a possible NULL as a memcpy parameter virtio/virtio_pci_legacy_dev: ensure the correct return value Stefano Garzarella (2): docs: document sysfs ABI for vDPA bus vdpa: add driver_override support Xianting Tian (1): vhost/test: fix memory leak of vhost virtqueues Zhu Lingshan (1): ifcvf/vDPA: fix misuse virtio-net device config size for blk dev 王贇 (1): virtio-pci: fix the confusing error message Documentation/ABI/testing/sysfs-bus-vdpa | 57 ++++++++++ MAINTAINERS | 1 + arch/um/drivers/virt-pci.c | 2 +- drivers/block/virtio_blk.c | 4 +- drivers/bluetooth/virtio_bt.c | 2 +- drivers/char/hw_random/virtio-rng.c | 2 +- drivers/char/virtio_console.c | 4 +- drivers/crypto/virtio/virtio_crypto_core.c | 8 +- drivers/firmware/arm_scmi/virtio.c | 2 +- drivers/firmware/qemu_fw_cfg.c | 21 ++-- drivers/gpio/gpio-virtio.c | 2 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- drivers/i2c/busses/i2c-virtio.c | 2 +- drivers/iommu/virtio-iommu.c | 2 +- drivers/net/caif/caif_virtio.c | 2 +- drivers/net/virtio_net.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/nvdimm/virtio_pmem.c | 2 +- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- drivers/vdpa/alibaba/eni_vdpa.c | 28 +++-- drivers/vdpa/ifcvf/ifcvf_base.c | 41 ++++++-- drivers/vdpa/ifcvf/ifcvf_base.h | 9 +- drivers/vdpa/ifcvf/ifcvf_main.c | 40 +++---- drivers/vdpa/mlx5/net/mlx5_vnet.c | 156 ++++++++++++++++----------- drivers/vdpa/vdpa.c | 163 +++++++++++++++++++++++++---- drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 ++-- drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 2 + drivers/vdpa/vdpa_user/vduse_dev.c | 19 +++- drivers/vdpa/virtio_pci/vp_vdpa.c | 16 ++- drivers/vhost/test.c | 1 + drivers/vhost/vdpa.c | 12 +-- drivers/virtio/virtio.c | 6 ++ drivers/virtio/virtio_balloon.c | 2 +- drivers/virtio/virtio_input.c | 2 +- drivers/virtio/virtio_mem.c | 114 +++++++++++++------- drivers/virtio/virtio_pci_legacy.c | 2 +- drivers/virtio/virtio_pci_legacy_dev.c | 4 +- drivers/virtio/virtio_pci_modern_dev.c | 2 +- drivers/virtio/virtio_ring.c | 4 +- drivers/virtio/virtio_vdpa.c | 7 +- fs/fuse/virtio_fs.c | 4 +- include/linux/vdpa.h | 39 +++++-- include/linux/virtio.h | 1 + include/uapi/linux/vdpa.h | 6 ++ net/9p/trans_virtio.c | 2 +- net/vmw_vsock/virtio_transport.c | 4 +- sound/virtio/virtio_card.c | 4 +- 48 files changed, 587 insertions(+), 249 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-vdpa