From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31429A04B1 for ; Thu, 5 Nov 2020 13:41:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 28F3EC31B; Thu, 5 Nov 2020 13:41:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 63BB9C31B for ; Thu, 5 Nov 2020 13:41:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580105; 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=BEyzEadh32Wk5Ah8AknZh0j8loY6TZruwQQXcUqXQNA=; b=RCnUGl1JWACPNm8w23JBigp7FnH2NWC6k5lDA71hTLIr+UQqy7sHw7/9edP4kpaKCzke59 taheJ3ABGXP1797JQESNi3dzve/CXGKc1SwUw5yHk9P0HJH60gpQRPAYK1BNzYf1RxgF6r iWOWLPBqunOPFl3zUf7ELvZ5Uz+Enb0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-290-if9Cd0riOwaeQmIVhm5ReA-1; Thu, 05 Nov 2020 07:41:42 -0500 X-MC-Unique: if9Cd0riOwaeQmIVhm5ReA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F54D805EFD; Thu, 5 Nov 2020 12:41:41 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1C735C3E1; Thu, 5 Nov 2020 12:41:33 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Brandon Lo , David Marchand , dpdk stable Date: Thu, 5 Nov 2020 12:39:45 +0000 Message-Id: <20201105124015.306404-38-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/88cf9e5af41f75146f31ae32f0c9cda0bd1416b8 Thanks. Kevin. --- >From 88cf9e5af41f75146f31ae32f0c9cda0bd1416b8 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 2 Oct 2020 09:54:00 +0200 Subject: [PATCH] vdpa/ifc: fix build with recent kernels [ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ] VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel headers, causing build issue. Let's define it in the IFC vDPA driver only if it wasn't already. Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") Reported-by: Brandon Lo Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- drivers/net/ifc/base/ifcvf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h index c15c691078..c6636a897a 100644 --- a/drivers/net/ifc/base/ifcvf.h +++ b/drivers/net/ifc/base/ifcvf.h @@ -14,5 +14,8 @@ #define IFCVF_MAX_QUEUES 1 + +#ifndef VIRTIO_F_IOMMU_PLATFORM #define VIRTIO_F_IOMMU_PLATFORM 33 +#endif /* Common configuration */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.988449137 +0000 +++ 0038-vdpa-ifc-fix-build-with-recent-kernels.patch 2020-11-05 12:38:54.239896019 +0000 @@ -1 +1 @@ -From 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a Mon Sep 17 00:00:00 2001 +From 88cf9e5af41f75146f31ae32f0c9cda0bd1416b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - drivers/vdpa/ifc/base/ifcvf.h | 3 +++ + drivers/net/ifc/base/ifcvf.h | 3 +++ @@ -21,4 +22,4 @@ -diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h -index a288ce57dc..573a35ffb4 100644 ---- a/drivers/vdpa/ifc/base/ifcvf.h -+++ b/drivers/vdpa/ifc/base/ifcvf.h +diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h +index c15c691078..c6636a897a 100644 +--- a/drivers/net/ifc/base/ifcvf.h ++++ b/drivers/net/ifc/base/ifcvf.h