From patchwork Tue Sep 7 22:30:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 178172 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 07 Sep 2010 23:30:21 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1Ot6gG-0006oX-CH for chris@printf.net; Tue, 07 Sep 2010 23:30:20 +0100 Received: by mail.laptop.org (Postfix) id C6E7E2446E; Tue, 7 Sep 2010 18:30:00 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id B88F92446D for ; Tue, 7 Sep 2010 18:30:00 -0400 (EDT) X-ASG-Debug-ID: 1283898608-0b746c9e0003-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id yArUV3yt58VcQLaZ for ; Tue, 07 Sep 2010 18:30:13 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757358Ab0IGWaN (ORCPT ); Tue, 7 Sep 2010 18:30:13 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:58535 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436Ab0IGWaM (ORCPT ); Tue, 7 Sep 2010 18:30:12 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o87MU58Q021621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 7 Sep 2010 15:30:05 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o87MU5rJ010213; Tue, 7 Sep 2010 15:30:05 -0700 Message-Id: <201009072230.o87MU5rJ010213@imap1.linux-foundation.org> X-ASG-Orig-Subj: + mmc_test-collect-data-and-show-it-via-sysfs-by-demand.patch added to -mm tree Subject: + mmc_test-collect-data-and-show-it-via-sysfs-by-demand.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: andy.shevchenko@gmail.com, ext-andriy.shevchenko@nokia.com, linux-mmc@vger.kernel.org From: akpm@linux-foundation.org Date: Tue, 07 Sep 2010 15:30:05 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283898608 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40226 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/card/mmc_test.c~mmc_test-collect-data-and-show-it-via-sysfs-by-demand drivers/mmc/card/mmc_test.c --- a/drivers/mmc/card/mmc_test.c~mmc_test-collect-data-and-show-it-via-sysfs-by-demand +++ a/drivers/mmc/card/mmc_test.c @@ -17,6 +17,7 @@ #include #include /* For nr_free_buffer_pages() */ +#include #define RESULT_OK 0 #define RESULT_FAIL 1 @@ -73,12 +74,45 @@ struct mmc_test_area { }; /** + * struct mmc_test_transfer_result - transfer results for performance tests. + * @link: double-linked list + * @count: amount of group of sectors to check + * @sectors: amount of sectors to check in one group + * @ts: time values of transfer + * @rate: calculated transfer rate + */ +struct mmc_test_transfer_result { + struct list_head link; + unsigned int count; + unsigned int sectors; + struct timespec ts; + unsigned int rate; +}; + +/** + * struct mmc_test_general_result - results for tests. + * @link: double-linked list + * @card: card under test + * @testcase: number of test case + * @result: result of test run + * @tr_lst: transfer measurements if any as mmc_test_transfer_result + */ +struct mmc_test_general_result { + struct list_head link; + struct mmc_card *card; + int testcase; + int result; + struct list_head tr_lst; +}; + +/** * struct mmc_test_card - test information. * @card: card under test * @scratch: transfer buffer * @buffer: transfer buffer * @highmem: buffer for highmem tests * @area: information for performance tests + * @gr: pointer to results of current testcase */ struct mmc_test_card { struct mmc_card *card; @@ -88,7 +122,8 @@ struct mmc_test_card { #ifdef CONFIG_HIGHMEM struct page *highmem; #endif - struct mmc_test_area area; + struct mmc_test_area area; + struct mmc_test_general_result *gr; }; /*******************************************************************/ @@ -421,6 +456,30 @@ static unsigned int mmc_test_rate(uint64 } /* + * Save transfer results for future usage + */ +static void mmc_test_save_transfer_result(struct mmc_test_card *test, + unsigned int count, unsigned int sectors, struct timespec ts, + unsigned int rate) +{ + struct mmc_test_transfer_result *tr; + + if (!test->gr) + return; + + tr = kmalloc(sizeof(struct mmc_test_transfer_result), GFP_KERNEL); + if (!tr) + return; + + tr->count = count; + tr->sectors = sectors; + tr->ts = ts; + tr->rate = rate; + + list_add_tail(&tr->link, &test->gr->tr_lst); +} + +/* * Print the transfer rate. */ static void mmc_test_print_rate(struct mmc_test_card *test, uint64_t bytes, @@ -438,6 +497,8 @@ static void mmc_test_print_rate(struct m mmc_hostname(test->card->host), sectors, sectors >> 1, (sectors == 1 ? ".5" : ""), (unsigned long)ts.tv_sec, (unsigned long)ts.tv_nsec, rate / 1000, rate / 1024); + + mmc_test_save_transfer_result(test, 1, sectors, ts, rate); } /* @@ -461,6 +522,8 @@ static void mmc_test_print_avg_rate(stru sectors >> 1, (sectors == 1 ? ".5" : ""), (unsigned long)ts.tv_sec, (unsigned long)ts.tv_nsec, rate / 1000, rate / 1024); + + mmc_test_save_transfer_result(test, count, sectors, ts, rate); } /* @@ -1853,6 +1916,8 @@ static const struct mmc_test_case mmc_te static DEFINE_MUTEX(mmc_test_lock); +static LIST_HEAD(mmc_test_result); + static void mmc_test_run(struct mmc_test_card *test, int testcase) { int i, ret; @@ -1863,6 +1928,8 @@ static void mmc_test_run(struct mmc_test mmc_claim_host(test->card->host); for (i = 0;i < ARRAY_SIZE(mmc_test_cases);i++) { + struct mmc_test_general_result *gr; + if (testcase && ((i + 1) != testcase)) continue; @@ -1881,6 +1948,25 @@ static void mmc_test_run(struct mmc_test } } + gr = kzalloc(sizeof(struct mmc_test_general_result), + GFP_KERNEL); + if (gr) { + INIT_LIST_HEAD(&gr->tr_lst); + + /* Assign data what we know already */ + gr->card = test->card; + gr->testcase = i; + + /* Append container to global one */ + list_add_tail(&gr->link, &mmc_test_result); + + /* + * Save the pointer to created container in our private + * structure. + */ + test->gr = gr; + } + ret = mmc_test_cases[i].run(test); switch (ret) { case RESULT_OK: @@ -1906,6 +1992,10 @@ static void mmc_test_run(struct mmc_test mmc_hostname(test->card->host), ret); } + /* Save the result */ + if (gr) + gr->result = ret; + if (mmc_test_cases[i].cleanup) { ret = mmc_test_cases[i].cleanup(test); if (ret) { @@ -1923,13 +2013,80 @@ static void mmc_test_run(struct mmc_test mmc_hostname(test->card->host)); } +static void mmc_test_free_result(struct mmc_card *card) +{ + struct mmc_test_general_result *gr, *grs; + + mutex_lock(&mmc_test_lock); + + list_for_each_entry_safe(gr, grs, &mmc_test_result, link) { + struct mmc_test_transfer_result *tr, *trs; + + if (card && gr->card != card) + continue; + + list_for_each_entry_safe(tr, trs, &gr->tr_lst, link) { + list_del(&tr->link); + kfree(tr); + } + + list_del(&gr->link); + kfree(gr); + } + + mutex_unlock(&mmc_test_lock); +} + static ssize_t mmc_test_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct mmc_card *card = mmc_dev_to_card(dev); + struct mmc_test_general_result *gr; + char *p = buf; + size_t len = PAGE_SIZE; + int ret; + mutex_lock(&mmc_test_lock); + + list_for_each_entry(gr, &mmc_test_result, link) { + struct mmc_test_transfer_result *tr; + + if (gr->card != card) + continue; + + ret = snprintf(p, len, "Test %d: %d\n", gr->testcase + 1, + gr->result); + if (ret < 0) + goto err; + if (ret >= len) { + ret = -ENOBUFS; + goto err; + } + p += ret; + len -= ret; + + list_for_each_entry(tr, &gr->tr_lst, link) { + ret = snprintf(p, len, "%u %d %lu.%09lu %u\n", + tr->count, tr->sectors, + (unsigned long)tr->ts.tv_sec, + (unsigned long)tr->ts.tv_nsec, + tr->rate); + if (ret < 0) + goto err; + if (ret >= len) { + ret = -ENOBUFS; + goto err; + } + p += ret; + len -= ret; + } + } + + ret = PAGE_SIZE - len; +err: mutex_unlock(&mmc_test_lock); - return 0; + return ret; } static ssize_t mmc_test_store(struct device *dev, @@ -1946,6 +2103,12 @@ static ssize_t mmc_test_store(struct dev if (!test) return -ENOMEM; + /* + * Remove all test cases associated with given card. Thus we have only + * actual data of the last run. + */ + mmc_test_free_result(card); + test->card = card; test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL); @@ -1992,6 +2155,7 @@ static int mmc_test_probe(struct mmc_car static void mmc_test_remove(struct mmc_card *card) { + mmc_test_free_result(card); device_remove_file(&card->dev, &dev_attr_test); } @@ -2010,6 +2174,9 @@ static int __init mmc_test_init(void) static void __exit mmc_test_exit(void) { + /* Clear stalled data if card is still plugged */ + mmc_test_free_result(NULL); + mmc_unregister_driver(&mmc_driver); }