From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: [PATCH net-next v11 6/6] openvswitch: use ipgre tunnel rather than gretap tunnel Date: Wed, 6 Jul 2016 19:59:56 +0200 Message-ID: <1467827996-32547-7-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 VGhpcyBhbGxvd3MgR1JFIHR1bm5lbHMgdG8gc2VuZCBhbmQgcmVjZWl2ZSBib3RoCmxheWVyIDIg cGFja2V0cyAocGFja2V0cyB3aXRoIGFuIGV0aGVybmV0IGhlYWRlcikgYW5kCmxheWVyIDMgcGFj a2V0cyAocGFja2V0cyB3aXRob3V0IGFuIGV0aGVybmV0IGhlYWRlcikuCgpTaWduZWQtb2ZmLWJ5 OiBTaW1vbiBIb3JtYW4gPHNpbW9uLmhvcm1hbkBuZXRyb25vbWUuY29tPgotLS0KdjExCiogTWFr ZSB1c2Ugb2Ygc2tiX21hY19oZWFkZXJfd2FzX3NldCgpIHRvIGF2b2lkIG5lZWRpbmcgdG8gY2Fs Y3VsYXRlIG1hY19sZW4KCnYxMAoqIEhhbmRsZSBjYXNlIG9mIGwzIG9ubHkgcGFja2V0cyBvbiB2 cG9ydC1uZXRkZXYKKiBVc2UgQVJQSFJEX05PTkUgZm9yIGlwZ3JlIGludGVyZmFjZXMgYXMgcGVy IHJlY2VudCBjaGFuZ2VzIGluIG1haW5saW5lCiogRW5zdXJlIHNrYi0+bWFjX2xlbiBpcyBzZXQg Y29ycmVjdGx5IGluIG5ldGRldl9wb3J0X3JlY2VpdmUgYW5kCiAgcmVsYXkgb24gdGhpcyB2YWx1 ZSB0byBkaWZmZXJlbnRpYXRlIGxheWVyMyBwYWNrZXRzIGluCiAgb3ZzX2Zsb3dfa2V5X2V4dHJh Y3QoKQotLS0KIGluY2x1ZGUvbmV0L2dyZS5oICAgICAgICAgICAgICB8ICA0ICsrLS0KIG5ldC9p cHY0L2lwX2dyZS5jICAgICAgICAgICAgICB8ICA5ICsrKysrLS0tLQogbmV0L29wZW52c3dpdGNo L2Zsb3cuYyAgICAgICAgIHwgIDIgKy0KIG5ldC9vcGVudnN3aXRjaC92cG9ydC1ncmUuYyAgICB8 ICAyICstCiBuZXQvb3BlbnZzd2l0Y2gvdnBvcnQtbmV0ZGV2LmMgfCAxOCArKysrKysrKysrKyst LS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9uZXQvZ3JlLmggYi9pbmNsdWRlL25ldC9ncmUuaAppbmRl eCA3YTU0YTMxZDFkNGMuLmEyMThhNGRlZmZkMSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9uZXQvZ3Jl LmgKKysrIGIvaW5jbHVkZS9uZXQvZ3JlLmgKQEAgLTIzLDggKzIzLDggQEAgc3RydWN0IGdyZV9w cm90b2NvbCB7CiBpbnQgZ3JlX2FkZF9wcm90b2NvbChjb25zdCBzdHJ1Y3QgZ3JlX3Byb3RvY29s ICpwcm90bywgdTggdmVyc2lvbik7CiBpbnQgZ3JlX2RlbF9wcm90b2NvbChjb25zdCBzdHJ1Y3Qg Z3JlX3Byb3RvY29sICpwcm90bywgdTggdmVyc2lvbik7CiAKLXN0cnVjdCBuZXRfZGV2aWNlICpn cmV0YXBfZmJfZGV2X2NyZWF0ZShzdHJ1Y3QgbmV0ICpuZXQsIGNvbnN0IGNoYXIgKm5hbWUsCi0J CQkJICAgICAgIHU4IG5hbWVfYXNzaWduX3R5cGUpOworc3RydWN0IG5ldF9kZXZpY2UgKmdyZV9m Yl9kZXZfY3JlYXRlKHN0cnVjdCBuZXQgKm5ldCwgY29uc3QgY2hhciAqbmFtZSwKKwkJCQkgICAg IHU4IG5hbWVfYXNzaWduX3R5cGUpOwogaW50IGdyZV9wYXJzZV9oZWFkZXIoc3RydWN0IHNrX2J1 ZmYgKnNrYiwgc3RydWN0IHRubF9wdGtfaW5mbyAqdHBpLAogCQkgICAgIGJvb2wgKmNzdW1fZXJy LCBfX2JlMTYgcHJvdG8sIGludCBuaHMpOwogCmRpZmYgLS1naXQgYS9uZXQvaXB2NC9pcF9ncmUu YyBiL25ldC9pcHY0L2lwX2dyZS5jCmluZGV4IDMzMGQ1OGU5YzUyMy4uYTIwMjQ4MzU1ZGEwIDEw MDY0NAotLS0gYS9uZXQvaXB2NC9pcF9ncmUuYworKysgYi9uZXQvaXB2NC9pcF9ncmUuYwpAQCAt MTE0Nyw4ICsxMTQ3LDggQEAgc3RhdGljIHN0cnVjdCBydG5sX2xpbmtfb3BzIGlwZ3JlX3RhcF9v cHMgX19yZWFkX21vc3RseSA9IHsKIAkuZ2V0X2xpbmtfbmV0CT0gaXBfdHVubmVsX2dldF9saW5r X25ldCwKIH07CiAKLXN0cnVjdCBuZXRfZGV2aWNlICpncmV0YXBfZmJfZGV2X2NyZWF0ZShzdHJ1 Y3QgbmV0ICpuZXQsIGNvbnN0IGNoYXIgKm5hbWUsCi0JCQkJCXU4IG5hbWVfYXNzaWduX3R5cGUp CitzdHJ1Y3QgbmV0X2RldmljZSAqZ3JlX2ZiX2Rldl9jcmVhdGUoc3RydWN0IG5ldCAqbmV0LCBj b25zdCBjaGFyICpuYW1lLAorCQkJCSAgICAgdTggbmFtZV9hc3NpZ25fdHlwZSkKIHsKIAlzdHJ1 Y3QgbmxhdHRyICp0YltJRkxBX01BWCArIDFdOwogCXN0cnVjdCBuZXRfZGV2aWNlICpkZXY7CkBA IC0xMTU5LDEzICsxMTU5LDE0IEBAIHN0cnVjdCBuZXRfZGV2aWNlICpncmV0YXBfZmJfZGV2X2Ny ZWF0ZShzdHJ1Y3QgbmV0ICpuZXQsIGNvbnN0IGNoYXIgKm5hbWUsCiAJbWVtc2V0KCZ0YiwgMCwg c2l6ZW9mKHRiKSk7CiAKIAlkZXYgPSBydG5sX2NyZWF0ZV9saW5rKG5ldCwgbmFtZSwgbmFtZV9h c3NpZ25fdHlwZSwKLQkJCSAgICAgICAmaXBncmVfdGFwX29wcywgdGIpOworCQkJICAgICAgICZp cGdyZV9saW5rX29wcywgdGIpOwogCWlmIChJU19FUlIoZGV2KSkKIAkJcmV0dXJuIGRldjsKIAog CS8qIENvbmZpZ3VyZSBmbG93IGJhc2VkIEdSRSBkZXZpY2UuICovCiAJdCA9IG5ldGRldl9wcml2 KGRldik7CiAJdC0+Y29sbGVjdF9tZCA9IHRydWU7CisJZGV2LT50eXBlID0gQVJQSFJEX05PTkU7 CiAKIAllcnIgPSBpcGdyZV9uZXdsaW5rKG5ldCwgZGV2LCB0YiwgTlVMTCk7CiAJaWYgKGVyciA8 IDApIHsKQEAgLTExOTAsNyArMTE5MSw3IEBAIG91dDoKIAl1bnJlZ2lzdGVyX25ldGRldmljZV9t YW55KCZsaXN0X2tpbGwpOwogCXJldHVybiBFUlJfUFRSKGVycik7CiB9Ci1FWFBPUlRfU1lNQk9M X0dQTChncmV0YXBfZmJfZGV2X2NyZWF0ZSk7CitFWFBPUlRfU1lNQk9MX0dQTChncmVfZmJfZGV2 X2NyZWF0ZSk7CiAKIHN0YXRpYyBpbnQgX19uZXRfaW5pdCBpcGdyZV90YXBfaW5pdF9uZXQoc3Ry dWN0IG5ldCAqbmV0KQogewpkaWZmIC0tZ2l0IGEvbmV0L29wZW52c3dpdGNoL2Zsb3cuYyBiL25l dC9vcGVudnN3aXRjaC9mbG93LmMKaW5kZXggODZmMmNmYjE5ZGUzLi40MjU4N2Q1YmY4OTQgMTAw NjQ0Ci0tLSBhL25ldC9vcGVudnN3aXRjaC9mbG93LmMKKysrIGIvbmV0L29wZW52c3dpdGNoL2Zs b3cuYwpAQCAtNzI5LDcgKzcyOSw3IEBAIGludCBvdnNfZmxvd19rZXlfZXh0cmFjdChjb25zdCBz dHJ1Y3QgaXBfdHVubmVsX2luZm8gKnR1bl9pbmZvLAogCWtleS0+cGh5LnNrYl9tYXJrID0gc2ti LT5tYXJrOwogCW92c19jdF9maWxsX2tleShza2IsIGtleSk7CiAJa2V5LT5vdnNfZmxvd19oYXNo ID0gMDsKLQlrZXktPnBoeS5pc19sYXllcjMgPSBza2ItPm1hY19sZW4gPT0gMDsKKwlrZXktPnBo eS5pc19sYXllcjMgPSBza2JfbWFjX2hlYWRlcl93YXNfc2V0KHNrYikgPT0gMDsKIAlrZXktPnJl Y2lyY19pZCA9IDA7CiAKIAllcnIgPSBrZXlfZXh0cmFjdChza2IsIGtleSk7CmRpZmYgLS1naXQg YS9uZXQvb3BlbnZzd2l0Y2gvdnBvcnQtZ3JlLmMgYi9uZXQvb3BlbnZzd2l0Y2gvdnBvcnQtZ3Jl LmMKaW5kZXggYmNiYzkxYjhiMDc3Li5jMWNhYjlkZDM5MmYgMTAwNjQ0Ci0tLSBhL25ldC9vcGVu dnN3aXRjaC92cG9ydC1ncmUuYworKysgYi9uZXQvb3BlbnZzd2l0Y2gvdnBvcnQtZ3JlLmMKQEAg LTYwLDcgKzYwLDcgQEAgc3RhdGljIHN0cnVjdCB2cG9ydCAqZ3JlX3RubF9jcmVhdGUoY29uc3Qg c3RydWN0IHZwb3J0X3Bhcm1zICpwYXJtcykKIAkJcmV0dXJuIHZwb3J0OwogCiAJcnRubF9sb2Nr KCk7Ci0JZGV2ID0gZ3JldGFwX2ZiX2Rldl9jcmVhdGUobmV0LCBwYXJtcy0+bmFtZSwgTkVUX05B TUVfVVNFUik7CisJZGV2ID0gZ3JlX2ZiX2Rldl9jcmVhdGUobmV0LCBwYXJtcy0+bmFtZSwgTkVU X05BTUVfVVNFUik7CiAJaWYgKElTX0VSUihkZXYpKSB7CiAJCXJ0bmxfdW5sb2NrKCk7CiAJCW92 c192cG9ydF9mcmVlKHZwb3J0KTsKZGlmZiAtLWdpdCBhL25ldC9vcGVudnN3aXRjaC92cG9ydC1u ZXRkZXYuYyBiL25ldC9vcGVudnN3aXRjaC92cG9ydC1uZXRkZXYuYwppbmRleCA3MzNlNzkxNGY2 YmQuLjgyYjEwODAyYWJlNiAxMDA2NDQKLS0tIGEvbmV0L29wZW52c3dpdGNoL3Zwb3J0LW5ldGRl di5jCisrKyBiL25ldC9vcGVudnN3aXRjaC92cG9ydC1uZXRkZXYuYwpAQCAtNjEsNiArNjEsNyBA QCBzdGF0aWMgdm9pZCBuZXRkZXZfcG9ydF9yZWNlaXZlKHN0cnVjdCBza19idWZmICpza2IpCiAJ CXNrYl9wdXNoKHNrYiwgRVRIX0hMRU4pOwogCQlza2JfcG9zdHB1c2hfcmNzdW0oc2tiLCBza2It PmRhdGEsIEVUSF9ITEVOKTsKIAl9CisKIAlvdnNfdnBvcnRfcmVjZWl2ZSh2cG9ydCwgc2tiLCBz a2JfdHVubmVsX2luZm8oc2tiKSk7CiAJcmV0dXJuOwogZXJyb3I6CkBAIC05OSw3ICsxMDAsOCBA QCBzdHJ1Y3QgdnBvcnQgKm92c19uZXRkZXZfbGluayhzdHJ1Y3QgdnBvcnQgKnZwb3J0LCBjb25z dCBjaGFyICpuYW1lKQogCX0KIAogCWlmICh2cG9ydC0+ZGV2LT5mbGFncyAmIElGRl9MT09QQkFD SyB8fAotCSAgICB2cG9ydC0+ZGV2LT50eXBlICE9IEFSUEhSRF9FVEhFUiB8fAorCSAgICAodnBv cnQtPmRldi0+dHlwZSAhPSBBUlBIUkRfRVRIRVIgJiYKKwkgICAgIHZwb3J0LT5kZXYtPnR5cGUg IT0gQVJQSFJEX05PTkUpIHx8CiAJICAgIG92c19pc19pbnRlcm5hbF9kZXYodnBvcnQtPmRldikp IHsKIAkJZXJyID0gLUVJTlZBTDsKIAkJZ290byBlcnJvcl9wdXQ7CkBAIC0xOTgsMTIgKzIwMCwx NiBAQCBFWFBPUlRfU1lNQk9MX0dQTChvdnNfbmV0ZGV2X3R1bm5lbF9kZXN0cm95KTsKIAogaW50 IG92c19uZXRkZXZfc2VuZChzdHJ1Y3Qgc2tfYnVmZiAqc2tiKQogewotCS8qIE9ubHkgc2VuZCBM MiBwYWNrZXRzICovCi0JaWYgKHNrYi0+bWFjX2xlbikKLQkJcmV0dXJuIGRldl9xdWV1ZV94bWl0 KHNrYik7CisJc3RydWN0IG5ldF9kZXZpY2UgKmRldiA9IHNrYi0+ZGV2OwogCi0Ja2ZyZWVfc2ti KHNrYik7Ci0JcmV0dXJuIC1FSU5WQUw7CisJaWYgKGRldi0+dHlwZSAhPSBBUlBIUkRfRVRIRVIg JiYgc2tiLT5tYWNfbGVuKSB7CisJCXNrYi0+cHJvdG9jb2wgPSBodG9ucyhFVEhfUF9URUIpOwor CX0gZWxzZSBpZiAoZGV2LT50eXBlID09IEFSUEhSRF9FVEhFUiAmJiAhc2tiLT5tYWNfbGVuKSB7 CisJCWtmcmVlX3NrYihza2IpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZXR1cm4gZGV2 X3F1ZXVlX3htaXQoc2tiKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKG92c19uZXRkZXZfc2VuZCk7 CiAKLS0gCjIuNy4wLnJjMy4yMDcuZzBhYzUzNDQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRldiBtYWlsaW5nIGxpc3QKZGV2QG9wZW52c3dpdGNoLm9y ZwpodHRwOi8vb3BlbnZzd2l0Y2gub3JnL21haWxtYW4vbGlzdGluZm8vZGV2Cg==