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 11B1D41E9F for ; Wed, 15 Mar 2023 15:37:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A4D1410FB; Wed, 15 Mar 2023 15:37:19 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4F6F942D0D for ; Wed, 15 Mar 2023 15:37:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891035; 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=UkxkQbRX7e2c+JqDfcbW2ByZqmxFEQFVCbigP9zkdY0=; b=iUVynW6JF9vY6KJRkXc8C234Y73Q8NF76IhHDeI7uhqrB7GXmRRWP31EG8Fu73SbJKySXp NNxdFfcoGfLLW7ERRnNPXvyOi+TlqOzXJweJDvhtO2dVuKSUmvhp5VpVnP8SBN04jTxtoG MgLo8hMyj8WntakmeIAKMNn+pZPgpy4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-S165YkOhOIapg3uoim_LnQ-1; Wed, 15 Mar 2023 10:37:14 -0400 X-MC-Unique: S165YkOhOIapg3uoim_LnQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16CF33C66724; Wed, 15 Mar 2023 14:37:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AA9C40C6E67; Wed, 15 Mar 2023 14:37:13 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix empty devargs parsing' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:20 +0000 Message-Id: <20230315143640.677317-27-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 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/20/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1b619068f32964344ed2e3a94956ec64afd97fb7 Thanks. Kevin --- >From 1b619068f32964344ed2e3a94956ec64afd97fb7 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 2 Mar 2023 07:50:09 +0000 Subject: [PATCH] net/hns3: fix empty devargs parsing [ upstream commit 8e9bd29995ddb1205d90291a684bcf71599d6623 ] The rte_kvargs_process() was used to parse KV pairs, it also supports to parse 'only keys' (e.g. socket_id) type. And the callback function parameter 'value' is NULL when parsed 'only keys'. This patch fixes segment fault when parse input args with 'only keys' (e.g. rx_func_hint). Fixes: a124f9e9591b ("net/hns3: add runtime config to select IO burst function") Fixes: 70791213242e ("net/hns3: support masking device capability") Fixes: 2fc3e696a7f1 ("net/hns3: add runtime config for mailbox limit time") Signed-off-by: Chengwen Feng Acked-by: Dongdong Liu --- drivers/net/hns3/hns3_common.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c index dc24f7557d..2532c3b770 100644 --- a/drivers/net/hns3/hns3_common.c +++ b/drivers/net/hns3/hns3_common.c @@ -162,4 +162,7 @@ hns3_parse_io_hint_func(const char *key, const char *value, void *extra_args) RTE_SET_USED(key); + if (value == NULL || extra_args == NULL) + return 0; + if (strcmp(value, "vec") == 0) hint = HNS3_IO_FUNC_HINT_VEC; @@ -202,4 +205,7 @@ hns3_parse_dev_caps_mask(const char *key, const char *value, void *extra_args) RTE_SET_USED(key); + if (value == NULL || extra_args == NULL) + return 0; + val = strtoull(value, NULL, HNS3_CONVERT_TO_HEXADECIMAL); *(uint64_t *)extra_args = val; @@ -215,4 +221,7 @@ hns3_parse_mbx_time_limit(const char *key, const char *value, void *extra_args) RTE_SET_USED(key); + if (value == NULL || extra_args == NULL) + return 0; + val = strtoul(value, NULL, HNS3_CONVERT_TO_DECIMAL); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.257280322 +0000 +++ 0027-net-hns3-fix-empty-devargs-parsing.patch 2023-03-15 14:30:20.589123714 +0000 @@ -1 +1 @@ -From 8e9bd29995ddb1205d90291a684bcf71599d6623 Mon Sep 17 00:00:00 2001 +From 1b619068f32964344ed2e3a94956ec64afd97fb7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8e9bd29995ddb1205d90291a684bcf71599d6623 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index a0c9e66c2c..f077ef5057 100644 +index dc24f7557d..2532c3b770 100644 @@ -28 +29 @@ -@@ -164,4 +164,7 @@ hns3_parse_io_hint_func(const char *key, const char *value, void *extra_args) +@@ -162,4 +162,7 @@ hns3_parse_io_hint_func(const char *key, const char *value, void *extra_args) @@ -36 +37 @@ -@@ -204,4 +207,7 @@ hns3_parse_dev_caps_mask(const char *key, const char *value, void *extra_args) +@@ -202,4 +205,7 @@ hns3_parse_dev_caps_mask(const char *key, const char *value, void *extra_args) @@ -44 +45 @@ -@@ -217,4 +223,7 @@ hns3_parse_mbx_time_limit(const char *key, const char *value, void *extra_args) +@@ -215,4 +221,7 @@ hns3_parse_mbx_time_limit(const char *key, const char *value, void *extra_args)