From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ECF6AA04A3 for ; Fri, 5 Jun 2020 20:27:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E588D1D510; Fri, 5 Jun 2020 20:27:39 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 37E6A1D510 for ; Fri, 5 Jun 2020 20:27:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381658; 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: in-reply-to:in-reply-to:references:references; bh=rR5WolHJ2UROKs6skSu0M3zW4xAs4+hRLUgCFJ+Y6Xk=; b=U1oWNhVyDWin60utYr6G9dJiBrIskWxgTWj44mkWjGMiZEgLcfDDyv9wHBVZgs847UiSWD c9+upSwXGSs17w1cNbZTCvG/vEYn061zY8UchydcvNNfxh8E/FdFJx6gv0vFh1FqDn0ZOh H00WDENnVXy9VXQXmY8MPdju0CFWuLo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-s8_ig_ZLM4ih6vRFaPf3cA-1; Fri, 05 Jun 2020 14:27:36 -0400 X-MC-Unique: s8_ig_ZLM4ih6vRFaPf3cA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27B0E107ACF7; Fri, 5 Jun 2020 18:27:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45DE360C47; Fri, 5 Jun 2020 18:27:34 +0000 (UTC) From: Kevin Traynor To: Darek Stojaczyk Cc: Gaetan Rivet , dpdk stable Date: Fri, 5 Jun 2020 19:25:03 +0100 Message-Id: <20200605182525.22483-66-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pci: accept 32-bit domain numbers' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/857ab632a16974b51b08f41370ff00ada2c03ba1 Thanks. Kevin. --- >From 857ab632a16974b51b08f41370ff00ada2c03ba1 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Tue, 12 May 2020 15:30:57 +0200 Subject: [PATCH] pci: accept 32-bit domain numbers [ upstream commit 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 ] The parsing code was bailing on domains greater than UINT16_MAX, but domain numbers like that are still valid and present on some systems. One example is Intel VMD (Volume Management Device), which acts somewhat as a software-managed PCI switch and its upstream linux driver assigns all downstream devices a PCI domain of 0x10000. Parsing a BDF like 10000:01:00.0 was failing before. To fix it, increase the upper limit of domain number to UINT32_MAX. This matches the size of struct rte_pci_addr->domain (uint32). Fixes: af75078fece3 ("first public release") Signed-off-by: Darek Stojaczyk Acked-by: Gaetan Rivet --- lib/librte_pci/rte_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c index a13aed9856..e35d64f99c 100644 --- a/lib/librte_pci/rte_pci.c +++ b/lib/librte_pci/rte_pci.c @@ -73,7 +73,7 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr) errno = 0; val = strtoul(in, &end, 16); - if (errno != 0 || end[0] != ':' || val > UINT16_MAX) + if (errno != 0 || end[0] != ':' || val > UINT32_MAX) return -EINVAL; - dev_addr->domain = (uint16_t)val; + dev_addr->domain = (uint32_t)val; in = end + 1; in = get_u8_pciaddr_field(in, &dev_addr->bus, ':'); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.466266143 +0100 +++ 0066-pci-accept-32-bit-domain-numbers.patch 2020-06-05 19:20:50.942037814 +0100 @@ -1 +1 @@ -From 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 Mon Sep 17 00:00:00 2001 +From 857ab632a16974b51b08f41370ff00ada2c03ba1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index d1ab6b414d..ad2cdfebb2 100644 +index a13aed9856..e35d64f99c 100644