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 D5E87A04F0 for ; Tue, 10 Dec 2019 16:01:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD95D1B13C; Tue, 10 Dec 2019 16:01:24 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id A7B2C1B13C for ; Tue, 10 Dec 2019 16:01:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990082; 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=Orhpj3k7UAzOi2/yX1xeBcLgJxI5cAQI+5airrnYGrA=; b=Gy45BdUtYjMGXrK2vfbZ/gKLzlGV8+ZWqchSqQ3dhG88UFVHCkndL1XaMSxoej/rwYxkM8 MpVHhi4eCQU1oOkSCP9spcX9v26tHFqQYfJK+03L+JmMLotkqxtREp4913trlze/D1oVf9 aTsoRDT4vMzDFo3lXC7sPE9kKaz8MuY= 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-313-8P5E4HivPI6wyFunl4HsBg-1; Tue, 10 Dec 2019 10:01:20 -0500 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 C136F1883521; Tue, 10 Dec 2019 15:01:19 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08A1D5DA2C; Tue, 10 Dec 2019 15:01:18 +0000 (UTC) From: Kevin Traynor To: Nipun Gupta Cc: dpdk stable Date: Tue, 10 Dec 2019 14:59:22 +0000 Message-Id: <20191210145937.32755-48-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 8P5E4HivPI6wyFunl4HsBg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'common/dpaax: fallback to check separate memory node for VM' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. 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 rebasi= ng (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/7a93e041dd69d38a7c= a89ee3708ea5a71b818074 Thanks. Kevin. --- >From 7a93e041dd69d38a7ca89ee3708ea5a71b818074 Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Tue, 5 Nov 2019 19:53:15 +0530 Subject: [PATCH] common/dpaax: fallback to check separate memory node for V= M [ upstream commit c9d9825bea486d4490a02ce2c5672c5a16891fab ] In Virtual Machine the memory node in the device tree is at '/proc/device-tree/memory/reg' which is separate from the memory node path on the host. This patch enables check on both the paths. Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table= ") Signed-off-by: Nipun Gupta --- drivers/common/dpaax/dpaax_iova_table.c | 7 +++++-- drivers/common/dpaax/dpaax_iova_table.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax= /dpaax_iova_table.c index ae0af0919..b4e50f735 100644 --- a/drivers/common/dpaax/dpaax_iova_table.c +++ b/drivers/common/dpaax/dpaax_iova_table.c @@ -69,7 +69,10 @@ read_memory_node(unsigned int *count) =20 =09ret =3D glob(MEM_NODE_PATH_GLOB, 0, NULL, &result); +=09if (ret !=3D 0) +=09=09ret =3D glob(MEM_NODE_PATH_GLOB_VM, 0, NULL, &result); + =09if (ret !=3D 0) { -=09=09DPAAX_DEBUG("Unable to glob device-tree memory node: (%s)(%d)", -=09=09=09 MEM_NODE_PATH_GLOB, ret); +=09=09DPAAX_DEBUG("Unable to glob device-tree memory node (err: %d)", +=09=09=09ret); =09=09goto out; =09} diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax= /dpaax_iova_table.h index 138827e7b..fef97f6dd 100644 --- a/drivers/common/dpaax/dpaax_iova_table.h +++ b/drivers/common/dpaax/dpaax_iova_table.h @@ -46,4 +46,6 @@ extern struct dpaax_iova_table *dpaax_iova_table_p; */ #define MEM_NODE_PATH_GLOB "/proc/device-tree/memory[@0-9]*/reg" +/* For Virtual Machines memory node is at different path (below) */ +#define MEM_NODE_PATH_GLOB_VM "/proc/device-tree/memory/reg" /* Device file should be multiple of 16 bytes, each containing 8 byte of a= ddr * and its length. Assuming max of 5 entries. --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:42.274237539 +0000 +++ 0048-common-dpaax-fallback-to-check-separate-memory-node-.patch=092019-= 12-10 14:49:39.080457245 +0000 @@ -1 +1 @@ -From c9d9825bea486d4490a02ce2c5672c5a16891fab Mon Sep 17 00:00:00 2001 +From 7a93e041dd69d38a7ca89ee3708ea5a71b818074 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c9d9825bea486d4490a02ce2c5672c5a16891fab ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 43c9c72e6..98b076e09 100644 +index ae0af0919..b4e50f735 100644