From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: [PATCH net-next v11 4/6] openvswitch: add support to push and pop mpls for layer3 packets Date: Wed, 6 Jul 2016 19:59:54 +0200 Message-ID: <1467827996-32547-5-git-send-email-simon.horman@netronome.com> References: <1467827996-32547-1-git-send-email-simon.horman@netronome.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1467827996-32547-1-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" List-Id: netdev.vger.kernel.org QWxsb3cgcHVzaCBhbmQgcG9wIG1wbHMgYWN0aW9ucyB0byBhY3Qgb24gbGF5ZXIgMyBwYWNrZXRz IGJ5IHRlYWNoaW5nCnRoZW0gbm90IHRvIGFjY2VzcyBub24tZXhpc3RlbnQgTDIgaGVhZGVycyBv ZiBzdWNoIHBhY2tldHMuCgpTaWduZWQtb2ZmLWJ5OiBTaW1vbiBIb3JtYW4gPHNpbW9uLmhvcm1h bkBuZXRyb25vbWUuY29tPgotLS0KdjExCiogZ3JvdXAgbDIgY29kZSBpbiBwb3BfbXBscygpCgp2 MTAKKiBMaW1pdCBzY29wZSBvZiBoZHIgaW4ge3B1c2gscG9wfV9tcGxzKCkKCnY5CiogTmV3IFBh dGNoCi0tLQogaW5jbHVkZS91YXBpL2xpbnV4L29wZW52c3dpdGNoLmggfCAgMiArKwogbmV0L29w ZW52c3dpdGNoL2FjdGlvbnMuYyAgICAgICAgfCAyNCArKysrKysrKysrKysrKystLS0tLS0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvb3BlbnZzd2l0Y2guaCBiL2luY2x1ZGUvdWFwaS9s aW51eC9vcGVudnN3aXRjaC5oCmluZGV4IGQ5NWEzMDE4ZjZhMS4uNWNkZTUwMTQzM2ViIDEwMDY0 NAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvb3BlbnZzd2l0Y2guaAorKysgYi9pbmNsdWRlL3Vh cGkvbGludXgvb3BlbnZzd2l0Y2guaApAQCAtNzM3LDYgKzczNyw4IEBAIGVudW0gb3ZzX25hdF9h dHRyIHsKICAqIGlzIG5vIE1QTFMgbGFiZWwgc3RhY2ssIGFzIGRldGVybWluZWQgYnkgZXRoZXJ0 eXBlLCBubyBhY3Rpb24gaXMgdGFrZW4uCiAgKiBAT1ZTX0FDVElPTl9BVFRSX0NUOiBUcmFjayB0 aGUgY29ubmVjdGlvbi4gUG9wdWxhdGUgdGhlIGNvbm50cmFjay1yZWxhdGVkCiAgKiBlbnRyaWVz IGluIHRoZSBmbG93IGtleS4KKyAqIEBPVlNfQUNUSU9OX0FUVFJfUFVTSF9FVEg6IFB1c2ggYSBu ZXcgb3V0ZXJtb3N0IEV0aGVybmV0IGhlYWRlciBvbnRvIHRoZSAgICAgICogcGFja2V0LgorICog QE9WU19BQ1RJT05fQVRUUl9QT1BfRVRIOiBQb3AgdGhlIG91dGVybW9zdCBFdGhlcm5ldCBoZWFk ZXIgb2ZmIHRoZSBwYWNrZXQuCiAgKgogICogT25seSBhIHNpbmdsZSBoZWFkZXIgY2FuIGJlIHNl dCB3aXRoIGEgc2luZ2xlICVPVlNfQUNUSU9OX0FUVFJfU0VULiAgTm90IGFsbAogICogZmllbGRz IHdpdGhpbiBhIGhlYWRlciBhcmUgbW9kaWZpYWJsZSwgZS5nLiB0aGUgSVB2NCBwcm90b2NvbCBh bmQgZnJhZ21lbnQKZGlmZiAtLWdpdCBhL25ldC9vcGVudnN3aXRjaC9hY3Rpb25zLmMgYi9uZXQv b3BlbnZzd2l0Y2gvYWN0aW9ucy5jCmluZGV4IDFlY2JkNzcxNWY2ZC4uMTJlOGE4OTQyYTQyIDEw MDY0NAotLS0gYS9uZXQvb3BlbnZzd2l0Y2gvYWN0aW9ucy5jCisrKyBiL25ldC9vcGVudnN3aXRj aC9hY3Rpb25zLmMKQEAgLTE2Myw4ICsxNjMsNiBAQCBzdGF0aWMgaW50IHB1c2hfbXBscyhzdHJ1 Y3Qgc2tfYnVmZiAqc2tiLCBzdHJ1Y3Qgc3dfZmxvd19rZXkgKmtleSwKIAkJcmV0dXJuIC1FTk9N RU07CiAKIAlza2JfcHVzaChza2IsIE1QTFNfSExFTik7Ci0JbWVtbW92ZShza2JfbWFjX2hlYWRl cihza2IpIC0gTVBMU19ITEVOLCBza2JfbWFjX2hlYWRlcihza2IpLAotCQlza2ItPm1hY19sZW4p OwogCXNrYl9yZXNldF9tYWNfaGVhZGVyKHNrYik7CiAKIAluZXdfbXBsc19sc2UgPSAoX19iZTMy ICopc2tiX21wbHNfaGVhZGVyKHNrYik7CkBAIC0xNzIsNyArMTcwLDExIEBAIHN0YXRpYyBpbnQg cHVzaF9tcGxzKHN0cnVjdCBza19idWZmICpza2IsIHN0cnVjdCBzd19mbG93X2tleSAqa2V5LAog CiAJc2tiX3Bvc3RwdXNoX3Jjc3VtKHNrYiwgbmV3X21wbHNfbHNlLCBNUExTX0hMRU4pOwogCi0J dXBkYXRlX2V0aGVydHlwZShza2IsIGV0aF9oZHIoc2tiKSwgbXBscy0+bXBsc19ldGhlcnR5cGUp OworCWlmIChza2ItPm1hY19sZW4pIHsKKwkJdXBkYXRlX2V0aGVydHlwZShza2IsIGV0aF9oZHIo c2tiKSwgbXBscy0+bXBsc19ldGhlcnR5cGUpOworCQltZW1tb3ZlKHNrYl9tYWNfaGVhZGVyKHNr YikgLSBNUExTX0hMRU4sIHNrYl9tYWNfaGVhZGVyKHNrYiksCisJCQlza2ItPm1hY19sZW4pOwor CX0KIAlpZiAoIXNrYi0+aW5uZXJfcHJvdG9jb2wpCiAJCXNrYl9zZXRfaW5uZXJfcHJvdG9jb2wo c2tiLCBza2ItPnByb3RvY29sKTsKIAlza2ItPnByb3RvY29sID0gbXBscy0+bXBsc19ldGhlcnR5 cGU7CkBAIC0xODQsNyArMTg2LDYgQEAgc3RhdGljIGludCBwdXNoX21wbHMoc3RydWN0IHNrX2J1 ZmYgKnNrYiwgc3RydWN0IHN3X2Zsb3dfa2V5ICprZXksCiBzdGF0aWMgaW50IHBvcF9tcGxzKHN0 cnVjdCBza19idWZmICpza2IsIHN0cnVjdCBzd19mbG93X2tleSAqa2V5LAogCQkgICAgY29uc3Qg X19iZTE2IGV0aGVydHlwZSkKIHsKLQlzdHJ1Y3QgZXRoaGRyICpoZHI7CiAJaW50IGVycjsKIAog CWVyciA9IHNrYl9lbnN1cmVfd3JpdGFibGUoc2tiLCBza2ItPm1hY19sZW4gKyBNUExTX0hMRU4p OwpAQCAtMTk5LDExICsyMDAsMTYgQEAgc3RhdGljIGludCBwb3BfbXBscyhzdHJ1Y3Qgc2tfYnVm ZiAqc2tiLCBzdHJ1Y3Qgc3dfZmxvd19rZXkgKmtleSwKIAlfX3NrYl9wdWxsKHNrYiwgTVBMU19I TEVOKTsKIAlza2JfcmVzZXRfbWFjX2hlYWRlcihza2IpOwogCi0JLyogc2tiX21wbHNfaGVhZGVy KCkgaXMgdXNlZCB0byBsb2NhdGUgdGhlIGV0aGVydHlwZQotCSAqIGZpZWxkIGNvcnJlY3RseSBp biB0aGUgcHJlc2VuY2Ugb2YgVkxBTiB0YWdzLgotCSAqLwotCWhkciA9IChzdHJ1Y3QgZXRoaGRy ICopKHNrYl9tcGxzX2hlYWRlcihza2IpIC0gRVRIX0hMRU4pOwotCXVwZGF0ZV9ldGhlcnR5cGUo c2tiLCBoZHIsIGV0aGVydHlwZSk7CisJaWYgKHNrYi0+bWFjX2xlbikgeworCQlzdHJ1Y3QgZXRo aGRyICpoZHI7CisKKwkJLyogc2tiX21wbHNfaGVhZGVyKCkgaXMgdXNlZCB0byBsb2NhdGUgdGhl IGV0aGVydHlwZQorCQkgKiBmaWVsZCBjb3JyZWN0bHkgaW4gdGhlIHByZXNlbmNlIG9mIFZMQU4g dGFncy4KKwkJICovCisJCWhkciA9IChzdHJ1Y3QgZXRoaGRyICopKHNrYl9tcGxzX2hlYWRlcihz a2IpIC0gRVRIX0hMRU4pOworCQl1cGRhdGVfZXRoZXJ0eXBlKHNrYiwgaGRyLCBldGhlcnR5cGUp OworCX0KKwogCWlmIChldGhfcF9tcGxzKHNrYi0+cHJvdG9jb2wpKQogCQlza2ItPnByb3RvY29s ID0gZXRoZXJ0eXBlOwogCi0tIAoyLjcuMC5yYzMuMjA3LmcwYWM1MzQ0CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkZXYgbWFpbGluZyBsaXN0CmRldkBv cGVudnN3aXRjaC5vcmcKaHR0cDovL29wZW52c3dpdGNoLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Rl dgo=