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 8206EA0543 for ; Tue, 21 Jun 2022 10:11:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B01D342B91; Tue, 21 Jun 2022 10:11:17 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2071.outbound.protection.outlook.com [40.107.92.71]) by mails.dpdk.org (Postfix) with ESMTP id 932F242B8C for ; Tue, 21 Jun 2022 10:11:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CbHJEifeKQin2v27LhMTWj5OLGsKkw3wP3fWAdDSAFfVQUaHleBLoZs33f2yYIhEmNnZ6OJt1UQCTgnyOfNVizpc5TkZBhQkd0L4oVNNEKtItTk15FlyH8YD1eDa4TMMPjSpZ2bXZNRJYnk8WMhQE5SJ6j+5Jlq0raJCsedPZCxV0B22DLC8rRc/O3ScDMkUYbS3NTxp7R3MXp00PHEVW23lrO/pMs3mRbx7htPp5TkI5bWALRwV0IYgTxFA789E1/SfzmnbijNMEYFD+sp9+jpWrcTWsFqWNNL5TN8w1kS3+ktORDs3gSFmQCYt96B6xbCC2oTUpMwCn5O0E9ONYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uXrQ7cQDQFpkzFhmvamM1GM4fRo1W3KTrMUQCh5ayew=; b=FIOBH750BZAWW6MqkxP+IeTr6nRd2HaCsqy7LMPAaV3cuXa/S0OQnGNBcjlixsUNaSP7fix8+o6ZiL1foIxIdranhfsUH0r35braaYXJU+bBHTHK8X7QSI4JgbSANnFDdX9jTfoSrpLTv0WMZ5uRtaovG/xWk1IMdxBcHClD+tgM5hJHCdHwBxokq4SdvrK/UtP31oMTSPa1IyiJVdmKEYSByV+pAnjrZJ05va9Ma1QMDzwqQAOALk7zjtG+yM9gk7WIq1isObKtGWnfT49/BhnUetckMYwm8545BwXmrwqlasmrmmNgKlsHPBuFb30CWkhXFpxocCuGwCZlpGSqOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uXrQ7cQDQFpkzFhmvamM1GM4fRo1W3KTrMUQCh5ayew=; b=SEuPgX4ZGi+z4Twrx/0vwnDsrOUoHe3ZLHmf0pcsdtOf8YNLiG2H4Tvd/MWLAM6sduD1QieRHvOLgtyAMbTxfJ3RdF0G52NMtMSvC/PUWtNTaPl4qvECstYKyYyrHKG7NtxD5k7uOLh27nUJexEskrx4MqK4wNkQJs+E1Erg9sAXAq9ftqyxoW6SsthOy5w1svfGxfyEpgm3H5CaF7TwYxN4OVjDm12h5ks2tq3IHH7vp55/YGWKhjcMWoxmXJyxrYTqjnH/YjxMLzR9Nh8rmqYm2eLEd47Zqy/P/z7577KG6J7GHJVpXC/lKu23Q5qZOWUZtsWrWYhe60STe38nwQ== Received: from BN6PR19CA0103.namprd19.prod.outlook.com (2603:10b6:404:a0::17) by DM6PR12MB4340.namprd12.prod.outlook.com (2603:10b6:5:2a8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.13; Tue, 21 Jun 2022 08:11:15 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:404:a0:cafe::eb) by BN6PR19CA0103.outlook.office365.com (2603:10b6:404:a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22 via Frontend Transport; Tue, 21 Jun 2022 08:11:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:11:14 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:11:12 -0700 From: Xueming Li To: Jiri Slaby CC: Andrew Rybchenko , dpdk stable Subject: patch 'kni: fix build with Linux 5.18' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:38 +0300 Message-ID: <20220621080301.2315720-93-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ce89718-1174-446a-2708-08da535d9c6b X-MS-TrafficTypeDiagnostic: DM6PR12MB4340:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1cvBHF2MAJHnoGIFlk+IvihX3wvmI+SdRAG9ljDkqCzaWfS28xAxAMuDrvMtTEcxGIo2IMVUxCIORx6L8fUsr3iQ3Ox6mD/GwrQJqEy8hcfsMEyeRayOfl9AqMnhCesBEynU4jXagOR8QGyZwaSPxYiApaflbplJparazGq0CcH6WysMHp+iK/DYhneZbmJUmCBdbvRYBG2JnXf671UQEdGKRj0RM0M1P2j529DHvco5Hka3fe8C8THXJLPflzA0/PxEkGKBCOAzhN13kbO+csZiu33o7qOTph7a3RY0RZGVl27zHx6NySdGgwDkHxltnoKHbVD2ehylyDodvoXFP3WUzWTEz0K+oXIZ5Wz1yJkQbO6vbFoCWseHJndetMiR/tuDg74MBHV43Y12yM8aD+u/trVQabCfQFXoXdSiTXSBMda2xrn7wsSxva4hOe28swZBOLaSIsxnaK/moEr9mnKk1qzlIaH7srHuPtArE5QU+PveUYFHikcTW0vHbLQ6DtPysvczH7eRLJykikkYF06jqxMrdWKLwiwk/uTqRnCMWdPUYAvxi1fKQW25oRvs93b4m/azJONFRJpe+aX2W8S2Pprv34SeYF5LyMK176WCHONdLy8eh07fVYzx8pUvLhaqXDPO2S1nGwT0ZszYmrT85memykhv9bG9Xw/NDIUtuwMwHPPwEzQrP8Vzsm23foQnXJ9IcvltgFXouKsgDEN+YJSWiX+dKxo3jfXps2ROtbAof1BDv0+IqtBLQbwun/eO7KbtNH5OkKNvZt+yc8qLnZw7fKKQqo3hxfMu/EeysxxzgONExL6mER+c7RLiXKIPZ64FIs2JIS6ZQsI4zc7nSFg2ieSIzhFPBK+KFmE= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(136003)(376002)(39860400002)(396003)(36840700001)(46966006)(40470700004)(316002)(6916009)(2616005)(41300700001)(86362001)(5660300002)(356005)(40460700003)(6666004)(81166007)(7696005)(2906002)(36860700001)(6286002)(53546011)(26005)(82310400005)(82740400003)(336012)(40480700001)(426003)(55016003)(36756003)(70206006)(83380400001)(70586007)(478600001)(47076005)(966005)(1076003)(4326008)(186003)(16526019)(8936002)(8676002)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:11:14.5959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ce89718-1174-446a-2708-08da535d9c6b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4340 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/133ec0ce1cf48478423440b532eabb7bcb019c0c Thanks. Xueming Li --- >From 133ec0ce1cf48478423440b532eabb7bcb019c0c Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 1 Jun 2022 08:53:58 +0200 Subject: [PATCH] kni: fix build with Linux 5.18 Cc: Xueming Li [ upstream commit c98600d4bed6d15599e448990f2ba117ca938a2d ] Since commit 2655926aea9b (net: Remove netif_rx_any_context() and netif_rx_ni().) in 5.18, netif_rx_ni() no longer exists as netif_rx() can be called from any context. So define HAVE_NETIF_RX_NI for older releases and call the appropriate function in kni_net. netif_rx_ni() must be used on older kernel since netif_rx() might might lead to deadlocks or other problems there. Signed-off-by: Jiri Slaby Reviewed-by: Andrew Rybchenko --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_net.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 664785674f..0db29a4a6f 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -141,3 +141,7 @@ #if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE #define HAVE_TSK_IN_GUP #endif + +#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE +#define HAVE_NETIF_RX_NI +#endif diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 29e5b9e21f..a8b092b756 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -441,7 +441,11 @@ kni_net_rx_normal(struct kni_dev *kni) skb->ip_summed = CHECKSUM_UNNECESSARY; /* Call netif interface */ +#ifdef HAVE_NETIF_RX_NI netif_rx_ni(skb); +#else + netif_rx(skb); +#else /* Update statistics */ dev->stats.rx_bytes += len; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:53.373585006 +0800 +++ 0092-kni-fix-build-with-Linux-5.18.patch 2022-06-21 15:37:49.187785117 +0800 @@ -1 +1 @@ -From c98600d4bed6d15599e448990f2ba117ca938a2d Mon Sep 17 00:00:00 2001 +From 133ec0ce1cf48478423440b532eabb7bcb019c0c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c98600d4bed6d15599e448990f2ba117ca938a2d ] @@ -13,2 +15,0 @@ - -Cc: stable@dpdk.org