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 249D941D4F for ; Thu, 23 Feb 2023 10:37:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FF0143150; Thu, 23 Feb 2023 10:37:28 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id CB3B7427E9 for ; Thu, 23 Feb 2023 10:37:25 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id t13so10060182wrv.13 for ; Thu, 23 Feb 2023 01:37:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yIA5++iHU70QIFZGitULsuvFh1zcJexgvPC29iugPY4=; b=W3DEXt5/6aeE/IuOucojRnjzS549PL47puSL+VMO0JpkS3cecXQrxMJTmBkpxyiaZr JtMgl8osHh4cAF+488FMkYgp9FESxnFWWhyEJAg8K63f2Z9PVQ4pn1bKT1/SakcPnoen BMoC3vzabjxlAXLNiUNQetTO6USsHlGKaaLtnZ0znS1HAvwWSq1CUM60BAfn8XivCpif 06UpUSAW4uT3fsu7fm34NjYwpZw+bOGyUsvwzzrgfNx4SlmXSB61qczNrOdFheVVJqIv enMGIkV9Gt3YlgH9RvJ/PKvQasZp8khK6K/amZynnqwxdGaQMCwYNAaGimklxInpC3yj RErg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yIA5++iHU70QIFZGitULsuvFh1zcJexgvPC29iugPY4=; b=kczovajYPFsTko7kmW6wf6BSwy2UGQaRnLCZcy7lSIKrBtlLqCKjXFRA0yLMoRYVxP 4Ix/BwJzHSyBJpxWSoUk7s+4y6kwyesIl3dsvnwVwasVPCedzwPEUraZIOnst1L166q5 k2l0fUZWb/C9kf3HJo8s84Jg+DQ+5C1HQfaxSI194O5p7Ww1YRkKTR/JLK6JMc9WPuLM WyAMoJeUgSZmEEnpDsCWeQvg6UMhrc/iRzRVBmQu6Ub4MDRVytsfhrXfzNpaHbGtS+XY 25HwbhPKCdqx611B8V1PRP8GwvFAvK78fJaZx0ZkKu2YcYL6U7UdWn7ApupAMrvwMnkq /nsQ== X-Gm-Message-State: AO0yUKUK75mZV8vZozCd5GZydIa718R97ucy0YFfI3uJIEVC5tR4g2xy GNQ8tpE3tC9CzipZOiAzg74= X-Google-Smtp-Source: AK7set8/gOpqt4bWEhU9Xkd5h5gUWvwpcdYK7Mj9IWPKrx2atbf596otpuBA9M8TKH2UmNLJPQinLg== X-Received: by 2002:a5d:53c1:0:b0:2c5:5234:882c with SMTP id a1-20020a5d53c1000000b002c55234882cmr8507236wrw.7.1677145045443; Thu, 23 Feb 2023 01:37:25 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id bh21-20020a05600c3d1500b003e2052bad94sm4822409wmb.33.2023.02.23.01.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:37:25 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Daxue Gao , David Marchand , dpdk stable Subject: patch 'kni: fix build on RHEL 9.1' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:06 +0000 Message-Id: <20230223093715.3926893-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/21a2d0184ffb6f4f686f9014d97366efd2009b86 Thanks. Luca Boccassi --- >From 21a2d0184ffb6f4f686f9014d97366efd2009b86 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 6 Jan 2023 20:13:14 +0000 Subject: [PATCH] kni: fix build on RHEL 9.1 [ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ] Linux kernel in the RHEL9.1 seems backported Linux commit 2655926aea9b ("net: Remove netif_rx_any_context() and netif_rx_ni().") that drops netif_rx_ni(). This was fixed in DPDK for vanilla kernel with the commit c98600d4bed6 ("kni: fix build with Linux 5.18"). Add RHEL9.1 check for the netif_rx_ni() usage to fix build error. Bugzilla ID: 1076 Signed-off-by: Ferruh Yigit Tested-by: Daxue Gao Reviewed-by: David Marchand --- kernel/linux/kni/compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 3a86d12bbc..7aa6cd9fca 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -146,6 +146,8 @@ #define HAVE_ETH_HW_ADDR_SET #endif -#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE +#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE && \ + (!(defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_VERSION(9, 1) <= RHEL_RELEASE_CODE)) #define HAVE_NETIF_RX_NI #endif -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:28.417041836 +0000 +++ 0002-kni-fix-build-on-RHEL-9.1.patch 2023-02-23 09:36:28.166168835 +0000 @@ -1 +1 @@ -From 8b07816b396f2075f44b4ffa65ecbd0d5a624661 Mon Sep 17 00:00:00 2001 +From 21a2d0184ffb6f4f686f9014d97366efd2009b86 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org