From patchwork Tue Sep 11 13:52:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 968655 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="L66A1pdq"; 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 428vFx0MLJz9s9N for ; Wed, 12 Sep 2018 04:53:57 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8029A1497; Tue, 11 Sep 2018 18:53:21 +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 15C6B1417 for ; Tue, 11 Sep 2018 18:53:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CD9D9102 for ; Tue, 11 Sep 2018 18:53:19 +0000 (UTC) Received: by mail-pf1-f172.google.com with SMTP id h69-v6so12680529pfd.4 for ; Tue, 11 Sep 2018 11:53:19 -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:in-reply-to:references; bh=KnuResvAiX5TqZav6AQx7aV/TvuTeJe3P2Dd8btjGvY=; b=L66A1pdqoD6Nj9Vb7tKYbdJo/+P08nJEnz6iRUaSzAPTnvauyd9TR0uROy61pYuL0q cnMJUAowA0rDAjzu7aeknsu/CiS3ioI7JF98tNqQJB0viW6RlOCniJeQ8XtE92FUJTqk 9s73Qkiz7PXcsxGic7pAjRhpzgXicB77T8bOtm2i18ZhrKilB0xkMH2Q7N5BQFCkUOBB Czsg/xPb5LNHd0bY5CQeVakEuVGyPEi3/ov2lIxdFEBWawnrs6Xg8+aLAE3DdcFCA+pW 14dfF4IqgqqibPbWknUke76nfLBzGYAgYL5jUmNn0J64ugTI6eR4UetN0WL7zqpPGCsI +Ndg== 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:in-reply-to :references; bh=KnuResvAiX5TqZav6AQx7aV/TvuTeJe3P2Dd8btjGvY=; b=QLrM+gGoZzZTywWcdpAIjHRCwe3MRAqOPewWVwXf3VYS9ZxjIqXMZcpcYXhhu76Yvu UoIkYgAmGp5zaI+nHi1yglUcmdCvXn/tN+ggH2ytFARvrHAOyNE5viZNwTuEq3dYZhX3 Zub4K/GHyWCkeQPlZX+rMWBhOwFXe5Wzi5prm+DSICEzLkrATkdtpRZy3I+OKFebKN4S VIIrkRR4hrXuIwLhyJeczA0b3b8qtEo9pEHZKDwLJTDMmO2vY6/ZK7qMnOpfLKeSySUU WfomQbzec6joZVHBOh67lKttsNjJgIhAXxsvKwLuLzA46jDPGdirvhvfMZ2vQmXeiRK1 qLKQ== X-Gm-Message-State: APzg51ADIaZJQxMzEF4s0/2ZofGnN3Gt5epeMcXeU7aInl22cYkc4r+I uH+6hP/aBwVm+r4jnIUGH6FtgH6J X-Google-Smtp-Source: ANB0VdafXeqzJUe3NbJbQjirspXHS81gsZyA7WgtmDAtbL+Sm459V0+KOvn0CS+TPOESLTGVG5IdZg== X-Received: by 2002:a63:5ec1:: with SMTP id s184-v6mr30071464pgb.26.1536691999263; Tue, 11 Sep 2018 11:53:19 -0700 (PDT) Received: from yfsovs.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id w81-v6sm34617797pfk.92.2018.09.11.11.53.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Sep 2018 11:53:18 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Tue, 11 Sep 2018 06:52:35 -0700 Message-Id: <1536673955-2687-2-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536673955-2687-1-git-send-email-pkusunyifeng@gmail.com> References: <1536673955-2687-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Greg Rose Subject: [ovs-dev] Revert "Revert "utilities/ovs-ctl: Force removal of ip_gre/gre"" 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 Please backport this patch to upstream OVS down to 2.10. Author: Greg Rose Date: Wed Jun 6 15:34:44 2018 -0700 This reverts commit a94f9524dbc11c78c83d1a49959497f5e73bf949. Signed-off-by: Greg Rose Signed-off-by: Greg Rose Tested-by: Yifeng Sun Reviewed-by: Yifeng Sun --- utilities/ovs-lib.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 090a144..f6b5393 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -627,6 +627,14 @@ force_reload_kmod () { action "Removing datapath: $dp" ovs-dpctl del-dp "$dp" done + if test -e /sys/module/ip_gre; then + action "Forcing removal of ip_gre module" rmmod ip_gre + fi + + if test -e /sys/module/gre; then + action "Forcing removal of gre module" rmmod gre + fi + ovs_kmod_ctl remove # Start vswitchd by asking it to wait till flow restore is finished.