From patchwork Tue Dec 5 02:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134829 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BF214433FD; Tue, 5 Dec 2023 03:13:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF61B427DF; Tue, 5 Dec 2023 03:13:51 +0100 (CET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id 02ADD427DC for ; Tue, 5 Dec 2023 03:13:50 +0100 (CET) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6cc02e77a9cso5028987b3a.0 for ; Mon, 04 Dec 2023 18:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742429; x=1702347229; darn=dpdk.org; 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=E49niAugGEAMLV8Z1NsCKtuhfBRzu0ptaCY90g32kqY=; b=aG+LdMAhqmuoG8nLkl6Ki8rj+ejZg0q94+ydinjF3N3MPT7DJ6Hmwk5yKQVDLLttvn TSqOTTOXGlHGIXNKOy0RTnWV/Iy2kXPrkMzLCADjnjeqax3mrbvBT1Si8XFtSpLpOErV jPwVJgPu6EmMJ2zx2HeSGxJqD+H/W9h4vVgk1ckq40dHaGlaJYdYDHSKCubjc3+zzpLv eycGJ9zi0enOz+0WU4UmeD9Xox+Vnn8j4gnpU7uUKktygRUpWbFvWc/DNxnjD7/h4b9o Q8bNTPiz3A461k/IuxNLXxmk4id0b6Iz3xtDzT39K3El/PcuzsO/7qTXWKMGEA9A2Aay l9kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742429; x=1702347229; 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=E49niAugGEAMLV8Z1NsCKtuhfBRzu0ptaCY90g32kqY=; b=SbXH1B3X/oCAKrKLFzemwAanrmli10bNn+hr2rcxI4B2RtY7cVVcegJd5qqnXDDZrO 7ErM6FFWTZu1o3msES3+O7Ao9EQxqiiYRMdxqlaCs2OPpD84S0R/sKUbZvRENOO+5JSK mWbEpOY3pnhkd6VneuFsOiA+swctifU45wH4YpJZycP6L/6VYN7P5OjZgSDG4YFYVlvN D4BqS+vOakZFEMzsIw7yvDpfQfaH2POqKJyOiEz/bPny0b2/konfyYh/uW+JgpHjTTFC 1Bou+k23T+O37ohJorUZIQkHt2c53fRq+9AntDOuUf4e9oGlTo2FsZoqskkw0kVUdBYR 2m1Q== X-Gm-Message-State: AOJu0Yx1GXyVlHA8F2JKxKz5gdMZ2ErFNJr65lZkfmTsa/HP7d0UjuRL fy8V5iZQzUUycDt+YNkOMSjjtpZfypxvrvEUQh0= X-Google-Smtp-Source: AGHT+IHCL9wo1jwv0Y6ubPRr/rhGu9rGgsqura3JQk3OEPCrvMl0LalX8ZeQDyXgBZ0jaulyMBs3KA== X-Received: by 2002:a05:6a00:1812:b0:6ce:6420:e174 with SMTP id y18-20020a056a00181200b006ce6420e174mr769078pfa.36.1701742429167; Mon, 04 Dec 2023 18:13:49 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jiayu Hu , Jiayu Hu , Mark Kavanagh Subject: [PATCH 01/18] gso: don't log message on non TCP/UDP Date: Mon, 4 Dec 2023 18:09:39 -0800 Message-ID: <20231205021330.260017-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org If a large packet is passed into GSO routines of unknown protocol then library would log a message. Better to tell the application instead of logging. Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO") Reviewed-by: Jiayu Hu Signed-off-by: Stephen Hemminger --- lib/gso/rte_gso.c | 4 +--- lib/gso/rte_gso.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/gso/rte_gso.c b/lib/gso/rte_gso.c index 4b59217c16ee..e29c7d884aed 100644 --- a/lib/gso/rte_gso.c +++ b/lib/gso/rte_gso.c @@ -80,9 +80,7 @@ rte_gso_segment(struct rte_mbuf *pkt, ret = gso_udp4_segment(pkt, gso_size, direct_pool, indirect_pool, pkts_out, nb_pkts_out); } else { - /* unsupported packet, skip */ - RTE_LOG(DEBUG, GSO, "Unsupported packet type\n"); - ret = 0; + ret = -ENOTSUP; /* only UDP or TCP allowed */ } if (ret < 0) { diff --git a/lib/gso/rte_gso.h b/lib/gso/rte_gso.h index 40922524df42..c0f9a1b66ff2 100644 --- a/lib/gso/rte_gso.h +++ b/lib/gso/rte_gso.h @@ -114,6 +114,7 @@ struct rte_gso_ctx { * - The number of GSO segments filled in pkts_out on success. * - Return 0 if it does not need to be GSO'd. * - Return -ENOMEM if run out of memory in MBUF pools. + * - Return -ENOTSUP for protocols that can not be segmented * - Return -EINVAL for invalid parameters. */ int rte_gso_segment(struct rte_mbuf *pkt, From patchwork Tue Dec 5 02:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134830 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 12BA4433FD; Tue, 5 Dec 2023 03:13:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD31C427E3; Tue, 5 Dec 2023 03:13:52 +0100 (CET) Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by mails.dpdk.org (Postfix) with ESMTP id 92342427DC for ; Tue, 5 Dec 2023 03:13:51 +0100 (CET) Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-58d3c9badf5so3522950eaf.1 for ; Mon, 04 Dec 2023 18:13:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742431; x=1702347231; darn=dpdk.org; 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=mo9oWYmnAiA90HrSiKRjxRHWLmpvW/gjdbd5z1rAZDM=; b=gk9FgIPZyEv1JbT5t2jgOtCHkh8dxtuxHAmnpFrCZjGckMmfLZZIeBmoHJUqWdWFC0 Jo9ACSEu7yKbz3TlW9iWDvcv2x4jy7DqQqJjApjD8eZvbg/afmO9xhRl9DcvTrh96aKG rXI78pXdMo4zkr274lfey+Sq2FC5lkM73jjn14UH/zYXYDpnuqNrbjx+q2lKHh7MDjWS 5WCwLszw3XMsnn06EHpVM3EA300/8mSq46XvkVGoJLqdvSkuJGD7rZ4Xxgle+YrbPpUe 3K85RNGeo05Volf1pN6ULQGmluSLbImufC8N6RJNdC/siiUYN8xhp/F7Jjt7TX9lMg1l vkMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742431; x=1702347231; 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=mo9oWYmnAiA90HrSiKRjxRHWLmpvW/gjdbd5z1rAZDM=; b=uV7BdAavU+P1JihD68/lCeO7lfxVh6wee4ERAMf/6RBEV3+pr7grou6euIgKtGjBXm 9yYcwVFedgJzFL3HSjE7XOBkknMTxMC0f9S0oam2373yNwEszf8fe36Z9IFBBZky60Ve gwEPBs8q/IQISDgFWzr9KkXkG6Xd3QLvPmsYVHA7dhRz3fnV7DFYPrDBnFn1cPq6rMrh 1lWeVa0iAccyAPr7uCHk7yIUP9cCdsE0i8LPHbHdEk331B2OCzTsWv6whlj2xZMOTAnI H4bbb0D9YjxoJur1asgCBo3yNU+9AgssrsKBF2oS9TwSdcnDsKRs2SD0D+Cd8kyehyyf 5thA== X-Gm-Message-State: AOJu0Yz4xqMrfnTlb36ZR1j2INlEOnIh1H+zJHZLcFSgeBPiXff/76gF jRPTA6+iAoNYyI/c9KOsWGiChQd7qXxcc5pTI9Q= X-Google-Smtp-Source: AGHT+IHpqgKNlodVW2IKN1U8BeJvXYDaDwlcGOHE37bU+SuqMhGrGNb1zW6YVRDSuPE5TQUphK2xxw== X-Received: by 2002:a05:6358:91c:b0:170:742:8ad8 with SMTP id r28-20020a056358091c00b0017007428ad8mr5776494rwi.0.1701742430857; Mon, 04 Dec 2023 18:13:50 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:49 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 02/18] eal: drop no longer used GSO logtype Date: Mon, 4 Dec 2023 18:09:40 -0800 Message-ID: <20231205021330.260017-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The message that used this was replaced in previous patch. Signed-off-by: Stephen Hemminger --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index b80725a5cf24..111a40932170 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -370,7 +370,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, {RTE_LOGTYPE_EFD, "lib.efd"}, {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"}, - {RTE_LOGTYPE_GSO, "lib.gso"}, {RTE_LOGTYPE_USER1, "user1"}, {RTE_LOGTYPE_USER2, "user2"}, {RTE_LOGTYPE_USER3, "user3"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index f7a8405de969..0ac10f580bc1 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -46,7 +46,7 @@ extern "C" { #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */ #define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */ #define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */ -#define RTE_LOGTYPE_GSO 20 /**< Log related to GSO. */ + /* was RTE_LOGTYPE_GSO */ /* these log types can be used in an application */ #define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */ From patchwork Tue Dec 5 02:09:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134831 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BBCD433FD; Tue, 5 Dec 2023 03:14:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF83C42D28; Tue, 5 Dec 2023 03:13:53 +0100 (CET) Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by mails.dpdk.org (Postfix) with ESMTP id 85182427E3 for ; Tue, 5 Dec 2023 03:13:52 +0100 (CET) Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3b845ba9ba9so3213581b6e.3 for ; Mon, 04 Dec 2023 18:13:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742432; x=1702347232; darn=dpdk.org; 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=LbV6QhUPVfXK01SIp+JIHNm6zy0pHYzcVGH+5kNtVhI=; b=n96QxmYYFFEr5Ay2GOZE1XWhuNbvx6tFJGqGFwpFTfQSJGPkxfckr5BU889TZFkLbe JxX9jk/5PhDnaZfs9ES2jpcapztj4ISDJqgjXJZCvSRLR8PqsGU4FY8p0hCz+cZprkhV 2RgmhK8fjN6uJKKlBurFjz13foZ5ths4xmJnBfLPmTYDxutglcEDpHs0QZX0L0U+R49z /0wUHL5QUnAirdCO9Ik5aHb+na7dCISkQoumAdSijMZflO4/5XWX0PdQoejwlzhCKv0f 5zv4xelm5sM/W80tU+O/wFv4ca8qHEeL7sbHMRZjYpuBUypIXquvDpf7kqOAbrn6aaLw E77Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742432; x=1702347232; 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=LbV6QhUPVfXK01SIp+JIHNm6zy0pHYzcVGH+5kNtVhI=; b=drRxjyoul4NdnVNTXQTzFtS4vYXBXEKXlALDcesOjtTh5yX9oTGXXtu/FSOrtBeCZD 7hopE7kq61Z1AYdTC1iGa5OUHYicsgjVNGhRUspYJY3va934AvijtJ5XBIUVEv6EoFuh zp317Gb1NHP+2xneqZIFkOhFC9JgAZKnAJ+Fx3RHJ45DaIi5uCFZHAEJDg9lcq5IFfic 4ApktdD6/IMKKi9K/loP9rydvn+/SIh8I4wkCfyI+dDNPWBJX/lKETBbwgQi7Fcnxasw Q+NJ4sYu7NSTUcsy5d8hYegtjwZRhTtRiJx3klFnmQv3J1ojkILiFX7k5mlyOJXiSwls ixpw== X-Gm-Message-State: AOJu0Yz2SIvNb4+zgFEaT18VTwxH8m4D0F4mtX/hkBVAQGx6dfIZrJrK 6IStFDPVqWuLgFv59P79n/lNlSVbjPBgkRJvmvs= X-Google-Smtp-Source: AGHT+IFBnnc8KHiMgfIUFGhJEwB/1o7E7IaLyywiLsN6smRBbc8oVQQe/2ezdUJyvk8bY0r5pYP6yA== X-Received: by 2002:a05:6808:e8a:b0:3b8:b063:ae05 with SMTP id k10-20020a0568080e8a00b003b8b063ae05mr6167147oil.98.1701742431780; Mon, 04 Dec 2023 18:13:51 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:51 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 03/18] log: drop unused RTE_LOGTYPE_TIMER Date: Mon, 4 Dec 2023 18:09:41 -0800 Message-ID: <20231205021330.260017-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The timer code does not use rte_log. Signed-off-by: Stephen Hemminger --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 111a40932170..c05a7cf5a2dd 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -355,7 +355,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_MALLOC, "lib.malloc"}, {RTE_LOGTYPE_RING, "lib.ring"}, {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, - {RTE_LOGTYPE_TIMER, "lib.timer"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 0ac10f580bc1..fe8188302125 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -30,7 +30,7 @@ extern "C" { #define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */ #define RTE_LOGTYPE_RING 2 /**< Log related to ring. */ #define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */ -#define RTE_LOGTYPE_TIMER 4 /**< Log related to timers. */ + /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ From patchwork Tue Dec 5 02:09:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134832 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B8588433FD; Tue, 5 Dec 2023 03:14:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2681F42D7D; Tue, 5 Dec 2023 03:13:55 +0100 (CET) Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by mails.dpdk.org (Postfix) with ESMTP id 4015842D0B for ; Tue, 5 Dec 2023 03:13:53 +0100 (CET) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3b8b6acc3e7so1408457b6e.1 for ; Mon, 04 Dec 2023 18:13:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742432; x=1702347232; darn=dpdk.org; 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=kk3jhDea+nkSxHJpEZH2p2xONh7EiybjJV2zHagQckk=; b=vGOWtrTyf7slr6LKPHhYlwtN96B7JuPzEipeg8gYLx89ar1VUkTIVeKjF5m+2fEV6X dgseHwBrR7QypOaeB6KQdJLKho5ZX7zu2cSJfOVOij5h8egvkgPZWQE4lz1pCnYI59ES WHeJzMjycmbL9gtFjpLXPTOVJ9OyARXqeXbQHiBIQmdeBPNtf6tDYn+u3Cbgx1ZkKH6S yUP8XX9Y6kaE2bO+nM5XHuYVPDwXbSDUNWWc/1YL5iWhd0qaVhmM2qcJOzjCAhVWh4Lm mK2QzCqjiLO5PCE/4gPkFtNsVz/ycjqYRfJ2hHsjYI9tsN7dItg28Mz+tIkGBukMnrwd pE0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742432; x=1702347232; 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=kk3jhDea+nkSxHJpEZH2p2xONh7EiybjJV2zHagQckk=; b=vFkpX+dmxejPUNkf/ZKo/CckfZBMg06u0tXjC/O+caFZKdl64SFk+H2PSxzJ6Kbnxw LWl0jvTw5O2Aa9KtK1Ja1g3uVG90cFcYl7U6qmdz2CDslptTT35E3GWiLBioB6WsbXBN ZRozB8zzEMUN4nxndcRlQ2OwLoqLMJUZbWKUXYmEMoJD/hTjIbdccevOum4bkGlyNyNQ 4Lv7TcDufYEfaSdws9SiID3SvO0lt2qiI65l2z42Qy/lIcIf3weyVMQSI2TgR1gV+2Lb bblz3+njMnlu5+nL+uFcM7iKlNZ4Z5tb4mEa7jdctcAFW85naWSCpbZNhGUudiBzYO55 GJ+Q== X-Gm-Message-State: AOJu0Yy4bOZzCcTLFRn49/Ev8YYNboKvv5rx1rfoJJKyUsadPF5WG2Uu aC7Fgl5cQ0FLLbLNqDbneFpc+m7M4DZcelPnrcc= X-Google-Smtp-Source: AGHT+IEAkHDs4aE/43elJyH0DSg74GQiJYvjDIc0dbYuQHbkCQN8jf3vsWG8e71okSLpqEY6YJYKyQ== X-Received: by 2002:a05:6808:23cb:b0:3b8:b063:5d5a with SMTP id bq11-20020a05680823cb00b003b8b0635d5amr5730855oib.65.1701742432518; Mon, 04 Dec 2023 18:13:52 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:52 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Byron Marohn , Yipeng Wang Subject: [PATCH 04/18] efd: convert RTE_LOGTYPE_EFD to dynamic type Date: Mon, 4 Dec 2023 18:09:42 -0800 Message-ID: <20231205021330.260017-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace all uses of the global logtype with a dynamic log type. Signed-off-by: Stephen Hemminger --- lib/efd/rte_efd.c | 4 ++++ lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c index dad962ce29bf..78fb9250ef87 100644 --- a/lib/efd/rte_efd.c +++ b/lib/efd/rte_efd.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -28,6 +29,9 @@ #include "rte_efd_arm64.h" #endif +RTE_LOG_REGISTER_DEFAULT(efd_logtype, INFO); +#define RTE_LOGTYPE_EFD efd_logtype + #define EFD_KEY(key_idx, table) (table->keys + ((key_idx) * table->key_len)) /** Hash function used to determine chunk_id and bin_id for a group */ #define EFD_HASH(key, table) \ diff --git a/lib/log/log.c b/lib/log/log.c index c05a7cf5a2dd..c256709b8586 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -367,7 +367,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, {RTE_LOGTYPE_MBUF, "lib.mbuf"}, {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, - {RTE_LOGTYPE_EFD, "lib.efd"}, {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"}, {RTE_LOGTYPE_USER1, "user1"}, {RTE_LOGTYPE_USER2, "user2"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index fe8188302125..c6594e0509a5 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -44,7 +44,7 @@ extern "C" { #define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */ #define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */ #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */ -#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */ + /* was RTE_LOGTYPE_EFD */ #define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */ /* was RTE_LOGTYPE_GSO */ From patchwork Tue Dec 5 02:09:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134833 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57249433FD; Tue, 5 Dec 2023 03:14:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 471D742D91; Tue, 5 Dec 2023 03:13:56 +0100 (CET) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id 040BD427DD for ; Tue, 5 Dec 2023 03:13:54 +0100 (CET) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cddb35ef8bso4024324b3a.2 for ; Mon, 04 Dec 2023 18:13:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742433; x=1702347233; darn=dpdk.org; 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=quUfJZ9+wvBzsJ44z/c3OwngbCup3kDq9UI18pHDXHU=; b=QMa0c/+qNom5gr3vZarU35TVeik7S16ITnnXHx5AsF+9zW4V+F6JqcFBTg6IT2gpIr mAw1PR0qNqAAe1dyzaXiGMzsQlpszs8GhK/miMOEs5Qwv7obZgCgLuhkbgUbjGZBtpvQ Dz1RW4YGSvBwBNb5MoYMY8HnY6Qp4tcxfnRTqgpusDFQXY1BoGHI/ZHVFsxTtQ/dZYPl fa5JfvS5D5YjKTrjO6yYbo9A9GS1wTJnft/eysmhZUU+nFlagrEjPyIo7xE4N+2GkNSK VPeSesdV/joxpPvGMeAAcNFc/LBb3rbErHUFbPdZCGYjrLtU7ksSk7Go49nO+bjoWdAd qwCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742433; x=1702347233; 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=quUfJZ9+wvBzsJ44z/c3OwngbCup3kDq9UI18pHDXHU=; b=eJdcautilbe5kWyGrwqGIF15h4cOS5HudISGtLO2eQTgPKHOg/JWbMOoFA9iA74GBh IJVw3tmJw6/0sI4dtdc+SGwd/Mauzhc+lJYmFzbpAxru1lFsCxs0wHv450O+4B9KfKQr NTWKQwB/Y6fU9mVnwS9WEBft29iMl8iChuLALuuMNc/c2uO31kOLaxJ5RrxKD2+AAteh TEW3u01dRy99GSNuh74X8nrdyLo7GWznhMsJQ2HhYAd9VbtL6Cn76Dtj+iE2cAgsNUwL 9b6jyn2dgV60eSLkDet5Qtex1WG3ntPOyom8jIC2R5OZmUghsNM9bZXxk3v1SEdMG/Z0 WUTw== X-Gm-Message-State: AOJu0YzYJ7Yv+YqjLMaNCrArJ/f14QeuvpyKWldN2rBJiIj5OvvO+Gxe eDwm+OjseA4XYCYY6dJ0Od8uDJqvGfvwdEFktsE= X-Google-Smtp-Source: AGHT+IEKsbW9lVeebwSTIQ3d0K2vPmB3TRPzkajkIt4P80BoafklZeCD1pwNj+m0TcPzLBC3Z182ug== X-Received: by 2002:a05:6a00:188f:b0:6cb:82bb:5238 with SMTP id x15-20020a056a00188f00b006cb82bb5238mr583645pfh.30.1701742433214; Mon, 04 Dec 2023 18:13:53 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:52 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 05/18] mbuf: convert RTE_LOGTYPE_MBUF to dynamic type Date: Mon, 4 Dec 2023 18:09:43 -0800 Message-ID: <20231205021330.260017-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Introduce a new dynamic logtype for mbuf related messages. Since this is used in multiple files put one macro in mbuf_log.h Signed-off-by: Stephen Hemminger --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/mbuf/mbuf_log.h | 4 ++++ lib/mbuf/rte_mbuf.c | 4 ++++ lib/mbuf/rte_mbuf_dyn.c | 2 ++ lib/mbuf/rte_mbuf_pool_ops.c | 2 ++ 6 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 lib/mbuf/mbuf_log.h diff --git a/lib/log/log.c b/lib/log/log.c index c256709b8586..0718b84dcb04 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -365,7 +365,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, - {RTE_LOGTYPE_MBUF, "lib.mbuf"}, {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"}, {RTE_LOGTYPE_USER1, "user1"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index c6594e0509a5..bd10e32fe164 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -42,7 +42,7 @@ extern "C" { #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */ #define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */ -#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */ + /* was RTE_LOGTYPE_MBUF */ #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */ /* was RTE_LOGTYPE_EFD */ #define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */ diff --git a/lib/mbuf/mbuf_log.h b/lib/mbuf/mbuf_log.h new file mode 100644 index 000000000000..d759a9a25501 --- /dev/null +++ b/lib/mbuf/mbuf_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int mbuf_logtype; +#define RTE_LOGTYPE_MBUF mbuf_logtype diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c index 686e797c80c4..3eccc618270b 100644 --- a/lib/mbuf/rte_mbuf.c +++ b/lib/mbuf/rte_mbuf.c @@ -20,6 +20,10 @@ #include #include +#include "mbuf_log.h" + +RTE_LOG_REGISTER_DEFAULT(mbuf_logtype, INFO); + /* * pktmbuf pool constructor, given as a callback function to * rte_mempool_create(), or called directly if using diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c index 5049508bea6e..4fb1863a1043 100644 --- a/lib/mbuf/rte_mbuf_dyn.c +++ b/lib/mbuf/rte_mbuf_dyn.c @@ -17,6 +17,8 @@ #include #include +#include "mbuf_log.h" + #define RTE_MBUF_DYN_MZNAME "rte_mbuf_dyn" struct mbuf_dynfield_elt { diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c index 4c91f4ce8569..5318430126cb 100644 --- a/lib/mbuf/rte_mbuf_pool_ops.c +++ b/lib/mbuf/rte_mbuf_pool_ops.c @@ -8,6 +8,8 @@ #include #include +#include "mbuf_log.h" + int rte_mbuf_set_platform_mempool_ops(const char *ops_name) { From patchwork Tue Dec 5 02:09:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134834 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C723E433FD; Tue, 5 Dec 2023 03:14:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B5E042D9D; Tue, 5 Dec 2023 03:13:57 +0100 (CET) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id 0753A42D76 for ; Tue, 5 Dec 2023 03:13:55 +0100 (CET) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6cdcef787ffso5452704b3a.0 for ; Mon, 04 Dec 2023 18:13:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742434; x=1702347234; darn=dpdk.org; 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=DcPgwKOIrZDCJ4NHJ0867FpXDPnBRCJSvSb5jRhEO/8=; b=UAKp9Y7sAtm7fwzoJDQimKiPL1LF8NhTSm3JI4xmoWSaEEawQUwCiKRQo8bjHdGslm 6/tFL5dQtxdaNy1trWxLshqpipMgp5omvD56Su8EIiytUVwqPxHIOuKcMlH/tSIddABt Hp0TV6N/p40/KIEfbRqpsxm1N0zEBq+CqZMFk89NfD+ehbWb3KHaVQ98rGaGEVY8U7v3 +/0rB5P6j3P+/sxYQZyUke/KlhKPlW262E01zTerF5qKNAsY6Axe/t26m+yNPs0SbpiD JThwVOsH7Svi5vVS3PLtc9TJrsYtg2vQSzSDdECBBOuTvcK4G5bA3pNRo+H7o2PZBrT+ ui9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742434; x=1702347234; 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=DcPgwKOIrZDCJ4NHJ0867FpXDPnBRCJSvSb5jRhEO/8=; b=GmrSO78P+N2gsns8tsVTzDITidBQav6Co5NfDs6D9FJM0KqHKkMfnII0Tmm5BkHgRX eZnWj8XHfB5yvl2Pv6e5/mbLsNAyEzBuC1CTvjn6R54U2NhGCkWHSpKMz3Fa0eZCudaN Q2+fvO+tQKcLa9eprBKYKHdWUslER9YTyICVey66NfnW2U4eGozZkBiAB43LlGC5XTRB CNfDof0RAVcKpdDa26pEtQPcNYt7t2mPJ3t68bKDXm6abmpKcWxbXZlVVR7oyENp8C9x gMG7RBq7dmTKgkn8AmpVBbjYLCre22GPsD6LTLvU6eHN5ZB0lbJiHyFdYN/Nz/OUaDsy m1rw== X-Gm-Message-State: AOJu0YwZMQqgj6KlxSAfFvGe0AFlP1VQwXfm4Q8t8muVMgEAJX4JJV+8 6MuqIK4XxRsuCaM9G9e8TMU4WZmCI7SNKo0yioc= X-Google-Smtp-Source: AGHT+IEStY8YDQy2cQ2IPiFKRkJ/cEmOUwYxmSqEtqpA4kq1QZQ3N/GtsgPriLscL1eM+xNf8th0gg== X-Received: by 2002:a05:6a00:2d89:b0:6cd:e8c3:f733 with SMTP id fb9-20020a056a002d8900b006cde8c3f733mr782255pfb.3.1701742434116; Mon, 04 Dec 2023 18:13:54 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:53 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Konstantin Ananyev Subject: [PATCH 06/18] acl: convert RTE_LOGTYPE_ACL to dynamic type Date: Mon, 4 Dec 2023 18:09:44 -0800 Message-ID: <20231205021330.260017-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC. For ACL library use a dynamic type. The one message using RTE_LOGTYPE_MALLOC should have been under the ACL logtype anyway. The test code should not have been using fixed log type so just change that to stderr. Signed-off-by: Stephen Hemminger --- app/test/test_acl.c | 2 +- lib/acl/acl.h | 1 + lib/acl/acl_bld.c | 3 +++ lib/acl/acl_gen.c | 1 + lib/acl/acl_log.h | 6 ++++++ lib/acl/rte_acl.c | 3 +++ lib/acl/tb_mem.c | 3 ++- lib/log/log.c | 2 -- lib/log/rte_log.h | 4 ++-- 9 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 lib/acl/acl_log.h diff --git a/app/test/test_acl.c b/app/test/test_acl.c index 8011639ddd1f..503ff0889405 100644 --- a/app/test/test_acl.c +++ b/app/test/test_acl.c @@ -154,7 +154,7 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx, for (i = 0; i != num; i++) { rc = acl_ipv4vlan_check_rule(rules + i); if (rc != 0) { - RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n", + fprintf(stderr, "%s: rule #%u is invalid\n", __func__, i + 1); return rc; } diff --git a/lib/acl/acl.h b/lib/acl/acl.h index c8e4e72fabfb..baed9513cb31 100644 --- a/lib/acl/acl.h +++ b/lib/acl/acl.h @@ -225,6 +225,7 @@ int rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data, uint32_t *results, uint32_t num, uint32_t categories); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c index 418751e9f4c7..eaf8770415a5 100644 --- a/lib/acl/acl_bld.c +++ b/lib/acl/acl_bld.c @@ -3,8 +3,11 @@ */ #include +#include + #include "tb_mem.h" #include "acl.h" +#include "acl_log.h" #define ACL_POOL_ALIGN 8 #define ACL_POOL_ALLOC_MIN 0x800000 diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c index 25e75fec3534..03a47ea231ec 100644 --- a/lib/acl/acl_gen.c +++ b/lib/acl/acl_gen.c @@ -4,6 +4,7 @@ #include #include "acl.h" +#include "acl_log.h" #define QRANGE_MIN ((uint8_t)INT8_MIN) diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h new file mode 100644 index 000000000000..6147116d8d12 --- /dev/null +++ b/lib/acl/acl_log.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#include + +extern int acl_logtype; +#define RTE_LOGTYPE_ACL acl_logtype diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c index 4182006d1d1c..760c3587d4dc 100644 --- a/lib/acl/rte_acl.c +++ b/lib/acl/rte_acl.c @@ -8,6 +8,9 @@ #include #include "acl.h" +#include "acl_log.h" + +RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO); TAILQ_HEAD(rte_acl_list, rte_tailq_entry); diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c index f14d7b4fa26e..6a9d96aaeda2 100644 --- a/lib/acl/tb_mem.c +++ b/lib/acl/tb_mem.c @@ -3,6 +3,7 @@ */ #include "tb_mem.h" +#include "acl_log.h" /* * Memory management routines for temporary memory. @@ -25,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz) size = sz + pool->alignment - 1; block = calloc(1, size + sizeof(*pool->block)); if (block == NULL) { - RTE_LOG(ERR, MALLOC, "%s(%zu)\n failed, currently allocated " + RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated " "by pool: %zu bytes\n", __func__, sz, pool->alloc); siglongjmp(pool->fail, -ENOMEM); return NULL; diff --git a/lib/log/log.c b/lib/log/log.c index 0718b84dcb04..49ee89ffdd97 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,13 +352,11 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, - {RTE_LOGTYPE_MALLOC, "lib.malloc"}, {RTE_LOGTYPE_RING, "lib.ring"}, {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, - {RTE_LOGTYPE_ACL, "lib.acl"}, {RTE_LOGTYPE_POWER, "lib.power"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index bd10e32fe164..0c651f58b58e 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -27,7 +27,7 @@ extern "C" { /* SDK log type */ #define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */ -#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */ + /* was RTE_LOGTYPE_MALLOC */ #define RTE_LOGTYPE_RING 2 /**< Log related to ring. */ #define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */ /* was RTE_LOGTYPE_TIMER */ @@ -35,7 +35,7 @@ extern "C" { #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ /* was RTE_LOGTYPE_KNI */ -#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */ + /* was RTE_LOGTYPE_ACL */ #define RTE_LOGTYPE_POWER 10 /**< Log related to power. */ #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ From patchwork Tue Dec 5 02:09:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134835 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D7406433FD; Tue, 5 Dec 2023 03:14:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86DAB42DB0; Tue, 5 Dec 2023 03:13:58 +0100 (CET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id 88D1D42D76 for ; Tue, 5 Dec 2023 03:13:55 +0100 (CET) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6ce2ff70619so1233099b3a.2 for ; Mon, 04 Dec 2023 18:13:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742435; x=1702347235; darn=dpdk.org; 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=Pd2CHpvQUCiKcWTyDtB09YEk+0c1f62IA1HCx0UDvBI=; b=icFYi/pQrRCfiDf562+IyN6R4ONX8IPUe5HE+2mKJhLjk8EGEm0RQcTQEWlEsoHq13 2ifUhduY3gfz+l2aZVq5WregKPHWxPCrjyEScYq0DHXU5Sa6JTZbZrXD05/WYPozj0GI c/85TGGGFt+SM0FX2zUbcEZHOFrcFdlfk/3yr3ZQ0+rZjsI1q2U2iZEVipxReutLOxGP oqjyyCNV6qm85gvBIjSG5/aW6PB2NRg2tK3X9GJo+N1Q4Wr0Ee9PtXdaSI19yBrKpQe1 mBeRolfXGA20v+vbX/IXcfJA91lwNkKkZXuGB3HOO7cwN+jB3jAZCaNNKfOSKKTCivtu 9csA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742435; x=1702347235; 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=Pd2CHpvQUCiKcWTyDtB09YEk+0c1f62IA1HCx0UDvBI=; b=XUxWh2wSoa5rGY+IfJBdsKXHUi/pJg+U7IEa05IQmYx/FM+qZnvCx55Oq/RuR31h2C fz31+906onO47DJesqjLA1idkKSEBbwGHkHALH/869BH3FHHpJnf6m3iGcuQWpl00jaa eC61T11Ujgl03Lb8m6A/v47//M5sB0Wl4cMWubOeF2D1Yg1btaE6+/NagpSuiNl06dHD x8+Q2XPOqq37tJRIHfehz1a7u4VI5nTKuW6RPFkKjQJZYjt7hvop801yWiEjnUd8RJMO IrFke8UbFC9XjOlkEiKqgCmjWn2IJe+69cBdmXn/MGBO9XBLtoZ6F/sJWlCEuPHZEhYq 2S/g== X-Gm-Message-State: AOJu0Ywl9+rJmP7SZ9eL0gj3DtznXVJ/w0xOcxiEdRMwiUds/pIOYw9D +INOBU618bhCQZNKQfihl7ErNhk8hFrJVHhfr2Y= X-Google-Smtp-Source: AGHT+IHF+K9OGIhDWyldDhheL4II5E7PPXGrE4xxlEc5N2zaE/SXcWsfCp/0bs3h7HZYcaWguC5J4Q== X-Received: by 2002:a05:6a00:c8b:b0:6ce:2731:c245 with SMTP id a11-20020a056a000c8b00b006ce2731c245mr516119pfv.52.1701742434773; Mon, 04 Dec 2023 18:13:54 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:54 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , David Hunt Subject: [PATCH 07/18] examples/power: replace use of RTE_LOGTYPE_POWER Date: Mon, 4 Dec 2023 18:09:45 -0800 Message-ID: <20231205021330.260017-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Don't use static logtype in sample application. Signed-off-by: Stephen Hemminger Acked-by: David Hunt --- examples/distributor/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/distributor/main.c b/examples/distributor/main.c index 21304d661873..542f76cf9664 100644 --- a/examples/distributor/main.c +++ b/examples/distributor/main.c @@ -679,7 +679,7 @@ init_power_library(void) /* init power management library */ ret = rte_power_init(lcore_id); if (ret) { - RTE_LOG(ERR, POWER, + fprintf(stderr, "Library initialization failed on core %u\n", lcore_id); /* From patchwork Tue Dec 5 02:09:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134836 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5A824433FD; Tue, 5 Dec 2023 03:14:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9CE6742DBD; Tue, 5 Dec 2023 03:13:59 +0100 (CET) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by mails.dpdk.org (Postfix) with ESMTP id 4969442D95 for ; Tue, 5 Dec 2023 03:13:56 +0100 (CET) Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-58cecfb4412so3514331eaf.3 for ; Mon, 04 Dec 2023 18:13:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742435; x=1702347235; darn=dpdk.org; 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=Km9h9C+n6gij7KYimiKStPJzZJonSH7624lZejkF1Xs=; b=1yIRkzLJDnB9O07jblx5VbIPyTbbP2lr6TCmZdQjYHYXhIHzU6sttF8+3vxyUu+RwB MFZ164vbFeZ8U2MRf1SOsBMJCmqtzDEbAfFIHYSLpmrP7ZS4olPA9nM3iGpi5icc4j6K ijSmCN4pURtfGP7fZbfdFV4UidPtgkEyFGN237VKIrIyq8Yj2kwrvy+MCNYD62mQSP+V uBQ4WB+bx1DV8/xFbeAK+LqYAzGJq4kkt17krZEo+gRtGeEhXr7QH8r5x5ay4JtaYWgM bGvF6Xb+qORngLaTTspMtknIdX30YEMVvPPsxsXfKjWfw6xoMP4bAJ16MfJzhxrI7H0b +cAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742435; x=1702347235; 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=Km9h9C+n6gij7KYimiKStPJzZJonSH7624lZejkF1Xs=; b=GC+wzedjbJsNMYyJrJway4jiZRSBXzTjdFRNKK6/eDwXvIc0OZ8ACf/1eo1wqFfZcS a4gSiYy6f9Rc9gIVAG1Vsi29FjGxGMoDUkgOL2UTp5ks+DoiEzZW2FEgrOPX6z4AhCTe 6xE7pTwGBn5UdYzvVRQP1zMni3DtkCw+6MmgKrGGFNX7DzI/gpwBrO6DWdFVg+ezaKFb RnsLm1/8jrGo5IIWH3Oxc7Q6uup1YgAVxjo5Y08CDd07SV19P8gAikM5VW8wjjeFzl5n mCsu0DBzyN4QarI0XYhbi5WydbzYYrlm5VwP+SJL8SeyXNUVuMYCf+b/uFgUuEy2TfLK lqMw== X-Gm-Message-State: AOJu0YweYPlAH9/IvHT+hvgnbRzTpPpKqlqoBvYJAFX4+W/zkz4jWSdm mI4oNEh+ih813IJT+hl2oEJHez99B0kOKwcMfpA= X-Google-Smtp-Source: AGHT+IFkwsoTDaclqLEe5e5LlE/+43Uz0afp+MBkLExpVQSSQLj9dwKfCkytmxOw1+eAEV0alhcNNg== X-Received: by 2002:a05:6358:7241:b0:16d:f743:4107 with SMTP id i1-20020a056358724100b0016df7434107mr7152048rwa.3.1701742435611; Mon, 04 Dec 2023 18:13:55 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:55 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , David Hunt , Anatoly Burakov , Sivaprasad Tummala Subject: [PATCH 08/18] examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER Date: Mon, 4 Dec 2023 18:09:46 -0800 Message-ID: <20231205021330.260017-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Convert to using a dynamic logtype for the application. Signed-off-by: Stephen Hemminger Acked-by: David Hunt --- examples/l3fwd-power/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 9c0dcd343bd9..f4adcf41b55f 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -51,7 +51,8 @@ #include "perf_core.h" #include "main.h" -#define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1 +RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO); +#define RTE_LOGTYPE_L3FWD_POWER l3fwd_power_logtype #define MAX_PKT_BURST 32 @@ -2242,7 +2243,7 @@ init_power_library(void) /* init power management library */ ret = rte_power_init(lcore_id); if (ret) { - RTE_LOG(ERR, POWER, + RTE_LOG(ERR, L3FWD_POWER, "Library initialization failed on core %u\n", lcore_id); return ret; @@ -2253,8 +2254,8 @@ init_power_library(void) env != PM_ENV_PSTATE_CPUFREQ && env != PM_ENV_AMD_PSTATE_CPUFREQ && env != PM_ENV_CPPC_CPUFREQ) { - RTE_LOG(ERR, POWER, - "Only ACPI, PSTATE and CPPC mode are supported\n"); + RTE_LOG(ERR, L3FWD_POWER, + "Only ACPI and PSTATE mode are supported\n"); return -1; } } @@ -2271,7 +2272,7 @@ deinit_power_library(void) /* deinit power management library */ ret = rte_power_exit(lcore_id); if (ret) { - RTE_LOG(ERR, POWER, + RTE_LOG(ERR, L3FWD_POWER, "Library deinitialization failed on core %u\n", lcore_id); return ret; @@ -2340,7 +2341,7 @@ update_telemetry(__rte_unused struct rte_timer *tim, ret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index, values, RTE_DIM(values)); if (ret < 0) - RTE_LOG(WARNING, POWER, "failed to update metrics\n"); + RTE_LOG(WARNING, L3FWD_POWER, "failed to update metrics\n"); } static int @@ -2389,7 +2390,7 @@ launch_timer(unsigned int lcore_id) rte_get_main_lcore()); } - RTE_LOG(INFO, POWER, "Bring up the Timer\n"); + RTE_LOG(INFO, L3FWD_POWER, "Bring up the Timer\n"); telemetry_setup_timer(); @@ -2405,7 +2406,7 @@ launch_timer(unsigned int lcore_id) } } - RTE_LOG(INFO, POWER, "Timer_subsystem is done\n"); + RTE_LOG(INFO, L3FWD_POWER, "Timer_subsystem is done\n"); return 0; } From patchwork Tue Dec 5 02:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134837 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0F31433FD; Tue, 5 Dec 2023 03:14:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C692442D7B; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by mails.dpdk.org (Postfix) with ESMTP id E24EF42D6A for ; Tue, 5 Dec 2023 03:13:57 +0100 (CET) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6d857f6f1c0so2941091a34.0 for ; Mon, 04 Dec 2023 18:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742437; x=1702347237; darn=dpdk.org; 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=a1/xVlFD1kXMRcwIkELTLNb0MTYKN5SdcelWBJKjgp0=; b=Xu/D6vhsjMIz6OUTwCdePJiXMB5rLt8yGneKbZgRifzRrsNjvsmCruJGnLoFXQw701 XPF3Z3D+pycJKXQEobg8iYF/aCt20bN8osQH8GDjyOzxPE0XeSNsIrIGWFAf2kty46fr 3ewsAJB+n8FMuFTg7Aq1ICeJM3CqkzCxTDaKeNwzllheRsSIODjijXN+OLizqD8WWiu5 HjEF4KlC1G0QWg6jZ9/W+xI0xOp/K+27zbYZR9iBYl0e0peU9xl5v0p/xM51MNudTES7 ULFrsBOOf/zoea/NWFk/djQ+87wxlWkyXwTRmJK/eWf+ch0tKMQq7/1bzva6KntkdjZm eXzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742437; x=1702347237; 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=a1/xVlFD1kXMRcwIkELTLNb0MTYKN5SdcelWBJKjgp0=; b=RyTZH5+hqDih05nDUnW27ljPxjk9Nxv6YvVvaw7tgELDj2/VHPPup+MrvEAqLu/PtF 5B3DzeGSpRSIgguklZaW5uSr3JDJbEQVqaDWv1ANGbvtBlxM2ik+gLXB99293a18ueOQ wp6va4m/lf65jmlrVndu0yFc0nI21zXoRfPh6qWLijrz4XsnfDGCjnv+GtLmKSLC30VL Qd00hPvdlCjh3b7T9N4M3O2jhvcKN8+lqk9pBQqjdF8kIRADpSA+vbBedtKGUmRs8z/n GqDbnvDWLQkrwjsSBPhzFNdCuNTxGEbar3bkd7nU4R7amDUSX/QHvLquX9RmtiBgJH7U mFSg== X-Gm-Message-State: AOJu0YyeumE85LT1SKj1UmKuZ6YCG3/0xo7F7LMBiqn2wKfbnUQ5JP66 N3mbiMEygHK5ltpyDaZt1ATxkYMSxjxH7NyittM= X-Google-Smtp-Source: AGHT+IFqFhURD7zBoImKwsLWqg0/wU2O94p3S0nJ/k4YHvPFuQ/NhAKhjq0o5utBZIdCyIwuzWFONA== X-Received: by 2002:a05:6830:1e0c:b0:6d9:65f5:b6bf with SMTP id s12-20020a0568301e0c00b006d965f5b6bfmr2877236otr.30.1701742437232; Mon, 04 Dec 2023 18:13:57 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:56 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , David Hunt , Anatoly Burakov , Sivaprasad Tummala Subject: [PATCH 09/18] power: convert RTE_LOGTYPE_POWER to dynamic type Date: Mon, 4 Dec 2023 18:09:47 -0800 Message-ID: <20231205021330.260017-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use dynamic log type for power library. Signed-off-by: Stephen Hemminger Acked-by: David Hunt --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/power/power_common.c | 2 ++ lib/power/power_common.h | 2 ++ lib/power/power_kvm_vm.c | 1 + lib/power/rte_power.c | 1 + lib/power/rte_power_uncore.c | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 49ee89ffdd97..70b3a0995e2e 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -357,7 +357,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, - {RTE_LOGTYPE_POWER, "lib.power"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 0c651f58b58e..0cdff28e12d6 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -36,7 +36,7 @@ extern "C" { #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ -#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */ + /* was RTE_LOGTYPE_POWER */ #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ diff --git a/lib/power/power_common.c b/lib/power/power_common.c index 1e09facb863f..bf77eafa886b 100644 --- a/lib/power/power_common.c +++ b/lib/power/power_common.c @@ -12,6 +12,8 @@ #include "power_common.h" +RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO); + #define POWER_SYSFILE_SCALING_DRIVER \ "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver" #define POWER_SYSFILE_GOVERNOR \ diff --git a/lib/power/power_common.h b/lib/power/power_common.h index c1c713927621..c3fcbf4c1000 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -10,6 +10,8 @@ #define RTE_POWER_INVALID_FREQ_INDEX (~0) +extern int power_logtype; +#define RTE_LOGTYPE_POWER power_logtype #ifdef RTE_LIBRTE_POWER_DEBUG #define POWER_DEBUG_TRACE(fmt, args...) \ diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c index 6a8109d44959..db031f43105a 100644 --- a/lib/power/power_kvm_vm.c +++ b/lib/power/power_kvm_vm.c @@ -8,6 +8,7 @@ #include "rte_power_guest_channel.h" #include "guest_channel.h" +#include "power_common.h" #include "power_kvm_vm.h" #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent" diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 48c2e6b428d8..1502612b0a15 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -10,6 +10,7 @@ #include "rte_power.h" #include "power_acpi_cpufreq.h" #include "power_cppc_cpufreq.h" +#include "power_common.h" #include "power_kvm_vm.h" #include "power_pstate_cpufreq.h" #include "power_amd_pstate_cpufreq.h" diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c index ce027bbeb829..9c20fe150d46 100644 --- a/lib/power/rte_power_uncore.c +++ b/lib/power/rte_power_uncore.c @@ -8,6 +8,7 @@ #include #include +#include "power_common.h" #include "rte_power_uncore.h" #include "power_intel_uncore.h" From patchwork Tue Dec 5 02:09:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134838 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5E940433FD; Tue, 5 Dec 2023 03:14:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6670842DDA; Tue, 5 Dec 2023 03:14:02 +0100 (CET) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mails.dpdk.org (Postfix) with ESMTP id BB98E42DB4 for ; Tue, 5 Dec 2023 03:13:58 +0100 (CET) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5c210e34088so2998526a12.2 for ; Mon, 04 Dec 2023 18:13:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742438; x=1702347238; darn=dpdk.org; 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=XFAqgbXBDItUXMBdQTiGbn7htuTQpJ1CcCGdYzbnf1A=; b=bGJjRfKDacLrKVUPa7L0TFyvF9lgGLmX44veezF293iVMClMTu4kFNjv7nggQh3IiO 9Z/nUANBoXwzFmwyCkXzNHoypLswRntoWbxzfFKWzujDZY0fP0ObIH2PC67WqkUdGytA DSBHZBTr48exETR8sbma4Tjc1AQay/ipvq7J3gJePJoEnPscWw82gAYyYPgg8EssqnKe p4nigYFfTNFLLZN20gfqQVYAsdM7WI1w+vdNAfSFtPtsrjc85GTy2FQo6Np4tUPd/Vwd LnkkdzoD35infjKN1mjkql/kci7cywjbjwRsV2BSxyMRVgjIk+y+t0TetskBQNzGyRx5 /30Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742438; x=1702347238; 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=XFAqgbXBDItUXMBdQTiGbn7htuTQpJ1CcCGdYzbnf1A=; b=XRMqeWWex4GFf2LKoYJRDDnhqfc20ytA30hkX9kUVfGJTTODMagowroKVRtJ/pkQdi K4RKSj1iUQy0chMpp/u715jOhH/tC+QXWXU+KHcUaeT/bQhgoGtWCtZ/9F/lC60PAQKR UIshBbZTcQ7icbjqidsCPO0eBWbV9s+8Xq/NOfvQB4W2A6Yv2Hi/eWIbGdT4AYXOneDR hvPGtYUsQJ0ZyUmvX/GWsqKFbRFBEL3Fr/FaNGc9yiIv3k0om3yJfyp6gD41TWLVb8vN VdhOzjUEpdS5lrfQrcrfL2Dw4Uh/oDnBZgIoZbs4z9b0OyoZ6FjbvvHUZ//914l3xbND 5Nrg== X-Gm-Message-State: AOJu0YytiLVFzscXhU97z6o5NoecbRKRCNk5if3gh4iQ0LnXgcXlmGuG GqydBCe3ljsI4qE4gbJR2d5VkHHraAu4am+jBI4= X-Google-Smtp-Source: AGHT+IFAk8ZOwYj5espGiDoGjYNvEIMxd6hvQ2cfLCTLmAxmXqvoTLO+mCsKEdhG2pzKJnEyNf0OiQ== X-Received: by 2002:a05:6a20:9381:b0:18a:f317:1ee8 with SMTP id x1-20020a056a20938100b0018af3171ee8mr7444555pzh.16.1701742437913; Mon, 04 Dec 2023 18:13:57 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:57 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Honnappa Nagarahalli , Konstantin Ananyev Subject: [PATCH 10/18] ring: convert RTE_LOGTYPE_RING to dynamic type Date: Mon, 4 Dec 2023 18:09:48 -0800 Message-ID: <20231205021330.260017-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The logtype for ring only used in library. Signed-off-by: Stephen Hemminger --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/ring/rte_ring.c | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 70b3a0995e2e..f0ab92a3cb59 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,7 +352,6 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, - {RTE_LOGTYPE_RING, "lib.ring"}, {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 0cdff28e12d6..f7cb85c7ab28 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -28,7 +28,7 @@ extern "C" { /* SDK log type */ #define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */ /* was RTE_LOGTYPE_MALLOC */ -#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */ + /* was RTE_LOGTYPE_RING */ #define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */ /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index 057d25ff6f2f..12046419f194 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -26,6 +26,9 @@ #include "rte_ring.h" #include "rte_ring_elem.h" +RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO); +#define RTE_LOGTYPE_RING ring_logtype + TAILQ_HEAD(rte_ring_list, rte_tailq_entry); static struct rte_tailq_elem rte_ring_tailq = { From patchwork Tue Dec 5 02:09:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134839 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA4ED433FD; Tue, 5 Dec 2023 03:14:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F68F42D3F; Tue, 5 Dec 2023 03:14:03 +0100 (CET) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mails.dpdk.org (Postfix) with ESMTP id 6F58542D45 for ; Tue, 5 Dec 2023 03:13:59 +0100 (CET) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6cb74a527ceso3791328b3a.2 for ; Mon, 04 Dec 2023 18:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742438; x=1702347238; darn=dpdk.org; 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=ymTCsS1dYCxtLlLnq/jHUzQxlIdtbY1W9ASXm0XyTnA=; b=gxnHRYjYqAGNbsqR20f0ejgc1Eyt4t15SRKahRzuSGG+cKui8LXv4dc9l1nLTfv8ZE zynRhS9U6qDlGJfzmdK4JsgG07t3FboAYPPLMq5j/PEBwI492NoGV6q9ww+/sVY/rUQE kiycK6qV5NaPSLfk8hefB5/xVp+sAJ9Fy3LiKi5YA+AZOR6Jxu+RKZZP5M2cFx+QknAv BCdspnsowOhjbPOjnEab+XS421ApZszR1mDx67XcUEKOET+5hYe+fNjC1YaHVvEuJtZw SUaKFAz1cxvYilMCSPm+j1xtA/KRwHdNU51atNUUQQM5dpI1cX1ZIKpTDAifaQ3Ke/k0 EPPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742438; x=1702347238; 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=ymTCsS1dYCxtLlLnq/jHUzQxlIdtbY1W9ASXm0XyTnA=; b=r3kRljxijoMkAVRQM2NwTGAu7zCwvh4ciA2ECoBf7w6Lc3oRoNrWuNEgh4196mmdI7 ubCYfB3UKQX/WAX30kEVEWstRCbxl1Rtm1119eI/ivXGQENcnWJ6xNYDH4J7f9gJBzRh JzNEDUu0nopWK5k4R3OTRYGVv8pApzUC0cHxj607acbaLq0JwwLapaEY1BljKlZXsUsD /3yjhiKbBhcCxV7VX1vsJOrbQfib4k8p76UGBpjyC1aWaeTFPvMesV5qdhEYTggSyccq iYOrpOeB4HH5cQfMMY42U5FFriYUimJUHV5pxwRlVjIw0Lj78PMfsfF72DWo4p8OgjCF 34mg== X-Gm-Message-State: AOJu0Yz0AOHT9FG4/bgD2b5bDyyus4VLrDeqJqOZ30zkPMVzF6LuMbHf m4vBOKpgEoCvOdpbHOGPBO/sll67IP9sxf/UO2E= X-Google-Smtp-Source: AGHT+IGFpWK6sK0zVnEUY1HJNkrEbIpk+vp6T0mp2l2pl/1nfWVs8NhJ5C+Pusvyf+dNznzEuVyWow== X-Received: by 2002:a05:6a00:8006:b0:6ce:6e6c:cdc7 with SMTP id eg6-20020a056a00800600b006ce6e6ccdc7mr176650pfb.56.1701742438649; Mon, 04 Dec 2023 18:13:58 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:58 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko , =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Subject: [PATCH 11/18] mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type Date: Mon, 4 Dec 2023 18:09:49 -0800 Message-ID: <20231205021330.260017-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Convert from RTE_LOGTYPE_MEMPOOL to logtype_mempool. Signed-off-by: Stephen Hemminger --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/mempool/rte_mempool.c | 2 ++ lib/mempool/rte_mempool.h | 8 ++++++++ lib/mempool/version.map | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index f0ab92a3cb59..f118e4c7fbaa 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,7 +352,6 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, - {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index f7cb85c7ab28..b0421a35954d 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -29,7 +29,7 @@ extern "C" { #define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */ /* was RTE_LOGTYPE_MALLOC */ /* was RTE_LOGTYPE_RING */ -#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */ + /* was RTE_LOGTYPE_MEMPOOL */ /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index 7a7a9bf6db63..2f8adad5ca10 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -31,6 +31,8 @@ #include "mempool_trace.h" #include "rte_mempool.h" +RTE_LOG_REGISTER_DEFAULT(rte_mempool_logtype, INFO); + TAILQ_HEAD(rte_mempool_list, rte_tailq_entry); static struct rte_tailq_elem rte_mempool_tailq = { diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 95deade160c0..c6109732dfcf 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -176,6 +177,13 @@ struct rte_mempool_objtlr { #endif + +/** + * @internal Logtype used for mempool related messages. + */ +extern int rte_mempool_logtype; +#define RTE_LOGTYPE_MEMPOOL rte_mempool_logtype + /** * A list of memory where objects are stored */ diff --git a/lib/mempool/version.map b/lib/mempool/version.map index d0bfedd1d875..ca6cf89ce3ea 100644 --- a/lib/mempool/version.map +++ b/lib/mempool/version.map @@ -57,4 +57,7 @@ INTERNAL { # added in 21.11 rte_mempool_event_callback_register; rte_mempool_event_callback_unregister; + + # added in 23.07 + rte_mempool_logtype; }; From patchwork Tue Dec 5 02:09:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134840 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36123433FD; Tue, 5 Dec 2023 03:15:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E55CB42DD1; Tue, 5 Dec 2023 03:14:04 +0100 (CET) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by mails.dpdk.org (Postfix) with ESMTP id 09C8342D45 for ; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3b845ba9ba9so3213650b6e.3 for ; Mon, 04 Dec 2023 18:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742439; x=1702347239; darn=dpdk.org; 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=4/myHYbjXFiJxl7OvS6hCJ2kjzFHmGbdNlLVvZOdq3I=; b=kfzmwZBFkcMBSeiAK5yWY9uFiIg7RCDlyoDzkHX2+lnYV7bLG5QXSPqCdqAknXKezk QILPM59f9wtcN87Pyf2hU4wz5Q1Vh/AvvwCnEGXPTj5WsGtT8sDMTTDfiaZMLEV6k3Y+ 3ORpie0tJEWZN0dvjGSYW3qI9qlWzOefBNx6kS6IOZfxlkXKCuoprUpXAo2QkYvhZb0W 5bOjhUPdCvqIcSx8FuyHMpnca74OWswj0hPw9DSfWhO7Ozvpn8RzxFRQahH7DJ+3jLwy XP6g0YxzjbAfS44csYPIwnHRqxr8zmk2129q2ShbHxDudCVEcjHQi5hciB3YEBlbbBu+ 2ydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742439; x=1702347239; 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=4/myHYbjXFiJxl7OvS6hCJ2kjzFHmGbdNlLVvZOdq3I=; b=EEYJ/BRPB9V0qJR7u2pwmrq6IBjimIUd/ljPgJtXdeXigC6mdQA+jvPNCtfnHOXA8Q YYxFE7mFOpnMwrP/37jaqpz8X53qIsPJ0vXTNQNvVAXbIuuQ7AQY7ELn+aVS2bZ7g2EG wHZ8AoSiZqsXZAbugL91PKjHOqbZBxWdws733ROKojc1RYBNT4xcqp/BUxCCn3eP/Mpk 2TSPlPqOHGTI3KxzaD6OmInuef32UXbsBtug9ovx7fFFBmTr5VE3bWU1NGD5HHEQLgxp bIiPSMY+yh1SCdgy6JmD70hlgkkiEp510k4yQ9ZY7i8xBlFBOTfV8ZulU0w4Pr2704+R SWjQ== X-Gm-Message-State: AOJu0Yx5O9fLaVa5nsZXoqd2ZeLCbZdk8+oD1mJVINTPlnTKaFEPRxS+ A4KG1XgLlegesJ/BbS1jMUIkqYE7N3uaQ3pbono= X-Google-Smtp-Source: AGHT+IFEhPacEGY0WXqjQNSeVljlgu+asurG0IqvRwOBN7ihVuBUhCNUITuI0orex5pl9gUo/31hbA== X-Received: by 2002:a05:6808:200d:b0:3b8:b2f1:8b44 with SMTP id q13-20020a056808200d00b003b8b2f18b44mr5652358oiw.71.1701742439436; Mon, 04 Dec 2023 18:13:59 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Vladimir Medvedkin , Bruce Richardson Subject: [PATCH 12/18] lpm: convert RTE_LOGTYPE_LPM to dynamic types Date: Mon, 4 Dec 2023 18:09:50 -0800 Message-ID: <20231205021330.260017-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Split lpm and lpm6 into separate log types since they are in different files and user may want to change log levels for IPv4 vs IPv6. For rib and fib libraries give them own types as well. Signed-off-by: Stephen Hemminger --- lib/fib/fib_log.h | 4 ++++ lib/fib/rte_fib.c | 3 +++ lib/fib/rte_fib6.c | 2 ++ lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/lpm/lpm_log.h | 4 ++++ lib/lpm/rte_lpm.c | 3 +++ lib/lpm/rte_lpm6.c | 1 + lib/rib/rib_log.h | 4 ++++ lib/rib/rte_rib.c | 3 +++ lib/rib/rte_rib6.c | 3 +++ 11 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 lib/fib/fib_log.h create mode 100644 lib/lpm/lpm_log.h create mode 100644 lib/rib/rib_log.h diff --git a/lib/fib/fib_log.h b/lib/fib/fib_log.h new file mode 100644 index 000000000000..c731c820f621 --- /dev/null +++ b/lib/fib/fib_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int fib_logtype; +#define RTE_LOGTYPE_LPM fib_logtype diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c index 0c3b20e00a5a..f88e71a59d5a 100644 --- a/lib/fib/rte_fib.c +++ b/lib/fib/rte_fib.c @@ -17,6 +17,9 @@ #include #include "dir24_8.h" +#include "fib_log.h" + +RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO); TAILQ_HEAD(rte_fib_list, rte_tailq_entry); static struct rte_tailq_elem rte_fib_tailq = { diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c index 28c69b38999f..ab1d9604796f 100644 --- a/lib/fib/rte_fib6.c +++ b/lib/fib/rte_fib6.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -17,6 +18,7 @@ #include #include "trie.h" +#include "fib_log.h" TAILQ_HEAD(rte_fib6_list, rte_tailq_entry); static struct rte_tailq_elem rte_fib6_tailq = { diff --git a/lib/log/log.c b/lib/log/log.c index f118e4c7fbaa..95e0ba1c6b51 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -354,7 +354,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, - {RTE_LOGTYPE_LPM, "lib.lpm"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index b0421a35954d..8d34ac902b39 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -33,7 +33,7 @@ extern "C" { /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ -#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ + /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ /* was RTE_LOGTYPE_POWER */ diff --git a/lib/lpm/lpm_log.h b/lib/lpm/lpm_log.h new file mode 100644 index 000000000000..a0621b70a5fe --- /dev/null +++ b/lib/lpm/lpm_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int lpm_logtype; +#define RTE_LOGTYPE_LPM lpm_logtype diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c index cdcd1b7f9e47..0ca82147866a 100644 --- a/lib/lpm/rte_lpm.c +++ b/lib/lpm/rte_lpm.c @@ -18,6 +18,9 @@ #include #include "rte_lpm.h" +#include "lpm_log.h" + +RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO); TAILQ_HEAD(rte_lpm_list, rte_tailq_entry); diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c index 8d21aeddb83c..873cc8bc267d 100644 --- a/lib/lpm/rte_lpm6.c +++ b/lib/lpm/rte_lpm6.c @@ -20,6 +20,7 @@ #include #include "rte_lpm6.h" +#include "lpm_log.h" #define RTE_LPM6_TBL24_NUM_ENTRIES (1 << 24) #define RTE_LPM6_TBL8_GROUP_NUM_ENTRIES 256 diff --git a/lib/rib/rib_log.h b/lib/rib/rib_log.h new file mode 100644 index 000000000000..f3ee513ca854 --- /dev/null +++ b/lib/rib/rib_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int rib_logtype; +#define RTE_LOGTYPE_LPM rib_logtype diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c index 486e8216dfeb..251d0d4ef19e 100644 --- a/lib/rib/rte_rib.c +++ b/lib/rib/rte_rib.c @@ -16,6 +16,9 @@ #include +RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO); +#define RTE_LOGTYPE_LPM rib_logtype + TAILQ_HEAD(rte_rib_list, rte_tailq_entry); static struct rte_tailq_elem rte_rib_tailq = { .name = "RTE_RIB", diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c index 94ff434978b2..ad3d48ab8e1a 100644 --- a/lib/rib/rte_rib6.c +++ b/lib/rib/rte_rib6.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -16,6 +17,8 @@ #include +#include "rib_log.h" + #define RTE_RIB_VALID_NODE 1 #define RIB6_MAXDEPTH 128 /* Maximum length of a RIB6 name. */ From patchwork Tue Dec 5 02:09:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134841 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D024433FD; Tue, 5 Dec 2023 03:15:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A27F42DE2; Tue, 5 Dec 2023 03:14:06 +0100 (CET) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by mails.dpdk.org (Postfix) with ESMTP id B757B42DC9 for ; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3b844e3e817so2890200b6e.0 for ; Mon, 04 Dec 2023 18:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742440; x=1702347240; darn=dpdk.org; 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=BTcAiREUy8P9cMnej7TK5Visaj8wZSzk7HjwDnP2Zkc=; b=CEboHLjFsrTFLGdP6Zf+jphLiRziPaha+80PKzRDvo0xiB19ejjZmXp7qwGQbcM6bF B1+banvva+veluWYqHeFamy28kVugxyxfHVm8xg7LIHZoAo7A7V3Kh3fq4RXw2shZcCd s7+M/rl/uvScpVvILiwx+n4KXcKajHTr3zFm5FZyEV9QC4QWMcB/uw7dsk/Zyluut++z KoqySvS6gw3zY6d08VDqZ1Lk3RlXqHIb3Cfqitbw7ILzKYcmBw+MP/a3RimDqWpvQpZl 9kvTp5tsCgccXescwqKtGSKd9sJIbCE1sOld6QyMVsG0IHqE9f3uyGdAq0p/22KLh+5Z 1VJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742440; x=1702347240; 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=BTcAiREUy8P9cMnej7TK5Visaj8wZSzk7HjwDnP2Zkc=; b=tA5ptnAyucEOKzzRjWxq0qw+tzo6SLFwkGaR8L+yprrRqvnsDi3ygTH2jujOjkXx/6 NMrXBtZ+NHcqaQ4QpywLOChq2vbUiYHLQZZPt+ylw1juwhYRONqaJJ6lnYFh/ilAy3Pw 9W5SZzkfdLuTGhw6seAwoIVqg8ICDi+xn75CpJYxjLV5pjpMc+1ru8dByr4H3ExPYKzS BebUtMv4e3Ppo1sK0If+XS+yJKcwlPCTPkBTk/M4QHJ16se+324nv9TLdAtoPAjx2XzL W6PP79qFrKywokE29162k0b0JEHUj/LsZYTg+JYB88ACAi4b5sg0VCpVDqo7LKrwl38p RwNg== X-Gm-Message-State: AOJu0YzmVfuMAQmLbyiJpc7+mRfYAAXlw44iPK9dcml11MRYsInCE7X3 /Jjus7HJqUvvJcHjiTuDZoAUh6pwsVeE2X6d+bY= X-Google-Smtp-Source: AGHT+IHUZEXQzrw3lbmtcuYR2/LXVk90C4QN4x60GaUYaK3FrAclA6+jh4vGWe6cjfORuip7Ofb8YA== X-Received: by 2002:a05:6808:1795:b0:3b8:b2c0:e317 with SMTP id bg21-20020a056808179500b003b8b2c0e317mr5674130oib.77.1701742440166; Mon, 04 Dec 2023 18:14:00 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 13/18] sched: convert RTE_LOGTYPE_SCHED to dynamic type Date: Mon, 4 Dec 2023 18:09:51 -0800 Message-ID: <20231205021330.260017-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Also can remove unused RTE_LOGTYPE_METER Signed-off-by: Stephen Hemminger --- lib/log/log.c | 2 -- lib/log/rte_log.h | 4 ++-- lib/sched/rte_pie.c | 1 + lib/sched/rte_sched.c | 5 +++++ lib/sched/rte_sched_log.h | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 lib/sched/rte_sched_log.h diff --git a/lib/log/log.c b/lib/log/log.c index 95e0ba1c6b51..56877d42e6b9 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -354,8 +354,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, - {RTE_LOGTYPE_METER, "lib.meter"}, - {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 8d34ac902b39..189ad2bbd2cf 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -37,8 +37,8 @@ extern "C" { /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ /* was RTE_LOGTYPE_POWER */ -#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ -#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ + /* was RTE_LOGTYPE_METER */ + /* was RTE_LOGTYPE_SCHED */ #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */ #define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */ diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c index 947e2a059f6f..cce0ce762da8 100644 --- a/lib/sched/rte_pie.c +++ b/lib/sched/rte_pie.c @@ -6,6 +6,7 @@ #include #include +#include "rte_sched_log.h" #include "rte_pie.h" #ifdef __INTEL_COMPILER diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c index 1a6beb14f4ab..76dd8dd7388c 100644 --- a/lib/sched/rte_sched.c +++ b/lib/sched/rte_sched.c @@ -16,9 +16,12 @@ #include #include "rte_sched.h" +#include "rte_sched_log.h" #include "rte_sched_common.h" + #include "rte_approx.h" + #ifdef __INTEL_COMPILER #pragma warning(disable:2259) /* conversion may lose significant bits */ #endif @@ -2999,3 +3002,5 @@ rte_sched_port_dequeue(struct rte_sched_port *port, struct rte_mbuf **pkts, uint return count; } + +RTE_LOG_REGISTER_DEFAULT(sched_logtype, INFO); diff --git a/lib/sched/rte_sched_log.h b/lib/sched/rte_sched_log.h new file mode 100644 index 000000000000..fde051f49d62 --- /dev/null +++ b/lib/sched/rte_sched_log.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +extern int sched_logtype; +#define RTE_LOGTYPE_SCHED sched_logtype From patchwork Tue Dec 5 02:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134842 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4944C433FD; Tue, 5 Dec 2023 03:15:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3228042DEE; Tue, 5 Dec 2023 03:14:07 +0100 (CET) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by mails.dpdk.org (Postfix) with ESMTP id 8D26442DCE for ; Tue, 5 Dec 2023 03:14:01 +0100 (CET) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3b8b6acc3e7so1408542b6e.1 for ; Mon, 04 Dec 2023 18:14:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742441; x=1702347241; darn=dpdk.org; 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=qFaMnJXQij33jz47oMwRM0yVIwx6CJNiqZDwzlQioIo=; b=RT+0LduSJBGUmjOQWHBJcOcjwuubTtR95cm1oJ5M+SLrTesMTVLGAYGl2Qvy7Lxylh dQvS9r/zcofXJtzv4cIC24PiR0coaVtV40QO+jfBNOhlPYTkFeixR3sc2/G2O5BNoxQZ 5hGZJemAWkNkQa9ZPNrMOpgG8zG7+BHUKJtND4SlKgbVdgn76opK5RvE7yR11+MNiagu QsgkVJJOJ6hHKrx7VwGBCwsN8sGxQFsOcINcVgS0ZikHR0Nn4sNoy5EjYL3r2jbJd0pe O5Qft/89dHywp/eoPhwQlnbQajwqaktR5c8qoVxlZVgbasrVO05OfYmCubcHmjmvJh5G Oh/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742441; x=1702347241; 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=qFaMnJXQij33jz47oMwRM0yVIwx6CJNiqZDwzlQioIo=; b=vBXzXCl+tE7m0qMRwt9YhbSz53aDTd/6Lx6/kPn+QxnYRAPCBF3XJeYdqWaoy4e50i b4xr7p3ic95EbL40k4MSQxIFoSdP51Iw+zoCxhmW2/o2gv2dq57+LcWFgnDKyKaG4rkj kaYzySw7yit2BzCKhEbzfjDTMj9I33cFJSWFdXqFmwiiCfDTUGLohXIx8/8dmIG0Vxse Mkj773FnS4eYgGYvNzaOrRtQq/p6F6JXpPMmUXVmbAKZ6w6cML8IUMirDoeCjKUBgLiN Q9Gyynr9Lf9xhwcah4QiIwlTUt1mi/orIqGoFK/Qh5RX1VlLBOrR+K5Xn7oyML5aujbg zNXw== X-Gm-Message-State: AOJu0YwWSxvYqB4U87pYt8XJa5YfcDWam73TyTTPCGpjs15fmXxI85yC 941GWnI5waoX7kHsnTNQ0J5JeomNJt+owDtP1iM= X-Google-Smtp-Source: AGHT+IE8d7EHHF7pKiwcTDjNgGw/IfzTcN+qVpnV4BzvV2LVLmrLP2UfRmuBn3ak1kOSYJeFGcOa/Q== X-Received: by 2002:a05:6808:1817:b0:3b8:b063:5d5e with SMTP id bh23-20020a056808181700b003b8b0635d5emr6162316oib.69.1701742440945; Mon, 04 Dec 2023 18:14:00 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:14:00 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Radu Nicolau , Aviad Yehezkel , Boris Pismenny , Declan Doherty Subject: [PATCH 14/18] examples/ipsec-secgw: replace RTE_LOGTYPE_PORT Date: Mon, 4 Dec 2023 18:09:52 -0800 Message-ID: <20231205021330.260017-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Looks like some code got copy/paste in to the IPSEC gateway example from another place. Shouldn't be using RTE_LOGTYPE_PORT here. Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload") Acked-by: Akhil Goyal Signed-off-by: Stephen Hemminger --- examples/ipsec-secgw/sa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index 6ae0e49fd7f8..c4bac17cd77c 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -1128,7 +1128,7 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, uint32_t tso) if (inbound) { if ((dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_SECURITY) == 0) { - RTE_LOG(WARNING, PORT, + RTE_LOG(WARNING, IPSEC, "hardware RX IPSec offload is not supported\n"); return -EINVAL; } @@ -1136,13 +1136,13 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, uint32_t tso) } else { /* outbound */ if ((dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_SECURITY) == 0) { - RTE_LOG(WARNING, PORT, + RTE_LOG(WARNING, IPSEC, "hardware TX IPSec offload is not supported\n"); return -EINVAL; } if (tso && (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) { - RTE_LOG(WARNING, PORT, + RTE_LOG(WARNING, IPSEC, "hardware TCP TSO offload is not supported\n"); return -EINVAL; } From patchwork Tue Dec 5 02:09:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134843 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 296C6433FD; Tue, 5 Dec 2023 03:15:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB49242DF7; Tue, 5 Dec 2023 03:14:08 +0100 (CET) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by mails.dpdk.org (Postfix) with ESMTP id 48C3542DD5 for ; Tue, 5 Dec 2023 03:14:02 +0100 (CET) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6d8d28e4bbeso1486801a34.3 for ; Mon, 04 Dec 2023 18:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742441; x=1702347241; darn=dpdk.org; 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=hYcT8YKOszbDAQrvrqd/DAHFO4H7Q9pEsE7IwWdsc6g=; b=17HwtPmGxnrjchpwaQU1z7VemeMxHUSqbnLQn1Sal7pvjTdZSqxnYE5/xyfUX5MqOK LiKI983WajmywgsJfSRgjLqnUYK/WqAwmEgcwnwUWV4jSUIIWMfvojeVX67ATfvIHLF1 KhNkoeaRIUHhfVqVkM6OyyS76ys3ZoVHWkK9Db1ei8JPNob0+WLXbsmpzT6gcV1BF9zD 3H8JDHlGqA4LVk7uM8IV1Pl2IpAFy+H/N5RAwo1AAiu2pdME0NNJs3bhc4mRMDPMS2D5 Jl6NFNB63KfiQB4F6fQiiaojL0k/4qP8tTWEXw6fAwdL5i1lYzZub0bd68m35jdIxQuM TG+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742441; x=1702347241; 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=hYcT8YKOszbDAQrvrqd/DAHFO4H7Q9pEsE7IwWdsc6g=; b=omihpIzsHHOVGMy28i+z06uNV+uJNDmZz5AL03sOFLc8hnNGAUHa3zZjprJzDMsKop xxnvIaU2lbvl46EvotumFXWYWwevTq1K6P1xTnkBjmUPPxk9EOAsR/232GvURuVpQiBa YltkvumnI4drjqgAOwVKxDzXSkY6UViehBH06NzOgBW5SVKotdX6l6mrVn0jmCkCJqEi 2BR7ob+kQvfiCtkOZ7AkshPtTRCz/0o0oCxoeIMNI6kLwlIjk8d1TX90YdOOJj/XEPvy K8mz6tfQjmW7eZLhx14r5MTu4niXxA5fu/MonswsVUSptAFVcoRVVkhbaiqrQNqTDFLD skAw== X-Gm-Message-State: AOJu0Yy/2Ti3my7fpvqoV5shvjP6GqM2hBJGhxO/9CW6BB5dU//UeLl7 bI5RxTqxdoqwz4IDJV9csXX2ELO595DXDMEMhyA= X-Google-Smtp-Source: AGHT+IGd03IXuUZ7YlnpvqNmV0KWEu7y1QeHJc6S+eH1kE+SGONe0s5F2zY4pWvHareEzUwvW90uNQ== X-Received: by 2002:a05:6830:1e2f:b0:6d9:a4bf:4e81 with SMTP id t15-20020a0568301e2f00b006d9a4bf4e81mr2161554otr.3.1701742441664; Mon, 04 Dec 2023 18:14:01 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:14:01 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 15/18] app/test: remove use of RTE_LOGTYPE_PIPELINE Date: Mon, 4 Dec 2023 18:09:53 -0800 Message-ID: <20231205021330.260017-16-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Instead of using static type PIPELINE for logging in test application use stderr instead. If not testing RTE_LOG() better to not use it since log also goes to syslog. Signed-off-by: Stephen Hemminger --- app/test/test_table_acl.c | 50 ++++++++++++++++------------------ app/test/test_table_pipeline.c | 40 +++++++++++++-------------- 2 files changed, 43 insertions(+), 47 deletions(-) diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c index e66f06b84d0a..dff9bddfb948 100644 --- a/app/test/test_table_acl.c +++ b/app/test/test_table_acl.c @@ -165,7 +165,7 @@ parse_cb_ipv4_rule(char *str, struct rte_table_acl_rule_add_params *v) &v->field_value[SRC_FIELD_IPV4].value.u32, &v->field_value[SRC_FIELD_IPV4].mask_range.u32); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n", + fprintf(stderr, "failed to read src address/mask: %s\n", in[CB_FLD_SRC_ADDR]); return rc; } @@ -178,7 +178,7 @@ parse_cb_ipv4_rule(char *str, struct rte_table_acl_rule_add_params *v) &v->field_value[DST_FIELD_IPV4].value.u32, &v->field_value[DST_FIELD_IPV4].mask_range.u32); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n", + fprintf(stderr, "failed to read dest address/mask: %s\n", in[CB_FLD_DST_ADDR]); return rc; } @@ -190,7 +190,7 @@ parse_cb_ipv4_rule(char *str, struct rte_table_acl_rule_add_params *v) &v->field_value[SRCP_FIELD_IPV4].value.u16, &v->field_value[SRCP_FIELD_IPV4].mask_range.u16); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n", + fprintf(stderr, "failed to read source port range: %s\n", in[CB_FLD_SRC_PORT_RANGE]); return rc; } @@ -202,7 +202,7 @@ parse_cb_ipv4_rule(char *str, struct rte_table_acl_rule_add_params *v) &v->field_value[DSTP_FIELD_IPV4].value.u16, &v->field_value[DSTP_FIELD_IPV4].mask_range.u16); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n", + fprintf(stderr, "failed to read dest port range: %s\n", in[CB_FLD_DST_PORT_RANGE]); return rc; } @@ -254,7 +254,7 @@ parse_cb_ipv4_rule_del(char *str, struct rte_table_acl_rule_delete_params *v) &v->field_value[SRC_FIELD_IPV4].value.u32, &v->field_value[SRC_FIELD_IPV4].mask_range.u32); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n", + fprintf(stderr, "failed to read src address/mask: %s\n", in[CB_FLD_SRC_ADDR]); return rc; } @@ -267,7 +267,7 @@ parse_cb_ipv4_rule_del(char *str, struct rte_table_acl_rule_delete_params *v) &v->field_value[DST_FIELD_IPV4].value.u32, &v->field_value[DST_FIELD_IPV4].mask_range.u32); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n", + fprintf(stderr, "failed to read dest address/mask: %s\n", in[CB_FLD_DST_ADDR]); return rc; } @@ -279,7 +279,7 @@ parse_cb_ipv4_rule_del(char *str, struct rte_table_acl_rule_delete_params *v) &v->field_value[SRCP_FIELD_IPV4].value.u16, &v->field_value[SRCP_FIELD_IPV4].mask_range.u16); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n", + fprintf(stderr, "failed to read source port range: %s\n", in[CB_FLD_SRC_PORT_RANGE]); return rc; } @@ -291,7 +291,7 @@ parse_cb_ipv4_rule_del(char *str, struct rte_table_acl_rule_delete_params *v) &v->field_value[DSTP_FIELD_IPV4].value.u16, &v->field_value[DSTP_FIELD_IPV4].mask_range.u16); if (rc != 0) { - RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n", + fprintf(stderr, "failed to read dest port range: %s\n", in[CB_FLD_DST_PORT_RANGE]); return rc; } @@ -346,7 +346,7 @@ setup_acl_pipeline(void) /* Pipeline configuration */ p = rte_pipeline_create(&pipeline_params); if (p == NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n", + fprintf(stderr, "%s: Failed to configure pipeline\n", __func__); goto fail; } @@ -410,7 +410,7 @@ setup_acl_pipeline(void) table_params.f_action_miss = NULL; table_params.action_data_size = 0; - RTE_LOG(INFO, PIPELINE, "miss_action=%x\n", + printf("miss_action=%x\n", table_entry_miss_action); printf("RTE_ACL_RULE_SZ(%zu) = %zu\n", DIM(ipv4_defs), @@ -471,9 +471,8 @@ setup_acl_pipeline(void) ret = parser(line, &keys[n]); if (ret != 0) { - RTE_LOG(ERR, PIPELINE, - "line %u: parse_cb_ipv4vlan_rule" - " failed, error code: %d (%s)\n", + fprintf(stderr, + "line %u: parse_cb_ipv4vlan_rule failed, error code: %d (%s)\n", n, ret, strerror(-ret)); return ret; } @@ -513,9 +512,8 @@ setup_acl_pipeline(void) ret = parse_cb_ipv4_rule_del(line, &keys[n]); if (ret != 0) { - RTE_LOG(ERR, PIPELINE, - "line %u: parse_cb_ipv4vlan_rule" - " failed, error code: %d (%s)\n", + fprintf(stderr, + "line %u: parse_cb_ipv4vlan_rule failed, error code: %d (%s)\n", n, ret, strerror(-ret)); return ret; } @@ -549,9 +547,8 @@ setup_acl_pipeline(void) ret = parser(line, &rule_params); if (ret != 0) { - RTE_LOG(ERR, PIPELINE, - "line %u: parse_cb_ipv4vlan_rule" - " failed, error code: %d (%s)\n", + fprintf(stderr, + "line %u: parse_cb_ipv4vlan_rule failed, error code: %d (%s)\n", n, ret, strerror(-ret)); return ret; } @@ -575,8 +572,8 @@ setup_acl_pipeline(void) ret = parser(line, &rule_params); if (ret != 0) { - RTE_LOG(ERR, PIPELINE, "line %u: parse rule " - " failed, error code: %d (%s)\n", + fprintf(stderr, + "line %u: parse rule failed, error code: %d (%s)\n", n, ret, strerror(-ret)); return ret; } @@ -602,8 +599,8 @@ setup_acl_pipeline(void) ret = parser(line, &rule_params); if (ret != 0) { - RTE_LOG(ERR, PIPELINE, "line %u: parse rule" - " failed, error code: %d (%s)\n", + fprintf(stderr, + "line %u: parse rule failed, error code: %d (%s)\n", n, ret, strerror(-ret)); return ret; } @@ -667,7 +664,7 @@ test_pipeline_single_filter(int expected_count) memcpy(rte_pktmbuf_mtod(mbuf, char *), &five_tuple, sizeof(struct ipv4_5tuple)); - RTE_LOG(INFO, PIPELINE, "%s: Enqueue onto ring %d\n", + printf("%s: Enqueue onto ring %d\n", __func__, i); rte_ring_enqueue(rings_rx[i], mbuf); } @@ -702,9 +699,8 @@ test_pipeline_single_filter(int expected_count) } if (tx_count != expected_count) { - RTE_LOG(INFO, PIPELINE, - "%s: Unexpected packets for ACL test, " - "expected %d, got %d\n", + fprintf(stderr, + "%s: Unexpected packets for ACL test, expected %d, got %d\n", __func__, expected_count, tx_count); goto fail; } diff --git a/app/test/test_table_pipeline.c b/app/test/test_table_pipeline.c index 7adbbffbf55d..960f730cf20d 100644 --- a/app/test/test_table_pipeline.c +++ b/app/test/test_table_pipeline.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include "test_table.h" @@ -173,30 +172,31 @@ check_pipeline_invalid_params(void) p = rte_pipeline_create(NULL); if (p != NULL) { - RTE_LOG(INFO, PIPELINE, + fprintf(stderr, "%s: configured pipeline with null params\n", __func__); goto fail; } p = rte_pipeline_create(&pipeline_params_1); if (p != NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with NULL " - "name\n", __func__); + fprintf(stderr, + "%s: Configure pipeline with NULL name\n", __func__); goto fail; } p = rte_pipeline_create(&pipeline_params_2); if (p != NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with invalid " - "socket\n", __func__); + fprintf(stderr, + "%s: Configure pipeline with invalid socket\n", __func__); goto fail; } if (rte_eal_has_hugepages()) { p = rte_pipeline_create(&pipeline_params_3); if (p != NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with " - "invalid socket\n", __func__); + fprintf(stderr, + "%s: Configure pipeline with invalid socket\n", + __func__); goto fail; } } @@ -224,20 +224,20 @@ setup_pipeline(int test_type) .socket_id = 0, }; - RTE_LOG(INFO, PIPELINE, "%s: **** Setting up %s test\n", + fprintf(stderr, "%s: **** Setting up %s test\n", __func__, pipeline_test_names[test_type]); /* Pipeline configuration */ p = rte_pipeline_create(&pipeline_params); if (p == NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n", + fprintf(stderr, "%s: Failed to configure pipeline\n", __func__); goto fail; } ret = rte_pipeline_free(p); if (ret != 0) { - RTE_LOG(INFO, PIPELINE, "%s: Failed to free pipeline\n", + fprintf(stderr, "%s: Failed to free pipeline\n", __func__); goto fail; } @@ -245,7 +245,7 @@ setup_pipeline(int test_type) /* Pipeline configuration */ p = rte_pipeline_create(&pipeline_params); if (p == NULL) { - RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n", + fprintf(stderr, "%s: Failed to configure pipeline\n", __func__); goto fail; } @@ -411,7 +411,7 @@ test_pipeline_single_filter(int test_type, int expected_count) int ret; int tx_count; - RTE_LOG(INFO, PIPELINE, "%s: **** Running %s test\n", + fprintf(stderr, "%s: **** Running %s test\n", __func__, pipeline_test_names[test_type]); /* Run pipeline once */ for (i = 0; i < N_PORTS; i++) @@ -420,7 +420,7 @@ test_pipeline_single_filter(int test_type, int expected_count) ret = rte_pipeline_flush(NULL); if (ret != -EINVAL) { - RTE_LOG(INFO, PIPELINE, + fprintf(stderr, "%s: No pipeline flush error NULL pipeline (%d)\n", __func__, ret); goto fail; @@ -445,7 +445,7 @@ test_pipeline_single_filter(int test_type, int expected_count) k32 = (uint32_t *) key; k32[0] = 0xadadadad >> (j % 2); - RTE_LOG(INFO, PIPELINE, "%s: Enqueue onto ring %d\n", + fprintf(stderr, "%s: Enqueue onto ring %d\n", __func__, i); rte_ring_enqueue(rings_rx[i], m); } @@ -487,9 +487,9 @@ test_pipeline_single_filter(int test_type, int expected_count) } if (tx_count != expected_count) { - RTE_LOG(INFO, PIPELINE, - "%s: Unexpected packets out for %s test, expected %d, " - "got %d\n", __func__, pipeline_test_names[test_type], + fprintf(stderr, + "%s: Unexpected packets out for %s test, expected %d, got %d\n", + __func__, pipeline_test_names[test_type], expected_count, tx_count); goto fail; } @@ -564,8 +564,8 @@ test_table_pipeline(void) connect_miss_action_to_table = 0; if (check_pipeline_invalid_params()) { - RTE_LOG(INFO, PIPELINE, "%s: Check pipeline invalid params " - "failed.\n", __func__); + fprintf(stderr, "%s: Check pipeline invalid params failed.\n", + __func__); return -1; } From patchwork Tue Dec 5 02:09:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134844 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81110433FD; Tue, 5 Dec 2023 03:15:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD7BC42DFB; Tue, 5 Dec 2023 03:14:09 +0100 (CET) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 300F342D76 for ; Tue, 5 Dec 2023 03:14:03 +0100 (CET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6cddc148285so5469760b3a.2 for ; Mon, 04 Dec 2023 18:14:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742442; x=1702347242; darn=dpdk.org; 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=PWR1K6YSlC9gkEptbTI1aqv1RWOFNkD8axBDPil4M6U=; b=HaprV6llGkKT2u8ph7dhpo0lMOucaoo5Ys4T3wS2yxeftYXJiVkXyUgBzMXBTZPRB3 VVUiPRVkWwXaotke+0DUezV6Pr/HgO0vEKWzcC2ReRkUajw1pFR/kLe2SesOwqdGh7+i nvMOvJXoHI8YuJR4suufMWp0RvLNNobtkYH9ybAreBB9MLAJCT27yBhMwuBYTiJia7Vc UMyeg5zqa5zadL30v3GHPVyUNPMO4n5SPn2E/31hIO462xy0ndmSeHv06h1UF0y9WoCx rVSe4Z8ShcBMGbuzkheQT/UzkqQrA+nhDRAnb63iDMBw9YTDhJ4fhwmwtyozvgLeHMmI xjVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742442; x=1702347242; 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=PWR1K6YSlC9gkEptbTI1aqv1RWOFNkD8axBDPil4M6U=; b=HnU9dgg6RsiWkjJh+d0aI9A8xRJaU2EV3c5hHqYXpL6OWKB4a3Sdm6UhaRDToXsUDN lLd3FX7uybtM1SwY56QSE0kmRcEA8DpBHDo9DZ0P42itW0G/A9jU8Qk0uvPkvucHTuHa 4teesDaU2mUcvQiIs0q3bCqjzLsvpQtM1ZWvMyQg/QCDF0OgNCvbhUak5MgE30yunejO glra34u/+OIg551nyvVRQjmvmHvUFYNApo5g2X+Hs+WyBDjLHFxR3kKm6PDUTlYvcI+h j93NigEQaBtu6AAj5tKVeoXZcSLINsOatmh45H/Iosl+UMopdm4hj3FOL9p0p05Fr9Y3 aF8w== X-Gm-Message-State: AOJu0YzVlTf/alwcVae+rHtcv3qJ3NREjiAY4OaCBrB1lUnLxsoNCQ+c 65h3nFBQWTzTdQx4zqh3sRM0bk7e7qyWALZ/I6Q= X-Google-Smtp-Source: AGHT+IGjMWZu8DM1eBdL/+WFDr6ER9xbv1NljcsDztgXUzIXg2/zlmfcESsV8cyUM5tncTcK6gVdxQ== X-Received: by 2002:a05:6a20:e595:b0:18f:97c:8a3b with SMTP id ng21-20020a056a20e59500b0018f097c8a3bmr5193525pzb.102.1701742442399; Mon, 04 Dec 2023 18:14:02 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:14:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH 16/18] hash: mover rte_thash_gfni stubs out of header file Date: Mon, 4 Dec 2023 18:09:54 -0800 Message-ID: <20231205021330.260017-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Having stubs in header file makes it harder to update RTE_LOG(). Also modify to only print warning once. Signed-off-by: Stephen Hemminger --- lib/hash/meson.build | 8 ++++++- lib/hash/rte_thash_gfni.c | 47 +++++++++++++++++++++++++++++++++++++++ lib/hash/rte_thash_gfni.h | 23 +++++-------------- lib/hash/version.map | 2 ++ 4 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 lib/hash/rte_thash_gfni.c diff --git a/lib/hash/meson.build b/lib/hash/meson.build index 2f757d45f9bc..e56ee8572564 100644 --- a/lib/hash/meson.build +++ b/lib/hash/meson.build @@ -17,7 +17,13 @@ indirect_headers += files( 'rte_thash_x86_gfni.h', ) -sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c') +sources = files( + 'rte_cuckoo_hash.c', + 'rte_fbk_hash.c', + 'rte_thash.c', + 'rte_thash_gfni.c' +) + deps += ['net'] deps += ['ring'] deps += ['rcu'] diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c new file mode 100644 index 000000000000..eb334185725c --- /dev/null +++ b/lib/hash/rte_thash_gfni.c @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2021 Intel Corporation + */ + +#include + +#include +#include +#include + +#ifndef RTE_THASH_GFNI_DEFINED + +uint32_t +rte_thash_gfni(const uint64_t *mtrx __rte_unused, + const uint8_t *key __rte_unused, int len __rte_unused) +{ + static bool warned; + + if (!warned) { + warned = true; + RTE_LOG(ERR, HASH, + "%s is undefined under given arch\n", __func__); + } + + return 0; +} + +void +rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused, + int len __rte_unused, uint8_t *tuple[] __rte_unused, + uint32_t val[], uint32_t num) +{ + unsigned int i; + + static bool warned; + + if (!warned) { + warned = true; + RTE_LOG(ERR, HASH, + "%s is undefined under given arch\n", __func__); + } + + for (i = 0; i < num; i++) + val[i] = 0; +} + +#endif diff --git a/lib/hash/rte_thash_gfni.h b/lib/hash/rte_thash_gfni.h index cd253459e7da..4e5388a1bf65 100644 --- a/lib/hash/rte_thash_gfni.h +++ b/lib/hash/rte_thash_gfni.h @@ -33,13 +33,8 @@ extern "C" { * @return * Calculated Toeplitz hash value. */ -static inline uint32_t -rte_thash_gfni(const uint64_t *mtrx __rte_unused, - const uint8_t *key __rte_unused, int len __rte_unused) -{ - RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__); - return 0; -} +uint32_t +rte_thash_gfni(const uint64_t *mtrx, const uint8_t *key, int len); /** * Bulk implementation for Toeplitz hash. @@ -58,17 +53,9 @@ rte_thash_gfni(const uint64_t *mtrx __rte_unused, * @param num * Number of tuples to hash. */ -static inline void -rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused, - int len __rte_unused, uint8_t *tuple[] __rte_unused, - uint32_t val[], uint32_t num) -{ - unsigned int i; - - RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__); - for (i = 0; i < num; i++) - val[i] = 0; -} +void +rte_thash_gfni_bulk(const uint64_t *mtrx, int len, uint8_t *tuple[], + uint32_t val[], uint32_t num); #endif /* RTE_THASH_GFNI_DEFINED */ diff --git a/lib/hash/version.map b/lib/hash/version.map index b98b64a1638a..56a0cbd4b8a5 100644 --- a/lib/hash/version.map +++ b/lib/hash/version.map @@ -39,6 +39,8 @@ DPDK_24 { rte_thash_get_gfni_matrices; rte_thash_get_helper; rte_thash_get_key; + rte_thash_gfni; + rte_thash_gfni_bulk; rte_thash_gfni_supported; rte_thash_init_ctx; From patchwork Tue Dec 5 02:09:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134845 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32770433FD; Tue, 5 Dec 2023 03:15:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A00142DF2; Tue, 5 Dec 2023 03:14:11 +0100 (CET) Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by mails.dpdk.org (Postfix) with ESMTP id D1A4A42DE0 for ; Tue, 5 Dec 2023 03:14:03 +0100 (CET) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6d99c3a3a32so1114543a34.3 for ; Mon, 04 Dec 2023 18:14:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742443; x=1702347243; darn=dpdk.org; 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=k41eErwRD2PBuUzRw0Zce7vaDvM+2SF3ll6/yG/jG8g=; b=ogGHi9X2pkOFMFj6Tda1iGD32rK9sfncEgbneCWgrZIEoyADVJht8hDvfZU4g4Atqi lNigicU540J8c2HAo1CJh4PXMK5WHI8NvHsCZ1h1Aad1Wa0Yp21RlhRhWW42p7qJc10y 5i8kIT8ZK4tVAcblVnkBWRhBplcd1/T7tgOcshpy6S2cJnh2YmSzrHteMWqyQmN61Yt0 6N0HpVE9rV2ScD5XtkBpIyaKb6brSwtptFln/Zj0EcMeZgW1mKKuSpB3MAeVGpVmHf43 275r7CHTzwlDzpgU44uLfyZOWA6LEoUomiAJNrlZsOu746RFtQk9lh93C+lMer4bKYdo Gp+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742443; x=1702347243; 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=k41eErwRD2PBuUzRw0Zce7vaDvM+2SF3ll6/yG/jG8g=; b=ZmJ2xHGhCzfqNYWCIjtpYmQpNmYZuxVV0v/9vrrqsmOy3YXxsA/EAbJlPrMDwCdf+3 qb55qthqsSEi0t9AB4sxOv4WMyA8VAIRv1y9D4Rja2NvHFwrvLNPk7fW98qUR9HWhKe2 RmACIpge6DxAe8RuGaNVMEwbJlgKzfCbtPbQ6yBi4e3XvE+dEdzdzrQK1aeQXDXrtDfI zmgPmubUYn7oYNEN4jj2U57UfAJDcCG5bv+dKPeNVoLqpwaVI0mdjUTrSZK/S2m29nQ7 LFyDQji0gZicgB6Tfoj1tgSiQXz2zudksHDo3vUQfDVFldmvrC4I/kdmzn1LcfI+gUqS zK3A== X-Gm-Message-State: AOJu0YzOi5pJ2dXUyKKoqRSCmTj7RGk4ebP0FKTT//c+Fiba/p0lRlnH S+gz/uSkFcFc7AnN9atFh91Qcimy/xQBWuQ5iJI= X-Google-Smtp-Source: AGHT+IGiGNjPMMq6CO9ybb33qx3xI16L5Qmsq5vEUZAdcDLnGetBYkWshez23APDmYtbo3WDDbMvsg== X-Received: by 2002:a9d:63cc:0:b0:6d9:a69f:b8ae with SMTP id e12-20020a9d63cc000000b006d9a69fb8aemr1892962otl.27.1701742443209; Mon, 04 Dec 2023 18:14:03 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:14:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ruifeng Wang , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH 17/18] hash: move rte_hash_set_alg out of header file Date: Mon, 4 Dec 2023 18:09:55 -0800 Message-ID: <20231205021330.260017-18-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The code for setting algorithm for hash is not at all perf sensitive, and doing it inline has a couple of problems. First, it means that if multiple files include the header, then the initialization gets done multiple times. But also, it makes it harder to fix usage of RTE_LOG(). Despite what the checking script say. This is not an ABI change, the previous version inlined the same code; therefore both old and new code will work the same. Signed-off-by: Stephen Hemminger Acked-by: Ruifeng Wang --- lib/hash/meson.build | 1 + lib/hash/rte_crc_arm64.h | 8 ++--- lib/hash/rte_crc_x86.h | 10 +++--- lib/hash/rte_hash_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++ lib/hash/rte_hash_crc.h | 48 ++-------------------------- lib/hash/version.map | 7 +++++ 6 files changed, 88 insertions(+), 54 deletions(-) create mode 100644 lib/hash/rte_hash_crc.c diff --git a/lib/hash/meson.build b/lib/hash/meson.build index e56ee8572564..c345c6f561fc 100644 --- a/lib/hash/meson.build +++ b/lib/hash/meson.build @@ -19,6 +19,7 @@ indirect_headers += files( sources = files( 'rte_cuckoo_hash.c', + 'rte_hash_crc.c', 'rte_fbk_hash.c', 'rte_thash.c', 'rte_thash_gfni.c' diff --git a/lib/hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h index c9f52510871b..414fe065caa8 100644 --- a/lib/hash/rte_crc_arm64.h +++ b/lib/hash/rte_crc_arm64.h @@ -53,7 +53,7 @@ crc32c_arm64_u64(uint64_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_1byte(uint8_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_ARM64)) + if (likely(rte_hash_crc32_alg & CRC32_ARM64)) return crc32c_arm64_u8(data, init_val); return crc32c_1byte(data, init_val); @@ -67,7 +67,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_2byte(uint16_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_ARM64)) + if (likely(rte_hash_crc32_alg & CRC32_ARM64)) return crc32c_arm64_u16(data, init_val); return crc32c_2bytes(data, init_val); @@ -81,7 +81,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_4byte(uint32_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_ARM64)) + if (likely(rte_hash_crc32_alg & CRC32_ARM64)) return crc32c_arm64_u32(data, init_val); return crc32c_1word(data, init_val); @@ -95,7 +95,7 @@ rte_hash_crc_4byte(uint32_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_8byte(uint64_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_ARM64)) + if (likely(rte_hash_crc32_alg & CRC32_ARM64)) return crc32c_arm64_u64(data, init_val); return crc32c_2words(data, init_val); diff --git a/lib/hash/rte_crc_x86.h b/lib/hash/rte_crc_x86.h index 205bc182be77..3b865e251db2 100644 --- a/lib/hash/rte_crc_x86.h +++ b/lib/hash/rte_crc_x86.h @@ -67,7 +67,7 @@ crc32c_sse42_u64(uint64_t data, uint64_t init_val) static inline uint32_t rte_hash_crc_1byte(uint8_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_SSE42)) + if (likely(rte_hash_crc32_alg & CRC32_SSE42)) return crc32c_sse42_u8(data, init_val); return crc32c_1byte(data, init_val); @@ -81,7 +81,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_2byte(uint16_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_SSE42)) + if (likely(rte_hash_crc32_alg & CRC32_SSE42)) return crc32c_sse42_u16(data, init_val); return crc32c_2bytes(data, init_val); @@ -95,7 +95,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val) static inline uint32_t rte_hash_crc_4byte(uint32_t data, uint32_t init_val) { - if (likely(crc32_alg & CRC32_SSE42)) + if (likely(rte_hash_crc32_alg & CRC32_SSE42)) return crc32c_sse42_u32(data, init_val); return crc32c_1word(data, init_val); @@ -110,11 +110,11 @@ static inline uint32_t rte_hash_crc_8byte(uint64_t data, uint32_t init_val) { #ifdef RTE_ARCH_X86_64 - if (likely(crc32_alg == CRC32_SSE42_x64)) + if (likely(rte_hash_crc32_alg == CRC32_SSE42_x64)) return crc32c_sse42_u64(data, init_val); #endif - if (likely(crc32_alg & CRC32_SSE42)) + if (likely(rte_hash_crc32_alg & CRC32_SSE42)) return crc32c_sse42_u64_mimic(data, init_val); return crc32c_2words(data, init_val); diff --git a/lib/hash/rte_hash_crc.c b/lib/hash/rte_hash_crc.c new file mode 100644 index 000000000000..1439d8a71f6a --- /dev/null +++ b/lib/hash/rte_hash_crc.c @@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation + */ + +#include +#include + +#include "rte_hash_crc.h" + +RTE_LOG_REGISTER_SUFFIX(hash_crc_logtype, crc, INFO); +#define RTE_LOGTYPE_HASH_CRC hash_crc_logtype + +uint8_t rte_hash_crc32_alg = CRC32_SW; + +/** + * Allow or disallow use of SSE4.2/ARMv8 intrinsics for CRC32 hash + * calculation. + * + * @param alg + * An OR of following flags: + * - (CRC32_SW) Don't use SSE4.2/ARMv8 intrinsics (default non-[x86/ARMv8]) + * - (CRC32_SSE42) Use SSE4.2 intrinsics if available + * - (CRC32_SSE42_x64) Use 64-bit SSE4.2 intrinsic if available (default x86) + * - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available (default ARMv8) + * + */ +void +rte_hash_crc_set_alg(uint8_t alg) +{ + rte_hash_crc32_alg = CRC32_SW; + + if (alg == CRC32_SW) + return; + +#if defined RTE_ARCH_X86 + if (!(alg & CRC32_SSE42_x64)) + RTE_LOG(WARNING, HASH_CRC, + "Unsupported CRC32 algorithm requested using CRC32_x64/CRC32_SSE42\n"); + if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_EM64T) || alg == CRC32_SSE42) + rte_hash_crc32_alg = CRC32_SSE42; + else + rte_hash_crc32_alg = CRC32_SSE42_x64; +#endif + +#if defined RTE_ARCH_ARM64 + if (!(alg & CRC32_ARM64)) + RTE_LOG(WARNING, HASH_CRC, + "Unsupported CRC32 algorithm requested using CRC32_ARM64\n"); + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32)) + rte_hash_crc32_alg = CRC32_ARM64; +#endif + + if (rte_hash_crc32_alg == CRC32_SW) + RTE_LOG(WARNING, HASH_CRC, + "Unsupported CRC32 algorithm requested using CRC32_SW\n"); +} + +/* Setting the best available algorithm */ +RTE_INIT(rte_hash_crc_init_alg) +{ +#if defined(RTE_ARCH_X86) + rte_hash_crc_set_alg(CRC32_SSE42_x64); +#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32) + rte_hash_crc_set_alg(CRC32_ARM64); +#else + rte_hash_crc_set_alg(CRC32_SW); +#endif +} diff --git a/lib/hash/rte_hash_crc.h b/lib/hash/rte_hash_crc.h index 60bf42ce1d97..8ad2422ec333 100644 --- a/lib/hash/rte_hash_crc.h +++ b/lib/hash/rte_hash_crc.h @@ -20,8 +20,6 @@ extern "C" { #include #include #include -#include -#include #include "rte_crc_sw.h" @@ -31,7 +29,7 @@ extern "C" { #define CRC32_SSE42_x64 (CRC32_x64|CRC32_SSE42) #define CRC32_ARM64 (1U << 3) -static uint8_t crc32_alg = CRC32_SW; +extern uint8_t rte_hash_crc32_alg; #if defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32) #include "rte_crc_arm64.h" @@ -52,48 +50,8 @@ static uint8_t crc32_alg = CRC32_SW; * - (CRC32_SSE42_x64) Use 64-bit SSE4.2 intrinsic if available (default x86) * - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available (default ARMv8) */ -static inline void -rte_hash_crc_set_alg(uint8_t alg) -{ - crc32_alg = CRC32_SW; - - if (alg == CRC32_SW) - return; - -#if defined RTE_ARCH_X86 - if (!(alg & CRC32_SSE42_x64)) - RTE_LOG(WARNING, HASH, - "Unsupported CRC32 algorithm requested using CRC32_x64/CRC32_SSE42\n"); - if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_EM64T) || alg == CRC32_SSE42) - crc32_alg = CRC32_SSE42; - else - crc32_alg = CRC32_SSE42_x64; -#endif - -#if defined RTE_ARCH_ARM64 - if (!(alg & CRC32_ARM64)) - RTE_LOG(WARNING, HASH, - "Unsupported CRC32 algorithm requested using CRC32_ARM64\n"); - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32)) - crc32_alg = CRC32_ARM64; -#endif - - if (crc32_alg == CRC32_SW) - RTE_LOG(WARNING, HASH, - "Unsupported CRC32 algorithm requested using CRC32_SW\n"); -} - -/* Setting the best available algorithm */ -RTE_INIT(rte_hash_crc_init_alg) -{ -#if defined(RTE_ARCH_X86) - rte_hash_crc_set_alg(CRC32_SSE42_x64); -#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32) - rte_hash_crc_set_alg(CRC32_ARM64); -#else - rte_hash_crc_set_alg(CRC32_SW); -#endif -} +void +rte_hash_crc_set_alg(uint8_t alg); #ifdef __DOXYGEN__ diff --git a/lib/hash/version.map b/lib/hash/version.map index 56a0cbd4b8a5..ed0743adedbb 100644 --- a/lib/hash/version.map +++ b/lib/hash/version.map @@ -9,6 +9,7 @@ DPDK_24 { rte_hash_add_key_with_hash; rte_hash_add_key_with_hash_data; rte_hash_count; + rte_hash_crc_set_alg; rte_hash_create; rte_hash_del_key; rte_hash_del_key_with_hash; @@ -46,3 +47,9 @@ DPDK_24 { local: *; }; + +INTERNAL { + global: + + rte_hash_crc32_alg; +}; From patchwork Tue Dec 5 02:09:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134846 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86F52433FD; Tue, 5 Dec 2023 03:15:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94D9D42E07; Tue, 5 Dec 2023 03:14:12 +0100 (CET) Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by mails.dpdk.org (Postfix) with ESMTP id 9052242DE3 for ; Tue, 5 Dec 2023 03:14:04 +0100 (CET) Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3b844357f7cso2868088b6e.1 for ; Mon, 04 Dec 2023 18:14:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742444; x=1702347244; darn=dpdk.org; 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=6yatbEXbk8JjdL02Xj5MmzSrD11/Ce5jY3XPRMVXuGc=; b=PyGmQl3MGn72eZHsXneKnDzm1SdRrbzHDnLVRcjQOoLjjjoHQ+302VM/J3ODxJzG3P J7r2ptWsgFcKM5CZZ4Gh+09ZwjCD/KuEGVPMDZ56qnUibOjmmugwvZ0vTXwpZVFGRywJ A5tTjivxnYyjABHbWNy/2dgCHx8J3r/PxMdDw4DHJQmHu3/Hfeb7C0nj690widbuZeDg lJD2r4P6vTgMvZNZ00vVBC6grd/VZ3cS3rXQOY3QkM5DsgBKAMwibsmZ3zeU8PPpTv0v 6ALcPkNShmaIuQW5VOG0HHcrIIKTPXHjdU6vRxG7+bzRETOLUtmmTtQHCKGQ+NVlz5xp 1IFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742444; x=1702347244; 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=6yatbEXbk8JjdL02Xj5MmzSrD11/Ce5jY3XPRMVXuGc=; b=R3rTWX3wTyxsM8I2scEu9GuVE4tPeasC2UpvRkMIQtpUweyGR9jcSstTum5+iwHpFb r5sEYm1sDvbgHUICDO5QK0OQdXGMIOAZlOJLe9W01lzzymxvnRcZYngHUjr2GxXLxn+q gaVqpGWPRgqlEOxwGXgNSlQEPu+Pu8klvbUQqxXwuwkhoKJ/uM0Byv7K9xzkvNw+IHxu /BlIq5t0CheCLB+hhRMPwtxq3FasVAt7s1vi/yx6KjGqW44HdEvzEFyvic//4M08+vXw OKhiRhhz7au1m6TtQc4nmZsDC2DTnPBi6itvWg9lGNIRdhMdzVHb05mpho9JmqBBHWl4 wI9A== X-Gm-Message-State: AOJu0Yy8EMhzoXGMfuPkU1227/qX5a7q9iOHl10+GGv5HDXtxdF808Hc zgmP7l8r1kkHC4ggv5NyUc3mBDVAMUeUzEw6WKs= X-Google-Smtp-Source: AGHT+IHhlsqb9zm0gY+hoDNPVnkDWslWuGCLQtGkzvNgjUipnjjeYXm4M6iJX/j/cR757pgwYS54Yw== X-Received: by 2002:a05:6808:118a:b0:3b8:b063:6bb4 with SMTP id j10-20020a056808118a00b003b8b0636bb4mr6206359oil.99.1701742444007; Mon, 04 Dec 2023 18:14:04 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:14:03 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Yipeng Wang , Sameh Gobriel , Bruce Richardson , Vladimir Medvedkin Subject: [PATCH 18/18] hash: convert RTE_LOGTYPE_HASH to dynamic type Date: Mon, 4 Dec 2023 18:09:56 -0800 Message-ID: <20231205021330.260017-19-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use dynamic type for hash and add subtypes for crc and gfni. Signed-off-by: Stephen Hemminger --- lib/hash/rte_cuckoo_hash.c | 5 +++++ lib/hash/rte_fbk_hash.c | 5 +++++ lib/hash/rte_thash.c | 3 +++ lib/hash/rte_thash_gfni.c | 3 +++ lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index ccdc3b989489..8e4364f060a3 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -24,6 +24,11 @@ #include #include "rte_hash.h" + +/* needs to be before rte_cuckoo_hash.h */ +RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO); +#define RTE_LOGTYPE_HASH hash_logtype + #include "rte_cuckoo_hash.h" /* Mask of all flags supported by this version */ diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c index 538b23a4030a..b4c4c191abdc 100644 --- a/lib/hash/rte_fbk_hash.c +++ b/lib/hash/rte_fbk_hash.c @@ -8,6 +8,8 @@ #include #include + +#include #include #include #include @@ -18,6 +20,9 @@ #include "rte_fbk_hash.h" +RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO); +#define RTE_LOGTYPE_HASH fbk_hash_logtype + TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry); static struct rte_tailq_elem rte_fbk_hash_tailq = { diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c index 4ff567ee5adf..d819dddd84f4 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -13,6 +13,9 @@ #include #include +RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO); +#define RTE_LOGTYPE_HASH thash_logtype + #define THASH_NAME_LEN 64 #define TOEPLITZ_HASH_LEN 32 diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c index eb334185725c..35206d575153 100644 --- a/lib/hash/rte_thash_gfni.c +++ b/lib/hash/rte_thash_gfni.c @@ -10,6 +10,9 @@ #ifndef RTE_THASH_GFNI_DEFINED +RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO); +#define RTE_LOGTYPE_HASH hash_gfni_logtype + uint32_t rte_thash_gfni(const uint64_t *mtrx __rte_unused, const uint8_t *key __rte_unused, int len __rte_unused) diff --git a/lib/log/log.c b/lib/log/log.c index 56877d42e6b9..e3cd4cff0fbc 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -353,7 +353,6 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, {RTE_LOGTYPE_PMD, "pmd"}, - {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 189ad2bbd2cf..27fb6129a7aa 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -32,7 +32,7 @@ extern "C" { /* was RTE_LOGTYPE_MEMPOOL */ /* was RTE_LOGTYPE_TIMER */ #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ -#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */ + /* was RTE_LOGTYPE_HASH */ /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */