From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753712AbbAVAoC (ORCPT ); Wed, 21 Jan 2015 19:44:02 -0500 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]:32921 "HELO na3sys009aog127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752640AbbAVAnD (ORCPT ); Wed, 21 Jan 2015 19:43:03 -0500 From: Joe Stringer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dev@openvswitch.org, pshelar@nicira.com Subject: [PATCH net-next v14 2/5] openvswitch: Refactor ovs_flow_tbl_insert(). Date: Wed, 21 Jan 2015 16:42:49 -0800 Message-Id: <1421887372-56414-3-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1421887372-56414-1-git-send-email-joestringer@nicira.com> References: <1421887372-56414-1-git-send-email-joestringer@nicira.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rework so that ovs_flow_tbl_insert() calls flow_{key,mask}_insert(). This tidies up a future patch. Signed-off-by: Joe Stringer --- net/openvswitch/flow_table.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 5899bf1..81b977d 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -585,16 +585,10 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, } /* Must be called with OVS mutex held. */ -int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, - const struct sw_flow_mask *mask) +static void flow_key_insert(struct flow_table *table, struct sw_flow *flow) { struct table_instance *new_ti = NULL; struct table_instance *ti; - int err; - - err = flow_mask_insert(table, flow, mask); - if (err) - return err; flow->hash = flow_hash(&flow->key, flow->mask->range.start, flow->mask->range.end); @@ -613,6 +607,19 @@ int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, table_instance_destroy(ti, true); table->last_rehash = jiffies; } +} + +/* Must be called with OVS mutex held. */ +int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, + const struct sw_flow_mask *mask) +{ + int err; + + err = flow_mask_insert(table, flow, mask); + if (err) + return err; + flow_key_insert(table, flow); + return 0; } -- 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Stringer Subject: [PATCH net-next v14 2/5] openvswitch: Refactor ovs_flow_tbl_insert(). Date: Wed, 21 Jan 2015 16:42:49 -0800 Message-ID: <1421887372-56414-3-git-send-email-joestringer@nicira.com> References: <1421887372-56414-1-git-send-email-joestringer@nicira.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1421887372-56414-1-git-send-email-joestringer-l0M0P4e3n4LQT0dZR+AlfA@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 UmV3b3JrIHNvIHRoYXQgb3ZzX2Zsb3dfdGJsX2luc2VydCgpIGNhbGxzIGZsb3dfe2tleSxtYXNr fV9pbnNlcnQoKS4KVGhpcyB0aWRpZXMgdXAgYSBmdXR1cmUgcGF0Y2guCgpTaWduZWQtb2ZmLWJ5 OiBKb2UgU3RyaW5nZXIgPGpvZXN0cmluZ2VyQG5pY2lyYS5jb20+Ci0tLQogbmV0L29wZW52c3dp dGNoL2Zsb3dfdGFibGUuYyB8ICAgMjEgKysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9uZXQv b3BlbnZzd2l0Y2gvZmxvd190YWJsZS5jIGIvbmV0L29wZW52c3dpdGNoL2Zsb3dfdGFibGUuYwpp bmRleCA1ODk5YmYxLi44MWI5NzdkIDEwMDY0NAotLS0gYS9uZXQvb3BlbnZzd2l0Y2gvZmxvd190 YWJsZS5jCisrKyBiL25ldC9vcGVudnN3aXRjaC9mbG93X3RhYmxlLmMKQEAgLTU4NSwxNiArNTg1 LDEwIEBAIHN0YXRpYyBpbnQgZmxvd19tYXNrX2luc2VydChzdHJ1Y3QgZmxvd190YWJsZSAqdGJs LCBzdHJ1Y3Qgc3dfZmxvdyAqZmxvdywKIH0KIAogLyogTXVzdCBiZSBjYWxsZWQgd2l0aCBPVlMg bXV0ZXggaGVsZC4gKi8KLWludCBvdnNfZmxvd190YmxfaW5zZXJ0KHN0cnVjdCBmbG93X3RhYmxl ICp0YWJsZSwgc3RydWN0IHN3X2Zsb3cgKmZsb3csCi0JCQljb25zdCBzdHJ1Y3Qgc3dfZmxvd19t YXNrICptYXNrKQorc3RhdGljIHZvaWQgZmxvd19rZXlfaW5zZXJ0KHN0cnVjdCBmbG93X3RhYmxl ICp0YWJsZSwgc3RydWN0IHN3X2Zsb3cgKmZsb3cpCiB7CiAJc3RydWN0IHRhYmxlX2luc3RhbmNl ICpuZXdfdGkgPSBOVUxMOwogCXN0cnVjdCB0YWJsZV9pbnN0YW5jZSAqdGk7Ci0JaW50IGVycjsK LQotCWVyciA9IGZsb3dfbWFza19pbnNlcnQodGFibGUsIGZsb3csIG1hc2spOwotCWlmIChlcnIp Ci0JCXJldHVybiBlcnI7CiAKIAlmbG93LT5oYXNoID0gZmxvd19oYXNoKCZmbG93LT5rZXksIGZs b3ctPm1hc2stPnJhbmdlLnN0YXJ0LAogCQkJZmxvdy0+bWFzay0+cmFuZ2UuZW5kKTsKQEAgLTYx Myw2ICs2MDcsMTkgQEAgaW50IG92c19mbG93X3RibF9pbnNlcnQoc3RydWN0IGZsb3dfdGFibGUg KnRhYmxlLCBzdHJ1Y3Qgc3dfZmxvdyAqZmxvdywKIAkJdGFibGVfaW5zdGFuY2VfZGVzdHJveSh0 aSwgdHJ1ZSk7CiAJCXRhYmxlLT5sYXN0X3JlaGFzaCA9IGppZmZpZXM7CiAJfQorfQorCisvKiBN dXN0IGJlIGNhbGxlZCB3aXRoIE9WUyBtdXRleCBoZWxkLiAqLworaW50IG92c19mbG93X3RibF9p bnNlcnQoc3RydWN0IGZsb3dfdGFibGUgKnRhYmxlLCBzdHJ1Y3Qgc3dfZmxvdyAqZmxvdywKKwkJ CWNvbnN0IHN0cnVjdCBzd19mbG93X21hc2sgKm1hc2spCit7CisJaW50IGVycjsKKworCWVyciA9 IGZsb3dfbWFza19pbnNlcnQodGFibGUsIGZsb3csIG1hc2spOworCWlmIChlcnIpCisJCXJldHVy biBlcnI7CisJZmxvd19rZXlfaW5zZXJ0KHRhYmxlLCBmbG93KTsKKwogCXJldHVybiAwOwogfQog Ci0tIAoxLjcuMTAuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZGV2IG1haWxpbmcgbGlzdApkZXZAb3BlbnZzd2l0Y2gub3JnCmh0dHA6Ly9vcGVudnN3 aXRjaC5vcmcvbWFpbG1hbi9saXN0aW5mby9kZXYK