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 E9531A0555 for ; Thu, 9 Jun 2022 13:38:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3B2D40220; Thu, 9 Jun 2022 13:38:28 +0200 (CEST) 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 F1C4C427F6 for ; Thu, 9 Jun 2022 13:38:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774706; 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=orPDYu21dJzEOOoIOG6B4ulh05/4dZhMarOss5cxePc=; b=FEjXFFKTuDPj7X2qCOkG1BPEqJkgnUdT3V29Bu3tnn6kxehIjpLynU7DOfp8K26yIyYIxh qi9Jbw7OLkQI/VJO1v1KIGtnJqcfPGU+V76bMs+dQ1cOqjXkbDjS7WpaLly3wFtf6KNfrC u7fZA66H/nJdCpr1YzhQY8Pvg3xnz1I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-533-9nRxwSsRNBWRI9DAFDsUeA-1; Thu, 09 Jun 2022 07:38:25 -0400 X-MC-Unique: 9nRxwSsRNBWRI9DAFDsUeA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 334B9185A7B2; Thu, 9 Jun 2022 11:38:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EE4C18EA5; Thu, 9 Jun 2022 11:38:24 +0000 (UTC) From: Kevin Traynor To: Jiri Slaby Cc: Andrew Rybchenko , dpdk stable Subject: patch 'kni: fix build with Linux 5.18' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:41 +0100 Message-Id: <20220609113701.386938-54-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.2 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/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/85185a45528ba4eb07d37f7b10fd4b744aba971c Thanks. Kevin --- >From 85185a45528ba4eb07d37f7b10fd4b744aba971c 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 [ 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 @@ -142,2 +142,6 @@ #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 @@ -442,5 +442,9 @@ kni_net_rx_normal(struct kni_dev *kni) /* Call netif interface */ +#ifdef HAVE_NETIF_RX_NI netif_rx_ni(skb); +#else + netif_rx(skb); +#else /* Update statistics */ -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.005263410 +0100 +++ 0054-kni-fix-build-with-Linux-5.18.patch 2022-06-09 12:34:29.769980681 +0100 @@ -1 +1 @@ -From c98600d4bed6d15599e448990f2ba117ca938a2d Mon Sep 17 00:00:00 2001 +From 85185a45528ba4eb07d37f7b10fd4b744aba971c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c98600d4bed6d15599e448990f2ba117ca938a2d ] + @@ -13,2 +14,0 @@ - -Cc: stable@dpdk.org