linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jing Zhang <jingzhangos@google.com>,
	Sean Christopherson <seanjc@google.com>
Subject: [PATCH] KVM: Move binary stats helpers to header to effectively export them
Date: Wed, 11 Aug 2021 09:53:46 -0700	[thread overview]
Message-ID: <20210811165346.3110715-1-seanjc@google.com> (raw)

Move kvm_stats_linear_hist_update() and kvm_stats_log_hist_update() to
kvm_host.h as static inline helpers to resolve a linker error on PPC,
which references the latter from module code.  This also fixes a goof
where the functions are tagged as "inline", despite being externs and
thus not inline-friendy.

  ERROR: modpost: ".kvm_stats_log_hist_update" [arch/powerpc/kvm/kvm-hv.ko] undefined!

Fixes: c8ba95948182 ("KVM: stats: Support linear and logarithmic histogram statistics")
Cc: Jing Zhang <jingzhangos@google.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 include/linux/kvm_host.h | 38 +++++++++++++++++++++++++++++++++++---
 virt/kvm/binary_stats.c  | 34 ----------------------------------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index d447b21cdd73..e4d712e9f760 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1467,9 +1467,41 @@ ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,
 		       const struct _kvm_stats_desc *desc,
 		       void *stats, size_t size_stats,
 		       char __user *user_buffer, size_t size, loff_t *offset);
-inline void kvm_stats_linear_hist_update(u64 *data, size_t size,
-				  u64 value, size_t bucket_size);
-inline void kvm_stats_log_hist_update(u64 *data, size_t size, u64 value);
+
+/**
+ * kvm_stats_linear_hist_update() - Update bucket value for linear histogram
+ * statistics data.
+ *
+ * @data: start address of the stats data
+ * @size: the number of bucket of the stats data
+ * @value: the new value used to update the linear histogram's bucket
+ * @bucket_size: the size (width) of a bucket
+ */
+static inline void kvm_stats_linear_hist_update(u64 *data, size_t size,
+						u64 value, size_t bucket_size)
+{
+	size_t index = div64_u64(value, bucket_size);
+
+	index = min(index, size - 1);
+	++data[index];
+}
+
+/**
+ * kvm_stats_log_hist_update() - Update bucket value for logarithmic histogram
+ * statistics data.
+ *
+ * @data: start address of the stats data
+ * @size: the number of bucket of the stats data
+ * @value: the new value used to update the logarithmic histogram's bucket
+ */
+static inline void kvm_stats_log_hist_update(u64 *data, size_t size, u64 value)
+{
+	size_t index = fls64(value);
+
+	index = min(index, size - 1);
+	++data[index];
+}
+
 #define KVM_STATS_LINEAR_HIST_UPDATE(array, value, bsize)		       \
 	kvm_stats_linear_hist_update(array, ARRAY_SIZE(array), value, bsize)
 #define KVM_STATS_LOG_HIST_UPDATE(array, value)				       \
diff --git a/virt/kvm/binary_stats.c b/virt/kvm/binary_stats.c
index 9bd595c92d3a..eefca6c69f51 100644
--- a/virt/kvm/binary_stats.c
+++ b/virt/kvm/binary_stats.c
@@ -142,37 +142,3 @@ ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,
 	*offset = pos;
 	return len;
 }
-
-/**
- * kvm_stats_linear_hist_update() - Update bucket value for linear histogram
- * statistics data.
- *
- * @data: start address of the stats data
- * @size: the number of bucket of the stats data
- * @value: the new value used to update the linear histogram's bucket
- * @bucket_size: the size (width) of a bucket
- */
-inline void kvm_stats_linear_hist_update(u64 *data, size_t size,
-				  u64 value, size_t bucket_size)
-{
-	size_t index = div64_u64(value, bucket_size);
-
-	index = min(index, size - 1);
-	++data[index];
-}
-
-/**
- * kvm_stats_log_hist_update() - Update bucket value for logarithmic histogram
- * statistics data.
- *
- * @data: start address of the stats data
- * @size: the number of bucket of the stats data
- * @value: the new value used to update the logarithmic histogram's bucket
- */
-inline void kvm_stats_log_hist_update(u64 *data, size_t size, u64 value)
-{
-	size_t index = fls64(value);
-
-	index = min(index, size - 1);
-	++data[index];
-}
-- 
2.32.0.605.g8dce9f2422-goog


             reply	other threads:[~2021-08-11 16:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11 16:53 Sean Christopherson [this message]
2021-08-11 17:55 ` [PATCH] KVM: Move binary stats helpers to header to effectively export them Jing Zhang
2021-08-13  7:38 ` Paolo Bonzini

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=20210811165346.3110715-1-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=jingzhangos@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@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).