From patchwork Wed Sep 16 17:08:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Upton X-Patchwork-Id: 518503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id A451914017E for ; Thu, 17 Sep 2015 03:09:03 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 6F64310A98; Wed, 16 Sep 2015 10:09:01 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id A43AF10982 for ; Wed, 16 Sep 2015 10:09:00 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id EA0171E021F for ; Wed, 16 Sep 2015 11:08:59 -0600 (MDT) X-ASG-Debug-ID: 1442423339-09eadd48f82349e0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id IOMNuqyPhpmbZMTT (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 16 Sep 2015 11:08:59 -0600 (MDT) X-Barracuda-Envelope-From: kupton@baymicrosystems.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO na01-bl2-obe.outbound.protection.outlook.com) (65.55.169.57) by mx1-pf1.cudamail.com with ESMTPS (AES256-SHA encrypted); 16 Sep 2015 17:08:58 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at spf.protection.outlook.com designates 65.55.169.57 as permitted sender) X-Barracuda-Apparent-Source-IP: 65.55.169.57 X-Barracuda-RBL-IP: 65.55.169.57 Received: from BY2PR0301MB0630.namprd03.prod.outlook.com (10.160.125.28) by BY2PR0301MB1576.namprd03.prod.outlook.com (10.163.28.18) with Microsoft SMTP Server (TLS) id 15.1.268.17; Wed, 16 Sep 2015 17:08:55 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kupton@baymicrosystems.com; Received: from [192.168.20.155] (71.246.225.210) by BY2PR0301MB0630.namprd03.prod.outlook.com (10.160.125.28) with Microsoft SMTP Server (TLS) id 15.1.268.17; Wed, 16 Sep 2015 17:08:53 +0000 To: "dev@openvswitch.org" X-CudaMail-Envelope-Sender: kupton@baymicrosystems.com From: Kyle Upton X-CudaMail-MID: CM-E1-915057822 X-CudaMail-DTE: 091615 X-CudaMail-Originating-IP: 65.55.169.57 Message-ID: <55F9A220.70300@baymicrosystems.com> X-ASG-Orig-Subj: [##CM-E1-915057822##][PATCH]: Use ctz64() instead of rightmost_1bit_idx() with 64 bit arg Date: Wed, 16 Sep 2015 13:08:48 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 X-Originating-IP: [71.246.225.210] X-ClientProxiedBy: BN3PR16CA0056.namprd16.prod.outlook.com (25.165.72.152) To BY2PR0301MB0630.namprd03.prod.outlook.com (25.160.125.28) X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0630; 2:XLwqXkKX1z3Ip/517P023VbnyVnVgcORHV4qx1a7Nw8QztQag3dW5JdwVAYOulMZUEDxWNi5nAslPNnnUVEIuuaCQLBQazgs1j8uqSQH/miqpnjMgpU8TQn8OQ1HnLDMABsuDVqq6QH9xEdA8otfCAKq9d6d642V+pDOQjR+x08=; 3:hcw1/KyIAqh+6uFb3PVQ35iyVPhu+uKQJ9h+nHC7IxwMBqMjxP+oozvSEydICQOf0veECw69CZrOjmO6aFPNKhLszLEGgsq/u7+3xe8YCOIgnsToixfwbs2gGQ+5m0YQUNOCLvV28Cd9EfMTrqITiQ==; 25:6IEYd08Wid8ks5XF11HeV7n3dn1iriOI48bz7VsRhlk6rwSbZvVBjzD6v9WX1mzSPgHIedC4YuvihMTGozmdU6As0Q/70vQZSUjoog1FTlkW0gWLF6p9cgujYcKT5J06xM4Upd3xkuPEFkGWr4G4XoqaE1djNQoYWL1v9lpxJQTyQnF1FvPkBkSqI0DUjqo7+V5UgDCEumMDtpdk9lSu+LAcFNZCosNZKxogzr/ZHiY93F9PkrlXrPnnw8EmnfuYZGIdg67p0pvSXWMAerqOYA==; 20:QVD+1ayTso1BvQ5NnUBtcy6m1atavszLpnuC2D3hikg+Yyk2XoykIkbbvLjFH6D1HzdHIVHvQxbEpsjPPClhyY+M42u1W3Uwq47nhJnfiscNKQE6uBMZWRwX+cq3KLNSmf+ntNFiQ15765xt2ZiMV8nBhlJ6pjwIQJ/ECK98hDI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0630; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(520078)(520075)(5005006)(3002001); SRVR:BY2PR0301MB0630; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0630; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0630; 4:PtVIuZb5W8QIpS6YXG4c+RZv8EAYuKNVLkFwF+LwvQsu30BoqSmeaioS9K03XHuYUCj41+h1Gs/Dyfe9FCumyrTHumMjOIAPwUPuHyD+6RQ1h2RnYH4zzCEvJ1pznbnyJqmCAymZaWD8BtXINtzAFKlekd1LrY2zVG/CkrbfiZz9T3rKlzPTJ0GNn1W/r+8EpojTU7kIa00drajFFFmv1hqQsCsSsFtLNvMVkDKeslMSetGHhSkYLwTyyEGdcQXU0KQc/c8K6F0cnhfVWmuZ800JIOeL18lplL4htwqMRRrCwbLuv8yaBV4STwo+KsrHwO75gCzMcEhLrqkzn02eFyxbznq2v1ZjevvI83eW/JM= X-Forefront-PRVS: 07013D7479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6049001)(189002)(199003)(5001960100002)(5007970100001)(50466002)(40100003)(5001830100001)(117156001)(4001540100001)(5890100001)(5004730100002)(189998001)(19580395003)(5001860100001)(2501003)(19580405001)(107886002)(62966003)(77096005)(122386002)(46102003)(81156007)(110136002)(97736004)(36756003)(77156002)(47776003)(450100001)(4001350100001)(64126003)(575784001)(68736005)(83506001)(106356001)(87976001)(229853001)(54356999)(86362001)(2351001)(64706001)(92566002)(105586002)(33656002)(65956001)(50986999)(42186005)(65816999)(66066001)(65806001)(101416001)(23676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0630; H:[192.168.20.155]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: baymicrosystems.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTJQUjAzMDFNQjA2MzA7MjM6S01mZDlVclRJM01NL2JUMlRLaWc1ajNP?= =?utf-8?B?TXl5NVcrd0Q2aU54WERDejd6M2RxZVVwZGRyVVVrN3pzdm1qMjg4QzR3T3E4?= =?utf-8?B?clJvdXdVZFFKMDEwbTdQcDMrRGRTUm53dTc0N0RzakdybUtqSHBQSStraDZE?= =?utf-8?B?aHdWQTQxOTVqaHhIN3dHUW51bnp2RHNiZjAxdVR1TU1tdzFRK01rL2lDRlNp?= =?utf-8?B?UHFnM0NRalhraHAxQlVpN0psZ1E4cElTeFlCdGI2ODRDYWY1L09YMjdFVE1z?= =?utf-8?B?N0ZuR1NzczlxRmhFSUJyOHcrY01idGhmRWQ2Wk1qMDUwVGZHdERMOEliYlpG?= =?utf-8?B?UFd3ZXJ4SFFwbkNtUkpLWmNRdGY4TWNsanBtMU03d05IRTRHRmxEeENQVEYy?= =?utf-8?B?NHBFYytXL1pyWUthSDRsMzJKYkdubUpLNlg2ZmpMdTFDQnVML29jcXN3SkVq?= =?utf-8?B?OGVWaERzRGRwSFphZmE0cHAzcnpUaWhtcjhxQ3EzSWN6dEl0bEg3cUozYXBF?= =?utf-8?B?ckdocG1ZVm15NitFM1lYTDhyUnZZdTV0YWgyTlh5ZFJRTUtQa296ck1KZ3o0?= =?utf-8?B?MnBrMXBwYVhERjZPWkovb2ttQzJqU3V4Z2grZ0h2Ym4za2NWZFQzTkJoR2dm?= =?utf-8?B?RUc4aWdVTzB1cFUvS1k0VUVMRnZvUXExWHJKZ1NlUC9hMEw5U2pob09tS0NF?= =?utf-8?B?bktZUmJ4Z2hGYXYzOHQxMGxkSjN0LzZQL1JyYVZoUFl4S3Fka2xYaTJVdkRE?= =?utf-8?B?U2txeGt5NitVci9jdkppQ2JxQVlqeVE3eHo4K1VSc0xjaFpvUVp2VUw3WDUz?= =?utf-8?B?VlhmdEdEYUJ6RWlnOER0ZmxqMndPVWxwWVBNVGJCQmZ5Ymkzbm1mZmI5OUxa?= =?utf-8?B?bVBIcGE1cGJKKzBKOU10SW9iZ0M1ZURIbWtucmxya25uOWdDTXZwZkdhSDlj?= =?utf-8?B?YXRXeXl5Q0pLcXVXZHhqYTMwZEt2amo2TzZVV3Vid09rRDI4L1YybXBCelZQ?= =?utf-8?B?NlVhb1JvbFRaclRlR25UNzI0Y1ZyUlphbldNUUpDS3lKY2JTVHQ1bEw0cDAw?= =?utf-8?B?aW5qQXIrZVpWeGhwdVlqajZVM3lic0t3WjUvQWg3YjJER2xiYVl0a2RmOVlz?= =?utf-8?B?eldlRmp1MjJtZFFKeUIvQUE0OWMvdFREejUycjVlNkxpc3NuNStwNHdlVVR0?= =?utf-8?B?cTBZTFFiVGtmM3FsV0l0Tm5mZ1ZJWm9GQ1VKMlZSaWYxUTNrQVlDeFlXeVI0?= =?utf-8?B?ZUhhQjdoRU5LOUlUcHFMNHJxemdSaUQ0VnRoVndNdy8zV0w5RVJGcyt5ZXZq?= =?utf-8?B?akYxSTNsVGUzeE1vWW9mVmxvRll1OGtPWmVKYXgvOSszd2s5ck55bmN6WklD?= =?utf-8?B?elp5SStDNjVCdGttemNlcGF5RjJja3VIVFprcXlXUGVBRXlBVndtNkFrSDZz?= =?utf-8?B?eHVnNjF6R08vNjVQL20xakNSVytCZ01KcjVXa1g4ajNzQXF3Wko4YkdpNFlG?= =?utf-8?B?MTZkSG9udXBlMXFjNnNBajRCdDkyNEw1UzRYaWthS1ljcEgrWUxYdk1DQnN1?= =?utf-8?B?SGp2dFd2Y3E0am5jK25Xc1pHK0VRQUtQZ0FYcGtQS0Y5c2xUZVJEb2xiREk0?= =?utf-8?B?L1ZwSFhqbmJFaEE3bU9uTzlRNDZSL05JMHBJcTFjNEt3NC9td0RuTEZUbDhB?= =?utf-8?B?bXFBV2lSMmcxUmtHSi93QUJEemI4bHkyQVFLVEZQdWhCVXIxcUJDUDQxdDg2?= =?utf-8?B?djVhOWJRaGROQ2hLanlUR1lZYWF0VjVHOW5SRGpjek9IKzlzLzhlZ3lvTTEy?= =?utf-8?B?VjFzS0xVT2FIRmxmcVhBZ3RxTGZqZTdJMzhXTlR2YytvODRwd05DK0dLaldC?= =?utf-8?Q?xZ2jajes7bKDAoM6FSkCWSi/pZnTgWX30F?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0630; 5:ZpEKOXfkk+2R7coem2miPEFjh35HjZTJvdTnfJKIE0NdtDxHycsjXJs2nuCVwOS20HvigGTwpFnK2LNvXuRESyOb15+tJPG3Q76X1pFnVmZsjfFeuyh0hRiokGcROdhFUiHzSYd+DyFPr8HQa/9Pmw==; 24:PAxphYMtq7PzCjZBuE9qTCdDUrkJdAz2FMiUVivJXs/cqYhBObHFHOMBvbQH5O/hoVSNXqUv8a2CJEHCYgIQDshkM0CmGR1K4FfnOxFHKQk=; 20:luXW+cfxnh4w6gfu4rob/9/Kty+tg2Zh6kDJRSHU6SDU8rN8R9L0cDJKdPhRgq9LVR/KSLSN3LzS4R1uG53R2Q== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2015 17:08:53.1169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0630 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1576; 2:6DO136IJjOT1gYT9qduABrufAyqlXaAo/LhX/5dLOTBgIRSwsqTQ60VYHSgLx2vZ/JRm3gNuN5bBf/jV9Be45DqFms91GXgassqKlAyqdJM1Zkp+GiHbGpe5o0pt2wKgP0CNp07tPIWVVp5MkAKT9EhR/2yX3S8BitiIgBT9k/c=; 23:u9qQV2Z7WMRHk5XGYus2YV1vJIeOrNFVLzxfvVGWjrb0McOHRKw6gTpXHoEH1iQvjwZ7rPdv6G4SeOp3uPsb27naRbodZYCs/XU6hsv6nF2oTbMzmyyW3LWCzDT1BQyKLXky/rE61hoAa9ZGcGtSax6olg3uT4xworazfH6nq0h31UFuoyTpGzIv/i6S5lB5 X-OriginatorOrg: baymicrosystems.com X-GBUdb-Analysis: 0, 65.55.169.57, Ugly c=0.446283 p=-0.368421 Source Normal X-MessageSniffer-Rules: 0-0-0-13001-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442423339 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_RULE7568M, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.22605 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS Subject: [ovs-dev] [PATCH]: Use ctz64() instead of rightmost_1bit_idx() with 64 bit arg X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" Applied a patch which changed value of OFPACT_SET_QUEUE to be greater than 32. Tracked down a subsequent autotest failure to invocation of rightmost_1bit_idx() with 64-bit argument 'opfacts_bitmap'. rightmost_1bit_idx() only works with 32-bit integers. Changed this and other occurrences where rightmost_1bit_idx() is invoked with a 64-bit argument to use ctz64() instead. Tested by running 'make check'. Signed-off-by: Kyle Upton This correspondence, and any attachments or files transmitted with this correspondence, contains information which may be confidential and privileged and is intended solely for the use of the addressee. Unless you are the addressee or are authorized to receive messages for the addressee, you may not use, copy, disseminate, or disclose this correspondence or any information contained in this correspondence to any third party. If you have received this correspondence in error, please notify the sender immediately and delete this correspondence and any attachments or files transmitted with this correspondence from your system, and destroy any and all copies thereof, electronic or otherwise. Your cooperation and understanding are greatly appreciated. diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 88f0f85..93d34f1 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -6097,8 +6097,7 @@ ofpact_bitmap_format(uint64_t ofpacts_bitmap, struct ds *s) ds_put_cstr(s, ""); } else { while (ofpacts_bitmap) { - ds_put_format(s, "%s ", - ofpact_name(rightmost_1bit_idx(ofpacts_bitmap))); + ds_put_format(s, "%s ", ofpact_name(ctz64(ofpacts_bitmap))); ofpacts_bitmap = zero_rightmost_1bit(ofpacts_bitmap); } ds_chomp(s, ' '); diff --git a/lib/ofp-util.c b/lib/ofp-util.c index d90cca8..b7e1071 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -160,7 +160,7 @@ static void put_bitmap_properties(struct ofpbuf *msg, uint64_t bitmap) { for (; bitmap; bitmap = zero_rightmost_1bit(bitmap)) { - start_property(msg, rightmost_1bit_idx(bitmap)); + start_property(msg, ctz64(bitmap)); } } diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index e55e524..b534bc6 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -202,7 +202,7 @@ recv_S_GENEVE_TABLE_REQUESTED(const struct ofp_header *oh, enum ofptype type) goto error; } - unsigned int index = rightmost_1bit_idx(md_free); + unsigned int index = ctz64(md_free); mff_ovn_geneve = MFF_TUN_METADATA0 + index; struct ofputil_geneve_map gm; gm.option_class = OVN_GENEVE_CLASS;