From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 921D6A034F for ; Tue, 1 Mar 2022 11:46:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E21A426DF; Tue, 1 Mar 2022 11:46:25 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C4B07426DE for ; Tue, 1 Mar 2022 11:46:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131583; 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=uAr2fVzvn6TXol/9zyytatFZyr/uYGwpnBs6NYVmi1w=; b=dL1hj261y+LmbXxHv86HR151qunOdkOXFvMSS/q0rvGvrTEgtSClxHqG14CphcWepej+Zn EzDfqc77pHlLVdiyGkGTRbRbFase5+CrkmaqlxxBygvSRjNV0PG68bwmjQXSi9HLe1HcLk VmKzmQ/X3tl+BTAg+bLd4ccVTf+GpWs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-OTkZUdwBOnKrYtZWWzFwLQ-1; Tue, 01 Mar 2022 05:46:20 -0500 X-MC-Unique: OTkZUdwBOnKrYtZWWzFwLQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73547100C609; Tue, 1 Mar 2022 10:46:19 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B9F3752D2; Tue, 1 Mar 2022 10:46:18 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: dpdk stable Subject: patch 'bus/pci: assign driver pointer before mapping' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:59 +0000 Message-Id: <20220301104300.334382-103-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/86598c1b6ff6f92be28ca692d4c75bd0e74a74d2 Thanks. Kevin --- >From 86598c1b6ff6f92be28ca692d4c75bd0e74a74d2 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 19 Jan 2022 15:50:37 +0100 Subject: [PATCH] bus/pci: assign driver pointer before mapping [ upstream commit 6b92f184680283b4b3da4ebc722b5feb7ef280fb ] Patch changing the way of accessing interrupt handle also changed order of the rte_pci_map_device() call and rte_pci_device:driver assignment. It was causing issues with Write Combine mapping on the Linux platform if it was used with the igb_uio module. Linux implementation of pci_uio_map_resource_by_index(), which is called by rte_pci_map_device(), needs access to the device's driver. Otherwise it won't be able to check the driver's flags and won't respect them. Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Michal Krawczyk --- drivers/bus/pci/pci_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 4a3a87f24f..def372b67e 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -248,7 +248,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, } + dev->driver = dr; + if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) { ret = rte_pci_map_device(dev); if (ret != 0) { + dev->driver = NULL; rte_intr_instance_free(dev->vfio_req_intr_handle); dev->vfio_req_intr_handle = NULL; @@ -258,6 +261,4 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, } } - - dev->driver = dr; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:04.157113135 +0000 +++ 0103-bus-pci-assign-driver-pointer-before-mapping.patch 2022-03-01 10:41:01.485244135 +0000 @@ -1 +1 @@ -From 6b92f184680283b4b3da4ebc722b5feb7ef280fb Mon Sep 17 00:00:00 2001 +From 86598c1b6ff6f92be28ca692d4c75bd0e74a74d2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6b92f184680283b4b3da4ebc722b5feb7ef280fb ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org