Received: by 10.213.65.68 with SMTP id h4csp2119910imn; Sun, 8 Apr 2018 20:11:50 -0700 (PDT) X-Google-Smtp-Source: AIpwx49GojLA4nPpj6Gy5QQD47Xms1833R5312AmT90kcDObMMMuay58xs5y5vFeaeHn7cYqNS+x X-Received: by 2002:a17:902:aa96:: with SMTP id d22-v6mr36653250plr.106.1523243415075; Sun, 08 Apr 2018 20:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523243415; cv=none; d=google.com; s=arc-20160816; b=fwP9lVIHkvbU0D5PvZPVXt6JgsgSLJg0rwK/EALwpmV12ds33Lm+ZHz9wnJk3ythrz FtN5cM/kFrqYgpPBvrWWGbzCpxCOeBur6ukvxwSuLv3OuY1myY2Ea3jeHG790+BlYIcC vJA7WSk7lDO6xl4N+6S78EhAtOhYsef+m3fyBfCP/OTEXC9QBy29Ad3YAXnCFmVBasoF YlCxXDW4gSW/pX9ljU/sFgLVeFXF3VXsyVCtypxZWPeF57Cj8pxi/cHSauNNnLzyz7RX rEe5Hb5AFy5cF/qlsWJL8xDDIwlLy1/iNXolBCRHx5HwGx86R8dasRKHA+sUupzkm7JH ySWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=3fdhGDpV24ilHyT2KeqDZbiAY4mztSc4Hm9l44fTgrk=; b=cR8Tf5hvCHkjg7jh7NrA8ztumZk2vhSjtinYn9G5eaTaco1Fxz1e+IQxPHM/d1oyXq +pT4BTt7PLMyszW/hKqfDqJbV2LD+g7k9/6bMyrMML1nyye638mPyL+P/VJp5UibEBep 8NQXYC9fhWQQKmMo+STcOkNQWYR2N6Swqq5KUcuA/AlTkWBPh3YXXtx2THt4HiyB9fiY sjpDPbKDe+SWOGolkgEju7OvITtDBwoCqeRahLtsAydJB8se9KdWoaLedaqMGa1alCea YTniX90XNdnZXXjcrswUjb5m3uebMcK8OMrfy+tMg7eocZgzQq4wHvNFFpfhKBIOl4vJ 13ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SfZA8Kqa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r16si5640945pfh.333.2018.04.08.20.09.38; Sun, 08 Apr 2018 20:10:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=SfZA8Kqa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755964AbeDIBgK (ORCPT + 99 others); Sun, 8 Apr 2018 21:36:10 -0400 Received: from mail-sn1nam02on0123.outbound.protection.outlook.com ([104.47.36.123]:10752 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932584AbeDIAfG (ORCPT ); Sun, 8 Apr 2018 20:35:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3fdhGDpV24ilHyT2KeqDZbiAY4mztSc4Hm9l44fTgrk=; b=SfZA8KqaJwGnl2jEiLCgbEVO6SCORz65+RDuavoeE0drDH270ZRDKboUBEnAOKIkzcdKd2KPZSxQRhVW+b2joiWUX5GFR5AAcw8BUZOsMiEsLfikAs0KFs+lndVgJAagMqjYgLAmzFC9hVJQhDI402tdQptdeNj+RrAygrX1xV8= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:35:04 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:35:04 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Roopa Prabhu , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 022/162] vxlan: dont migrate permanent fdb entries during learn Thread-Topic: [PATCH AUTOSEL for 4.4 022/162] vxlan: dont migrate permanent fdb entries during learn Thread-Index: AQHTz5mcSL87qixP6USicbVdZxjQtQ== Date: Mon, 9 Apr 2018 00:27:58 +0000 Message-ID: <20180409002738.163941-22-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1013;7:sCRpkzujtwyYUktVdNfWU41zep8mMZwyBSXf/kW/DHaB4x3B+XLOSYcnJ5dsyn7tqGnhVMDqT9TVepjNeHpzZVADIE5U/QQ6ZNIOPTMSfz+xfD/kT7msxBg2g9kYTo7CPpJUEZtK9C44aD2oxCTEIyE3uvJMbyF1pbQs9gQ4KrFUs69hGTRuRC6hRq1V1RCfUN1yRka0dWuOeHFrnog/JNEeR3AQ+CNxxkbzssdpNS/HZi12H5TA3GjCfvUEXJ5Y;20:3dSR1T7EW2oz15eiKCC7d/QW6sRmWQHXERhNuYvZUGNMwCEIv/J5jqQJroPvQjQirkIyStPitgx2rQSORvzLAEOjbr3+vlZJ2RBavvbbWQbMNVR0g7dIp6oCdgBeNp/UfaUerr5uznw9wvqf+6iS5DtpSeahSxb64F/H5VsShho= X-MS-Office365-Filtering-Correlation-Id: 17514c0e-6f33-46b3-9231-08d59db1bcbf x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020);SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1013;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(39860400002)(396003)(346002)(366004)(376002)(189003)(199004)(478600001)(10290500003)(6436002)(5250100002)(2501003)(14454004)(305945005)(4326008)(66066001)(99286004)(10090500001)(6506007)(36756003)(102836004)(54906003)(486006)(107886003)(76176011)(59450400001)(2900100001)(22452003)(316002)(110136005)(86362001)(3660700001)(2906002)(81166006)(186003)(86612001)(81156014)(2616005)(8936002)(3280700002)(11346002)(53936002)(7736002)(476003)(446003)(72206003)(68736007)(6116002)(5660300001)(106356001)(6666003)(6486002)(8676002)(1076002)(105586002)(26005)(6512007)(3846002)(97736004)(25786009)(22906009)(192303002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1013;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Kcb9uXLiXOiAdpagqcuFUvk1/46QJ+Y2tTekZ+FarRVr31oUBZjTyn9xE1fi22t9rvSP1TVN/DsjIymYgK+JYzyuzoj7kRuS1BsAHHM8JV37aGi5KqIJPTioAHiS3a6AYRswqSTxPfODrf3C+TJJCKG+j0GuZqV41b0KQKUMlNCeUfYQCCZKGNULHLNEGQCciOLlO/QYBhHC8ImKzLI+SeoL1xqtTVp/qiFRb+JBDzBqUzeJVUAWZWSB21Yxuxr/kWIvfapuRgk6anPXMHp27Hueriwt/uYk6RQCDtTcnOMtuH8AvwQjFU/Lv3gjKaCfE/5ctEUMS4EeW2QjQ4GMo/gmbBShVenNNlGTLf0T1VOoModQMR8nGss5a0hwC8GLAhjDLmwk5nrTavJOTgbGWTWjQRM3bsBqna00Z+i0Cg0= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17514c0e-6f33-46b3-9231-08d59db1bcbf X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:27:58.7548 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roopa Prabhu [ Upstream commit e0090a9e979de5202c7d16c635dea2f005221073 ] This patch fixes vxlan_snoop to not move permanent fdb entries on learn events. This is consistent with the bridge fdb handling of permanent entries. Fixes: 26a41ae60438 ("vxlan: only migrate dynamic FDB entries") Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index e4ff1e45c02e..c41378214ede 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -962,7 +962,7 @@ static bool vxlan_snoop(struct net_device *dev, return false; =20 /* Don't migrate static entries, drop packets */ - if (f->state & NUD_NOARP) + if (f->state & (NUD_PERMANENT | NUD_NOARP)) return true; =20 if (net_ratelimit()) --=20 2.15.1