From patchwork Sun Feb 26 09:10:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Talat Batheesh X-Patchwork-Id: 734191 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 3vYDpZ058Fz9sNm; Wed, 1 Mar 2017 23:12:22 +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="uCCvWtLB"; 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 1cj37B-0005Zp-QU; Wed, 01 Mar 2017 12:12:17 +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 1chuqc-0007rG-W2 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=KdQIevDlfyk3sOIRtMiHWw/PA1Puk/acYtUraHfmzUA=; b=uCCvWtLBbpH29mbi6W0SB7nfQmnKZi6n0qVOm8zfIM4Nqp/qGHpIxdZKVWkVSSR31hifTJLmxwZS/EQ8KvgIT/PwjF0swiRNnljDYggZDcMU62aM0OWaa59zbV2mWXOqCh+lUAwbtBkv3A0xpfL5ErjqfwIjhz+OlRgGYBBUBL4= 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:28 +0000 From: Talat Batheesh To: Subject: [PATCH 16/18] net/sched: cls_matchall: Reflect HW offloading status Date: Sun, 26 Feb 2017 11:10:01 +0200 Message-ID: <1488100203-31976-16-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: a6e26b93-19cc-4023-e3ae-08d45e274f0a 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:rlk0xyELjulSXq0D+Qsu19JGei9Z2JawwU2iMVsXG5HZL7iAzUTcnoTR09xPf9bIParjDd4WfL22rNzSJTXLF5VMhsfDKjRcRKI2x4eUyjDjr0Tthr8KOJvg0KIcKDkD1yshQyT42YUixPVaPwf1NcHaSgkKmW5+vRly724jNIMQhKI+Fs56dwLpbs9vmtMg18I+Iz6eMJKY+o3QzdYD208XCQrCzVdTJ2efnkZV2L+eDVPQCF3O8ZdvaKLmg0+s1Sfujwu5UAQhaFu9UlokBFCB9Tjlpx6Z05zZ2ppVrJw=; 25:iXvlfxwkJgJdcJ9dpLEhHu38y89ELaJbdkjdf+Rb9Z/HbSS2LJcEemglUCi/USQZH5pgOYNy6wt+JxbkUPNnaeHK5qOxjh1Lu6GJLyJESdKF7k7MYat6mErSLeF5/P9wZWvQJgw1oRUwwHTL4Hd3nzGMXMJr7JML5nInqLE0vrrmCImGP5RZPDOjC2o1Uo6dSjHVJCCc7ac/dRp4kXpvOh1bzaSOXVB2MKntmdilnIlMYnZsqyps2b0TvuujdI54shykDVyl2ViSDM5aBef7iz12lM7Y4OJRQuj1z0EE0XpF8uihL+0ZIs8l0+Jq3T/nPjcL2LDr+elmz+3OwehzzF2AcWQl2dgwJAzPBi6mDP53XjyTw/r+RLUN597D8PbNssDsIisqKiVlUD9tcN7UtAq8mrWcCDpZvIiA6RzC7eesF+IGTSGx04PiEh7CgWSiUPNCc0WkZaV9WFzj7KiH9A== X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 31:uVJjbDWJByXRPQkAZwXutAmZGgaRPODilE3dBf+rbo1xDZoegIzo2m+lCr7Z5xwXwAfrqLaAgurI3F2WXBmcD/Kp7gnFnn4/FpR2xn+ymKqZ4MCo/4ZRjTcwC0MvEvxCKBbR2H7fPpoWlPUJ+Un8bCfRMCPNopjG4Ex1q68c5aEhPmWzvPqmv0Fdzb542r12Z2RFoDBgtlAZnzzdqJkGpDgeCwxafzbCd6udCOcUV/I=; 20:J4juqJupQcoroFU/tRaxB+F3op9MVW28zzzWUim3I4L3t1vwi5UqaEx8mDZ/kgN2TiNfUF+gFwPgZdGjB8nFqJa2kL7DCduGVb7lIy5rAjugymcoMrq9aomfKN759s67Jo9j5BytxwlG1jbcj/rEj0mmDogB008E3KZMYy7FAPVTRQAzlBSHcTqjnDR0QnMmd1xq26WGNS1l4AL9bALxoqx6qw1M/dS5oqJ8iTvVYUj0PuC7TSwBLXnXQq5vDU2iNjsYV0Xm1yuyGZ9+HOyKgA3BnEH20Ldk/iLNNKSvN6NHgUmC6iQ5R9JEnEGIn4S8QFnZBlvWGPtzn7eXfHrXW04emL9DiMWxJsWXOIi38yTTcjl9XSjBdb3zq57aZQljUhiYlfgu5/3wuue/g1ANXMqxVHpaXldpnCyEuzcA7X1CTqcvGKiGS/X/gav64jKL5jg9g1DsfbtbL6HcTWE8e8SQE+NaHhsBdaqAlgMPox0Pn3dMg7r1qls5l8KagZQX 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:o+NMDmU9h4uZcqdIKgNtTVTFflrjGVfmm5cztw1yLTG4NCz65jNHi6ZB6dPX0+c7tWPyqcCpj2ESaSDVrC2+iu05sznGnQifZbMBt9KVX4eliz0BXDJKHHTwyqzyUqK5sKwjnRstMVpDeChIn2AHR3+QOa8qUabb0XNnss361LCMuISuLoirqn4pc0+wNkPBXOdPhrWkYz5nU46+yIo7x2/swaugGIVk1fM0FsACI3PrltM61VbUjCX3sX2OdAg/VdcYGQJXmsjBIKQc8aCqyqD9/MwgyUzxhgIz2YP0LdTq23XIAcTxuqr/7LF2sLE+YKz4TQFzMGv+GYg3fgFOeMSCZYPTVBZMogRnYgbnII4w7qwvul3Vh9ZwdJK6++3If7RcFMIPGY9EjD0wJ7UpvtTRkLZ+LZzdjDP+ATtRLlsGVExzyHjcuJ8Hg893Kkq2wBfph8gTaIOWf/QBSQFNiYPHMlxeCwEZ1izBa7XSCdTT0z+0aR4jqlLyPhlg6B4dFBjQeTEFJ5M9PR3lsCq8E1wNyo2Cvizs+WTKQLXIklt7Gn077O2rLg1tuZ205q+MfOHAbhd6aXnFsNP0WMpcs85Vz56wBx/dyquJQSQ1Gl4FJPaw+c+MZigX7+fB7ftJgd7JuZ+3pYzWMorhOd+TVsCUaGytrxImO3wmo4jpeQQynXQ5MOnqtHmGpC/LZhRRkj02slASyTeKH+7s9rbT3Q== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(979002)(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)(575784001)(42186005)(450100001)(969003)(989001)(999001)(1009001)(1019001); 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:hTyZQePyIcnMDBRcoDJ+j4FL7AIaQHYBswKhtjX71?= =?us-ascii?Q?RuGJW1ch8mVBYa7rFrClsUU9ybBNHrE+KD29zIohQ4QYFgx+fe1pVB4tsWGE?= =?us-ascii?Q?76uBEVoU+j0xCajYKy/3BCc9uHvJ69YptcnHs5NNw2wEWJBjrO6L+/POpKS6?= =?us-ascii?Q?iqw5Xc74ZfdRSDGmBOnCIQ1At3V3wu9LBKsr4CU+WUIUbCX1QBt1P/+aKWmA?= =?us-ascii?Q?gVti4cibFaMYsVHfMOxaf33/5opJTH70uEecu+6TvqJ0+RMA6cOEelS3Wy4n?= =?us-ascii?Q?wy850Czxm42AR+eK0mCxccz4w6GBi0Mw567rolafp+uib6u8MN8xjz7paNol?= =?us-ascii?Q?wPvgk5N9ztYruTVaDBL9hByBu+zGttv6z5SdTRd5t1vIqNFA7xalp2So0J4c?= =?us-ascii?Q?nyRkyCNAucIC+wzSGKrLUKorOrZCSVJ8bj1se9FTND46BRFaDWrPZG9ud5fm?= =?us-ascii?Q?gZG5UzxNZ4HM2wudpTAfGoXvVFb92ZDIbV78nfuC4867P/ZqZ4lILXOZAikd?= =?us-ascii?Q?ObZt6WHdG9xLnp6eppN7dpLwBgR1843cOWl6DDEn7ussrVggqzC5WdB73t4m?= =?us-ascii?Q?+poDCAM8qgwa8kGzC3cHHUERi9sgLMyyhDYYAsiBxR3zdaCf0gWbVLlZqpqj?= =?us-ascii?Q?qgqJCndJ0+514kdb8IexTmk2GLc8w45sw442CfB4X/hb5SpS+uPEUeuO09S1?= =?us-ascii?Q?SeCHFoi13vCeAJHhoBAxfO2JQIhBPI7nVZFXr+6dPmLfAmH1fo9o4HzGv/E1?= =?us-ascii?Q?62xPmOPlP0oS6oe/KeTWsDLTg21zXwalshmWUzemKBgBDFUQeryJ1L7+wb+4?= =?us-ascii?Q?uTJy8ne+tkgh6yRIH3yHN2EdKrGQxUiB/4qXUfgezmpqydCXnWI18SFqAn8j?= =?us-ascii?Q?nFtDiuIKnCPLo63Z9rZQ4WxBWTMjhcQydt24W19Yr++05hX65mYvAOwNNRHa?= =?us-ascii?Q?lvN8k2nw+wxeON8wy/ZVVSRMKBbbEGUywuSyrr1fa+uIDBDxoK2Gk1b8ymsA?= =?us-ascii?Q?qhnMNlr+P0le7ybUQNXT4OL2mzX7s4l3j9P9hY4ovHNMx4MWDJB6/CU9+16J?= =?us-ascii?Q?IExloCCoAkYujACi8yZj2HMqU6YWU5H3MRTV8k45OeK9h6TB/of3aCH08sKx?= =?us-ascii?Q?qH6zFpT4llMLm8bMp/crxLQ3+UFJiHLvTMbU08xgPtETVMPEChS7cRiT4DPj?= =?us-ascii?Q?oXkKlb2vvUzhPwAz6tVzmnFUY2uOdbaSf4NuJTkFRcl/fM3zfvm0a24Bo5WQ?= =?us-ascii?Q?oLmD0um/asp45XaxYvJaX3WR4uZaFBJ7nyV2dEbQj/eK4m94oz48cmWtlu67?= =?us-ascii?Q?3MWoPzsnndEpeXmNbbSy4G0bXvuB2qwvwhzisJfcbABtHMIMBx2mbhh+L7XD?= =?us-ascii?Q?I5J5y169yq18H2B151rY6TmROU=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 6:cTdESDTzAajSCPC9XKS0CyGsW8qDYxgNZy3EarEeZLpKoSvfI07Ubmx3xkQtnLc3JfBXMMzQGtUzUMjcrvH9l5WC0SZaiYHGv82F4YD40HCbQd73E8WW7NDLsmVkRhp4hReS1CaShdcjSoiTG1rK+SbSlJF3FvwfZ3t3ng+9efAO4/4sRswaKhNiw04ZGJzmNrnwdUYQb5MQ9QCswsBrk1/z2fRqhf/dzBIeIRaoRJerGfI0s8epoxoq3/s41tv7DBq+PLTydIE0O8/KV6MRgKj0FaULAav9F7OO1g1WrnDtUdhN7LluKs/4S/0QvqhagLCidPtLTM8jdTT2f7OFkvM1FRnPP5u5XU6HtvNmDEYmHT1O7cYGJkAbDPGB7tzinlUP9gU1yhM2kGt0WDNK+MeQhRSHpODn0eYtJ3C2at0=; 5:uC0I53go1eONoXdR6vBcUJVDmcKGcaB0sLFLaqYd8/wEAzttQIB24FjL3ejBpwPRifFZnseIXgw1vTaOQ5gm1eUn3faL67BGXqBOEr9V0R+YwPXWy3Curqj/3glEiAYr0G9D3f+AzjwWO0AKcH5k2I8T4KzagisAQcj+rjze9bM=; 24:MGYG0SB/klDRji3Ea52HzOZaDWr8JgryJUo0cFUjAPLj30HTq6nSqjG0azqYZ7Cz2mq42fwjY1LXRMB/6FwWiuIruE6E1IjcqKLRpO9ngG0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1306; 7:fB6myiDwQkVQeeJoZXGUcIOcOdBlyyg31gdBiDPSCussieyFbJa5YVvwseaqvVkd+lwSEXr0/e2BGlCmPD8G49rL0cM47aBjbm8EsSp1LPfEg9IovHHvHcQe6YRFSodq5rueTcxZVy28hYUzHyryv16Vx4+Frm6yO08Q1Bd2vvZ3Q7+GjDpPb3ae/8txsQok8b+8fJeb4oEQxB9ZgF3ttO7pnlLNrNBed6ESA1AOrEf70/Xq+RUtsfyDYmbDGM5DY87J5jiLRiwnKSzjczKREF05kMKptt4seKIJILPIyETKhtsF8/3TZH7z9xh5D+F90KDfP4lzbtp06yFi0de8PQ== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 09:10:28.4027 (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 Matchall support for the "in hw" offloading flags. Signed-off-by: Or Gerlitz Reviewed-by: Amir Vadai Acked-by: Jiri Pirko Signed-off-by: David S. Miller (cherry picked from commit c7d2b2f5eebe6e76efc11cfd7a600c0748234f3a) Signed-off-by: Talat Batheesh --- net/sched/cls_matchall.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c index f4327e8..55f0be3 100644 --- a/net/sched/cls_matchall.c +++ b/net/sched/cls_matchall.c @@ -56,6 +56,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp, struct net_device *dev = tp->q->dev_queue->dev; struct tc_to_netdev offload; struct tc_cls_matchall_offload mall_offload = {0}; + int err; offload.type = TC_SETUP_MATCHALL; offload.cls_mall = &mall_offload; @@ -63,8 +64,12 @@ static int mall_replace_hw_filter(struct tcf_proto *tp, offload.cls_mall->exts = &head->exts; offload.cls_mall->cookie = cookie; - return dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, - &offload); + err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, + &offload); + if (!err) + head->flags |= TCA_CLS_FLAGS_IN_HW; + + return err; } static void mall_destroy_hw_filter(struct tcf_proto *tp, @@ -187,6 +192,9 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, } } + if (!tc_in_hw(new->flags)) + new->flags |= TCA_CLS_FLAGS_NOT_IN_HW; + *arg = (unsigned long) head; rcu_assign_pointer(tp->root, new); if (head)