From patchwork Sun Feb 9 17:28:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151219 X-Patchwork-Delegate: thomas@monjalon.net 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 8FAD6461DB; Sun, 9 Feb 2025 18:29:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D8864065C; Sun, 9 Feb 2025 18:29:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 402314065A for ; Sun, 9 Feb 2025 18:29:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pgGdQIfzfTGXcmt33fxUK3CQYs1OJyllsC6ileAvHyM=; b=ZuDwNteylEeSFykFCIVOPpZQ+FJZwFpbwSwAKZCBhiVCA4cXmqwIgR/gwY0CEvudovJaGX ouvygBAlqUSsEm8PpLTrDOcCdEpYNni2RKboNrwQnfiyWApwnuNu7eEvxOzcC/inQq0q1a I8uCz84Yrszr6y2jd3UU4MPwcmkjmdE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-c-WUDnuOMCqUygwKkbW5Vg-1; Sun, 09 Feb 2025 12:29:01 -0500 X-MC-Unique: c-WUDnuOMCqUygwKkbW5Vg-1 X-Mimecast-MFC-AGG-ID: c-WUDnuOMCqUygwKkbW5Vg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D3B1C1800873; Sun, 9 Feb 2025 17:28:59 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A66C71800265; Sun, 9 Feb 2025 17:28:57 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Parav Pandit , Xueming Li Subject: [RFC v2 01/10] bus/auxiliary: remove weak symbols Date: Sun, 9 Feb 2025 18:28:39 +0100 Message-ID: <20250209172850.2429075-2-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kZeBJaSTn0I2Bp4hrvEFYiFCvv2GS1R8tpHRA0hOi90_1739122140 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, expose stubs symbols when needed. Signed-off-by: David Marchand --- drivers/bus/auxiliary/auxiliary_common.c | 6 ++++-- drivers/bus/auxiliary/meson.build | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c index e6cbc4d356..b444eb43ef 100644 --- a/drivers/bus/auxiliary/auxiliary_common.c +++ b/drivers/bus/auxiliary/auxiliary_common.c @@ -36,12 +36,13 @@ auxiliary_devargs_lookup(const char *name) return NULL; } +#ifndef AUXILIARY_OS_SUPPORTED /* * Test whether the auxiliary device exist. * * Stub for OS not supporting auxiliary bus. */ -__rte_weak bool +bool auxiliary_dev_exists(const char *name) { RTE_SET_USED(name); @@ -53,11 +54,12 @@ auxiliary_dev_exists(const char *name) * * Stub for OS not supporting auxiliary bus. */ -__rte_weak int +int auxiliary_scan(void) { return 0; } +#endif /* AUXILIARY_OS_SUPPORTED */ /* * Update a device's devargs being scanned. diff --git a/drivers/bus/auxiliary/meson.build b/drivers/bus/auxiliary/meson.build index 10468fd130..38d2f05d4b 100644 --- a/drivers/bus/auxiliary/meson.build +++ b/drivers/bus/auxiliary/meson.build @@ -7,6 +7,7 @@ sources = files( 'auxiliary_params.c', ) if is_linux + cflags += '-DAUXILIARY_OS_SUPPORTED' sources += files( 'linux/auxiliary.c', ) From patchwork Sun Feb 9 17:28:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151220 X-Patchwork-Delegate: thomas@monjalon.net 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 F0CEA461DB; Sun, 9 Feb 2025 18:29:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6C0214066A; Sun, 9 Feb 2025 18:29:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D1D0F4065A for ; Sun, 9 Feb 2025 18:29:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pRyfhKpU327LAZSKwaKAzat/YlIjCz55Lm6lAfubx7A=; b=OoyZPPPG97iIBvEUS8uoIG7IM6W35E4EAbLDsJ9Nr/Wyvt0avF/QABkUL4Nv7/JHo3pFy+ mIvEb6RP48Cfc+loNxnT1l0P/e9tcl9WVkL7ioAFXwxOnjY4SxTb+EUIlMqpTmLmrI/vLb nrNfoyNRHBLac6PWb37vletAxw/T6Bs= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-sLNgTc_DOauEEhOXg1Zgvw-1; Sun, 09 Feb 2025 12:29:06 -0500 X-MC-Unique: sLNgTc_DOauEEhOXg1Zgvw-1 X-Mimecast-MFC-AGG-ID: sLNgTc_DOauEEhOXg1Zgvw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4A78195608B; Sun, 9 Feb 2025 17:29:04 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AE0A130001AB; Sun, 9 Feb 2025 17:29:02 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Kai Ji Subject: [RFC v2 02/10] common/qat: remove weak symbols Date: Sun, 9 Feb 2025 18:28:40 +0100 Message-ID: <20250209172850.2429075-3-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vFLZMC1tK2Yb_mnhOhzcA7SULsHi76gkVAqmZj0FqHo_1739122145 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Remove dead code, those symbols are never used as the "strong" symbols are always linked in. Signed-off-by: David Marchand --- drivers/common/qat/qat_qp.c | 8 -------- drivers/common/qat/qat_qp.h | 5 ----- 2 files changed, 13 deletions(-) diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c index 4bf9bac23e..0d2bbdb8a5 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -944,11 +944,3 @@ qat_cq_get_fw_cipher_crc_cap(struct qat_qp *qp) return ret; } #endif - -__rte_weak int -qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused, - void *op_cookie __rte_unused, - uint64_t *dequeue_err_count __rte_unused) -{ - return 0; -} diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h index f0ea907503..5ccaedefa7 100644 --- a/drivers/common/qat/qat_qp.h +++ b/drivers/common/qat/qat_qp.h @@ -156,11 +156,6 @@ int qat_cq_get_fw_cipher_crc_cap(struct qat_qp *qp); #endif -/* Needed for weak function*/ -int -qat_comp_process_response(void **op __rte_unused, uint8_t *resp __rte_unused, - void *op_cookie __rte_unused, - uint64_t *dequeue_err_count __rte_unused); int qat_read_qp_config(struct qat_pci_device *qat_dev); From patchwork Sun Feb 9 17:28:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151221 X-Patchwork-Delegate: thomas@monjalon.net 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 95DB0461DB; Sun, 9 Feb 2025 18:29:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B24740677; Sun, 9 Feb 2025 18:29:17 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 004A540677 for ; Sun, 9 Feb 2025 18:29:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o03yEeznxmqnVcNpfukGCaghzNONrW1lwmKXBf18xog=; b=TyPFGSHuaXydEMNl1IniUXUqUblEhhQeheX9H9I+FcAodqoemKv4EWuWoEbVUJRw0/9qjH 1N4l4nQ7pwiArF6S6RjCjij3V0Cc9ibRKcEyqmAdh7VqmwnVRWI2iDnaur3eG+n6UrNLAA f0VS9MKTr5XYJEh0eH5d57/yHFP8WPA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-prmubT0mNoGRXulxK9g5ig-1; Sun, 09 Feb 2025 12:29:12 -0500 X-MC-Unique: prmubT0mNoGRXulxK9g5ig-1 X-Mimecast-MFC-AGG-ID: prmubT0mNoGRXulxK9g5ig Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F232195608C; Sun, 9 Feb 2025 17:29:10 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7E6FD19560A3; Sun, 9 Feb 2025 17:29:07 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Nagadheeraj Rottela , Srikanth Jampala , Fan Zhang , Ashish Gupta Subject: [RFC v2 03/10] drivers: remove weak symbols in Nitrox drivers Date: Sun, 9 Feb 2025 18:28:41 +0100 Message-ID: <20250209172850.2429075-4-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: faIjALI3jmSwfyGK9STWzmBw1TJwCfh-TL4EKiLI_BA_1739122150 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Make compress and crypto drivers register to the common driver. Remove (unneeded) include_directories(). Signed-off-by: David Marchand --- drivers/common/nitrox/meson.build | 3 -- drivers/common/nitrox/nitrox_device.c | 75 ++++++++++----------------- drivers/common/nitrox/nitrox_device.h | 16 ++++++ drivers/common/nitrox/version.map | 1 + drivers/compress/nitrox/meson.build | 2 - drivers/compress/nitrox/nitrox_comp.c | 6 +++ drivers/crypto/nitrox/meson.build | 2 - drivers/crypto/nitrox/nitrox_sym.c | 6 +++ 8 files changed, 57 insertions(+), 54 deletions(-) diff --git a/drivers/common/nitrox/meson.build b/drivers/common/nitrox/meson.build index f3cb42f006..115dd8de4d 100644 --- a/drivers/common/nitrox/meson.build +++ b/drivers/common/nitrox/meson.build @@ -14,6 +14,3 @@ sources += files( 'nitrox_logs.c', 'nitrox_qp.c', ) - -includes += include_directories('../../crypto/nitrox') -includes += include_directories('../../compress/nitrox') diff --git a/drivers/common/nitrox/nitrox_device.c b/drivers/common/nitrox/nitrox_device.c index 39edc440a7..6cd57faaa4 100644 --- a/drivers/common/nitrox/nitrox_device.c +++ b/drivers/common/nitrox/nitrox_device.c @@ -6,8 +6,6 @@ #include "nitrox_device.h" #include "nitrox_hal.h" -#include "nitrox_sym.h" -#include "nitrox_comp.h" #define PCI_VENDOR_ID_CAVIUM 0x177d #define NITROX_V_PCI_VF_DEV_ID 0x13 @@ -63,11 +61,21 @@ ndev_release(struct nitrox_device *ndev) rte_free(ndev); } +TAILQ_HEAD(ndrv_list, nitrox_driver); +static struct ndrv_list ndrv_list = TAILQ_HEAD_INITIALIZER(ndrv_list); + +void +nitrox_register_driver(struct nitrox_driver *ndrv) +{ + TAILQ_INSERT_TAIL(&ndrv_list, ndrv, next); +} + static int nitrox_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pdev) { struct nitrox_device *ndev; + struct nitrox_driver *ndrv; int err = -1; /* Nitrox CSR space */ @@ -79,19 +87,21 @@ nitrox_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, return -ENOMEM; ndev_init(ndev, pdev); - err = nitrox_sym_pmd_create(ndev); - if (err) - goto sym_pmd_err; - - err = nitrox_comp_pmd_create(ndev); - if (err) - goto comp_pmd_err; + TAILQ_FOREACH(ndrv, &ndrv_list, next) { + err = ndrv->create(ndev); + if (err) + goto drv_err; + } return 0; -comp_pmd_err: - nitrox_sym_pmd_destroy(ndev); -sym_pmd_err: +drv_err: + ndrv = TAILQ_PREV(ndrv, ndrv_list, next); + while (ndrv != NULL) { + ndrv->destroy(ndev); + ndrv = TAILQ_PREV(ndrv, ndrv_list, next); + } + ndev_release(ndev); return err; } @@ -100,19 +110,18 @@ static int nitrox_pci_remove(struct rte_pci_device *pdev) { struct nitrox_device *ndev; + struct nitrox_driver *ndrv; int err; ndev = find_ndev(pdev); if (!ndev) return -ENODEV; - err = nitrox_sym_pmd_destroy(ndev); - if (err) - return err; - - err = nitrox_comp_pmd_destroy(ndev); - if (err) - return err; + TAILQ_FOREACH(ndrv, &ndrv_list, next) { + err = ndrv->destroy(ndev); + if (err) + return err; + } ndev_release(ndev); return 0; @@ -133,33 +142,5 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; -__rte_weak int -nitrox_sym_pmd_create(struct nitrox_device *ndev) -{ - RTE_SET_USED(ndev); - return 0; -} - -__rte_weak int -nitrox_sym_pmd_destroy(struct nitrox_device *ndev) -{ - RTE_SET_USED(ndev); - return 0; -} - -__rte_weak int -nitrox_comp_pmd_create(struct nitrox_device *ndev) -{ - RTE_SET_USED(ndev); - return 0; -} - -__rte_weak int -nitrox_comp_pmd_destroy(struct nitrox_device *ndev) -{ - RTE_SET_USED(ndev); - return 0; -} - RTE_PMD_REGISTER_PCI(nitrox, nitrox_pmd); RTE_PMD_REGISTER_PCI_TABLE(nitrox, pci_id_nitrox_map); diff --git a/drivers/common/nitrox/nitrox_device.h b/drivers/common/nitrox/nitrox_device.h index 877bccb321..b74b71808e 100644 --- a/drivers/common/nitrox/nitrox_device.h +++ b/drivers/common/nitrox/nitrox_device.h @@ -6,6 +6,7 @@ #define _NITROX_DEVICE_H_ #include +#include struct nitrox_sym_device; struct nitrox_comp_device; @@ -21,4 +22,19 @@ struct nitrox_device { uint16_t nr_queues; }; +struct nitrox_driver { + TAILQ_ENTRY(nitrox_driver) next; + int (*create)(struct nitrox_device *ndev); + int (*destroy)(struct nitrox_device *ndev); +}; + +__rte_internal +void nitrox_register_driver(struct nitrox_driver *ndrv); + +#define NITROX_REGISTER_DRIVER(ndrv) \ +RTE_INIT(ndrv ## _register) \ +{ \ + nitrox_register_driver(&ndrv); \ +} + #endif /* _NITROX_DEVICE_H_ */ diff --git a/drivers/common/nitrox/version.map b/drivers/common/nitrox/version.map index 43295171e4..f58c044fc5 100644 --- a/drivers/common/nitrox/version.map +++ b/drivers/common/nitrox/version.map @@ -4,6 +4,7 @@ INTERNAL { nitrox_logtype; nitrox_qp_release; nitrox_qp_setup; + nitrox_register_driver; local: *; }; diff --git a/drivers/compress/nitrox/meson.build b/drivers/compress/nitrox/meson.build index 1becc66912..5cecc2ad66 100644 --- a/drivers/compress/nitrox/meson.build +++ b/drivers/compress/nitrox/meson.build @@ -12,5 +12,3 @@ sources += files( 'nitrox_comp.c', 'nitrox_comp_reqmgr.c', ) - -includes += include_directories('../../common/nitrox') diff --git a/drivers/compress/nitrox/nitrox_comp.c b/drivers/compress/nitrox/nitrox_comp.c index 1b2054c61a..41a3ee0de8 100644 --- a/drivers/compress/nitrox/nitrox_comp.c +++ b/drivers/compress/nitrox/nitrox_comp.c @@ -602,3 +602,9 @@ nitrox_comp_pmd_destroy(struct nitrox_device *ndev) ndev->comp_dev = NULL; return 0; } + +static struct nitrox_driver comp_drv = { + .create = nitrox_comp_pmd_create, + .destroy = nitrox_comp_pmd_destroy, +}; +NITROX_REGISTER_DRIVER(comp_drv); diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build index f8887713d2..cbe2b7d6dc 100644 --- a/drivers/crypto/nitrox/meson.build +++ b/drivers/crypto/nitrox/meson.build @@ -13,5 +13,3 @@ sources += files( 'nitrox_sym_capabilities.c', 'nitrox_sym_reqmgr.c', ) - -includes += include_directories('../../common/nitrox') diff --git a/drivers/crypto/nitrox/nitrox_sym.c b/drivers/crypto/nitrox/nitrox_sym.c index da70121d91..7c2dc98a4b 100644 --- a/drivers/crypto/nitrox/nitrox_sym.c +++ b/drivers/crypto/nitrox/nitrox_sym.c @@ -798,6 +798,12 @@ nitrox_sym_pmd_destroy(struct nitrox_device *ndev) return rte_cryptodev_pmd_destroy(ndev->sym_dev->cdev); } +static struct nitrox_driver sym_drv = { + .create = nitrox_sym_pmd_create, + .destroy = nitrox_sym_pmd_destroy, +}; +NITROX_REGISTER_DRIVER(sym_drv); + static struct cryptodev_driver nitrox_crypto_drv; RTE_PMD_REGISTER_CRYPTO_DRIVER(nitrox_crypto_drv, nitrox_rte_sym_drv, From patchwork Sun Feb 9 17:28:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151222 X-Patchwork-Delegate: thomas@monjalon.net 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 4276E461DB; Sun, 9 Feb 2025 18:29:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9130C4068E; Sun, 9 Feb 2025 18:29:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9283B40673 for ; Sun, 9 Feb 2025 18:29:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MBFBEZJvH/OgKecf6MzEcifa4KGlXCGGvggMt1JfA5E=; b=MZ3oG/UOWTEKmXwB+CFFljzuO9k6OfbAJlXeIkJF2RB3i9NhmT1PEvDcOQ7sZYszC1dN2D BViVf8iJNN56IIl7n9FeOTRzM0SHuKeV+pPY8TBiJf86uynLPzmaYqmA8WEUTgz9C7pN+E XZ4QiL9bJQHYjAuECVA+vItr4dx+xf4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-MmcGr_ohNPqcZ-kry1ysbQ-1; Sun, 09 Feb 2025 12:29:17 -0500 X-MC-Unique: MmcGr_ohNPqcZ-kry1ysbQ-1 X-Mimecast-MFC-AGG-ID: MmcGr_ohNPqcZ-kry1ysbQ Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBAC3180087A; Sun, 9 Feb 2025 17:29:15 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 42F311800352; Sun, 9 Feb 2025 17:29:13 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, John Daley , Hyong Youb Kim Subject: [RFC v2 04/10] net/enic: remove weak symbols Date: Sun, 9 Feb 2025 18:28:42 +0100 Message-ID: <20250209172850.2429075-5-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tTa86LZWxXa_J1a83zlmxjUKMBeb_nHls2qKZ-7Vn3Y_1739122156 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, expose stubs symbols when needed. Signed-off-by: David Marchand --- drivers/net/enic/enic_main.c | 8 +++----- drivers/net/enic/meson.build | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index b755b15d92..5ee2ae555d 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -509,15 +509,13 @@ static void enic_prep_wq_for_simple_tx(struct enic *enic, uint16_t queue_idx) } } -/* - * The 'strong' version is in enic_rxtx_vec_avx2.c. This weak version is used - * used when that file is not compiled. - */ -__rte_weak bool +#ifndef ENIC_RXTX_VEC +bool enic_use_vector_rx_handler(__rte_unused struct rte_eth_dev *eth_dev) { return false; } +#endif /* ENIC_RXTX_VEC */ void enic_pick_rx_handler(struct rte_eth_dev *eth_dev) { diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build index 00f8348348..1e26338350 100644 --- a/drivers/net/enic/meson.build +++ b/drivers/net/enic/meson.build @@ -33,6 +33,7 @@ includes += include_directories('base') # may not. This is to support users who build for the min supported machine # and need to run the binary on newer CPUs too. if dpdk_conf.has('RTE_ARCH_X86_64') + cflags += '-DENIC_RXTX_VEC' enic_avx2_lib = static_library('enic_avx2_lib', 'enic_rxtx_vec_avx2.c', dependencies: [static_rte_ethdev, static_rte_bus_pci], From patchwork Sun Feb 9 17:28:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151223 X-Patchwork-Delegate: thomas@monjalon.net 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 87716461DB; Sun, 9 Feb 2025 18:29:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8B5B40A6D; Sun, 9 Feb 2025 18:29:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5C83F40695 for ; Sun, 9 Feb 2025 18:29:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L/lFN6zU1iHSKBiAAvyFvzwskN/GD3skHUU4DAU5mRQ=; b=bz0NRLh1hySZeEO4JgpRmnVfNIXLqzz3owjC08tMAwIBVt6EaPJEMboEpAz0ZE8RxE4Tp7 Ax5dApzlgKcxX6O4FSTlpn3sQii9mL1A6ITmWVuiDVy1hvCbZ0DT610+l+EbzMTt3bJmCz p+uzz03AT6l1o/qSnSEu22jnvO4UK0k= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-4ylZ3AVTNvOgnzMA_8d4Qg-1; Sun, 09 Feb 2025 12:29:22 -0500 X-MC-Unique: 4ylZ3AVTNvOgnzMA_8d4Qg-1 X-Mimecast-MFC-AGG-ID: 4ylZ3AVTNvOgnzMA_8d4Qg Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1F1231800875; Sun, 9 Feb 2025 17:29:21 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CF5401800352; Sun, 9 Feb 2025 17:29:18 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Jie Hai Subject: [RFC v2 05/10] net/hns3: remove weak symbols Date: Sun, 9 Feb 2025 18:28:43 +0100 Message-ID: <20250209172850.2429075-6-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: R_aNTygkN5jzW1PzLP5LJiSIMKHT9VU8_AJl8GySBDo_1739122161 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, expose stubs symbols when needed. Signed-off-by: David Marchand --- Changes since v1: - fix build for Arm64 without SVE, --- drivers/net/hns3/hns3_rxtx.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 09e39cb673..bb7ffee12c 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2787,32 +2787,36 @@ hns3_recv_scattered_pkts(void *rx_queue, return nb_rx; } -void __rte_weak +#ifndef RTE_ARCH_ARM64 +void hns3_rxq_vec_setup(__rte_unused struct hns3_rx_queue *rxq) { } -int __rte_weak +int hns3_rx_check_vec_support(__rte_unused struct rte_eth_dev *dev) { return -ENOTSUP; } -uint16_t __rte_weak +uint16_t hns3_recv_pkts_vec(__rte_unused void *rx_queue, __rte_unused struct rte_mbuf **rx_pkts, __rte_unused uint16_t nb_pkts) { return 0; } +#endif /* RTE_ARCH_ARM64 */ -uint16_t __rte_weak +#ifndef RTE_HAS_SVE_ACLE +uint16_t hns3_recv_pkts_vec_sve(__rte_unused void *rx_queue, __rte_unused struct rte_mbuf **rx_pkts, __rte_unused uint16_t nb_pkts) { return 0; } +#endif /* RTE_HAS_SVE_ACLE */ int hns3_rx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id, @@ -4256,27 +4260,31 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) return nb_tx; } -int __rte_weak +#ifndef RTE_ARCH_ARM64 +int hns3_tx_check_vec_support(__rte_unused struct rte_eth_dev *dev) { return -ENOTSUP; } -uint16_t __rte_weak +uint16_t hns3_xmit_pkts_vec(__rte_unused void *tx_queue, __rte_unused struct rte_mbuf **tx_pkts, __rte_unused uint16_t nb_pkts) { return 0; } +#endif /* RTE_ARCH_ARM64 */ -uint16_t __rte_weak +#ifndef RTE_HAS_SVE_ACLE +uint16_t hns3_xmit_pkts_vec_sve(void __rte_unused * tx_queue, struct rte_mbuf __rte_unused **tx_pkts, uint16_t __rte_unused nb_pkts) { return 0; } +#endif /* RTE_HAS_SVE_ACLE */ int hns3_tx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id, From patchwork Sun Feb 9 17:28:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151224 X-Patchwork-Delegate: thomas@monjalon.net 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 AB116461DB; Sun, 9 Feb 2025 18:29:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0EA140698; Sun, 9 Feb 2025 18:29:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CAD8640656 for ; Sun, 9 Feb 2025 18:29:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2haxSvuaYWcOGuNu7U4vnzEet3HmiKjFNobwjNTlcaE=; b=XUv0J6GWdKj5FWCCpian0H0oNbW4TujjIYd2I+5CLVNJ7i293s7tXbKR8f6GA+w6OOg0qD 0T/anNuabW7z7iprAKVb4g6tMZWb9C5xA9mo5APVIlwooGDudf+LucSfyWDM0PB3nt+L+P Bx8AQ8H243j1fq04Iufi0w8ScPNDD5I= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-599-FDaTVfpCNn-Fqbmb3bGZWA-1; Sun, 09 Feb 2025 12:29:26 -0500 X-MC-Unique: FDaTVfpCNn-Fqbmb3bGZWA-1 X-Mimecast-MFC-AGG-ID: FDaTVfpCNn-Fqbmb3bGZWA Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B332E1956094; Sun, 9 Feb 2025 17:29:25 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 11D401956094; Sun, 9 Feb 2025 17:29:23 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com Subject: [RFC v2 06/10] net/fm10k: remove weak symbols Date: Sun, 9 Feb 2025 18:28:44 +0100 Message-ID: <20250209172850.2429075-7-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ewoh6u_QTn9Uf1TIswpNGqiTYydcwGbSsH_DgqqQNWg_1739122165 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, expose stubs symbols when needed. Signed-off-by: David Marchand Acked-by: Bruce Richardson --- drivers/net/intel/fm10k/fm10k_ethdev.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/intel/fm10k/fm10k_ethdev.c b/drivers/net/intel/fm10k/fm10k_ethdev.c index 747042d621..75ce2e19cf 100644 --- a/drivers/net/intel/fm10k/fm10k_ethdev.c +++ b/drivers/net/intel/fm10k/fm10k_ethdev.c @@ -129,14 +129,15 @@ fm10k_mbx_unlock(struct fm10k_hw *hw) rte_spinlock_unlock(FM10K_DEV_PRIVATE_TO_MBXLOCK(hw->back)); } -/* Stubs needed for linkage when vPMD is disabled */ -__rte_weak int +#ifndef RTE_ARCH_X86 +/* Stubs for non x86 architectures. */ +int fm10k_rx_vec_condition_check(__rte_unused struct rte_eth_dev *dev) { return -1; } -__rte_weak uint16_t +uint16_t fm10k_recv_pkts_vec( __rte_unused void *rx_queue, __rte_unused struct rte_mbuf **rx_pkts, @@ -145,7 +146,7 @@ fm10k_recv_pkts_vec( return 0; } -__rte_weak uint16_t +uint16_t fm10k_recv_scattered_pkts_vec( __rte_unused void *rx_queue, __rte_unused struct rte_mbuf **rx_pkts, @@ -154,39 +155,40 @@ fm10k_recv_scattered_pkts_vec( return 0; } -__rte_weak int +int fm10k_rxq_vec_setup(__rte_unused struct fm10k_rx_queue *rxq) { return -1; } -__rte_weak void +void fm10k_rx_queue_release_mbufs_vec( __rte_unused struct fm10k_rx_queue *rxq) { return; } -__rte_weak void +void fm10k_txq_vec_setup(__rte_unused struct fm10k_tx_queue *txq) { return; } -__rte_weak int +int fm10k_tx_vec_condition_check(__rte_unused struct fm10k_tx_queue *txq) { return -1; } -__rte_weak uint16_t +uint16_t fm10k_xmit_fixed_burst_vec(__rte_unused void *tx_queue, __rte_unused struct rte_mbuf **tx_pkts, __rte_unused uint16_t nb_pkts) { return 0; } +#endif /* RTE_ARCH_X86 */ /* * reset queue to initial state, allocate software buffers used when starting From patchwork Sun Feb 9 17:28:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151225 X-Patchwork-Delegate: thomas@monjalon.net 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 2FDE0461DB; Sun, 9 Feb 2025 18:29:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05CAD40B8C; Sun, 9 Feb 2025 18:29:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1473340A7A for ; Sun, 9 Feb 2025 18:29:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FuzAbAj3xrho+o9JWJsa6Xujg//N8sEDGfrgfR/fBhQ=; b=KtZAFJx+qGZzE5izyZOP7a6cvSAUhbkKeMKR6YwTu2FRrIBfKnNpqB421VkVtB5WAqbrJd ML3nYio2XQUZrzGLVUiH2UfkJh81SdYQt5pIViiWwW6T8H6oHI0pcWFNn9IbvyOJjTMIsH 8Ud+TTgT0DnNiYfOpLtn5E8OqRYWovE= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-231-tMimyZSeNmW1TmVjPfzcug-1; Sun, 09 Feb 2025 12:29:32 -0500 X-MC-Unique: tMimyZSeNmW1TmVjPfzcug-1 X-Mimecast-MFC-AGG-ID: tMimyZSeNmW1TmVjPfzcug Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C065519560A0; Sun, 9 Feb 2025 17:29:30 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A52511800352; Sun, 9 Feb 2025 17:29:28 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Chaoyong He Subject: [RFC v2 07/10] net/nfp: remove weak symbols Date: Sun, 9 Feb 2025 18:28:45 +0100 Message-ID: <20250209172850.2429075-8-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NV7uXk8pHi5lw99-hXCi1z3ZBf4tDTX8kED5fixDSwA_1739122170 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, link stubs code when needed. Signed-off-by: David Marchand Acked-by: Chaoyong He --- drivers/net/nfp/meson.build | 7 +++++-- drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c | 2 +- drivers/net/nfp/nfp_rxtx_vec_stub.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 4052846dc2..39762bd45a 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -17,7 +17,6 @@ sources = files( 'flower/nfp_flower_service.c', 'nfd3/nfp_nfd3_dp.c', 'nfdk/nfp_nfdk_dp.c', - 'nfdk/nfp_nfdk_vec_stub.c', 'nfpcore/nfp_cppcore.c', 'nfpcore/nfp_crc.c', 'nfpcore/nfp_elf.c', @@ -45,7 +44,6 @@ sources = files( 'nfp_net_flow.c', 'nfp_net_meta.c', 'nfp_rxtx.c', - 'nfp_rxtx_vec_stub.c', 'nfp_service.c', ) @@ -67,6 +65,11 @@ if arch_subdir == 'x86' ) objs += nfp_avx2_lib.extract_all_objects(recursive: true) +else + sources += files( + 'nfp_rxtx_vec_stub.c', + 'nfdk/nfp_nfdk_vec_stub.c', + ) endif deps += ['hash', 'security', 'common_nfp'] diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c index 146ec21d51..4f905bce6b 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_vec_stub.c @@ -5,7 +5,7 @@ #include "nfp_nfdk_vec.h" -uint16_t __rte_weak +uint16_t nfp_net_nfdk_vec_avx2_xmit_pkts(__rte_unused void *tx_queue, __rte_unused struct rte_mbuf **tx_pkts, __rte_unused uint16_t nb_pkts) diff --git a/drivers/net/nfp/nfp_rxtx_vec_stub.c b/drivers/net/nfp/nfp_rxtx_vec_stub.c index c480f61ef0..201965afbe 100644 --- a/drivers/net/nfp/nfp_rxtx_vec_stub.c +++ b/drivers/net/nfp/nfp_rxtx_vec_stub.c @@ -10,13 +10,13 @@ #include "nfp_rxtx_vec.h" -bool __rte_weak +bool nfp_net_get_avx2_supported(void) { return false; } -uint16_t __rte_weak +uint16_t nfp_net_vec_avx2_recv_pkts(__rte_unused void *rx_queue, __rte_unused struct rte_mbuf **rx_pkts, __rte_unused uint16_t nb_pkts) From patchwork Sun Feb 9 17:28:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151226 X-Patchwork-Delegate: thomas@monjalon.net 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 827D8461DB; Sun, 9 Feb 2025 18:29:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A3BF40A80; Sun, 9 Feb 2025 18:29:42 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 39C8040647 for ; Sun, 9 Feb 2025 18:29:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Labvj+3reRIKOL8ZnrJ1W6+3fBeXSM8oHjWD8F65t/4=; b=bmSgsSmmHlMfttPmd6neOjHh/Shiu52hC7YtzqUmjkdnXqL0zmGyx0ZQICXoxqb30G8Lmg k+WL+SFVzPW+xtoNet09+HthvtkgAwe2diXnZA8ONDwXhHRcl2TzOyuCXZyf2FePEV9Oek yAqZICojIx2Ka2CO/Vn7/pyKy5gLatU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-bYjUL_jbOn-DTUMT-2JzrA-1; Sun, 09 Feb 2025 12:29:37 -0500 X-MC-Unique: bYjUL_jbOn-DTUMT-2JzrA-1 X-Mimecast-MFC-AGG-ID: bYjUL_jbOn-DTUMT-2JzrA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C7BD01800877; Sun, 9 Feb 2025 17:29:35 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9823E1800570; Sun, 9 Feb 2025 17:29:33 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Maxime Coquelin , Chenbo Xia Subject: [RFC v2 08/10] net/virtio: remove weak symbols Date: Sun, 9 Feb 2025 18:28:46 +0100 Message-ID: <20250209172850.2429075-9-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GDwE2z2rqOyObV_xanbPMrmJ8tFkzFpDO3TmtavXPVw_1739122175 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Rather than use weak symbols, expose stubs symbols when needed. Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin --- drivers/net/virtio/meson.build | 5 +++++ drivers/net/virtio/virtio_rxtx.c | 6 ++++-- drivers/net/virtio/virtio_rxtx_simple.c | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index c708ea5258..56c763e96f 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -28,6 +28,7 @@ cflags += no_wvla_cflag if arch_subdir == 'x86' if cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + cflags += ['-DVIRTIO_RXTX_PACKED_VEC'] virtio_avx512_lib = static_library('virtio_avx512_lib', 'virtio_rxtx_packed.c', dependencies: [static_rte_ethdev, @@ -43,11 +44,15 @@ if arch_subdir == 'x86' cflags += '-DVIRTIO_ICC_UNROLL_PRAGMA' endif endif + cflags += ['-DVIRTIO_RXTX_VEC'] sources += files('virtio_rxtx_simple_sse.c') elif arch_subdir == 'ppc' + cflags += ['-DVIRTIO_RXTX_VEC'] sources += files('virtio_rxtx_simple_altivec.c') elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64') + cflags += ['-DVIRTIO_RXTX_PACKED_VEC'] sources += files('virtio_rxtx_packed.c') + cflags += ['-DVIRTIO_RXTX_VEC'] sources += files('virtio_rxtx_simple_neon.c') endif diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index b67f063b31..2a0d1b6101 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -2045,7 +2045,8 @@ virtio_xmit_pkts_inorder(void *tx_queue, return nb_tx; } -__rte_weak uint16_t +#ifndef VIRTIO_RXTX_PACKED_VEC +uint16_t virtio_recv_pkts_packed_vec(void *rx_queue __rte_unused, struct rte_mbuf **rx_pkts __rte_unused, uint16_t nb_pkts __rte_unused) @@ -2053,10 +2054,11 @@ virtio_recv_pkts_packed_vec(void *rx_queue __rte_unused, return 0; } -__rte_weak uint16_t +uint16_t virtio_xmit_pkts_packed_vec(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts __rte_unused, uint16_t nb_pkts __rte_unused) { return 0; } +#endif /* DVIRTIO_RXTX_PACKED_VEC */ diff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c index 439e00a7e1..aa96c9c488 100644 --- a/drivers/net/virtio/virtio_rxtx_simple.c +++ b/drivers/net/virtio/virtio_rxtx_simple.c @@ -43,8 +43,9 @@ virtio_rxq_vec_setup(struct virtnet_rx *rxq) return 0; } +#ifndef VIRTIO_RXTX_VEC /* Stub for linkage when arch specific implementation is not available */ -__rte_weak uint16_t +uint16_t virtio_recv_pkts_vec(void *rx_queue __rte_unused, struct rte_mbuf **rx_pkts __rte_unused, uint16_t nb_pkts __rte_unused) @@ -52,3 +53,4 @@ virtio_recv_pkts_vec(void *rx_queue __rte_unused, rte_panic("Wrong weak function linked by linker\n"); return 0; } +#endif /* VIRTIO_RXTX_VEC */ From patchwork Sun Feb 9 17:28:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151227 X-Patchwork-Delegate: thomas@monjalon.net 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 E22D4461DB; Sun, 9 Feb 2025 18:29:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CCAA40A8A; Sun, 9 Feb 2025 18:29:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6EE3F40A8A for ; Sun, 9 Feb 2025 18:29:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jkmQ6ytYlhPphvZ88SaLAQNi9Dkj4O4QflVcyt4FkOE=; b=iedpchO0rQnOaKKX36MrZAsg3FQTEyJa5OOahpxndk3lrL1E2uKCFApCRelb34BhoVbE5G 5MVBffSMthPlrWV2uTi9nfudo+tY0OXQ9j68XdJBZh0z0v2V08I6TjVX16NDaDvIjMfiDf 2V4YkpBKikfPHZWeDf9rJnYZioc1Fwc= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-_wXFxDwrP6Oi1Bk-UsVYAg-1; Sun, 09 Feb 2025 12:29:41 -0500 X-MC-Unique: _wXFxDwrP6Oi1Bk-UsVYAg-1 X-Mimecast-MFC-AGG-ID: _wXFxDwrP6Oi1Bk-UsVYAg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63ECE195608C; Sun, 9 Feb 2025 17:29:40 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BAEC11800570; Sun, 9 Feb 2025 17:29:38 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com Subject: [RFC v2 09/10] app/compress-perf: remove weak symbols Date: Sun, 9 Feb 2025 18:28:47 +0100 Message-ID: <20250209172850.2429075-10-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rGcQfF0WcCxzMioepllak09t4sTQGDwcOvoIEb28sZg_1739122180 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Remove dead code, those symbols are never used as the "strong" symbols are always linked in. Signed-off-by: David Marchand --- app/test-compress-perf/main.c | 62 ----------------------------------- 1 file changed, 62 deletions(-) diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c index fa366123ed..70ce4316cc 100644 --- a/app/test-compress-perf/main.c +++ b/app/test-compress-perf/main.c @@ -521,65 +521,3 @@ main(int argc, char **argv) } return ret; } - -__rte_weak void * -cperf_cyclecount_test_constructor(uint8_t dev_id __rte_unused, - uint16_t qp_id __rte_unused, - struct comp_test_data *options __rte_unused) -{ - RTE_LOG(INFO, USER1, "Cycle count test is not supported yet\n"); - return NULL; -} - -__rte_weak void -cperf_cyclecount_test_destructor(void *arg __rte_unused) -{ - RTE_LOG(INFO, USER1, "Something wrong happened!!!\n"); -} - -__rte_weak int -cperf_cyclecount_test_runner(void *test_ctx __rte_unused) -{ - return 0; -} - -__rte_weak void * -cperf_throughput_test_constructor(uint8_t dev_id __rte_unused, - uint16_t qp_id __rte_unused, - struct comp_test_data *options __rte_unused) -{ - RTE_LOG(INFO, USER1, "Benchmark test is not supported yet\n"); - return NULL; -} - -__rte_weak void -cperf_throughput_test_destructor(void *arg __rte_unused) -{ - -} - -__rte_weak int -cperf_throughput_test_runner(void *test_ctx __rte_unused) -{ - return 0; -} -__rte_weak void * -cperf_verify_test_constructor(uint8_t dev_id __rte_unused, - uint16_t qp_id __rte_unused, - struct comp_test_data *options __rte_unused) -{ - RTE_LOG(INFO, USER1, "Verify test is not supported yet\n"); - return NULL; -} - -__rte_weak void -cperf_verify_test_destructor(void *arg __rte_unused) -{ - -} - -__rte_weak int -cperf_verify_test_runner(void *test_ctx __rte_unused) -{ - return 0; -} From patchwork Sun Feb 9 17:28:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 151228 X-Patchwork-Delegate: thomas@monjalon.net 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 007DB461DB; Sun, 9 Feb 2025 18:30:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CB2D40B9A; Sun, 9 Feb 2025 18:29:50 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A09884065C for ; Sun, 9 Feb 2025 18:29:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739122188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w7lOD+GaQPpHum54VnppMl+N76TfdSxFYPMO4xIo70g=; b=OoNTHdjH/YnHWBLssn4s3dYge2Zu5u27aAdYt7bobjwK+/TEuorbhxJTLWQJkp3Zzk05E1 hjBEwhx2kRzPVW44hERBIS5+1hwR/0wuHXl6a8eEcPbk9zXIXVasy0MzIA3aoyW1DLSnuT hKdopPbm1k9k04+zLRBaO6VPjR96TZI= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-Q0hIWgSrNeKuBHyXFZIy6A-1; Sun, 09 Feb 2025 12:29:46 -0500 X-MC-Unique: Q0hIWgSrNeKuBHyXFZIy6A-1 X-Mimecast-MFC-AGG-ID: Q0hIWgSrNeKuBHyXFZIy6A Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BF7811956086; Sun, 9 Feb 2025 17:29:45 +0000 (UTC) Received: from dmarchan.com (unknown [10.44.32.76]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 622FC195608D; Sun, 9 Feb 2025 17:29:43 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, andremue@linux.microsoft.com, Tyler Retzlaff Subject: [RFC v2 10/10] eal: deprecate weak symbols Date: Sun, 9 Feb 2025 18:28:48 +0100 Message-ID: <20250209172850.2429075-11-david.marchand@redhat.com> In-Reply-To: <20250209172850.2429075-1-david.marchand@redhat.com> References: <20250207083252.3131588-1-david.marchand@redhat.com> <20250209172850.2429075-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JTg8RwLW3134l8JNZxHWXoshtDfwLsxKVUx4hskgITI_1739122185 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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 Mark __rte_weak as deprecated. It will avoid having to support such feature with other linkers, plus this was never really needed. Signed-off-by: David Marchand --- doc/guides/rel_notes/release_25_03.rst | 2 ++ lib/eal/include/rte_common.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_25_03.rst b/doc/guides/rel_notes/release_25_03.rst index 2b139fc35b..3426bfee0e 100644 --- a/doc/guides/rel_notes/release_25_03.rst +++ b/doc/guides/rel_notes/release_25_03.rst @@ -154,6 +154,8 @@ API Changes * eal: The ``__rte_packed`` macro for packing data is replaced with ``__rte_packed_begin`` / ``__rte_packed_end``. +* eal: The ``__rte_weak`` macro is deprecated and will be removed in a future release. + * build: The Intel networking drivers: cpfl, e1000, fm10k, i40e, iavf, ice, idpf, igc, ipn3ke and ixgbe, have been moved from ``drivers/net`` to a new ``drivers/net/intel`` directory. diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index 7a252c1997..2e0ee9dc7e 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -181,7 +181,11 @@ typedef uint16_t unaligned_uint16_t; /** * Mark a function or variable to a weak reference. */ -#define __rte_weak __attribute__((__weak__)) +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_weak RTE_DEPRECATED(__rte_weak) +#else +#define __rte_weak RTE_DEPRECATED(__rte_weak) __attribute__((__weak__)) +#endif /** * Mark a function to be pure.