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 A455641D4F for ; Thu, 23 Feb 2023 10:38:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A07D043158; Thu, 23 Feb 2023 10:38:45 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id D34A543164 for ; Thu, 23 Feb 2023 10:38:43 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id p26so8207471wmc.4 for ; Thu, 23 Feb 2023 01:38:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FDglnnBLlmNjB3TskyJSli9PvfTPQcZQ+1iz67dn9Yw=; b=mXPAeMRWSugwTkjkgX6sO6om/XNJL6oCukdAoU7Gez74L7uVZa1KKS+lhw2X95SJJa OSI+4pbp3sXmVIjDXq+RRxep+EtiBRsbMI7dZdV86rHX3xfAOI7ktW1xR2ldPJ1ZsrLF E8PzCXvoVJ9asR40zaFUdDuG601lttnQIH91F/sMJoia/7LWSkNZKK3IRwNrPgwCOpYf wp5rflVwDsfETY7zD/yIQalvhmDVVpnX8+9mY8vGzE0TfPT0Aixh31Q3doLRq9L1czev +NhJlqDRxVZk+C3LhLQLPQRsha/OqLhA1OrWXDH8+bQwSoskj62levmHeh5YIQOQNDZd mjnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FDglnnBLlmNjB3TskyJSli9PvfTPQcZQ+1iz67dn9Yw=; b=gboJDdnp3mFgfN51L/kNqaLweqgKlvuAvxjXE1BPbagnI9sFlQqzwxqmbUC7cF2Zle tsVGVMN5ta7Aal8mitcrrsibqra3mtYXXYUXC7L8X3GbdTz94ddnpLB8X3dEiYsiFaPD k79firDrOXPsCRf2h1zVQoF5mSk8EPYxgnxDaaBTTID2docceMZc3FFFAH1aiSk/XWa/ ZFhN3QNrUPqkRrAU+Peoc7L3zm/M3if9vhxAk3XCj7yvv9+o43f5+ngEoTarrptstuLk gBEzcKk1Wx0gL6rjjsYIsSUuHzMr7Rtkt8uokKzMAecOGue/FH0s9ZL3oRnA1aJs75Po PSTg== X-Gm-Message-State: AO0yUKXr+cdxUuNpi+YzRnZV3YSvMFV3T1G/znwpgWTs16QSC6telMOu UMQBKYFYbwlgY8KrUBAohKdIyF9QC3A= X-Google-Smtp-Source: AK7set8ETfxSM0dfyuiDSdwSfcW5Jw7InmsLgPNezEjplfYUAJaelb9j72W8yHFu2dyndqUNSE3Blg== X-Received: by 2002:a05:600c:4da2:b0:3e2:19b0:887d with SMTP id v34-20020a05600c4da200b003e219b0887dmr9261148wmp.25.1677145123474; Thu, 23 Feb 2023 01:38:43 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id h6-20020a05600c350600b003e0238d9101sm11940835wmq.31.2023.02.23.01.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:38:43 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Rosen Xu , dpdk stable Subject: patch 'raw/ifpga/base: fix init with multi-process' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:31 +0000 Message-Id: <20230223093715.3926893-27-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a16c5f0eea2899d4983e68a251e67a45b5588d1e Thanks. Luca Boccassi --- >From a16c5f0eea2899d4983e68a251e67a45b5588d1e Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 6 Feb 2023 10:53:11 +0000 Subject: [PATCH] raw/ifpga/base: fix init with multi-process [ upstream commit e6a2804b77c5fbfd97d0fe05ec7f959a0404a380 ] The MAP_FAILED should be used to determine whether the mapping is successful. Fixes: e41856b515ce ("raw/ifpga/base: enhance driver reliability in multi-process") Signed-off-by: Chengwen Feng Reviewed-by: Rosen Xu --- drivers/raw/ifpga/base/opae_hw_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/raw/ifpga/base/opae_hw_api.c b/drivers/raw/ifpga/base/opae_hw_api.c index d5cd5fe608..8b05a2988d 100644 --- a/drivers/raw/ifpga/base/opae_hw_api.c +++ b/drivers/raw/ifpga/base/opae_hw_api.c @@ -380,7 +380,7 @@ static pthread_mutex_t *opae_adapter_mutex_open(struct opae_adapter *adapter) PROT_READ | PROT_WRITE, MAP_SHARED, shm_id, 0); adapter->lock = (pthread_mutex_t *)ptr; - if (ptr) { + if (ptr != MAP_FAILED) { dev_info(NULL, "shared memory %s address is %p\n", shm_name, ptr); @@ -497,7 +497,7 @@ static void *opae_adapter_shm_alloc(struct opae_adapter *adapter) adapter->shm.size = size; adapter->shm.ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_id, 0); - if (adapter->shm.ptr) { + if (adapter->shm.ptr != MAP_FAILED) { dev_info(NULL, "shared memory %s address is %p\n", shm_name, adapter->shm.ptr); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:29.348212901 +0000 +++ 0027-raw-ifpga-base-fix-init-with-multi-process.patch 2023-02-23 09:36:28.222169866 +0000 @@ -1 +1 @@ -From e6a2804b77c5fbfd97d0fe05ec7f959a0404a380 Mon Sep 17 00:00:00 2001 +From a16c5f0eea2899d4983e68a251e67a45b5588d1e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e6a2804b77c5fbfd97d0fe05ec7f959a0404a380 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 1117c3e160..6d48d227d6 100644 +index d5cd5fe608..8b05a2988d 100644 @@ -31 +32 @@ -@@ -499,7 +499,7 @@ static void *opae_adapter_shm_alloc(struct opae_adapter *adapter) +@@ -497,7 +497,7 @@ static void *opae_adapter_shm_alloc(struct opae_adapter *adapter)