{"id":831044,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831044/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20171027040833.3644-4-aneesh.kumar@linux.vnet.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<20171027040833.3644-4-aneesh.kumar@linux.vnet.ibm.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20171027040833.3644-4-aneesh.kumar@linux.vnet.ibm.com/","date":"2017-10-27T04:08:20","name":"[03/16] powerpc/pseries: Update hpte find helper to take hash value","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"62d8c3a2eaa2b555d73b1614d60f61a888340ec6","submitter":{"id":664,"url":"http://patchwork.ozlabs.org/api/1.2/people/664/?format=json","name":"Aneesh Kumar K.V","email":"aneesh.kumar@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20171027040833.3644-4-aneesh.kumar@linux.vnet.ibm.com/mbox/","series":[{"id":10486,"url":"http://patchwork.ozlabs.org/api/1.2/series/10486/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=10486","date":"2017-10-27T04:08:17","name":"Remove hash page table slot tracking from linux PTE","version":1,"mbox":"http://patchwork.ozlabs.org/series/10486/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831044/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831044/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3yNVqP3RBDz9t0F\n\tfor ;\n\tFri, 27 Oct 2017 15:13:37 +1100 (AEDT)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3yNVqP2YG0zDrd6\n\tfor ;\n\tFri, 27 Oct 2017 15:13:37 +1100 (AEDT)","from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3yNVkD4XNCzDrbn\n\tfor ;\n\tFri, 27 Oct 2017 15:09:08 +1100 (AEDT)","from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv9R492KZ091623\n\tfor ; Fri, 27 Oct 2017 00:09:06 -0400","from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2duvcejpmp-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 27 Oct 2017 00:09:05 -0400","from localhost\n\tby e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from\n\t; Thu, 26 Oct 2017 22:09:05 -0600","from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16)\n\tby e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tThu, 26 Oct 2017 22:09:02 -0600","from b03ledav001.gho.boulder.ibm.com\n\t(b03ledav001.gho.boulder.ibm.com [9.17.130.232])\n\tby b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v9R492iF7930266; Thu, 26 Oct 2017 21:09:02 -0700","from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 2A8846E176;\n\tThu, 26 Oct 2017 22:09:02 -0600 (MDT)","from skywalker.ibmmodules.com (unknown [9.85.199.61])\n\tby b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP id 5B9516E121;\n\tThu, 26 Oct 2017 22:08:57 -0600 (MDT)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com;\n\tenvelope-from=aneesh.kumar@linux.vnet.ibm.com; receiver=)","From":"\"Aneesh Kumar K.V\" ","To":"benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au","Subject":"[PATCH 03/16] powerpc/pseries: Update hpte find helper to take hash\n\tvalue","Date":"Fri, 27 Oct 2017 09:38:20 +0530","X-Mailer":"git-send-email 2.13.6","In-Reply-To":"<20171027040833.3644-1-aneesh.kumar@linux.vnet.ibm.com>","References":"<20171027040833.3644-1-aneesh.kumar@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17102704-0020-0000-0000-00000CE87138","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007958; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000239; SDB=6.00937034; UDB=6.00472245;\n\tIPR=6.00717297; \n\tBA=6.00005660; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017735;\n\tXFM=3.00000015; UTC=2017-10-27 04:09:04","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17102704-0021-0000-0000-00005EAC0D01","Message-Id":"<20171027040833.3644-4-aneesh.kumar@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-10-27_02:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tpriorityscore=1501\n\tmalwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0\n\tclxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0\n\tclassifier=spam adjust=0 reason=mlx scancount=1\n\tengine=8.0.1-1707230000\n\tdefinitions=main-1710270053","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"linuxppc-dev@lists.ozlabs.org,\n\t\"Aneesh Kumar K.V\" ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"The helper now also does secondary hash search so that we can use this in other\nfunctions.\n\nSigned-off-by: Aneesh Kumar K.V \n---\n arch/powerpc/platforms/pseries/lpar.c | 28 +++++++++++++++++-----------\n 1 file changed, 17 insertions(+), 11 deletions(-)","diff":"diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c\nindex 495ba4e7336d..edab68d9f9f3 100644\n--- a/arch/powerpc/platforms/pseries/lpar.c\n+++ b/arch/powerpc/platforms/pseries/lpar.c\n@@ -328,15 +328,21 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,\n \treturn 0;\n }\n \n-static long __pSeries_lpar_hpte_find(unsigned long want_v, unsigned long hpte_group)\n+static long __pSeries_lpar_hpte_find(unsigned long hash, unsigned long want_v)\n {\n \tlong lpar_rc;\n \tunsigned long i, j;\n+\tunsigned long hpte_group;\n+\tbool secondary_search = false;\n \tstruct {\n \t\tunsigned long pteh;\n \t\tunsigned long ptel;\n \t} ptes[4];\n \n+\t/* first check primary */\n+\thpte_group = (hash & htab_hash_mask) * HPTES_PER_GROUP;\n+\n+search_again:\n \tfor (i = 0; i < HPTES_PER_GROUP; i += 4, hpte_group += 4) {\n \n \t\tlpar_rc = plpar_pte_read_4(0, hpte_group, (void *)ptes);\n@@ -346,31 +352,31 @@ static long __pSeries_lpar_hpte_find(unsigned long want_v, unsigned long hpte_gr\n \t\tfor (j = 0; j < 4; j++) {\n \t\t\tif (HPTE_V_COMPARE(ptes[j].pteh, want_v) &&\n \t\t\t (ptes[j].pteh & HPTE_V_VALID))\n-\t\t\t\treturn i + j;\n+\t\t\t\treturn hpte_group + j;\n \t\t}\n \t}\n-\n+\tif (!secondary_search) {\n+\t\thpte_group = (~hash & htab_hash_mask) * HPTES_PER_GROUP;\n+\t\tsecondary_search = true;\n+\t\tgoto search_again;\n+\t}\n \treturn -1;\n }\n \n static long pSeries_lpar_hpte_find(unsigned long vpn, int psize, int ssize)\n {\n \tlong slot;\n-\tunsigned long hash;\n-\tunsigned long want_v;\n-\tunsigned long hpte_group;\n+\tunsigned long hash, want_v;\n \n \thash = hpt_hash(vpn, mmu_psize_defs[psize].shift, ssize);\n \twant_v = hpte_encode_avpn(vpn, psize, ssize);\n-\n-\t/* Bolted entries are always in the primary group */\n-\thpte_group = (hash & htab_hash_mask) * HPTES_PER_GROUP;\n-\tslot = __pSeries_lpar_hpte_find(want_v, hpte_group);\n+\tslot = __pSeries_lpar_hpte_find(hash, want_v);\n \tif (slot < 0)\n \t\treturn -1;\n-\treturn hpte_group + slot;\n+\treturn slot;\n }\n \n+\n static void pSeries_lpar_hpte_updateboltedpp(unsigned long newpp,\n \t\t\t\t\t unsigned long ea,\n \t\t\t\t\t int psize, int ssize)\n","prefixes":["03/16"]}