Received: by 10.213.65.68 with SMTP id h4csp2113381imn; Sun, 8 Apr 2018 20:03:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx499zZQvv729aQqvCpCBHb0BOVMk2/CkUyML++aZCmRaETjzPAZaWqTCwR6f1Te5ZFxc1pq/ X-Received: by 2002:a17:902:28c3:: with SMTP id f61-v6mr36877466plb.114.1523243002319; Sun, 08 Apr 2018 20:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523243002; cv=none; d=google.com; s=arc-20160816; b=Ylnkg3nz9LaMKEAdk6KDw1wj2eG1aCXaHEDJljSBJrSctfIEuIiD8viwpl/JhVh4fP 6rpwOe3SsBVXd1+F9PisVXu+nqayMKpavujBBQS0XXRqFFMI93XU0yn6ZaEjN3m3VExI BaQreTw4a2mPzOZzRbaYt/jp4zCFXw0i5zsO2D7xw3dRjUQIeROBDLrMNNwr2JQ1TrMy 9nz/ZGdJWsWWQ2Mk4f9BZ9gYOVT3nTgolkXb3y4QSCZBOqsJYM1ikq9zmNRxIpler8qw NaBquiCGShGfkXmm1boc2qYmXVre2BFgwQRkOHmL5vysX3+W4G0Obk0HSj7DZM8WESJu Hi/Q== 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=VdUd2XY2T0aQvw46UQ8JAV6yUop2kU0fF1VkqsLLYXo=; b=LzQ1Th7dP/bVYj6u3JHATveujI9jg2HsUfqHtQjH3sWOQ8MwcYzYMVViFpuUzxScIn keT79u7IEC3Zi4kt7Ja8jvrmHdhedCLalPAzn9aE2pYNN9YXe7lVCkE+w8k+vSRQPn2n MTGr3n3nnaJEtun4pAMk30PlvG1vhgO2HF8btgQmv6bDqgGQUkKyq9qfJXlvU8apQCin hT3V+UrTNaJ56oHlHCssAtxR00RdfRkyCKqsT8fv4cnMOoFbNVmA+yNIMDhD42a53UyU kTbOQY54UeajQbfbS23vZxwD+HTRhebjbmM5ceS0e0zyJ53/8HDzoKReQhdjBv1c6Y8k 87gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=W+B62njv; 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 z127si9937394pfb.397.2018.04.08.20.02.45; Sun, 08 Apr 2018 20:03:22 -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=W+B62njv; 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 S1755631AbeDIA1g (ORCPT + 99 others); Sun, 8 Apr 2018 20:27:36 -0400 Received: from mail-cys01nam02on0104.outbound.protection.outlook.com ([104.47.37.104]:11355 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753174AbeDIA1c (ORCPT ); Sun, 8 Apr 2018 20:27:32 -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=VdUd2XY2T0aQvw46UQ8JAV6yUop2kU0fF1VkqsLLYXo=; b=W+B62njv8ZUax8RWKJE47Yz7/0ATv8uu4WW9dw5HwVJy+vlwHhgtHoot7m1nqvfk2VKbGaLRuQedfH+U53KOVOVb2e5U7X5/uNpcdli21T9ic4drjp320xM9ShpWSGHq7UxIlxQ6t2Dz8l+xKEopkKAp8aUTQrlMbJSt/L8321Y= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1031.namprd21.prod.outlook.com (52.132.128.12) 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:27:25 +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:27:25 +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.9 045/293] vxlan: dont migrate permanent fdb entries during learn Thread-Topic: [PATCH AUTOSEL for 4.9 045/293] vxlan: dont migrate permanent fdb entries during learn Thread-Index: AQHTz5j5cKeZ0Bl+DkyhYOR5uZdvMw== Date: Mon, 9 Apr 2018 00:23:25 +0000 Message-ID: <20180409002239.163177-45-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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;DM5PR2101MB1031;7:fZbtLVWliKqwfYxVthoPm+IQNSn18m/gMlhUW3h60IYZfO1WsBLNlxSJzo56wkuYMfCNxhP4OiF5P1TxFIjDqFgBgqkG/S2uPHWt82bJXv2fyDEGQuqqSsfnLlhUYBGCV7lPWhElHd5ZLwcpwi4A1LpGxYFI2bSFcUfVzGxk5Wj/FfnooGP6qwUYgU3COsWVtRQoNuwkStRZzxPHbenQQdZEy/yEcI2muhgG7oV4NmoWTbQSEIzIqzSs5flqNib/;20:6zPnMAQ1xEQdU7myrzgK3IQOt1yWnG1Ov1/pExTo0G/52fgqqV7mMRIbvx+cl2MTgJ9nP7uOriXdJWNAM5gATJoHT97fTXkb3wzRAX1elahaH/4+RquH9C2rvlkpPo9PQ2/9eVuP/Nunjc1VNi2jdUr/ksGX4uw52Cg8jSW9N40= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 15ed74c7-16c4-4c23-d1a3-08d59db0ab78 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1031; x-ms-traffictypediagnostic: DM5PR2101MB1031: 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)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1031;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1031; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(376002)(366004)(39380400002)(346002)(39860400002)(189003)(199004)(2900100001)(10290500003)(99286004)(76176011)(14454004)(7736002)(11346002)(26005)(86612001)(72206003)(478600001)(36756003)(106356001)(66066001)(2616005)(186003)(22452003)(86362001)(68736007)(305945005)(54906003)(102836004)(486006)(59450400001)(110136005)(316002)(6506007)(446003)(107886003)(53936002)(4326008)(105586002)(6436002)(6486002)(476003)(6512007)(5660300001)(5250100002)(25786009)(3846002)(6116002)(1076002)(97736004)(3280700002)(2501003)(2906002)(81156014)(8676002)(10090500001)(81166006)(8936002)(3660700001)(22906009)(192303002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1031;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: PApipaMCDRJhUxBJM6ys+U/+d+XJesPQ/CJ1R56EBak93XHwUtmh+fbcmAsm/1kSRTnVsxj4zf8T8t868PnxeKjitBc5K64g8UlOdpmI26HnMvB0sYcLV1mjGa5h4v2vs3KtXBGMcVHOeTo45g/xd8UtJ/C8gFmHTM4HWfCJqdaPi5WZHIx+gBSeLMRS50zffbCV6XyzO5x37q/l1hdGM5gSJkoNMFU/o38HA4Q3ju+U0etEID5EbAjV/ksdbdalN67O9csYXf8tfhsLIfea/QjfvvATnO+2OVUN05lHs5CCKXXD5+RCaQaWdFqToYv0hrMFJBCyxQv0YcSQjc42fh8ZvtcxJLsneetrqlTu2ML8YTyJ/1TGCH7v69FBGhytFfEVtNkUXhQkX3Z8lLtb6NQZSDplt+UR2S/YkdZHNsE= 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: 15ed74c7-16c4-4c23-d1a3-08d59db0ab78 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:23:25.0967 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1031 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 0f5dfb8a545d..28afdf22b88f 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -930,7 +930,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