From patchwork Fri Jul 20 18:04:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 947250 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="T2CH7cs9"; 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 41XRMR15WZz9s55 for ; Sat, 21 Jul 2018 09:06:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E6090F6D; Fri, 20 Jul 2018 23:06:07 +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 F3D81F3D for ; Fri, 20 Jul 2018 23:06:05 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id AD7DA711 for ; Fri, 20 Jul 2018 23:06:05 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id y4-v6so7991512pgp.9 for ; Fri, 20 Jul 2018 16:06:05 -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=nbR9E4cSHR/xR75Xf8bTSmgjmNydlndD5qHB9QS2zEE=; b=T2CH7cs9pNL2BPVpp7PH3CyJ8yRbDmEoGyC4byfWneLq4WFSr56wIg4PvadxjcdSqh viQwS04JpLfA+RzOtPSZondWSZPdJDEp6Z0vFMwELOlCNjmufGz1zxKwDoQpnm4p/fYp XVGYKpYd6frRsb+xzX+2v3/jMeBmFm7wE0t8NH5lHinK1vvGP015Ikj/94qkrjbXj4b2 cm3sMJ62mX5BEaEKg28OEbgHW1pY/uQkLiF8XrgPOM+1or1pQ3hbvgXfJoLD6v6tWcZh HFMOj1wXEvmmzHG9IFCI4UJQngMepn7dVIcM50EtkFLMMUTUwA9frNoeEkZHyQzBUloK 3UXA== 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=nbR9E4cSHR/xR75Xf8bTSmgjmNydlndD5qHB9QS2zEE=; b=odTjEK4hUcQU3iZnM/PNJsOEFpvwtvMi2oEYIKrWwe4c8nSoutQ3yzbe1PSbcnUwDa XtfipQt0Opdo2DXBMn8HryyYK1O7RFdldjCe6VIyRZjfLh9GxJhys6+ew60rMfDhFsdW sA2rFXJ7OmrEBiQDetR5GXPJDURGgaIpNCDWDVneDPIjznhNy0Opft+UWC1tloGvm4XC KoSFqrRCrNVJ1fNLLlALtw47g5C0Y8xVfGwh2pGTY5QGxmYF1+C1ubnqamrpZM6VnRmN mnxCaYUYZtq+BhuxtbQjQ6EG7mfAeSzFvqIvTPoNwcOEn+5VmEHZPhmpkabE7+POgvU6 LIgg== X-Gm-Message-State: AOUpUlGnW23q1jL/VPhA1hhSYln2SSrXu/XA+91gL/2vvffQvkwwLB+5 4O79JtjnbGEnogVwzb19jOEf6/Qs X-Google-Smtp-Source: AAOMgpeMc/ZAufa2lsS9c/96PLG62PB7grjysHUhAqilWxbq1E2Yx1ifoGBXn3fCTrVr/x49pVjd/Q== X-Received: by 2002:a63:a745:: with SMTP id w5-v6mr3826109pgo.374.1532127965083; Fri, 20 Jul 2018 16:06:05 -0700 (PDT) Received: from yfsovs.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id x1-v6sm3014038pgr.59.2018.07.20.16.06.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jul 2018 16:06:04 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 20 Jul 2018 11:04:42 -0700 Message-Id: <1532109882-10881-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 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 Subject: [ovs-dev] [PATCH] ip_tunnel: Fix bugs that could crash kernel 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 Without this patch, OVS kernel module can delete itn->fb_tunnel_dev one more time than necessary, which causes kernel crash. On kernel 4.4.0-116-generic, the crash can be reproduced by running the simple test provided below through check-kernel. make & make modules_install rmmod ip_gre gre ip_tunnel modprobe openvswitch make check-kernel TESTSUITEFLAGS=x dmesg Simple test: AT_SETUP([datapath - crash test]) OVS_CHECK_GRE() ip link del gre0 OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0]) ADD_BR([br-underlay], [set bridge br-underlay]) AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) ADD_NAMESPACES(at_ns0) ADD_VETH(p0, at_ns0, br-underlay, "172.31.1.1/24") AT_CHECK([ip addr add dev br-underlay "172.31.1.100/24"]) AT_CHECK([ip link set dev br-underlay up]) ADD_OVS_TUNNEL([gre], [br0], [at_gre0], [172.31.1.1], [10.1.1.100/24]) tcpdump -U -i br-underlay -w underlay.pcap & sleep 1 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP Signed-off-by: Yifeng Sun Acked-by: William Tu --- datapath/linux/compat/ip_tunnel.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/datapath/linux/compat/ip_tunnel.c b/datapath/linux/compat/ip_tunnel.c index 54af1f178d36..d16e60fbfef0 100644 --- a/datapath/linux/compat/ip_tunnel.c +++ b/datapath/linux/compat/ip_tunnel.c @@ -482,8 +482,10 @@ void rpl_ip_tunnel_dellink(struct net_device *dev, struct list_head *head) itn = net_generic(tunnel->net, tunnel->ip_tnl_net_id); - ip_tunnel_del(itn, netdev_priv(dev)); - unregister_netdevice_queue(dev, head); + if (itn->fb_tunnel_dev != dev) { + ip_tunnel_del(itn, netdev_priv(dev)); + unregister_netdevice_queue(dev, head); + } } int rpl_ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, @@ -642,7 +644,8 @@ void rpl_ip_tunnel_uninit(struct net_device *dev) struct ip_tunnel_net *itn; itn = net_generic(net, tunnel->ip_tnl_net_id); - ip_tunnel_del(itn, netdev_priv(dev)); + if (itn->fb_tunnel_dev != dev) + ip_tunnel_del(itn, netdev_priv(dev)); } /* Do least required initialization, rest of init is done in tunnel_init call */