From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DD4D9A0032 for ; Fri, 18 Feb 2022 13:45:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8C4940141; Fri, 18 Feb 2022 13:45:26 +0100 (CET) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mails.dpdk.org (Postfix) with ESMTP id 51C1B4113F for ; Fri, 18 Feb 2022 13:45:25 +0100 (CET) Received: by mail-ed1-f42.google.com with SMTP id q17so15335649edd.4 for ; Fri, 18 Feb 2022 04:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pM4WNnvs3bNUlPTnqeENCcXFH3LhCEK8JuJE1IWrg/s=; b=bc9QowdBxp+l0gvgV3z008OhTA+IvaZP+xb6Zxsy/vBiGUedaIvSxMG5lSgnrXmZfK nLj4QHeNFYOpDz8tGMxu/OzWtRtBfX3y21jNlpT4UbHutbluYAAQ/v6dqrURigZ8wEXr 7V5raSzXkTovXa/my4o9BozyWmX8tYnQqYYsfBWSacG300vm8sitH0OtJiJb/0JcyepX D8gleV1CPjkYmMe3KTGw0Hw9po0kfW8q+6bfYCgK7x/Un5I+eHSeTqEzczzYeUX/JbXd UlQCVvwf9VyrLCdxB+llRr8dPfjx0RFMS10XlIdTkvLfjyKdISNhdR3VZxKIGkRzykPO qdYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pM4WNnvs3bNUlPTnqeENCcXFH3LhCEK8JuJE1IWrg/s=; b=XGgJbOIefTqdB+LTka5qLOGrTM6YFnW8/D0KHTxVcIDtIJHU2g42Lpm7QJsus+RexW a/n3KtddRAZIs2BW2PcRNCHrKiezHReDkog2/KbkuDgDnAzQt5kgUvpH2jjG2DvFiOrf uBLOScsRzSDOSSmxRKMepueEFzb07+Gr3L4/8Q4MslktA7myE0upVZGF4dYzLLnbKZs0 vEJQCjLVjy3Nd2NqmcRqGd5P1T9Fz4xzd/RRJ01I2JGw3knX8wTNqfO7xCEvqFj3eR0P PmMHiUeQZtJXaG6XI50Nk47yt3QK+NZqKYH/JnvcqeWFkY5lmI4OILQ2SrBbD8hiUa/X lrNA== X-Gm-Message-State: AOAM532uM1dYG6t70rmgbqBH9denNgfEdijARiFDBBV+52kgS7SpfaZn Fgwnh+gIROaEmszYKt3IAPyhite4vL4D1SSN X-Google-Smtp-Source: ABdhPJyijATZ5aucgcZmBlPrt8exqrPB6GE3r2E9Eo+NlUbbdTDAeMIEwhC26IznME5xzgsP++3Nrw== X-Received: by 2002:a50:9b45:0:b0:410:7cdb:5d3a with SMTP id a5-20020a509b45000000b004107cdb5d3amr8221456edj.275.1645188324985; Fri, 18 Feb 2022 04:45:24 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id ec52sm4455737edb.92.2022.02.18.04.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:24 -0800 (PST) From: luca.boccassi@gmail.com To: Yiding Zhou Cc: Wei Ling , Qi Zhang , dpdk stable Subject: patch 'net/ice: fix build with 16-byte Rx descriptor' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:24 +0000 Message-Id: <20220218123931.1749595-115-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/64d94d1e8f5176865661b12f64e1061c826ccbd8 Thanks. Luca Boccassi --- >From 64d94d1e8f5176865661b12f64e1061c826ccbd8 Mon Sep 17 00:00:00 2001 From: Yiding Zhou Date: Tue, 8 Feb 2022 15:42:19 +0000 Subject: [PATCH] net/ice: fix build with 16-byte Rx descriptor [ upstream commit 94005e4640a7d1e10e9b6b89e9a31890c578192f ] gcc will report error "unused parameter 'rxq'" when the macro RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use RTE_SET_USED to avoid it Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling") Signed-off-by: Yiding Zhou Tested-by: Wei Ling Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 1fc2bec5d5..97cbeb2cf5 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -129,6 +129,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq, *RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata; } } +#else + RTE_SET_USED(rxq); #endif } @@ -167,6 +169,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq, *RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata; } } +#else + RTE_SET_USED(rxq); #endif } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:42.167382836 +0000 +++ 0115-net-ice-fix-build-with-16-byte-Rx-descriptor.patch 2022-02-18 12:37:37.870795940 +0000 @@ -1 +1 @@ -From 94005e4640a7d1e10e9b6b89e9a31890c578192f Mon Sep 17 00:00:00 2001 +From 64d94d1e8f5176865661b12f64e1061c826ccbd8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 94005e4640a7d1e10e9b6b89e9a31890c578192f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 58700f1b92..4f218bcd0d 100644 +index 1fc2bec5d5..97cbeb2cf5 100644 @@ -23 +24 @@ -@@ -163,6 +163,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq, +@@ -129,6 +129,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq, @@ -32 +33 @@ -@@ -201,6 +203,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq, +@@ -167,6 +169,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq,