From patchwork Wed Aug 1 06:59:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 951964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A8ft81uv"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41gPM73ZsLz9s1x for ; Wed, 1 Aug 2018 17:00:03 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7B475C50; Wed, 1 Aug 2018 07:00:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 13060BD8 for ; Wed, 1 Aug 2018 06:59:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 83108CF for ; Wed, 1 Aug 2018 06:59:58 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id a26-v6so7357806pfo.4 for ; Tue, 31 Jul 2018 23:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7sVeeBErKfRxAmfFqOIxWVNcSi61rwc1rhjNHOfs9vY=; b=A8ft81uv4G7ndfT1bGv6EfUbOmZDULzRzHg4u1IDZM7x3IHd+z8QQBsr4Et3KZs7Bj 1cr1nbEIFgHux88PLryoS/jKOB4be+A+9o+vjR5x8no6X24LnLtQY2SrwIs3DKTB5BB7 N0XF+UIgyai59e89o+GzHjga+OXxyYSfwFwAiHsAMmZwrvAA+Nl0z05UNY+qkGJZYU31 amZ8b6NuqMHm1uOatmAlTjW1ItF6rR4fSZLNzWEhCIt740domJy48n08NViijfCGvdNi MCykHt/pi71NWtPr1Zf4PTQiAxWWf68mpGrFmKr1VUPSV9Z2r8c6l0cTUVra8tNH0dai WPWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7sVeeBErKfRxAmfFqOIxWVNcSi61rwc1rhjNHOfs9vY=; b=V+bG2lNMQC1t2GKKZZRXJjqZXDT8VNM8fZR3fBxIs8gSWxzoy0PDqMe0l82fYNPIfX o1Uaz5BwwlzWAvq9Hh/1NGvpFFIlKomMXYPcXI7TPB/dShwBKFBiU8r1HPszGjYvdsqt 3oqcgqTCope/8v12tf+8v5TPemc80SWLycfynGyCDifVn40rwi9BYv1XYQNeu1aWv7zk Ur46nTv5bLTy4NueKe+bhgqhnx4JTbHi62BoHynrX/YQjdJmnbg5sP6uJ/2aaDOKhk5E n5OtWKpkLslSTxOK7iWmCjunT7lKHlBebSM/+ubOnjXEyGrzJBwAm2BgePteRI/NPGxn /emw== X-Gm-Message-State: AOUpUlHn7kGLr2gdQzgaCAAnhv2mO8ZvP+yWULxAPVrjJ7Qche0vRwrx txr8ZUUpyh9hJb+exDE1Xy1NASpm X-Google-Smtp-Source: AAOMgpcA5jbhnjguX+PvJ0zJgArVR1qtIOZqmbRiY4kW4PflDXAn014I5K233t7h3zmElpU2QsoN0g== X-Received: by 2002:a63:342:: with SMTP id 63-v6mr22880956pgd.290.1533106797981; Tue, 31 Jul 2018 23:59:57 -0700 (PDT) Received: from rhel72-vm1-local.eng.vmware.com. ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id g11-v6sm41490652pgi.90.2018.07.31.23.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 23:59:57 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Tue, 31 Jul 2018 23:59:52 -0700 Message-Id: <1533106792-104124-1-git-send-email-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Flavio Leitner Subject: [ovs-dev] [PATCH v2] rhel: support kmod build against multiple 7.2 kernels, rhel6 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch extends commit 89dd5819cf18 (rhel: support kmod-openvswitch build against multiple kernels, rhel6) to support building kmod RPMs with multiple minor revisions within 3.10.0-327 kernels. It was discovered for RHEL 7.2 that 41.3 minor revision introduced backward incompatible changes. VMware-BZ: #2170334 Signed-off-by: Martin Xu CC: Greg Rose CC: Ben Pfaff CC: Flavio Leitner CC: Yi-Hung Wei --- v1->v2: added author sign-off signature rhel/kmod-openvswitch-rhel6.spec.in | 7 +++-- ...sr_share_openvswitch_scripts_ovs-kmod-manage.sh | 35 ++++++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in index f18802d..7ca4853 100644 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ b/rhel/kmod-openvswitch-rhel6.spec.in @@ -31,7 +31,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # for specified kernel version. # Use -D 'kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64' # to build package for mulitple kernel versions in the same package -# This only works for kernel 3.10.0 major revision 693 +# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4) +# and major revision 327 (RHEL 7.2) # By default, build against the latest installed kernel-devel %{!?kversion:%global kversion %(rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1| sed "s/^kernel.*-devel-//")} @@ -86,8 +87,8 @@ install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \ current_kernel=$(uname -r) IFS=. read installed_major installed_minor installed_micro installed_arch \ installed_build <<<"${current_kernel##*-}" -if [ "$installed_major" = "693" ]; then - # Workaround for RHEL 7.4 +if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then + # Workaround for RHEL 7.2 and 7.4 if [ -x "/usr/share/%{oname}/scripts/ovs-kmod-manage.sh" ]; then /usr/share/%{oname}/scripts/ovs-kmod-manage.sh fi diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh index a6c738f..fbf8887 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -14,19 +14,25 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This version of the script is intended to be used on kernel version -# 3.10.0 major revision 693 only. It is packaged in the openvswitch kmod RPM -# built using the rhel6 spec file, and run in the post-install for minor -# revision 693 kernels. +# This version of the script is intended to be used on kernel version 3.10.0 +# major revision 327 and 693 only. It is packaged in the openvswitch kmod RPM +# built using the rhel6 spec file, and run in the post-install for major +# revision 327/693 kernels. # -# Due to some backward incompatible changes introduced in minor revision 17.1, +# For kernel 3.10.0-693, +# due to some backward incompatible changes introduced in minor revision 17.1, # kernel modules built against kernels newer than 17.1 cannot be loaded on # system running kernels older than 17.1, vice versa. # +# For kernel 3.10.0-327, +# due to some backward incompatible changes introduced in minor revision 41.3, +# kernel modules built against kernels newer than 41.3 cannot be loaded on +# system running kernels older than 41.3, vice versa. +# # This script checks the current running kernel version, and update symlinks # for the openvswitch kernel modules in the appropriate kernel directory, # provided the kmod RPM has installed kernel modules files built from both -# 1.1 and 17.1 minor revisions. +# minor revisions. # # In case of a kernel minor revision change after the openvswitch kmod package # is installed, this script shall be run manually after system reboots and @@ -42,7 +48,18 @@ IFS=. read installed_major installed_minor installed_micro \ # installed_build=$installed_build expected_base_minor="el7" -expected_minor=11 +if [ "$installed_major" = "327" ]; then + expected_minor=36 + kmod_minor_low_ver=22 + kmod_minor_high_ver=62 +elif [ "$installed_major" = "693" ]; then + expected_minor=11 + kmod_minor_low_ver=1 + kmod_minor_high_ver=17 +else + echo "This script is not intended to run on kernel $(uname -r)" + exit 1 +fi found_match=false for kname in `ls -d /lib/modules/*` @@ -51,14 +68,14 @@ do # echo major=$major minor=$minor micro=$micro arch=$arch build=$build if [ "$installed_minor" = "$expected_base_minor" ] || [ "$installed_minor" -le "$expected_minor" ]; then - if [ "$minor" = "1" ]; then + if [ "$minor" = "$kmod_minor_low_ver" ]; then requested_kernel=$kname found_match="true" echo "Installing Openvswitch KMOD from kernel $kname" break fi else - if [ "$minor" = "17" ]; then + if [ "$minor" = "$kmod_minor_high_ver" ]; then requested_kernel=$kname found_match="true" echo "Installing Openvswitch KMOD from kernel $kname"