From patchwork Fri Feb 16 21:36:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 35209 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8DE691B353; Fri, 16 Feb 2018 22:37:58 +0100 (CET) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0043.outbound.protection.outlook.com [104.47.34.43]) by dpdk.org (Postfix) with ESMTP id 8EA031B34F for ; Fri, 16 Feb 2018 22:37:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Ry18BuxP+GTYxdu8Pn2ij5sqaRKubsNFKYBOS+i6ZYk=; b=j/eNrEpeVPrWKnODjyy0s1S5nTfDatnGNv5ZGUUVPGCbihJuG23c3va4N0GcaT3s14lRJFgZ6E6smtCpad5oR3jp/8avtKi1Mid0i8S5JNzax4Ra2SxNzI58xNjoYUhiASafh3Uu6T+EsdaFmzgvyNDMo3viW71jldZrT5lwHX4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (111.93.218.67) by DM5PR07MB3467.namprd07.prod.outlook.com (2603:10b6:4:67::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.18; Fri, 16 Feb 2018 21:37:53 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com, erik.g.carrillo@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Sat, 17 Feb 2018 03:06:59 +0530 Message-Id: <20180216213700.3415-10-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216213700.3415-1-pbhagavatula@caviumnetworks.com> References: <20180216213700.3415-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SG2PR01CA0090.apcprd01.prod.exchangelabs.com (2603:1096:3:15::16) To DM5PR07MB3467.namprd07.prod.outlook.com (2603:10b6:4:67::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 411a6dfd-c8f5-439d-ee3c-08d575858a5e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR07MB3467; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3467; 3:riddBjqNkJtWjjul8dwsLwinQUVLm3RjE6yNOajcCXA1pXV2ZXy2+wGxl3rKA5BagPYvug0ZzlPF0dc0PYelKnSybUW+Ne/Pfr1tK8X+TR698HDpvURHxKRxPO40dqvxQyFl75dSl8ZXkIssXOWt1AdpKf+sDkaPLrQ85DIR9kusajPNIt+OH1O54EI0q+HgDWoe9bYK2FhXK++Pzv+WEJlufkjYswU2hLUr0pPP4hG43/xuQ99XXEtSPDJM5IRg; 25:7kgJmmGgEh/QulSgt0uBkRqNSNxzvR/DWPHvapDA3yTcMvMSlkT9Obeni/WVQPt+lDsO3K9NTgOQdCN6hEsBe7zrpDZk5+ZzAq1gPoZRSy7SVJBBh28YN3EDEVShS23LVjv9R6UJtYyzrBi7KJ8Xe2Op6pVK6zwXp1qET4v7vaWcQ3zEcXXSdgVcUNmQAI1ad9B8xmzG8Q6ukhwfBK7MaIqNLqWUwCQ/zrQZPP6EkBewUrm310m3RgB8cKGy5nx+uyGwlhHdAUc0pG9xdVXkOn8iNAXFgn8U9528zJSx1poGDTw4cN6GtEZamMkr0JyQq3Mk0oT1PX8nvaq5U0PcWA==; 31:XMY59U7z0XGNjZoJhMhxShnGQWmvIFh6vVzwAu/I2iOUyJ1y/hCQPHloxagPvPrL8okIB64zqp5oEbcca47LUcNqzqFB6T7fpgfKDWv62c2xcAQn5GcfG6vFD5V/2tSmbdFUf/zzwsOiQJXPq7Ckps6Ofa9EBHB/wZdB8ut80dO7DzBL2OTTGHQql8q0ZxUPE7wor+QIJq+MrQHSl01vnvbbX5AI7eiNFn0gL9WQWEY= X-MS-TrafficTypeDiagnostic: DM5PR07MB3467: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3467; 20:EdvWbN9Fp6U6LR8536KCPMh7YaPpRURK+9q4BpZQNcKv4aX4KlKYjhrMhcmRNrVJhmfqQdPcuiMlDzxS7ENDMibBPVUmLXmtNTFuaxcatiIA+pIyS7Iik1skegpPhpfmb3NJg7Qhu5U7Ro+GRhm9Zp+Mb5ZfYVGZ8f8ax+mmqnIFKAnNTb5qLWLFe5toIPa7123BIVRjzWd4wyQ8k4WFugt2N9Hf4lI0I2MlTnFgZgfI7eYN4Z1oa+rJz/DnnBIEviIiCiAAhaGkJrBsTFrulEcA57FSMPJNy5QWzdgk+95Zqe1j5aQeJY17v6Adk64hxmxkmQxi27pYWKJUuQRHk/1ZqdTrOTPhrAi7RP9gtBka0Y+kv6zaP8vVQqUL7hDDjTrAcI77wN5lO8OPITN1ymav0kCQVgkFBErTmGzL8AKoQi8HUXDBgH8WGRH8ojNm7mO3j90e61sf/QjPDqYRZYhp5IriVeEEu1pLwONJDVNOpyjo8WHQYKCtTAii4lQhMtY7xpFl+d8txdJn15HRg7d13iVU7hAxhO6vFORrjCcq8uwwHb6EhW0U26e88hxjvz+eMYWPaKYoVagQZwxkL7PIBikWW4HsygziDw9Jr4I=; 4:w4nWvKyBIKAJ9b4aVTB+86wxACKnmfDfArLqqSiHFW6RtXcUi+I+H/vYPrRquYrqx1aujN4aOImXafs3eA7Y8eQ81gisJvn1NpMj0VOA6nEOruREhwbBaDj3NDcaHWqVRNZBVnT/ZBs5OY9w+fy39rcbHqltGqt7xuVCjyPLQvACuC2XA8b0pSU0LvtVLwUN/M75WBx4G1DrV+0tepaUOvUfxTx7eS7UPwYK/BWhV+2vFWXPNj1rU3lTSeOMNcaEK77tqElwZHfj+IoxpD+ULQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3231101)(944501161)(93006095)(3002001)(6041288)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR07MB3467; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3467; X-Forefront-PRVS: 0585417D7B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(366004)(396003)(39860400002)(39380400002)(376002)(189003)(199004)(6486002)(25786009)(2950100002)(386003)(6506007)(53936002)(42882006)(5009440100003)(4326008)(107886003)(59450400001)(6512007)(16586007)(106356001)(316002)(105586002)(36756003)(478600001)(2906002)(47776003)(6116002)(76176011)(3846002)(1076002)(97736004)(66066001)(8676002)(51416003)(50466002)(48376002)(81156014)(5660300001)(68736007)(8936002)(52116002)(16526019)(26005)(305945005)(1857600001)(72206003)(81166006)(50226002)(7736002)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3467; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3467; 23:GucgZReUeKUnz7dRajS59c2rWMeyw3DcpCy9xrwim?= nVPWoA3UkZWV9Whwzz2Ec9z8Qt8ciussj/dEsBgTYamYXed0Bw2Xcc61b6hPCvfYLBmT7Ihtk61zXYkhfv3tk/C+WvWoYF4dIAu9nw0fcmzZaKCQkz0Hmzrwwu1aUmZ1+xa/qXnvcqLMuWvB2JXkOs0zDDLaNkycmr3qzvl5Rg2cOmHq2WxEOAUMfIN10z+SuUn7XN2ZYfYHqLQNZP4SOZMhIYj984um/W2x9TUp1tYV4YKPsPDcwEzkU4OV1GGsXkwsfKgTw/SYNCifUaed7IS2vgNdxdtRkD+R/5qus5+kPWB1GN9WadYRTEgxNFyOeDcESbzdtNNCTnGZCb1vX7OpPJiPgEPTpvypfYMPyQQn8TV30+yZaykb2n4EVfYg9V46CJukuPANw9ga/rKjART3AOOdYfJ9YK5+AjJuXqFRVjf1ELdnRKvEz+2UbIX5j9Ab9z6MtvpeiAynem1X1IljihqhVMbNax7SICMmCIYFWkj4sTD+d9OAeVQa/SnBinw1ZuRROpEpX6a28Ea84slmH/2V1mywBM9YJl7IPIRlZvVC4RAeT3Hn4hTJ1pYCNQi0ylR4L7PWZEZ2dzeVGKjYDmPz+XCAkhewVGEn3XZOF2H1FM3xECH5yiitWWtdZLMhJVIlhYRbpOjh0sObKsXqnrLLjlcJpLoLCe3X7li4oAukp1AE/SLRM1O8OaV72i7Skpk7LPicYSa/SAN6z+IrjsYr7XBabd3KyDIzs8xIhBqxaKQ4oe5FwWb3bVY8YuQ3eYa2lsilPU8jEVK8tLmb0qsMYWxsyqy0JYbwsiQ9Ww3cxb/D+WREAoaHrpi8sHZM6tEc47QiIuzFTj4JYXFlcfoOYgO+NgcQy4U7OkKOinQwSwla2yy+HnO5a5MlCVuL11AQQBMXd/rgIeFlb3C7m7QrEJz6vBkbUSoPjQ/NjpZV1IzKNuz9a508g5cQ4F8qM0DIeaEgr5AzWZYLrekqt2ffednGv5csJlcan8V3FTv7MSN/ljaNJRHVJGC1dR8v/jksyLAvUkgLi8j8xsrWRkHb12xscOKUHQIXv1Uy7t1E6jbnHqQVQ15O11lgnfx62Nzexktq0BwpSEAoz+6VN1BiykjZv5xZytwtOoaNj9BUb503T6G85NTUtp5hkC15SJiI5JrvXruGD4Wa2tOpqAorLHGpj+Wx5DjwWKy6g== X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3467; 6:PaqpqSOUakmHkHOUSDjWtOCGOOJi0/aaHb1YFxtX1OjbTtu1buNxfm08EkdbG9eMmZfXZRzg57LsNNQSflQRioOebjIkJ9W8TogymzwQ37a8Qgbm5ed4TNRk/KYGqJoyFX7sCSUUnPKe4QBRefQhw8hYgBkprQogzeFsttgFJiMzFxU0DF4Ol9oeoWMb0JUcV8Otq45oyjN+Fp12vG8JxD+NM2Ioj4LZ5ppBFrv9gfvkTZcxoiPwJMQGhgjeAGM66kbzaD7qhMZPhiYKhZn8stgNFr76/xLjedTcC8gNdTm3kJDzp71TxWXJI3BfA/uBGxARHdl8bpBdSsDsQWmjbWTj2rq1ttTWZMTNiUhhDiA=; 5:bsvPB6HLlTpEekiO05Z3wsLmIB/9jZeT8rUWTMhlVqFS2aYdTzPmUreHxi3vNRNQlgizK4neKDdTQ5kZhvjfXPwMyVXtsT9YYyZMwjR3Yp0Tf9HN9dORAET2CTtUJuxtetw2Ho38e57ZVjwLPtvSfgH4wVEi8HqIRRahUXcXqDc=; 24:00hn1uBku1Oc9HRhFPM3w704jXYkrxo+0RmvpvDZLkAMT5KgrHT7Ex4J5uEQ9saOzQ7YqQ/NKLmTgNse9DUfX++gcqxi7djBvk6FX3lvhs0=; 7:q0zXeG23wGDvED5DRBA4vbBLLboaQM0ZX3JezGCgggs6JvERvgJtC89hn0KvG3pfk59SHV/NGVZP7df4d+6/9LlmFVX7Nl4ghUF8PbwXCHVYhYSCZ1uJafRDmFH8ur8ITVPqd735GE7QwQr3gynFFImfYmL2+K+Tvnmiu0bHV5lRmebaeZII1+mVGpFDwf9Tl96K8NsRb1Kck15Gehr5ZuNGG84P9D5k3vr1Swz4USXgejbzlRAkHWEjrmWY0E9Z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2018 21:37:53.6620 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 411a6dfd-c8f5-439d-ee3c-08d575858a5e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3467 Subject: [dpdk-dev] [PATCH 09/10] event/octeontx: add timer adapter SW traversal routine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Pavan Nikhilesh --- config/common_base | 1 + drivers/event/octeontx/timvf_worker.h | 105 ++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/config/common_base b/config/common_base index 00010de92..2f8c21871 100644 --- a/config/common_base +++ b/config/common_base @@ -563,6 +563,7 @@ CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV=y # CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=y CONFIG_RTE_PMD_OCTEONTX_TIMVF_USE_FPAVF=n +CONFIG_RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL=n # # Compile PMD for OPDL event device diff --git a/drivers/event/octeontx/timvf_worker.h b/drivers/event/octeontx/timvf_worker.h index c3f37372a..1d5e27631 100644 --- a/drivers/event/octeontx/timvf_worker.h +++ b/drivers/event/octeontx/timvf_worker.h @@ -7,6 +7,23 @@ #include "timvf_evdev.h" +#ifdef RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL +#if defined(RTE_ARCH_ARM64) +#define timvf_store_pair(val0, val1, addr) ({ \ + asm volatile( \ + "stp %x[x0], %x[x1], [%x[p1]]" \ + ::[x0]"r"(val0), [x1]"r"(val1), [p1]"r"(addr) \ + ); }) +#else +#define timvf_store_pair(val0, val1, addr) \ +do { \ + rte_write64(val0, addr); \ + rte_write64(val1, (((uint8_t *)addr) + 8)); \ +} while (0) +#endif +#endif + + static inline int16_t timr_bkt_fetch_rem(uint64_t w1) { @@ -162,6 +179,49 @@ timr_clr_bkt(struct timvf_ring *timr, struct tim_mem_bucket *bkt) } #endif +#ifdef RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL +static __rte_always_inline void __hot +timvf_sw_trav(struct timvf_ring *timr, struct tim_mem_bucket *bkt) +{ + uint16_t i; + struct tim_mem_entry *chunk; + struct tim_mem_entry *wrk; + void *grp_addr; + chunk = (struct tim_mem_entry *)bkt->first_chunk; + timvf_log_info("Software traversing bucket."); + /* Only one sw thread can be here. */ + while (chunk) { + for (i = 0; i < nb_chunk_slots && bkt->nb_entry; i++) { + wrk = chunk + i; + if (!wrk->wqe) + continue; + grp_addr = octeontx_ssovf_bar(OCTEONTX_SSO_GROUP, + (uint8_t)((wrk->w0 >> 34) & 0xFF), 2); + timvf_store_pair(wrk->w0, wrk->wqe, grp_addr); + wrk->wqe = 0; + bkt->nb_entry--; + } + wrk = (struct tim_mem_entry *)((chunk + nb_chunk_slots)->w0); + rte_mempool_put(timr->meta.chunk_pool, chunk); + chunk = (struct tim_mem_entry *)wrk; + } +} +#endif + +static inline __hot void +timr_clr_bkt_full(struct timvf_ring *timr, struct tim_mem_bucket *bkt) +{ + struct tim_mem_entry *chunk; + struct tim_mem_entry *pnext; + chunk = (struct tim_mem_entry *)bkt->first_chunk; + + while (chunk) { + pnext = (struct tim_mem_entry *)((chunk + nb_chunk_slots)->w0); + rte_mempool_put(timr->meta.chunk_pool, chunk); + chunk = pnext; + } +} + /* Burst mode functions */ static inline int __hot timvf_add_entry_brst(struct timvf_ring *timr, const uint16_t rel_bkt, @@ -205,6 +265,20 @@ timvf_add_entry_brst(struct timvf_ring *timr, const uint16_t rel_bkt, goto __retry; } + /* Check for bsk & do software traversal. */ +#ifdef RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL + if (unlikely(timr_bkt_get_bsk(lock_sema))) { + lock_sema = timr_bkt_set_sbt(bkt); + if (unlikely(timr_bkt_get_sbt(lock_sema))) { + /* Should never hit. */ + goto __retry; + } + timvf_sw_trav(timr, bkt); + timr_bkt_clr_bsk(bkt); + goto __retry; + } +#endif + chunk_remainder = timr_bkt_fetch_rem(lock_sema); rem = chunk_remainder - nb_timers; if (rem < 0) { @@ -342,6 +416,18 @@ timvf_add_entry_sp(struct timvf_ring *timr, const uint32_t rel_bkt, if (unlikely(timr_bkt_get_shbt(lock_sema))) goto __retry; +#ifdef RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL + if (unlikely(timr_bkt_get_bsk(lock_sema))) { + lock_sema = timr_bkt_set_sbt(bkt); + if (unlikely(timr_bkt_get_sbt(lock_sema))) { + /* Should never hit. */ + goto __retry; + } + timvf_sw_trav(timr, bkt); + timr_bkt_clr_bsk(bkt); + goto __retry; + } +#endif /* Insert the work. */ rem = timr_bkt_fetch_rem(lock_sema); @@ -430,6 +516,25 @@ timvf_add_entry_mp(struct timvf_ring *timr, const uint32_t rel_bkt, } RTE_SET_USED(lock_cnt); +#ifdef RTE_PMD_OCTEONTX_EVENT_TIMER_SW_TRAVERSAL + lock_cnt = (uint8_t) + ((lock_sema >> TIM_BUCKET_W1_S_LOCK) & + TIM_BUCKET_W1_M_LOCK); + + if (unlikely(!lock_cnt && timr_bkt_get_bsk(lock_sema))) { + /* Only first thread processes the bucket.*/ + lock_sema = timr_bkt_set_sbt(bkt); + if (unlikely(timr_bkt_get_sbt(lock_sema))) { + timr_bkt_dec_lock(bkt); + goto __retry; + } + timvf_sw_trav(timr, bkt); + timr_bkt_clr_bsk(bkt); + timr_bkt_dec_lock(bkt); + continue; + } +#endif + /* Insert the work. */ rem = timr_bkt_fetch_rem(lock_sema);