From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 0AB834C8E for ; Thu, 16 Aug 2018 20:47:59 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id l2-v6so16302452wme.1 for ; Thu, 16 Aug 2018 11:47:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3jaYz322ohNBPkSebIMuyNg5T9pWuMC5tD0kch/fRi0=; b=DmJ5OXQ+iY9xijAMqOUCm3gq9VjekHBXHE0LtVp8Y/tfGOvjEPLdWpiGdak86RAo0M i0kYarFsiO3Bx0iGhe1X81FzGP5BHngUdu0w7TYwu9AYKSbF+th625Kzorn/Iug5XCPY M49ON4LblOEzcYVhGsQ7Abrvu63+wqh/GIGB8p+ZywEib3q/F+cq1+2XPoMA/pG6vxrP a+saWrocGklKucRO3cdgKprZQ+Uqve07H5dF+pqVYQKgU137Swv4sg3E6fFItQFThguh +MbfeCqGZzaMTCqC5D2bzm48Puwx1KFiHEgTuBMdE5sdf8Y1V2V/4qNhJNXP+6q92hcW cysA== X-Gm-Message-State: AOUpUlHvwQBBisgl/f0abmgjYhuPoDrGi57qmVVF2Qwve0LDVa5Eh7Nn dhNSVylvM7vdPlDGrgJ13anH/vnW X-Google-Smtp-Source: AA+uWPwNEsAqQ8CaA5wvbzCydNymTMU8vf1Ruts3Yoj/4/BirKr2wo3iR8JG3oztBLZdICttQ8MHGg== X-Received: by 2002:a1c:ea9c:: with SMTP id g28-v6mr16989465wmi.65.1534445279317; Thu, 16 Aug 2018 11:47:59 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id c12-v6sm54021wrr.6.2018.08.16.11.47.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Aug 2018 11:47:58 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, zhihong.wang@intel.com, tiwei.bie@intel.com, bruce.richardson@intel.com, Brian Russell , Luca Boccassi Date: Thu, 16 Aug 2018 19:47:50 +0100 Message-Id: <20180816184750.30843-2-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180816184750.30843-1-bluca@debian.org> References: <20180814143035.19640-1-bluca@debian.org> <20180816184750.30843-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 2/2] virtio: fix PCI config err handling X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 18:48:00 -0000 From: Brian Russell In virtio_read_caps and vtpci_msix_detect, rte_pci_read_config returns the number of bytes read from PCI config or < 0 on error. If less than the expected number of bytes are read then log the failure and return rather than carrying on with garbage. Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0") Signed-off-by: Brian Russell Signed-off-by: Luca Boccassi --- v2: handle additional rte_pci_read_config incomplete reads drivers/net/virtio/virtio_pci.c | 35 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 6bd22e54a6..ff6f96f361 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -560,6 +560,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) uint8_t pos; struct virtio_pci_cap cap; int ret; + uint32_t multiplier; if (rte_pci_map_device(dev)) { PMD_INIT_LOG(DEBUG, "failed to map pci device!"); @@ -567,16 +568,18 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) } ret = rte_pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST); - if (ret < 0) { - PMD_INIT_LOG(DEBUG, "failed to read pci capability list"); + if (ret != 1) { + PMD_INIT_LOG(DEBUG, + "failed to read pci capability list, ret %d", ret); return -1; } while (pos) { ret = rte_pci_read_config(dev, &cap, sizeof(cap), pos); - if (ret < 0) { - PMD_INIT_LOG(ERR, - "failed to read pci cap at pos: %x", pos); + if (ret != sizeof(cap)) { + PMD_INIT_LOG(DEBUG, + "failed to read pci cap at pos: %x ret %d", + pos, ret); break; } @@ -610,9 +613,13 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) hw->common_cfg = get_cfg_addr(dev, &cap); break; case VIRTIO_PCI_CAP_NOTIFY_CFG: - rte_pci_read_config(dev, &hw->notify_off_multiplier, - 4, pos + sizeof(cap)); - hw->notify_base = get_cfg_addr(dev, &cap); + /* Avoid half-reads into hw */ + ret = rte_pci_read_config(dev, &multiplier, 4, + pos + sizeof(cap)); + if (ret == 4) { + hw->notify_off_multiplier = multiplier; + hw->notify_base = get_cfg_addr(dev, &cap); + } break; case VIRTIO_PCI_CAP_DEVICE_CFG: hw->dev_cfg = get_cfg_addr(dev, &cap); @@ -693,16 +700,18 @@ vtpci_msix_detect(struct rte_pci_device *dev) int ret; ret = rte_pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST); - if (ret < 0) { - PMD_INIT_LOG(DEBUG, "failed to read pci capability list"); + if (ret != 1) { + PMD_INIT_LOG(DEBUG, + "failed to read pci capability list, ret %d", ret); return VIRTIO_MSIX_NONE; } while (pos) { ret = rte_pci_read_config(dev, &cap, sizeof(cap), pos); - if (ret < 0) { - PMD_INIT_LOG(ERR, - "failed to read pci cap at pos: %x", pos); + if (ret != sizeof(cap)) { + PMD_INIT_LOG(DEBUG, + "failed to read pci cap at pos: %x ret %d", + pos, ret); break; } -- 2.18.0