Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp979097ybe; Thu, 19 Sep 2019 06:55:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxL9pcMdFkOK32srAjAg/IdyPrCaCnUjz/+TZJ7KV/SSI4pw0cUHxZCDmBZgk1obREWW/Zo X-Received: by 2002:a17:906:e0d1:: with SMTP id gl17mr1834197ejb.99.1568901336974; Thu, 19 Sep 2019 06:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568901336; cv=none; d=google.com; s=arc-20160816; b=kbjyrbu+w+BU9gzJ3Q4ihxYl47vza7Cv0F0fjgZ+/XoRfSxzUc5lysZMCp4EiaH+U2 bPyCnXkbMvrZvutEppVLhpm8vJnknvTDmmPWgcPVk0iQZWqs6UWlAVHscDlaDrHGcndI 4BDJpNjnwumWmdbgLjtSH9ijo5nuPvdchq7+6Y892gQbViUp2cPf9Treee0Vl0LMBSS0 SJnqiwPSYYjjYwGBjw61shevbBqC8Ck0LokAPZ5+a02mOzIkr3iDxCKSrSCNQ1+bs9qC QR3jxxj/8XFHUufsjPkbslrGEOjCmNjuKFJknZoC9EkPiANQ4VUS7IAn3MZJ9+lFQRxl kJ2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=FbuzH0daMt+MsoMW45qZdAf/7ra0L3lDjQjOsI2VHWQ=; b=HhZtcsVji8kJiKoZ6xfAB1wnfiZgiaDZaLXU5dz8tM5vw5L/i2ysdzuCt0EtmLkK/b IuMW0+nDW064yWjdRO4pYD4I5iuDIMreniSgkgbb95/iWoftIgs32RPU8mOHGKjmQc9S ViM3oFwum3aFGB20B9Ve7E7PRFO2ctaUD0zCKvl0zJ9h3RTJOScEkZTSxinKuw7fBxnw aGb7UpYIV4nSODY+jqM4laYwdYyEHeVz4Z1UIvGIfNjSYVPQwFBhlW6jtXXlkbndtOZC 6xIbIx3VKUze6vTDOolIvjMYvTVMgjvIdCk6xNe6BGKYHfuqa/uPRW+D7rBBpDCxpHTp RA9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@brainfault-org.20150623.gappssmtp.com header.s=20150623 header.b=oBEzttwM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a41si5297521eda.366.2019.09.19.06.55.13; Thu, 19 Sep 2019 06:55:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@brainfault-org.20150623.gappssmtp.com header.s=20150623 header.b=oBEzttwM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390456AbfISM4R (ORCPT + 99 others); Thu, 19 Sep 2019 08:56:17 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42576 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390446AbfISM4R (ORCPT ); Thu, 19 Sep 2019 08:56:17 -0400 Received: by mail-wr1-f67.google.com with SMTP id n14so2963378wrw.9 for ; Thu, 19 Sep 2019 05:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brainfault-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FbuzH0daMt+MsoMW45qZdAf/7ra0L3lDjQjOsI2VHWQ=; b=oBEzttwMR9rbIp1WYQ0uoKtd9fQVsAyv5adJg6k2jsN17FRK/uMFdPM+iWYhwyHUgY Wv9otQwbkODuQaxad4JWGpV+NnSTy0AfrrK7qT/2Mq1omJkblCtRPp0vvickWuGdaEAo 9LwjkJo26aBKXkTzaguMdcy5yUjl0IFXDDEg5CshxjaSKj8PDWoO5cf1IWeIlv817pWl GnFeewZA9/Mdg5g4HJZ0UuYrwLJvgs1twQCCW1q/dEnO7Yl7KGVIfz57DQCCrjeFEzHv zt4PnAUp2JurM57cC4gFbCpH/qTbDXQlHCYpUwhhYXCFflKZubX3QVAjqvoPmuALF7VR afzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FbuzH0daMt+MsoMW45qZdAf/7ra0L3lDjQjOsI2VHWQ=; b=kj1R7ExI4yl7R0v9CgzGNCrSeSqgK3OowTLZLgXDTo68Yoym2VpIhOWlkM2HK69Mcd aIfUSTBsQbzHKy3OaF3sdQv1SpJ01O5reBUxTkPLIIyDdyXrTg3hriGvw7d1EgeA+V1b 9gzRGzS8sqiLrJUth+2TUTFNCRojKxR9FF5N7TNy8fQYB6n7RmRhzncZ1dv8Jn5xLxTh wRjM1M2qD3nBB0i/cR6xGTV2t4G2SQewCCn7m9qr52BdcOgqaTnQZsAp4w+U+BDw6e4t Yf0/3aPmT2afYORIikt2S7tvzMsdg6XDgqkprTPrRkmCBo/C1IqwgQNriPyz+FOcIKxT agkg== X-Gm-Message-State: APjAAAXThnvyAvrydmuVUKHs9UJJOqZ0M3g9YXYKMPQh6yQs9yrST2JW cG6gP+UT+BqHSp5yCv4j8t91svzU3WmYFU0ZExubaw== X-Received: by 2002:a05:6000:110f:: with SMTP id z15mr6556036wrw.328.1568897774029; Thu, 19 Sep 2019 05:56:14 -0700 (PDT) MIME-Version: 1.0 References: <20190904161245.111924-1-anup.patel@wdc.com> <20190904161245.111924-4-anup.patel@wdc.com> In-Reply-To: <20190904161245.111924-4-anup.patel@wdc.com> From: Anup Patel Date: Thu, 19 Sep 2019 18:26:02 +0530 Message-ID: Subject: Re: [PATCH v7 02/21] RISC-V: Add bitmap reprensenting ISA features common across CPUs To: Paul Walmsley , Anup Patel Cc: Palmer Dabbelt , Paolo Bonzini , Radim K , Daniel Lezcano , Thomas Gleixner , Alexander Graf , Atish Patra , Alistair Francis , Damien Le Moal , Christoph Hellwig , "kvm@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, On Wed, Sep 4, 2019 at 9:43 PM Anup Patel wrote: > > This patch adds riscv_isa bitmap which represents Host ISA features > common across all Host CPUs. The riscv_isa is not same as elf_hwcap > because elf_hwcap will only have ISA features relevant for user-space > apps whereas riscv_isa will have ISA features relevant to both kernel > and user-space apps. > > One of the use-case for riscv_isa bitmap is in KVM hypervisor where > we will use it to do following operations: > > 1. Check whether hypervisor extension is available > 2. Find ISA features that need to be virtualized (e.g. floating > point support, vector extension, etc.) I had addressed your previous comments on this patch by making riscv_isa as bitmap to cover Z-extensions. Please review it again. Regards, Anup > > Signed-off-by: Anup Patel > Signed-off-by: Atish Patra > Reviewed-by: Alexander Graf > --- > arch/riscv/include/asm/hwcap.h | 26 +++++++++++ > arch/riscv/kernel/cpufeature.c | 79 ++++++++++++++++++++++++++++++++-- > 2 files changed, 102 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h > index 7ecb7c6a57b1..9b657375aa51 100644 > --- a/arch/riscv/include/asm/hwcap.h > +++ b/arch/riscv/include/asm/hwcap.h > @@ -8,6 +8,7 @@ > #ifndef __ASM_HWCAP_H > #define __ASM_HWCAP_H > > +#include > #include > > #ifndef __ASSEMBLY__ > @@ -22,5 +23,30 @@ enum { > }; > > extern unsigned long elf_hwcap; > + > +#define RISCV_ISA_EXT_a ('a' - 'a') > +#define RISCV_ISA_EXT_c ('c' - 'a') > +#define RISCV_ISA_EXT_d ('d' - 'a') > +#define RISCV_ISA_EXT_f ('f' - 'a') > +#define RISCV_ISA_EXT_h ('h' - 'a') > +#define RISCV_ISA_EXT_i ('i' - 'a') > +#define RISCV_ISA_EXT_m ('m' - 'a') > +#define RISCV_ISA_EXT_s ('s' - 'a') > +#define RISCV_ISA_EXT_u ('u' - 'a') > +#define RISCV_ISA_EXT_zicsr (('z' - 'a') + 1) > +#define RISCV_ISA_EXT_zifencei (('z' - 'a') + 2) > +#define RISCV_ISA_EXT_zam (('z' - 'a') + 3) > +#define RISCV_ISA_EXT_ztso (('z' - 'a') + 4) > + > +#define RISCV_ISA_EXT_MAX 256 > + > +unsigned long riscv_isa_extension_base(const unsigned long *isa_bitmap); > + > +#define riscv_isa_extension_mask(ext) BIT_MASK(RISCV_ISA_EXT_##ext) > + > +bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, int bit); > +#define riscv_isa_extension_available(isa_bitmap, ext) \ > + __riscv_isa_extension_available(isa_bitmap, RISCV_ISA_EXT_##ext) > + > #endif > #endif > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index b1ade9a49347..4ce71ce5e290 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -6,21 +6,64 @@ > * Copyright (C) 2017 SiFive > */ > > +#include > #include > #include > #include > #include > > unsigned long elf_hwcap __read_mostly; > + > +/* Host ISA bitmap */ > +static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; > + > #ifdef CONFIG_FPU > bool has_fpu __read_mostly; > #endif > > +/** > + * riscv_isa_extension_base - Get base extension word > + * > + * @isa_bitmap ISA bitmap to use > + * @returns base extension word as unsigned long value > + * > + * NOTE: If isa_bitmap is NULL then Host ISA bitmap will be used. > + */ > +unsigned long riscv_isa_extension_base(const unsigned long *isa_bitmap) > +{ > + if (!isa_bitmap) > + return riscv_isa[0]; > + return isa_bitmap[0]; > +} > +EXPORT_SYMBOL_GPL(riscv_isa_extension_base); > + > +/** > + * __riscv_isa_extension_available - Check whether given extension > + * is available or not > + * > + * @isa_bitmap ISA bitmap to use > + * @bit bit position of the desired extension > + * @returns true or false > + * > + * NOTE: If isa_bitmap is NULL then Host ISA bitmap will be used. > + */ > +bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, int bit) > +{ > + const unsigned long *bmap = (isa_bitmap) ? isa_bitmap : riscv_isa; > + > + if (bit >= RISCV_ISA_EXT_MAX) > + return false; > + > + return test_bit(bit, bmap) ? true : false; > +} > +EXPORT_SYMBOL_GPL(__riscv_isa_extension_available); > + > void riscv_fill_hwcap(void) > { > struct device_node *node; > const char *isa; > - size_t i; > + char print_str[BITS_PER_LONG+1]; > + size_t i, j, isa_len; > static unsigned long isa2hwcap[256] = {0}; > > isa2hwcap['i'] = isa2hwcap['I'] = COMPAT_HWCAP_ISA_I; > @@ -32,8 +75,11 @@ void riscv_fill_hwcap(void) > > elf_hwcap = 0; > > + bitmap_zero(riscv_isa, RISCV_ISA_EXT_MAX); > + > for_each_of_cpu_node(node) { > unsigned long this_hwcap = 0; > + unsigned long this_isa = 0; > > if (riscv_of_processor_hartid(node) < 0) > continue; > @@ -43,8 +89,20 @@ void riscv_fill_hwcap(void) > continue; > } > > - for (i = 0; i < strlen(isa); ++i) > + i = 0; > + isa_len = strlen(isa); > +#if defined(CONFIG_32BIT) > + if (!strncmp(isa, "rv32", 4)) > + i += 4; > +#elif defined(CONFIG_64BIT) > + if (!strncmp(isa, "rv64", 4)) > + i += 4; > +#endif > + for (; i < isa_len; ++i) { > this_hwcap |= isa2hwcap[(unsigned char)(isa[i])]; > + if ('a' <= isa[i] && isa[i] <= 'z') > + this_isa |= (1UL << (isa[i] - 'a')); > + } > > /* > * All "okay" hart should have same isa. Set HWCAP based on > @@ -55,6 +113,11 @@ void riscv_fill_hwcap(void) > elf_hwcap &= this_hwcap; > else > elf_hwcap = this_hwcap; > + > + if (riscv_isa[0]) > + riscv_isa[0] &= this_isa; > + else > + riscv_isa[0] = this_isa; > } > > /* We don't support systems with F but without D, so mask those out > @@ -64,7 +127,17 @@ void riscv_fill_hwcap(void) > elf_hwcap &= ~COMPAT_HWCAP_ISA_F; > } > > - pr_info("elf_hwcap is 0x%lx\n", elf_hwcap); > + memset(print_str, 0, sizeof(print_str)); > + for (i = 0, j = 0; i < BITS_PER_LONG; i++) > + if (riscv_isa[0] & BIT_MASK(i)) > + print_str[j++] = (char)('a' + i); > + pr_info("riscv: ISA extensions %s\n", print_str); > + > + memset(print_str, 0, sizeof(print_str)); > + for (i = 0, j = 0; i < BITS_PER_LONG; i++) > + if (elf_hwcap & BIT_MASK(i)) > + print_str[j++] = (char)('a' + i); > + pr_info("riscv: ELF capabilities %s\n", print_str); > > #ifdef CONFIG_FPU > if (elf_hwcap & (COMPAT_HWCAP_ISA_F | COMPAT_HWCAP_ISA_D)) > -- > 2.17.1 >