From patchwork Fri May 3 17:15:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10929067 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 413B414C0 for ; Fri, 3 May 2019 17:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32D56285B0 for ; Fri, 3 May 2019 17:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24BD8285CB; Fri, 3 May 2019 17:15:58 +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 BDEED285B0 for ; Fri, 3 May 2019 17:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728792AbfECRP4 (ORCPT ); Fri, 3 May 2019 13:15:56 -0400 Received: from foss.arm.com ([217.140.101.70]:37636 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfECRP4 (ORCPT ); Fri, 3 May 2019 13:15:56 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B54C315AD; Fri, 3 May 2019 10:15:55 -0700 (PDT) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BFD853F557; Fri, 3 May 2019 10:15:54 -0700 (PDT) From: Andre Przywara To: Will Deacon Cc: Jean-Philippe Brucker , kvm@vger.kernel.org Subject: [PATCH kvmtool 1/4] vfio: remove spurious ampersand Date: Fri, 3 May 2019 18:15:41 +0100 Message-Id: <20190503171544.260901-2-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503171544.260901-1-andre.przywara@arm.com> References: <20190503171544.260901-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As clang rightfully pointed out, the ampersand in front of this member looks wrong. Remove it so we actually really compare against the count being 0. Signed-off-by: Andre Przywara Reviewed-by: Jean-Philippe Brucker --- vfio/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vfio/pci.c b/vfio/pci.c index f17498ea..10aa87b1 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -952,7 +952,7 @@ static int vfio_pci_init_msis(struct kvm *kvm, struct vfio_device *vdev, size_t nr_entries = msis->nr_entries; ret = ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, &msis->info); - if (ret || &msis->info.count == 0) { + if (ret || msis->info.count == 0) { vfio_dev_err(vdev, "no MSI reported by VFIO"); return -ENODEV; } From patchwork Fri May 3 17:15:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10929069 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 DA91E15A6 for ; Fri, 3 May 2019 17:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCE64285B0 for ; Fri, 3 May 2019 17:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C140F285CB; Fri, 3 May 2019 17:15:58 +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 76407285B0 for ; Fri, 3 May 2019 17:15:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728795AbfECRP5 (ORCPT ); Fri, 3 May 2019 13:15:57 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:37640 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfECRP5 (ORCPT ); Fri, 3 May 2019 13:15:57 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EA26515BF; Fri, 3 May 2019 10:15:56 -0700 (PDT) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 009DE3F557; Fri, 3 May 2019 10:15:55 -0700 (PDT) From: Andre Przywara To: Will Deacon Cc: Jean-Philippe Brucker , kvm@vger.kernel.org Subject: [PATCH kvmtool 2/4] vfio: remove unneeded test Date: Fri, 3 May 2019 18:15:42 +0100 Message-Id: <20190503171544.260901-3-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503171544.260901-1-andre.przywara@arm.com> References: <20190503171544.260901-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP clang complained that the comparison of an u8 variable against 256 is somewhat pointless. Just remove the check, as the condition will never hit. Signed-off-by: Andre Przywara Reviewed-by: Jean-Philippe Brucker --- vfio/pci.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vfio/pci.c b/vfio/pci.c index 10aa87b1..a4086326 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -557,11 +557,6 @@ static int vfio_pci_parse_caps(struct vfio_device *vdev) pdev->hdr.capabilities = 0; for (; pos; pos = next) { - if (pos >= PCI_DEV_CFG_SIZE) { - vfio_dev_warn(vdev, "ignoring cap outside of config space"); - return -EINVAL; - } - cap = PCI_CAP(&pdev->hdr, pos); next = cap->next; From patchwork Fri May 3 17:15:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10929073 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 A818214B6 for ; Fri, 3 May 2019 17:16:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A9E5285B0 for ; Fri, 3 May 2019 17:16:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EE05285CB; Fri, 3 May 2019 17:16:00 +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 2A97F285B0 for ; Fri, 3 May 2019 17:16:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728798AbfECRP7 (ORCPT ); Fri, 3 May 2019 13:15:59 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:37644 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfECRP6 (ORCPT ); Fri, 3 May 2019 13:15:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2B1DE15A2; Fri, 3 May 2019 10:15:58 -0700 (PDT) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 358E63F557; Fri, 3 May 2019 10:15:57 -0700 (PDT) From: Andre Przywara To: Will Deacon Cc: Jean-Philippe Brucker , kvm@vger.kernel.org Subject: [PATCH kvmtool 3/4] vfio: rework vfio_irq_set payload setting Date: Fri, 3 May 2019 18:15:43 +0100 Message-Id: <20190503171544.260901-4-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503171544.260901-1-andre.przywara@arm.com> References: <20190503171544.260901-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP struct vfio_irq_set from the kernel headers contains a variable sized array to hold a payload. The vfio_irq_eventfd struct puts the "fd" member right after this, hoping it to automatically fit in the payload slot. But having a variable sized type not at the end of a struct is a GNU C extension, so clang will refuse to compile this. Solve this by somewhat doing the compiler's job and place the payload manually at the end of the structure. Signed-off-by: Andre Przywara Reviewed-by: Jean-Philippe Brucker --- vfio/pci.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/vfio/pci.c b/vfio/pci.c index a4086326..76e24c15 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -9,11 +9,16 @@ #include /* Wrapper around UAPI vfio_irq_set */ -struct vfio_irq_eventfd { +union vfio_irq_eventfd { struct vfio_irq_set irq; - int fd; + u8 buffer[sizeof(struct vfio_irq_set) + sizeof(int)]; }; +static void set_vfio_irq_eventd_payload(union vfio_irq_eventfd *evfd, int fd) +{ + memcpy(&evfd->irq.data, &fd, sizeof(fd)); +} + #define msi_is_enabled(state) ((state) & VFIO_PCI_MSI_STATE_ENABLED) #define msi_is_masked(state) ((state) & VFIO_PCI_MSI_STATE_MASKED) #define msi_is_empty(state) ((state) & VFIO_PCI_MSI_STATE_EMPTY) @@ -38,7 +43,7 @@ static int vfio_pci_enable_msis(struct kvm *kvm, struct vfio_device *vdev, int *eventfds; struct vfio_pci_device *pdev = &vdev->pci; struct vfio_pci_msi_common *msis = msix ? &pdev->msix : &pdev->msi; - struct vfio_irq_eventfd single = { + union vfio_irq_eventfd single = { .irq = { .argsz = sizeof(single), .flags = VFIO_IRQ_SET_DATA_EVENTFD | @@ -117,7 +122,7 @@ static int vfio_pci_enable_msis(struct kvm *kvm, struct vfio_device *vdev, continue; single.irq.start = i; - single.fd = fd; + set_vfio_irq_eventd_payload(&single, fd); ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, &single); if (ret < 0) { @@ -1021,8 +1026,8 @@ static int vfio_pci_enable_intx(struct kvm *kvm, struct vfio_device *vdev) { int ret; int trigger_fd, unmask_fd; - struct vfio_irq_eventfd trigger; - struct vfio_irq_eventfd unmask; + union vfio_irq_eventfd trigger; + union vfio_irq_eventfd unmask; struct vfio_pci_device *pdev = &vdev->pci; int gsi = pdev->intx_gsi; @@ -1058,7 +1063,7 @@ static int vfio_pci_enable_intx(struct kvm *kvm, struct vfio_device *vdev) .start = 0, .count = 1, }; - trigger.fd = trigger_fd; + set_vfio_irq_eventd_payload(&trigger, trigger_fd); ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, &trigger); if (ret < 0) { @@ -1073,7 +1078,7 @@ static int vfio_pci_enable_intx(struct kvm *kvm, struct vfio_device *vdev) .start = 0, .count = 1, }; - unmask.fd = unmask_fd; + set_vfio_irq_eventd_payload(&unmask, unmask_fd); ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, &unmask); if (ret < 0) { From patchwork Fri May 3 17:15:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 10929075 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 8EDEB14C0 for ; Fri, 3 May 2019 17:16:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EE27285B0 for ; Fri, 3 May 2019 17:16:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73C84285CC; Fri, 3 May 2019 17:16:02 +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 015D1285B0 for ; Fri, 3 May 2019 17:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728808AbfECRQB (ORCPT ); Fri, 3 May 2019 13:16:01 -0400 Received: from foss.arm.com ([217.140.101.70]:37652 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfECRP7 (ORCPT ); Fri, 3 May 2019 13:15:59 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5FF0715AD; Fri, 3 May 2019 10:15:59 -0700 (PDT) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6A9BF3F557; Fri, 3 May 2019 10:15:58 -0700 (PDT) From: Andre Przywara To: Will Deacon Cc: Jean-Philippe Brucker , kvm@vger.kernel.org Subject: [PATCH kvmtool 4/4] virtio/blk: Avoid taking pointer to packed struct Date: Fri, 3 May 2019 18:15:44 +0100 Message-Id: <20190503171544.260901-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503171544.260901-1-andre.przywara@arm.com> References: <20190503171544.260901-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP clang and GCC9 refuse to compile virtio/blk.c with the following message: virtio/blk.c:161:37: error: taking address of packed member 'geometry' of class or structure 'virtio_blk_config' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] struct virtio_blk_geometry *geo = &conf->geometry; Since struct virtio_blk_geometry is in a kernel header, we can't do much about the packed attribute, but as Peter pointed out, the solution is rather simple: just get rid of the convenience variable and use the original struct member directly. Suggested-by: Peter Maydell Signed-off-by: Andre Przywara Reviewed-by: Jean-Philippe Brucker --- virtio/blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtio/blk.c b/virtio/blk.c index 50db6f5f..f267be15 100644 --- a/virtio/blk.c +++ b/virtio/blk.c @@ -161,7 +161,6 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features) { struct blk_dev *bdev = dev; struct virtio_blk_config *conf = &bdev->blk_config; - struct virtio_blk_geometry *geo = &conf->geometry; bdev->features = features; @@ -170,7 +169,8 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features) conf->seg_max = virtio_host_to_guest_u32(&bdev->vdev, conf->seg_max); /* Geometry */ - geo->cylinders = virtio_host_to_guest_u16(&bdev->vdev, geo->cylinders); + conf->geometry.cylinders = virtio_host_to_guest_u16(&bdev->vdev, + conf->geometry.cylinders); conf->blk_size = virtio_host_to_guest_u32(&bdev->vdev, conf->blk_size); conf->min_io_size = virtio_host_to_guest_u16(&bdev->vdev, conf->min_io_size);