From patchwork Thu Oct 17 17:20:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sukadev Bhattiprolu X-Patchwork-Id: 284328 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 91C9A2C03DA for ; Fri, 18 Oct 2013 04:21:53 +1100 (EST) Received: by ozlabs.org (Postfix) id E07762C00CB; Fri, 18 Oct 2013 04:21:22 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e39.co.us.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 2C4182C00C8 for ; Fri, 18 Oct 2013 04:21:21 +1100 (EST) Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Oct 2013 11:21:20 -0600 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 17 Oct 2013 11:21:16 -0600 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 22EDC6E804C for ; Thu, 17 Oct 2013 13:21:14 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp22033.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9HHLFdq53608672 for ; Thu, 17 Oct 2013 17:21:15 GMT Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r9HHLECT005096 for ; Thu, 17 Oct 2013 13:21:14 -0400 Received: from suka2 (suka2.usor.ibm.com [9.70.94.91] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r9HHLDHd005024; Thu, 17 Oct 2013 13:21:13 -0400 Received: by suka2 (Postfix, from userid 1000) id 79A6E834B8; Thu, 17 Oct 2013 10:20:50 -0700 (PDT) Date: Thu, 17 Oct 2013 10:20:50 -0700 From: Sukadev Bhattiprolu To: David Laight , Arnaldo Carvalho de Melo Subject: Re: [PATCH 02/10][v6] powerpc/Power7: detect load/store instructions Message-ID: <20131017172050.GB9229@us.ibm.com> References: <1381889202-16826-1-git-send-email-sukadev@linux.vnet.ibm.com> <1381889202-16826-3-git-send-email-sukadev@linux.vnet.ibm.com> <20131016152742.GB25073@us.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20131016152742.GB25073@us.ibm.com> X-Operating-System: Linux 2.0.32 on an i486 User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101717-9332-0000-0000-000001D193E4 Cc: Michael Ellerman , linux-kernel@vger.kernel.org, Stephane Eranian , linuxppc-dev@ozlabs.org, Paul Mackerras , Anshuman Khandual X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" | | How about I add this to the function header ? | | * Please use the table in Appendix F (opcode maps) to determine | * events selected by this function. Here is the updated patch with the comment. --- From 38d1f9ac67a7f50db593e5875a8de6a2ecbea8e0 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Fri, 23 Aug 2013 18:35:02 -0700 Subject: [PATCH 6/10][v6] powerpc/Power7: detect load/store instructions Implement instr_is_load_store_2_06() to detect whether a given instruction is one of the fixed-point or floating-point load/store instructions in the POWER Instruction Set Architecture v2.06. This function will be used in a follow-on patch to save memory hierarchy information of the load/store on a Power7 system. (Power8 systems set some bits in the SIER to identify load/store operations and hence don't need a similar functionality). Based on optimized code from Michael Ellerman and comments from Tom Musta. Signed-off-by: Sukadev Bhattiprolu --- Changelog[v6] - [David Laight, Anshuman Khandual] Add a comment in function header to help better understand which instructions are selected by the instr_is_load_store_2_06(). - [Michael Ellerman, Tom Musta]: Optmize the implementation to avoid for loop. arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/lib/code-patching.c | 48 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h index a6f8c7a..9cc3ef1 100644 --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -34,6 +34,7 @@ int instr_is_branch_to_addr(const unsigned int *instr, unsigned long addr); unsigned long branch_target(const unsigned int *instr); unsigned int translate_branch(const unsigned int *dest, const unsigned int *src); +int instr_is_load_store_2_06(const unsigned int *instr); static inline unsigned long ppc_function_entry(void *func) { diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 2bc9db3..84571aa 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -159,6 +159,54 @@ unsigned int translate_branch(const unsigned int *dest, const unsigned int *src) return 0; } +/* + * Determine if the op code in the instruction corresponds to a load or + * store instruction. Ignore the vector load instructions like evlddepx, + * evstddepx for now. + * + * This function is valid for POWER ISA 2.06. + * + * Reference: PowerISA_V2.06B_Public.pdf, Sections 3.3.2 through 3.3.6 + * and 4.6.2 through 4.6.4, Appendix F (Opcode Maps). + * + * Use the tables in Appendix F (Opcode Maps) to identify + * instructions selected by this function. + */ +int instr_is_load_store_2_06(const unsigned int *instr) +{ + unsigned int op, upper, lower; + + op = instr_opcode(*instr); + + if ((op >= 32 && op <= 58) || (op == 61 || op == 62)) + return true; + + if (op != 31) + return false; + + upper = op >> 5; + lower = op & 0x1f; + + /* Short circuit as many misses as we can */ + if (lower < 3 || lower > 23) + return false; + + if (lower == 3) { + if (upper >= 16) + return true; + + return false; + } + + if (lower == 7 || lower == 12) + return true; + + if (lower >= 20) /* && lower <= 23 (implicit) */ + return true; + + return false; +} + #ifdef CONFIG_CODE_PATCHING_SELFTEST