From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Benc Subject: [PATCH net-next v12 2/9] openvswitch: add mac_proto field to the flow key Date: Mon, 17 Oct 2016 15:02:38 +0200 Message-ID: <098a6ab19e26cf7b1cc16f57f5fc0cc019ca44d6.1476708212.git.jbenc@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, Simon Horman To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: 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 VXNlIGEgaG9sZSBpbiB0aGUgc3RydWN0dXJlLiBXZSBzdXBwb3J0IG9ubHkgRXRoZXJuZXQgc28g ZmFyIGFuZCB3aWxsIGFkZAphIHN1cHBvcnQgZm9yIEwyLWxlc3MgcGFja2V0cyBzaG9ydGx5LiBX ZSBjb3VsZCB1c2UgYSBib29sIHRvIGluZGljYXRlCndoZXRoZXIgdGhlIEV0aGVybmV0IGhlYWRl ciBpcyBwcmVzZW50IG9yIG5vdCBidXQgdGhlIGFwcHJvYWNoIHdpdGggdGhlCm1hY19wcm90byBm aWVsZCBpcyBtb3JlIGdlbmVyaWMgYW5kIG9jY3VwaWVzIHRoZSBzYW1lIG51bWJlciBvZiBieXRl cyBpbiB0aGUKc3RydWN0LCB3aGlsZSBhbGxvd2luZyBsYXRlciBleHRlbnNpYmlsaXR5LiBJdCBh bHNvIG1ha2VzIHRoZSBjb2RlIGluIHRoZQpuZXh0IHBhdGNoZXMgbW9yZSBzZWxmIGV4cGxhaW5p bmcuCgpJdCB3b3VsZCBiZSBuaWNlIHRvIHVzZSBBUlBIUkRfIGNvbnN0YW50cyBidXQgdGhvc2Ug YXJlIHUxNiB3aGljaCB3b3VsZCBiZQp3YXN0ZS4gVGh1cyBkZWZpbmUgb3VyIG93biBjb25zdGFu dHMuCgpBbm90aGVyIHVwc2lkZSBvZiB0aGlzIGlzIHRoYXQgd2UgY2FuIG92ZXJsb2FkIHRoaXMg bmV3IGZpZWxkIHRvIGFsc28gZGVub3RlCndoZXRoZXIgdGhlIGZsb3cga2V5IGlzIHZhbGlkLiBU aGlzIGhhcyB0aGUgYWR2YW50YWdlIHRoYXQgb24KcmVmcmFnbWVudGF0aW9uLCB3ZSBkb24ndCBo YXZlIHRvIHJlcGFyc2UgdGhlIHBhY2tldCBidXQgY2FuIHJlbHkgb24gdGhlCnN0b3JlZCBldGgu dHlwZS4gVGhpcyBpcyBlc3BlY2lhbGx5IGltcG9ydGFudCBmb3IgdGhlIG5leHQgcGF0Y2hlcyBp biB0aGlzCnNlcmllcyAtIGluc3RlYWQgb2YgYWRkaW5nIGFub3RoZXIgYnJhbmNoIGZvciBMMi1s ZXNzIHBhY2tldHMgYmVmb3JlIGNhbGxpbmcKb3ZzX2ZyYWdtZW50LCB3ZSBjYW4ganVzdCByZW1v dmUgYWxsIHRob3NlIGJyYW5jaGVzIGNvbXBsZXRlbHkuCgpTaWduZWQtb2ZmLWJ5OiBKaXJpIEJl bmMgPGpiZW5jQHJlZGhhdC5jb20+Ci0tLQpUaGVyZSBhcmUgdGhyZWUgcG9zc2libGUgYXBwcm9h Y2hlczoKCigxKSBUaGUgb25lIGluIHRoaXMgcGF0Y2guCgooMikgVXNlIGp1c3QgYSBvbmUgYml0 IGZsYWcgaW5kaWNhdGluZyB3aGV0aGVyIHRoZSBwYWNrZXQgaXMgTDMgb3IgRXRoZXJuZXQKICAg IChzaW1pbGFyIHRvIHRoZSAiaXNfbGF5ZXIzIiBib29sIGluIHYxMSkuIFRoZSBjb2RlIHdvdWxk IHN0YXkgdmVyeQogICAgc2ltaWxhciB0byB0aGlzIHBhdGNoc2V0LCB0aGUgbWVtb3J5IGNvbnN1 bXB0aW9uIHdvdWxkIGJlIHRoZSBzYW1lLgoKKDMpIFVzZSB2YWx1ZSBvZiAxNCBmb3IgTUFDX1BS T1RPX0VUSEVSTkVULiBJdCB3b3VsZCBzaW1wbGlmeSB0aGluZ3MgbmljZWx5LAogICAgYXMgb3Zz X21hY19oZWFkZXJfbGVuIHdvdWxkIGJlIGlkZW50aWNhbCB0byBvdnNfa2V5X21hY19wcm90bywg c2F2aW5nCiAgICBvbmUgY29tcGFyaXNvbi4gT2YgY291cnNlLCB0aGlzIHdvdWxkIG1lYW4gdGhh dCBpZiBvdGhlciBMMiBwcm90b2NvbHMKICAgIGFyZSBhZGRlZCBpbiB0aGUgZnV0dXJlLCB0aGV5 IGNhbiBvbmx5IGhhdmUgTDIgaGVhZGVyIGxlbmd0aCBkaWZmZXJlbnQKICAgIHRoYW4gMTQuIFNv dW5kcyBoYWNreSwgYWx0aG91Z2ggSSBraW5kIG9mIGxpa2UgdGhpcy4KCkFmdGVyIHRoaW5raW5n IGFib3V0IHByb3MgYW5kIGNvbnMsIEkgaW1wbGVtZW50ZWQgKDEpLiBTZWVtcyB0byBiZSBtb3N0 CmNsZWFyIG9mIHRoZSB0aHJlZSBvcHRpb25zLiBCdXQgSSdtIGhhcHB5IHRvIGltcGxlbWVudCAo Mikgb3IgKDMpIGlmIGl0J3MKZGVlbWVkIGJldHRlci4KLS0tCiBuZXQvb3BlbnZzd2l0Y2gvYWN0 aW9ucy5jICAgICAgfCAxNCArKystLS0tLS0tLS0tLQogbmV0L29wZW52c3dpdGNoL2Zsb3cuYyAg ICAgICAgIHwgIDEgKwogbmV0L29wZW52c3dpdGNoL2Zsb3cuaCAgICAgICAgIHwgMjIgKysrKysr KysrKysrKysrKysrKysrKwogbmV0L29wZW52c3dpdGNoL2Zsb3dfbmV0bGluay5jIHwgIDUgKysr KysKIDQgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbmV0L29wZW52c3dpdGNoL2FjdGlvbnMuYyBiL25ldC9vcGVudnN3aXRjaC9h Y3Rpb25zLmMKaW5kZXggNDlhZjE2NzEwNWQzLi40NDE0NGY5MTQ5MjAgMTAwNjQ0Ci0tLSBhL25l dC9vcGVudnN3aXRjaC9hY3Rpb25zLmMKKysrIGIvbmV0L29wZW52c3dpdGNoL2FjdGlvbnMuYwpA QCAtMTM3LDEyICsxMzcsMTIgQEAgc3RhdGljIHN0cnVjdCBkZWZlcnJlZF9hY3Rpb24gKmFkZF9k ZWZlcnJlZF9hY3Rpb25zKHN0cnVjdCBza19idWZmICpza2IsCiAKIHN0YXRpYyB2b2lkIGludmFs aWRhdGVfZmxvd19rZXkoc3RydWN0IHN3X2Zsb3dfa2V5ICprZXkpCiB7Ci0Ja2V5LT5ldGgudHlw ZSA9IGh0b25zKDApOworCWtleS0+bWFjX3Byb3RvIHw9IFNXX0ZMT1dfS0VZX0lOVkFMSUQ7CiB9 CiAKIHN0YXRpYyBib29sIGlzX2Zsb3dfa2V5X3ZhbGlkKGNvbnN0IHN0cnVjdCBzd19mbG93X2tl eSAqa2V5KQogewotCXJldHVybiAhIWtleS0+ZXRoLnR5cGU7CisJcmV0dXJuICEoa2V5LT5tYWNf cHJvdG8gJiBTV19GTE9XX0tFWV9JTlZBTElEKTsKIH0KIAogc3RhdGljIHZvaWQgdXBkYXRlX2V0 aGVydHlwZShzdHJ1Y3Qgc2tfYnVmZiAqc2tiLCBzdHJ1Y3QgZXRoaGRyICpoZHIsCkBAIC03OTYs MTYgKzc5Niw4IEBAIHN0YXRpYyB2b2lkIGRvX291dHB1dChzdHJ1Y3QgZGF0YXBhdGggKmRwLCBz dHJ1Y3Qgc2tfYnVmZiAqc2tiLCBpbnQgb3V0X3BvcnQsCiAJCQlvdnNfdnBvcnRfc2VuZCh2cG9y dCwgc2tiKTsKIAkJfSBlbHNlIGlmIChtcnUgPD0gdnBvcnQtPmRldi0+bXR1KSB7CiAJCQlzdHJ1 Y3QgbmV0ICpuZXQgPSByZWFkX3BuZXQoJmRwLT5uZXQpOwotCQkJX19iZTE2IGV0aGVydHlwZSA9 IGtleS0+ZXRoLnR5cGU7CiAKLQkJCWlmICghaXNfZmxvd19rZXlfdmFsaWQoa2V5KSkgewotCQkJ CWlmIChldGhfcF9tcGxzKHNrYi0+cHJvdG9jb2wpKQotCQkJCQlldGhlcnR5cGUgPSBza2ItPmlu bmVyX3Byb3RvY29sOwotCQkJCWVsc2UKLQkJCQkJZXRoZXJ0eXBlID0gdmxhbl9nZXRfcHJvdG9j b2woc2tiKTsKLQkJCX0KLQotCQkJb3ZzX2ZyYWdtZW50KG5ldCwgdnBvcnQsIHNrYiwgbXJ1LCBl dGhlcnR5cGUpOworCQkJb3ZzX2ZyYWdtZW50KG5ldCwgdnBvcnQsIHNrYiwgbXJ1LCBrZXktPmV0 aC50eXBlKTsKIAkJfSBlbHNlIHsKIAkJCWtmcmVlX3NrYihza2IpOwogCQl9CmRpZmYgLS1naXQg YS9uZXQvb3BlbnZzd2l0Y2gvZmxvdy5jIGIvbmV0L29wZW52c3dpdGNoL2Zsb3cuYwppbmRleCAy MjA4NzA2MmJkMTAuLjk2YzhjNDcxNjYwMyAxMDA2NDQKLS0tIGEvbmV0L29wZW52c3dpdGNoL2Zs b3cuYworKysgYi9uZXQvb3BlbnZzd2l0Y2gvZmxvdy5jCkBAIC03NTEsNiArNzUxLDcgQEAgaW50 IG92c19mbG93X2tleV9leHRyYWN0KGNvbnN0IHN0cnVjdCBpcF90dW5uZWxfaW5mbyAqdHVuX2lu Zm8sCiAJa2V5LT5waHkuc2tiX21hcmsgPSBza2ItPm1hcms7CiAJb3ZzX2N0X2ZpbGxfa2V5KHNr Yiwga2V5KTsKIAlrZXktPm92c19mbG93X2hhc2ggPSAwOworCWtleS0+bWFjX3Byb3RvID0gTUFD X1BST1RPX0VUSEVSTkVUOwogCWtleS0+cmVjaXJjX2lkID0gMDsKIAogCXJldHVybiBrZXlfZXh0 cmFjdChza2IsIGtleSk7CmRpZmYgLS1naXQgYS9uZXQvb3BlbnZzd2l0Y2gvZmxvdy5oIGIvbmV0 L29wZW52c3dpdGNoL2Zsb3cuaAppbmRleCBhZTc4M2Y1YzY2OTUuLmY2MWNhZTdmOTAzMCAxMDA2 NDQKLS0tIGEvbmV0L29wZW52c3dpdGNoL2Zsb3cuaAorKysgYi9uZXQvb3BlbnZzd2l0Y2gvZmxv dy5oCkBAIC0zNyw2ICszNywxMiBAQAogCiBzdHJ1Y3Qgc2tfYnVmZjsKIAorZW51bSBzd19mbG93 X21hY19wcm90byB7CisJTUFDX1BST1RPX05PTkUgPSAwLAorCU1BQ19QUk9UT19FVEhFUk5FVCwK K307CisjZGVmaW5lIFNXX0ZMT1dfS0VZX0lOVkFMSUQJMHg4MAorCiAvKiBTdG9yZSBvcHRpb25z IGF0IHRoZSBlbmQgb2YgdGhlIGFycmF5IGlmIHRoZXkgYXJlIGxlc3MgdGhhbiB0aGUKICAqIG1h eGltdW0gc2l6ZS4gVGhpcyBhbGxvd3MgdXMgdG8gZ2V0IHRoZSBiZW5lZml0cyBvZiB2YXJpYWJs ZSBsZW5ndGgKICAqIG1hdGNoaW5nIGZvciBzbWFsbCBvcHRpb25zLgpAQCAtNjgsNiArNzQsNyBA QCBzdHJ1Y3Qgc3dfZmxvd19rZXkgewogCQl1MzIJc2tiX21hcms7CS8qIFNLQiBtYXJrLiAqLwog CQl1MTYJaW5fcG9ydDsJLyogSW5wdXQgc3dpdGNoIHBvcnQgKG9yIERQX01BWF9QT1JUUykuICov CiAJfSBfX3BhY2tlZCBwaHk7IC8qIFNhZmUgd2hlbiByaWdodCBhZnRlciAndHVuX2tleScuICov CisJdTggbWFjX3Byb3RvOwkJCS8qIE1BQyBsYXllciBwcm90b2NvbCAoZS5nLiBFdGhlcm5ldCku ICovCiAJdTggdHVuX3Byb3RvOwkJCS8qIFByb3RvY29sIG9mIGVuY2Fwc3VsYXRpbmcgdHVubmVs LiAqLwogCXUzMiBvdnNfZmxvd19oYXNoOwkJLyogRGF0YXBhdGggY29tcHV0ZWQgaGFzaCB2YWx1 ZS4gICovCiAJdTMyIHJlY2lyY19pZDsJCQkvKiBSZWNpcmN1bGF0aW9uIElELiAgKi8KQEAgLTIw Niw2ICsyMTMsMjEgQEAgc3RydWN0IGFycF9ldGhfaGVhZGVyIHsKIAl1bnNpZ25lZCBjaGFyICAg ICAgIGFyX3RpcFs0XTsJCS8qIHRhcmdldCBJUCBhZGRyZXNzICAgICAgICAqLwogfSBfX3BhY2tl ZDsKIAorc3RhdGljIGlubGluZSB1OCBvdnNfa2V5X21hY19wcm90byhjb25zdCBzdHJ1Y3Qgc3df Zmxvd19rZXkgKmtleSkKK3sKKwlyZXR1cm4ga2V5LT5tYWNfcHJvdG8gJiB+U1dfRkxPV19LRVlf SU5WQUxJRDsKK30KKworc3RhdGljIGlubGluZSB1MTYgX19vdnNfbWFjX2hlYWRlcl9sZW4odTgg bWFjX3Byb3RvKQoreworCXJldHVybiBtYWNfcHJvdG8gPT0gTUFDX1BST1RPX0VUSEVSTkVUID8g RVRIX0hMRU4gOiAwOworfQorCitzdGF0aWMgaW5saW5lIHUxNiBvdnNfbWFjX2hlYWRlcl9sZW4o Y29uc3Qgc3RydWN0IHN3X2Zsb3dfa2V5ICprZXkpCit7CisJcmV0dXJuIF9fb3ZzX21hY19oZWFk ZXJfbGVuKG92c19rZXlfbWFjX3Byb3RvKGtleSkpOworfQorCiBzdGF0aWMgaW5saW5lIGJvb2wg b3ZzX2lkZW50aWZpZXJfaXNfdWZpZChjb25zdCBzdHJ1Y3Qgc3dfZmxvd19pZCAqc2ZpZCkKIHsK IAlyZXR1cm4gc2ZpZC0+dWZpZF9sZW47CmRpZmYgLS1naXQgYS9uZXQvb3BlbnZzd2l0Y2gvZmxv d19uZXRsaW5rLmMgYi9uZXQvb3BlbnZzd2l0Y2gvZmxvd19uZXRsaW5rLmMKaW5kZXggYWUyNWRl ZDgyYjNiLi5jY2I5OTAwYzUyMzAgMTAwNjQ0Ci0tLSBhL25ldC9vcGVudnN3aXRjaC9mbG93X25l dGxpbmsuYworKysgYi9uZXQvb3BlbnZzd2l0Y2gvZmxvd19uZXRsaW5rLmMKQEAgLTEwNTksNiAr MTA1OSwxMSBAQCBzdGF0aWMgaW50IG1ldGFkYXRhX2Zyb21fbmxhdHRycyhzdHJ1Y3QgbmV0ICpu ZXQsIHN0cnVjdCBzd19mbG93X21hdGNoICptYXRjaCwKIAkJCQkgICBzaXplb2YoKmNsKSwgaXNf bWFzayk7CiAJCSphdHRycyAmPSB+KDFVTEwgPDwgT1ZTX0tFWV9BVFRSX0NUX0xBQkVMUyk7CiAJ fQorCisJLyogQWx3YXlzIGV4YWN0IG1hdGNoIG1hY19wcm90byAqLworCVNXX0ZMT1dfS0VZX1BV VChtYXRjaCwgbWFjX3Byb3RvLCBpc19tYXNrID8gMHhmZiA6IE1BQ19QUk9UT19FVEhFUk5FVCwK KwkJCWlzX21hc2spOworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuOC4zLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRldiBtYWlsaW5nIGxpc3QKZGV2 QG9wZW52c3dpdGNoLm9yZwpodHRwOi8vb3BlbnZzd2l0Y2gub3JnL21haWxtYW4vbGlzdGluZm8v ZGV2Cg==