linux-kernel - Re: [PATCH] block: Removed a warning while compiling with a cross compiler for parisc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri,  2 Jul 2021 00:01:30 +0200
From:   Abd-Alrhman Masalkhi <abd.masalkhi@...il.com>
To:     hch@...radead.org
Cc:     axboe@...nel.dk, linux-block@...r.kernel.org,
        linux-kernel@...r.kernel.org,
        Abd-Alrhman Masalkhi <abd.masalkhi@...il.com>
Subject: Re: [PATCH] block: Removed a warning while compiling with a cross compiler for parisc

Thank you Christoph for your comment, you are absolutely right, my previous
solution has not actually solved the problem... I have not know about %pg,
it is a nice feature, I hope I have used correctly!! and about div_u64 I
have found out that each time div_u64 was used the stack frame increased
dramatically, so I wrapped with a wrapper function and used the noinline
attribute, and if there is any mistakes or if i have do not something not
correct I am happy to hear them.
And I am sorry for the late respond, I was at work, delivering pizza. next
time, if you have ordered a pizza and I was the deliver, it will be on me.

Thank you again!

Kind Regards,
Abd-Alrhman,

Signed-off-by: Abd-Alrhman Masalkhi <abd.masalkhi@...il.com>
---
 block/genhd.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 79aa40b4c39c..c32b7716381a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1106,6 +1106,12 @@ const struct device_type disk_type = {
 };
 
 #ifdef CONFIG_PROC_FS
+
+static noinline unsigned int call_div_u64(u64 dividend, u32 divisor)
+{
+	return (unsigned int)div_u64(dividend, divisor);
+}
+
 /*
  * aggregate disk stat collector.  Uses the same stats that the sysfs
  * entries do, above, but makes them available through one seq_file.
@@ -1117,7 +1123,6 @@ static int diskstats_show(struct seq_file *seqf, void *v)
 {
 	struct gendisk *gp = v;
 	struct block_device *hd;
-	char buf[BDEVNAME_SIZE];
 	unsigned int inflight;
 	struct disk_stats stat;
 	unsigned long idx;
@@ -1140,40 +1145,36 @@ static int diskstats_show(struct seq_file *seqf, void *v)
 		else
 			inflight = part_in_flight(hd);
 
-		seq_printf(seqf, "%4d %7d %s "
+		seq_printf(seqf, "%4d %7d %pg "
 			   "%lu %lu %lu %u "
 			   "%lu %lu %lu %u "
 			   "%u %u %u "
 			   "%lu %lu %lu %u "
 			   "%lu %u"
 			   "\n",
-			   MAJOR(hd->bd_dev), MINOR(hd->bd_dev),
-			   disk_name(gp, hd->bd_partno, buf),
+			   MAJOR(hd->bd_dev), MINOR(hd->bd_dev), gp,
 			   stat.ios[STAT_READ],
 			   stat.merges[STAT_READ],
 			   stat.sectors[STAT_READ],
-			   (unsigned int)div_u64(stat.nsecs[STAT_READ],
-							NSEC_PER_MSEC),
+			   call_div_u64(stat.nsecs[STAT_READ], NSEC_PER_MSEC),
 			   stat.ios[STAT_WRITE],
 			   stat.merges[STAT_WRITE],
 			   stat.sectors[STAT_WRITE],
-			   (unsigned int)div_u64(stat.nsecs[STAT_WRITE],
-							NSEC_PER_MSEC),
+			   call_div_u64(stat.nsecs[STAT_WRITE], NSEC_PER_MSEC),
 			   inflight,
 			   jiffies_to_msecs(stat.io_ticks),
-			   (unsigned int)div_u64(stat.nsecs[STAT_READ] +
-						 stat.nsecs[STAT_WRITE] +
-						 stat.nsecs[STAT_DISCARD] +
-						 stat.nsecs[STAT_FLUSH],
-							NSEC_PER_MSEC),
+			   call_div_u64(stat.nsecs[STAT_READ] +
+					stat.nsecs[STAT_WRITE] +
+					stat.nsecs[STAT_DISCARD] +
+					stat.nsecs[STAT_FLUSH],
+					NSEC_PER_MSEC),
 			   stat.ios[STAT_DISCARD],
 			   stat.merges[STAT_DISCARD],
 			   stat.sectors[STAT_DISCARD],
-			   (unsigned int)div_u64(stat.nsecs[STAT_DISCARD],
-						 NSEC_PER_MSEC),
+			   call_div_u64(stat.nsecs[STAT_DISCARD],
+					NSEC_PER_MSEC),
 			   stat.ios[STAT_FLUSH],
-			   (unsigned int)div_u64(stat.nsecs[STAT_FLUSH],
-						 NSEC_PER_MSEC)
+			   call_div_u64(stat.nsecs[STAT_FLUSH], NSEC_PER_MSEC)
 			);
 	}
 	rcu_read_unlock();
-- 
2.29.0.rc1.dirty