From patchwork Mon Mar 2 14:48:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1247680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48WNMH4QmQz9sRR; Tue, 3 Mar 2020 01:49:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j8mNb-0000xo-Dn; Mon, 02 Mar 2020 14:49:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j8mNY-0000vI-Jg for kernel-team@lists.ubuntu.com; Mon, 02 Mar 2020 14:49:08 +0000 Received: from 2.general.fheimes.uk.vpn ([10.172.194.67] helo=T570.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j8mNY-00087o-AG for kernel-team@lists.ubuntu.com; Mon, 02 Mar 2020 14:49:08 +0000 From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [F][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_NET_SWITCHDEV in kernel config for s390x starting with focal Date: Mon, 2 Mar 2020 15:48:49 +0100 Message-Id: <20200302144849.51810-2-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200302144849.51810-1-frank.heimes@canonical.com> References: <20200302144849.51810-1-frank.heimes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Frank Heimes BugLink: https://bugs.launchpad.net/bugs/1865452 This is a request to enable the kernel CONFIG option CONFIG_NET_SWITCHDEV for s390x starting with focal. On all other platforms (except s390x) CONFIG_NET_SWITCHDEV is enabled since 16.10 (LP 1628241). The NET_SWITCHDEV support is now required to enable ConnectX-5 network adapters on s390x, used in "embedded switch" mode. The s390/net side of the world, will have a need for NET_SWITCHDEV as well in the near future. Signed-off-by: Frank Heimes --- debian.master/config/annotations | 3 ++- debian.master/config/s390x/config.common.s390x | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index bec875bb7182..0a456a7b4532 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11825,7 +11825,7 @@ CONFIG_INET_ESP_OFFLOAD policy<{'amd64': 'm', 'arm64': ' CONFIG_INET_IPCOMP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_TCP_MD5SIG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NETLABEL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_NET_SWITCHDEV policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}> +CONFIG_NET_SWITCHDEV policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NET_L3_MASTER_DEV policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NET_NCSI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NCSI_OEM_CMD_GET_MAC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -11833,6 +11833,7 @@ CONFIG_BPF_STREAM_PARSER policy<{'amd64': 'y', 'arm64': ' # CONFIG_SYN_COOKIES mark CONFIG_NET_SWITCHDEV mark note +CONFIG_NET_SWITCHDEV mark note # Menu: Networking support >> Networking options >> TCP/IP networking >> BPF based packet filtering framework (BPFILTER) CONFIG_BPFILTER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index ed573d6be558..e34e50a8f023 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -331,7 +331,7 @@ CONFIG_MFD_CORE=m # CONFIG_MLXSW_I2C is not set # CONFIG_MMC is not set # CONFIG_MTD is not set -# CONFIG_NET_SWITCHDEV is not set +CONFIG_NET_SWITCHDEV=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_AGERE is not set