From patchwork Sun Feb 26 09:10:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Talat Batheesh X-Patchwork-Id: 734197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vYDpc4HR1z9sNC; Wed, 1 Mar 2017 23:12:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="ULnh5xlC"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cj37D-0005ev-SS; Wed, 01 Mar 2017 12:12:19 +0000 Received: from mail-he1eur01on0076.outbound.protection.outlook.com ([104.47.0.76] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1chuqd-0007rG-6p for kernel-team@lists.canonical.com; Sun, 26 Feb 2017 09:10:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=S0JaRTPgh7W9aRrbH0J5oNlj2M4ElXTGVKvwrYAQN3E=; b=ULnh5xlCfw1/iTdMyJ8SQZ/BeV6PEZuFCoW29kaZZ4ZKjy02f5i66SBxtsgwSb4WcWnn7WONpxJJ1JgBLLAc0ikFRM5Lc9Jx6CnRiAAmHV/JRg6gNWrIg1eIkUGCBiKXTS81Ulaxten4ETO3Dgr15Ddg8sTjFyFS31DcTM6R8+o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=talatb@mellanox.com; Received: from dev-h-vrt-005.mth.labs.mlnx (193.47.165.251) by HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 09:10:29 +0000 From: Talat Batheesh To: Subject: [PATCH 17/18] net/sched: cls_u32: Reflect HW offload status Date: Sun, 26 Feb 2017 11:10:02 +0200 Message-ID: <1488100203-31976-17-git-send-email-talatb@mellanox.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1488100203-31976-1-git-send-email-talatb@mellanox.com> References: <1488100203-31976-1-git-send-email-talatb@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM4PR02CA0026.eurprd02.prod.outlook.com (10.165.239.164) To HE1PR05MB1306.eurprd05.prod.outlook.com (10.162.250.151) X-MS-Office365-Filtering-Correlation-Id: 68d5035e-3f26-4de6-3739-08d45e274f9b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 3:ctE2b/Fb/PaapkQBdH3aW17T2J07fp4r3LKILnebTao465ES7lzG1wJTULTVAz8YmwN8C6Do8rTxJpz+s99NpYFwpjTmmDfSuZctrVDLuGyyjr4W3+qb+VF0k5mNj8UwXwVNCno9xmP5az9E6JLxe6OHjc6p5d+rYdIxag6kMZmUlbpnl2RGeTyv2+deBHRQUzqDBVtZMpdNjbQwEJt6MNGnhKYDQeeMKeEu1/U4juU0MjCNjhaR7tiff8ZbvGtoGVJsz2fEOMfGJAGiw95ykcFLRvWJ7Po1IFUnpT5cqZ4=; 25:OsnTOVnDaRwekY3eburxb457+n+dwpgqAYEJRdcUFN5NPJSN1jrnXM8F2T90Qpxop9f27amXEsC+udh8XqiRNSqYeaT+RqHEWg6qLYPevRaKOnKM4qA+9OAnoNThNa9j6wMXmSgDSOaIsGs7xrCL94JfG389UTvHhMxP0DkvsZmXK90hw7cyCaU+ZiRHlMDeYyMZdmwa2F6L24bUiv5RlQCqhMQfa1boEbOrdxwIFrjqlbGOhz4MNt+WMoVb95KJxrt6I3USH5o8SNdUlrAEDSKNb28N+xoLML03SLUeOt9NnQkw3GoNoLD47XjdBOv7ri7PrSeNsbRtcZW4D9KFrk5bfvUxsbiH/+UN3w/02urUVddcz93lsUeiMKdU0pNybukLPmcA6oBYlu4MjADethA3QfPXnpGaa/ePvKb8Wjgzlq7xYqC4LMa83dqvQ5dqjhlCYNCaRLYvf4lPXnY+EA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 31:jeHrJPIrX7EdgJYapgDWjwmsPtaLQKy8XeBKJbCufo6cDBVHejlKSqhs/YI6hVJW8eXTxumUDrQjkejNF4SR/LEaUrDClOTirSZHtjM4perMoy4cTMggNvhAtRbD3oeYgLk6T+7jblbrM+47/Gn31jt/ZQcBUP532lcqhN0cM1Pxx3cXLYe7voFNxe2r3PB0TTTmizpSvJt8ZIPpfSr4elxQgngadqOVAeLmMipz2JbtWd3AyOJ9vBOWzzUSC9uF; 20:xAFDRbeHR2i4RvgrbcxQef628GHqiMspWh0RDt7q1hOEmwb2Ciiht7KVuBvIBHBsaokR3maiwK6VkiHco8fMbRA3Ilvlwuyvalas+Aorc0bpZR+JQeUm83nfxPRagDLbl6vGdzH9SeJbwkYweS8ZuhzedFz9q0IILTFnBD0FR/1vJuj9ILJ5TsNvocI83ZHGlSNzRCt8aqL3Ik4cqps9k68iajG1wbuiHKDDL25fpAbGwmPqFIJKZ9cSfyFLsVg4+5D5Fsoui2A8io6btTN+UYj+en/ZTScAgYVPdXqkKsuDKzeN7GY5wbTmyq3XQECrjx5JPfaP9gnLUblBVEehFJ5qtLa+ledeBaTqMQPSaewT97ZgNW6urLBKJe0kl2PIb+nl3DTA/DPNRIWJwMGJTR1jO+wB4Swyap2OVrqte6HTyuggOQUCwCCvL3SNI5fmdMc7/4zHmeZXngg8e1qYKrdT4Enr/mw+MfkbiJT6F24x5VTsBVzPUgB/LSgYNWSg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(211254476889703)(24339691489775); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:HE1PR05MB1306; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1306; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 4:18SZd2Nywqhn3LAwqIJM1t3tnKllRRE6O7nxm9MMYyPO9pRRJtiNHcP92oCBXoppO38+va44su0XVkZcKTNBJ0d/A0jwYrF/ktcilad7wP9qbHf2lcrpHpTDWwoRuqbcmX4hhLA4jFMtwKwwJ7aWmD04ARa2z7+MJ43ZNlxwYbh/1e0nmiqt40U7HV7O/y+IeIqf77Ko3oonCFzWFxHv0tH1YgfnGN9WsoEy7pY8ZDiw4Q8nJmUp2FJ+bF25cWU37Fx/u74hpZs0XngJ/0K6156ZtoHYTtckvxsR4B8qetl7p8zhDhMDrLBqeeVbrdHWJDsWEdi0FuxJqcguo1Df5jPNuC7QJh6sBZMDWgl7wvHHei4TWQN8pnnE8vT+7sxAZ+4e2SyF9PF7UfgvYG4qNDJZ++sZRYuDKQRzWdwMakIh0e+t0zw3xUoyVRdn6bMy3WN5F588gXCDFx6ONIvYO5YTaIgQlmTEX9LKw3Xs6Z4RhJzGM3BdUrYCXTncBWo9YaLtTrRF0LZYF1Q1VrLYvvn7tI0Nx0XFlGVrV+J4BKGqhmCsBDkch92upNtTrxb+vbeglznzH9QSJhK1NAXLBr5ta2NOWYuIPgvlOy0fbVQAz6ph9KUfOExcKFfQAGw4rBIr83Ln07y3a5KyjCgsEF7btTaFGC4YbKNsF1mXCIQzf6218c1hGkdk3UiBV/K46qVpDS8mh2yptwlQbEffGQ== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39450400003)(39850400002)(39840400002)(199003)(189002)(68736007)(81166006)(8676002)(6512007)(81156014)(50226002)(3846002)(6116002)(50466002)(6506006)(48376002)(66066001)(6306002)(25786008)(47776003)(6666003)(2950100002)(5003940100001)(6916009)(6486002)(36756003)(5660300001)(101416001)(189998001)(92566002)(7736002)(107886003)(110136004)(33646002)(97736004)(105586002)(38730400002)(106356001)(2351001)(305945005)(76176999)(50986999)(4326007)(53936002)(2906002)(86362001)(42186005)(450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1306; H:dev-h-vrt-005.mth.labs.mlnx; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1306; 23:838zK8gifm4Rp9Zkc6eABiIh3FfCTBmCK+hCO83n7?= =?us-ascii?Q?CqFra8zyyuKPa1WC2/YSY8sRR9N7T+Yir9LZnHoChyVUL/7Q9qoYOtNKXvzX?= =?us-ascii?Q?twrZOfjgkz9YIBXcFxbTQn3DsbouJRCj//li1oNBUFVexkmgDjxtJgCCuAxI?= =?us-ascii?Q?JNle5+jKlnlosIisfOnA2coPrlE9JMvQO0u429ZM8d5WIQr1YUJXYXu/uo40?= =?us-ascii?Q?b0JSgY0/3nO137b5H1J/7ZYUGnHix3fkwOLrgsIN7ditqLw6SVs5SrRuRMKs?= =?us-ascii?Q?eSHZ4zeuzqDHcqX+YJ4pAUDGMNzBHEBLhW1UyNK9+S+cO5lK1LGaz1vD5BAR?= =?us-ascii?Q?lMKvPt8g35agTAZ9C2XuPXvjFZa/GAyt1EqltaxUyz1Yn0JDWf+9Ex5LtIZm?= =?us-ascii?Q?dN2i9t1RC2J8gaBBoZsa/U254PkKyQG2eDtZgVHiTtjzuv0oj17BWsboZdb4?= =?us-ascii?Q?lCHeoDyf2cRGJiTpL7/U0cFmA8huqUj8ZNK+Bx8bi57SeEmCnAjWDHmgWHjs?= =?us-ascii?Q?9r+zT9Ez1vj1nXnB3UHqLjzAhCePxQ3aHJzFKQmE0dVMLgDA2SsJidzNdTTT?= =?us-ascii?Q?a0wn18i6g+vhze67Zq/jzGJ2jq4dTmslDVIhvxVQDEStimQq/c/jbsplaP9C?= =?us-ascii?Q?cx/dJs/3n1fyN+Ywy13Q10ye3WG22eIuHE/L2YP9L4FeQ5kAQRkg/i2ldVKF?= =?us-ascii?Q?H5yMQGawQfZ9gVle4gRZ1A/mi0FvjdeLCNEAuHpHGpMtfsGgh2iYxxLU56uY?= =?us-ascii?Q?/ooXvDE+zYhaITEPN7dV9+Xz2HLbMxZkCDOlFndu4lwbBdSyxNN/6hJmco77?= =?us-ascii?Q?lSVrkFrg7eZEMZ3SOuE1faRt5WQBhmA+Qd8U9qBHcRdan+BXptrYqG7sIAl0?= =?us-ascii?Q?J7DqUDD+YVPFhwUggNDObDpEig1gw+EjxdGbSPMIpgyGCCTpsauZ9E5Zj76g?= =?us-ascii?Q?plEtvKDmmaXa4UlifsjEosiMH7sW43spT7MMLTnhV6egN9c85II4CsZvZSz7?= =?us-ascii?Q?VG7ruPEH3WPnwf4u5NGBOgIanZ4fxIuS/j+ZnD+XHa3SMelKgx3PLo1KSOFi?= =?us-ascii?Q?wTU9/9om/7cY1Fp+QUt3sFxqNq3rWXomcoFS64uFM3g7tNWixJ/hMIbMUiGK?= =?us-ascii?Q?42luiBXu+FfFkLIfcrN5cTy+QdFhtEiVQT528Fbq+FR+IBEy/MOGN/F/1Mwa?= =?us-ascii?Q?zscxKPUlKrBvTRktWLrgwE1gp/eFGdBLGE/sdUy3Wm5s5kvRU3/ppu6zgjOS?= =?us-ascii?Q?s2ZLKrrVnkcgWVhe3B7hh83D9kCg/tFywodtkQX?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 6:dvXGL2x5EAFVSdTSBsrQtpvU3ObENj+hz+GBnNP3H5ZZYKFgBjmCBCoFMKhsKoWl/XIVULaMgouG+CxjPU6r6C8oNPS8Gnb4XEqPMI5txDsRfnwYBQWyE2mKkBWmMhHiGuiHiTcdFEEGkICMjH7DjZ7E6d/xhcxEDvbwmgMAxY2niBixn3hN8Z600U9xVctg28de+frnp2s7OinzSV5yN/KojiJCUn3F93XZKF1GM29SRGqNzHl1+knmfCGgxuNUIZqxEEMLiGeizOIbpDstiwIufpp67D75bJcwgJ1ESQcZ3ftJF1nMEpkreyyZiT+bpqSR3YW4sBMFx84+FXJU/SrzgySMlj4+Obq4+TNOyK+v940otMH26SKufKKe45nHtTYAOewNNGBevPjX2tAD5WQwVDmtJxZZsrcUURYUC7w=; 5:oBDYKcyY4QYrZbi8Lwyv85dg+GI1zge+n+pDN7bVpnWBjrV9/H1MdWjSyCd8Lk4A+OPHPony7v1S9u0B8TjzASRrdzKalD1/ZuaBTx7mgjdz8+Edbe/TO4gjhQI7cnRhPpCa2a1BhYBhcGZM91Jk6yHTQ9w+z69Y6Vya3Xc/ueE=; 24:KWf9kANQCCFPUr7XSgeeZf62FivgC9PcNeWtu9/BdqXgq1N9yh0vLYi5Y79NimlubePKwtrrwrI2F2IpGUneonpVf7by4XHkmrYrlQzMNKM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 7:bVMrIBF9Su9Ge6nJKBR70DATBeyT5W4E/YDzrI1xE/zaweud6EqzW1S+OZMbjq8RMBwW8CkF1Q6MOheOwCWLAEEcmyrjySX0OtdO2kt62riPwHSETbdR6UCruZf/7rmU7AMds3/ChEv9KHkpolzKh6Fidu7qaiC2H2lH5G5PmH2zuv1CwKmloinLtE8eVuLFV2hbROwrhgI1LltH2b5+1+L4PUv6cGTMh2VKTgCLo1fyGb1csY0jWACcF1zWS/GrEenrRkWtCjwuvLvPJnSgXanaTFAPWOuHqghpybkota4zVFqWb8+EzAYo9vjh1Ud0rOFLUOmudoMXt7yMgn8CNg== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 09:10:29.3475 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1306 X-Mailman-Approved-At: Wed, 01 Mar 2017 12:12:14 +0000 Cc: talatb@mellanox.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Or Gerlitz BugLink: https://bugs.launchpad.net/ubuntu/1668019 U32 support for the "in hw" offloading flags. Signed-off-by: Or Gerlitz Reviewed-by: Amir Vadai Signed-off-by: David S. Miller (cherry picked from commit 24d3dc6d27eae19f422a5e216e25d3a16628d4ff) Signed-off-by: Talat Batheesh --- net/sched/cls_u32.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index ae83c3ae..0f250a7 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -524,6 +524,10 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n, err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &offload); + + if (!err) + n->flags |= TCA_CLS_FLAGS_IN_HW; + if (tc_skip_sw(flags)) return err; @@ -896,6 +900,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, return err; } + if (!tc_in_hw(new->flags)) + new->flags |= TCA_CLS_FLAGS_NOT_IN_HW; + u32_replace_knode(tp, tp_c, new); tcf_unbind_filter(tp, &n->res); call_rcu(&n->rcu, u32_delete_key_rcu); @@ -1015,6 +1022,9 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, if (err) goto errhw; + if (!tc_in_hw(n->flags)) + n->flags |= TCA_CLS_FLAGS_NOT_IN_HW; + ins = &ht->ht[TC_U32_HASH(handle)]; for (pins = rtnl_dereference(*ins); pins; ins = &pins->next, pins = rtnl_dereference(*ins))