qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, minyihh@uci.edu, berrange@redhat.com,
	kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com,
	mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com,
	cota@braap.org, stefanha@redhat.com, crosa@redhat.com,
	pbonzini@redhat.com, ma.mandourr@gmail.com,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	aurelien@aurel32.net
Subject: [PATCH  v3 37/40] plugins/cache: Enable cache parameterization
Date: Fri,  9 Jul 2021 15:30:02 +0100	[thread overview]
Message-ID: <20210709143005.1554-38-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org>

From: Mahmoud Mandour <ma.mandourr@gmail.com>

Enabled configuring both icache and dcache parameters using plugin
parameters.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623125458.450462-3-ma.mandourr@gmail.com>
---
 contrib/plugins/cache.c | 47 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c
index e9955cdc3a..b550ef31b0 100644
--- a/contrib/plugins/cache.c
+++ b/contrib/plugins/cache.c
@@ -99,8 +99,28 @@ static inline uint64_t extract_set(Cache *cache, uint64_t addr)
     return (addr & cache->set_mask) >> cache->blksize_shift;
 }
 
+static const char *cache_config_error(int blksize, int assoc, int cachesize)
+{
+    if (cachesize % blksize != 0) {
+        return "cache size must be divisible by block size";
+    } else if (cachesize % (blksize * assoc) != 0) {
+        return "cache size must be divisible by set size (assoc * block size)";
+    } else {
+        return NULL;
+    }
+}
+
+static bool bad_cache_params(int blksize, int assoc, int cachesize)
+{
+    return (cachesize % blksize) != 0 || (cachesize % (blksize * assoc) != 0);
+}
+
 static Cache *cache_init(int blksize, int assoc, int cachesize)
 {
+    if (bad_cache_params(blksize, assoc, cachesize)) {
+        return NULL;
+    }
+
     Cache *cache;
     int i;
     uint64_t blk_mask;
@@ -397,7 +417,19 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
 
     for (i = 0; i < argc; i++) {
         char *opt = argv[i];
-        if (g_str_has_prefix(opt, "limit=")) {
+        if (g_str_has_prefix(opt, "iblksize=")) {
+            iblksize = g_ascii_strtoll(opt + 9, NULL, 10);
+        } else if (g_str_has_prefix(opt, "iassoc=")) {
+            iassoc = g_ascii_strtoll(opt + 7, NULL, 10);
+        } else if (g_str_has_prefix(opt, "icachesize=")) {
+            icachesize = g_ascii_strtoll(opt + 11, NULL, 10);
+        } else if (g_str_has_prefix(opt, "dblksize=")) {
+            dblksize = g_ascii_strtoll(opt + 9, NULL, 10);
+        } else if (g_str_has_prefix(opt, "dassoc=")) {
+            dassoc = g_ascii_strtoll(opt + 7, NULL, 10);
+        } else if (g_str_has_prefix(opt, "dcachesize=")) {
+            dcachesize = g_ascii_strtoll(opt + 11, NULL, 10);
+        } else if (g_str_has_prefix(opt, "limit=")) {
             limit = g_ascii_strtoll(opt + 6, NULL, 10);
         } else {
             fprintf(stderr, "option parsing failed: %s\n", opt);
@@ -406,7 +438,20 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
     }
 
     dcache = cache_init(dblksize, dassoc, dcachesize);
+    if (!dcache) {
+        const char *err = cache_config_error(dblksize, dassoc, dcachesize);
+        fprintf(stderr, "dcache cannot be constructed from given parameters\n");
+        fprintf(stderr, "%s\n", err);
+        return -1;
+    }
+
     icache = cache_init(iblksize, iassoc, icachesize);
+    if (!icache) {
+        const char *err = cache_config_error(iblksize, iassoc, icachesize);
+        fprintf(stderr, "icache cannot be constructed from given parameters\n");
+        fprintf(stderr, "%s\n", err);
+        return -1;
+    }
 
     rng = g_rand_new();
 
-- 
2.20.1



  parent reply	other threads:[~2021-07-09 14:57 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-09 14:29 [PATCH for 6.1 v3 00/40] testing and plugins pre-PR Alex Bennée
2021-07-09 14:29 ` [PATCH v3 01/40] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-09 14:29 ` [PATCH v3 02/40] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-09 14:29 ` [PATCH v3 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-09 14:29 ` [PATCH v3 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-09 14:29 ` [PATCH v3 05/40] tests/tcg: also disable the signals test for plugins Alex Bennée
2021-07-09 14:29 ` [PATCH v3 06/40] build: validate that system capstone works before using it Alex Bennée
2021-07-09 14:29 ` [PATCH v3 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-09 14:29 ` [PATCH v3 08/40] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-09 14:29 ` [PATCH v3 09/40] hw/usb/ccid: remove references to NSS Alex Bennée
2021-07-09 14:29 ` [PATCH v3 10/40] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-09 14:29 ` [PATCH v3 11/40] tests/docker: use project specific container registries Alex Bennée
2021-07-09 14:29 ` [PATCH v3 12/40] tests/docker: use explicit docker.io registry Alex Bennée
2021-07-09 14:29 ` [PATCH v3 13/40] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-09 14:29 ` [PATCH v3 14/40] tests/docker: fix sorting in package lists Alex Bennée
2021-07-09 14:29 ` [PATCH v3 15/40] tests/docker: fix mistakes in centos " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 16/40] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-09 14:29 ` [PATCH v3 17/40] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-09 14:29 ` [PATCH v3 18/40] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-09 14:29 ` [PATCH v3 19/40] tests/docker: expand centos8 package list Alex Bennée
2021-07-09 14:29 ` [PATCH v3 20/40] tests/docker: expand fedora " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 21/40] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 22/40] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 23/40] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 24/40] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-09 14:29 ` [PATCH v3 25/40] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-09 14:29 ` [PATCH v3 26/40] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-09 15:04   ` Richard Henderson
2021-07-11 23:59   ` Taylor Simpson
2021-07-09 14:29 ` [PATCH v3 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-09 14:29 ` [PATCH v3 28/40] meson.build: move TCG plugin summary output Alex Bennée
2021-07-09 14:29 ` [PATCH v3 29/40] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-09 14:29 ` [PATCH v3 30/40] configure: add an explicit static and plugins check Alex Bennée
2021-07-09 15:06   ` Richard Henderson
2021-07-09 14:29 ` [PATCH v3 31/40] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-09 14:29 ` [PATCH v3 32/40] tcg/plugins: enable by default for most TCG builds Alex Bennée
2021-07-09 15:12   ` Richard Henderson
2021-07-09 14:29 ` [PATCH v3 33/40] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-09 14:29 ` [PATCH v3 34/40] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-09 14:30 ` [PATCH v3 35/40] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-09 14:30 ` [PATCH v3 36/40] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-09 14:30 ` Alex Bennée [this message]
2021-07-09 14:30 ` [PATCH v3 38/40] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-09 14:30 ` [PATCH v3 39/40] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-09 14:30 ` [PATCH v3 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210709143005.1554-38-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aaron@os.amperecomputing.com \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=crosa@redhat.com \
    --cc=erdnaxe@crans.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=kuhn.chenqun@huawei.com \
    --cc=ma.mandourr@gmail.com \
    --cc=mahmoudabdalghany@outlook.com \
    --cc=minyihh@uci.edu \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=robhenry@microsoft.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).