From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517179999-2-15096149543344032286 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179998; b=I+9sAJztDvdL0tqA4Ag6EoJnNHioKvjY8F/F4QdOeIJULje OJUDBfMlsR421YUmy0H4kMtcIKb0oZHVX5Z2sNqLL6zRWh1Ae/4/l+/7RzAth48r BOAqihdJrpmOGZJKSlMQjJL8ZezfcppTKbwETOpJFw3v3yZGE+MFQhdjdsXVYToP iuN3xrcZeAp36PLEvQ/tUfgOZUnytpNenfznBWkq5I3fAILN8AQicP5larYb9WAv rDuEtkwhgeJpzqEjC1pPcjRc8KdlZJHMoSNtor90nQGv8T2xuQUtIherNVFTxC65 8ZWX1cVCoZBoXBtqlcP+Y9sq3ckpnEQ/kv2Exzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179998; bh=lyQDfc O0p48X6tbf1Z9m1ZqGqP8q4+ehrZqLXy22Vjo=; b=jp4PFwy+yrEF5WotNm6+kG JZa9gNVE4XDYta98cKBgaYaHn2PChR/5zRsa6UE6el9MfG0PjZVMuLglOxCYlnSA EDtN/LfKHfMovrTrpYz7nzpP/M9JXMiHRosl0QyzuMlLJ6hIc9BIkEMmsjxeAF7o K67M/rcuddBGJNExuPfrbQgbqcq6AhroebHzx2wSgu9o6yApYQg6GcJ9IyUvhOD7 /XP9ga93sOH0o9bhGisg23visSqZOTIhZ4qF3z/fT3Ceu+T8XcFM54XMxpfkPmAX rruyamxv7QEaArgNnU8mQvt98oDvrfqxGoXGZJYFfjmBwkmXYMLYaMXNM9Rx9VMw == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=CU/hjSIS x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=CU/hjSIS x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932378AbeA1WxD (ORCPT ); Sun, 28 Jan 2018 17:53:03 -0500 Received: from mail-dm3nam03on0107.outbound.protection.outlook.com ([104.47.41.107]:53136 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753696AbeA1W2f (ORCPT ); Sun, 28 Jan 2018 17:28:35 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Gao Feng , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 18/49] ipvlan: Add the skb->mark as flow4's member to lookup route Thread-Topic: [PATCH AUTOSEL for 4.9 18/49] ipvlan: Add the skb->mark as flow4's member to lookup route Thread-Index: AQHTmIc5v/YRvf6d10+0taEnMHge3Q== Date: Sun, 28 Jan 2018 22:27:47 +0000 Message-ID: <20180128222727.22404-18-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB1097;6:zPz960+b4YJplm14zKb7aRnMNTyFdDjwLxdGLn45LLS4fTnrZnTUbmI6llDgq5x0inVyFWbF58e8RXXGCKnksge2LkEQ3jYFSnkNhiIf2l715b3VSdrQTrxHktUL0jQw7REALW9ELY0JzpgkA7yfJmLzPYgQylTVgH9hVsrSu92x6yQ1/hAHhxWD5EifGXyUvxdWNqVw7zlmMgzN4/4HUmur58M8YXCOL7QM9aEEdmSXYXhlpE67lr/ys4U97C72HYiYTBClqWmqRfd5aCq2Q2M0TjAT79wTpEqkJbkCRL5hS2KXx1eoY0PXED70xBwaIYETMGWdt1XMZTZkqkWm/sqxE9oiIYLbRfbr1lHacBOc5C/QBAwNCcilqdVIw+gX;5:4oiH9GSEU5SACI+Wkf0eAX8bFJFeeFxt/ihNI8FJ8mO6Mfyp/v5QXyOhHPX7uUxMa4jfIZX1hnnt8D7rMDL8V/MhZukry1DQrj5jSjOhnDFxU0qEOGcboy1lys1gPuYCRopKmfxp9waOIA1CVLzgerUEHAru5fnLIZzaCjwAMZY=;24:7sdXKea4PO+pElzEi8tUNE/kk4tEOp4jg3UDwQnrfeo3glvxG6rpEj1b/NQdPtm83IfxvawOoCba1rutZ7aNQil9am89CWiu3cjAtAJiBrA=;7:9sMV1bU1r3eWOEf0QMVrRjam56eWDiq6ydlwtNLGl32c38FidemJ0/BaODK3S9FsmiI5I9abirycxdlYmAhFt3CSRxX0kiQVqlkxJvwB1j1iDDSisOiA2H2OtBDqQAAM6vGsBD6jY5hE3U8J0A5XsdJ95ACYWx7tAaxKVecP2t6oetzAXHeoj44mzKwAuED+u/YrzOKVzfpaJnU15qZ8vTX7fySIzBukWr+Qz+GluCdG4FJV6vmJPz/YWzujKoze x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 06cfd2cb-f04d-46a6-bd5a-08d5669e73f8 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(58107921199556)(89211679590171)(130843839470238); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(575784001)(99286004)(110136005)(54906003)(107886003)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 6VQh1sMVkz0X+JgTxmSLzwT0N1ddMFGlZuL/GtfmTvTGpYhXsngceglOgJOjUMsjb9uFblz9PlAieF01xHNd5Q== 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: 06cfd2cb-f04d-46a6-bd5a-08d5669e73f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:47.6994 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Gao Feng [ Upstream commit a98a4ebc8c61d20f0150d6be66e0e65223a347af ] Current codes don't use skb->mark to assign flowi4_mark, it would make the policy route rule with fwmark doesn't work as expected. Signed-off-by: Gao Feng Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipvlan/ipvlan_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_c= ore.c index 980e38524418..627eb825eb74 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -370,6 +370,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *s= kb) .flowi4_oif =3D dev->ifindex, .flowi4_tos =3D RT_TOS(ip4h->tos), .flowi4_flags =3D FLOWI_FLAG_ANYSRC, + .flowi4_mark =3D skb->mark, .daddr =3D ip4h->daddr, .saddr =3D ip4h->saddr, }; --=20 2.11.0