From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751858AbcFWMOx (ORCPT ); Thu, 23 Jun 2016 08:14:53 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:49545 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001AbcFWMOv (ORCPT ); Thu, 23 Jun 2016 08:14:51 -0400 X-AuditID: cbfee68f-f79476d000001429-c1-576bd2b8e627 From: Manjeet Pawar To: corbet@lwn.net, catalin.marinas@arm.com, will.deacon@arm.com, konrad.wilk@oracle.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, r.thapliyal@samsung.com, akhilesh.k@samsung.com, ajeet.y@samsung.com Cc: pankaj.m@samsung.com, Manjeet Pawar Subject: [PATCH] arm64:swiotlb:Enable only when Input size through command line Date: Thu, 23 Jun 2016 17:43:40 +0530 Message-id: <1466684020-5224-1-git-send-email-manjeet.p@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsWyRsSkRnfHpexwg/c95hYvXk1gsdi87iSz xftlPYwWTw60M1osW/yU0WLT42usFgvblrBYXN41h83iXutaIPFmK5PFxnvZFi8/nmBx4PFY M28No8fmJfUei/sms3p8fHqLxaNvyypGj8+b5ALYorhsUlJzMstSi/TtErgyTm35w1rwUKHi 3L7/jA2MJ6W6GDk4JARMJJacTe5i5AQyxSQu3FvP1sXIxSEksIJR4valDSwwNVsmh0PElzJK 3Lr+jQXC+ckosf/4GiaQbjYBbYk9P9rYQRIiAs1MEoeXnmAHSTAL2EvMb7jMBmILC/hL7F91 jhHEZhFQlbj6aAULiM0r4CLxd3MTM8Q2BYk5k2xA5kgIbGKX2LTwHBNEvYDEt8mHoC6Sldh0 gBniakmJgytusExgFFzAyLCKUTS1ILmgOCm9yFivODG3uDQvXS85P3cTIzDYT/971r+D8e4B 60OMAhyMSjy8GceywoVYE8uKK3MPMZoCbZjILCWanA+MqbySeENjMyMLUxNTYyNzSzMlcd6F Uj+DhQTSE0tSs1NTC1KL4otKc1KLDzEycXBKNTAeqhF2+Kq+3X9iTxEji8gue5ur/uJPio/3 T7B23c56Z/fdheUaP243vLkQzjzx3P0oX7HOCOlo5t2deX+/v2575Hbno8HFGVUad4xzGJRs z1j29Xxfso27MHBi0u1jK1Rvdj8KZjn9KdAri3ln7edN3lWHGE+s4PffHzDJ/RTPxjeaHqXx i/uVWIozEg21mIuKEwEhYGjDcQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsVy+t9jAd0dl7LDDW7v1bR48WoCi8XmdSeZ Ld4v62G0eHKgndFi2eKnjBabHl9jtVjYtoTF4vKuOWwW91rXAok3W5ksNt7Ltnj58QSLA4/H mnlrGD02L6n3WNw3mdXj49NbLB59W1YxenzeJBfAFtXAaJORmpiSWqSQmpecn5KZl26r5B0c 7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDdKOSQlliTilQKCCxuFhJ3w7ThNAQN10LmMYI Xd+QILgeIwM0kLCGMePUlj+sBQ8VKs7t+8/YwHhSqouRg0NCwERiy+TwLkZOIFNM4sK99Wxd jFwcQgJLGSVuXf/GAuH8ZJTYf3wNE0gVm4C2xJ4fbewgCRGBZiaJw0tPsIMkmAXsJeY3XGYD sYUF/CX2rzrHCGKzCKhKXH20ggXE5hVwkfi7uYkZYrOCxJxJNhMYuRcwMqxilEgtSC4oTkrP NcxLLdcrTswtLs1L10vOz93ECI6pZ1I7GA/ucj/EKMDBqMTDm3EsK1yINbGsuDL3EKMEB7OS CO/Js9nhQrwpiZVVqUX58UWlOanFhxhNgfZPZJYSTc4HxnteSbyhsYm5qbGppYmFiZmlkjjv 4//rwoQE0hNLUrNTUwtSi2D6mDg4pRoYV7StaRE/YPlCVDxDtnB+0w8zL5ZfD4J0XBQibmxL ff7j2soOn02v57Q+lNu/V85l5UmZvgVzlkwJfOK3h6Orfr7QjG+rZ+01iF3w4xW/8p43nVlt 4ndkgrpDL9ifMH5SGj7pbQvT+4sfTy9+abdk+ZOvf/rF53VPu9OQvPBX24nI9lDGc/GpvUos xRmJhlrMRcWJAP+VOdK/AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rohit Thapliyal swiotlb default size of 64M is too big as default value therefore it is made configurable through command line through swiotlb_size parameter. swiotlb allocation shall be done only when the swiotlb size is given through command line. Otherwise no swiotlb is allocated. Signed-off-by: Rohit Thapliyal Signed-off-by: Manjeet Pawar Reviewed-by: Akhilesh Kumar Reviewed-by: Ajeet Kumar Yadav --- Documentation/kernel-parameters.txt | 3 +++ arch/arm64/mm/init.c | 3 ++- include/linux/swiotlb.h | 1 + lib/swiotlb.c | 33 +++++++++++++++++++++++++++++---- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 82b42c9..12b680f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3875,6 +3875,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. force -- force using of bounce buffers even if they wouldn't be automatically used by the kernel + swiotlb_sz= [KNL] enter swiotlb size. + Sets the swiotlb size for eg. swiotlb_sz=64M + switches= [HW,M68k] sysfs.deprecated=0|1 [KNL] diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d45f862..89c6b39 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -403,7 +403,8 @@ static void __init free_unused_memmap(void) */ void __init mem_init(void) { - swiotlb_init(1); + if (swiotlb_enabled) + swiotlb_init(1); set_max_mapnr(pfn_to_page(max_pfn) - mem_map); diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 017fced..c7eb146 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -11,6 +11,7 @@ struct page; struct scatterlist; extern int swiotlb_force; +extern int swiotlb_enabled; /* * Maximum allowable number of contiguous slabs to map, diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 76f29ec..e89296a 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -54,6 +54,7 @@ #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) int swiotlb_force; +int swiotlb_enabled; /* * Used to do a quick range check in swiotlb_tbl_unmap_single and @@ -96,6 +97,9 @@ static DEFINE_SPINLOCK(io_tlb_lock); static int late_alloc; +unsigned long swiotlb_sz; +unsigned int swiotlb_sz_shift; + static int __init setup_io_tlb_npages(char *str) { @@ -112,6 +116,24 @@ setup_io_tlb_npages(char *str) return 0; } early_param("swiotlb", setup_io_tlb_npages); + +static int __init +setup_io_tlb_size(char *str) +{ + int len = strlen(str); + + if (str[len-1] == 'M') + swiotlb_sz_shift = 20; + else if (str[len-1] == 'K') + swiotlb_sz_shift = 10; + str[len-1] = '\0'; + if (isdigit(*str)) + swiotlb_sz = kstrtoul(str, &str, 0); + + swiotlb_enabled = 1; + return 0; +} +early_param("swiotlb_sz", setup_io_tlb_size); /* make io_tlb_overflow tunable too? */ unsigned long swiotlb_nr_tbl(void) @@ -120,8 +142,9 @@ unsigned long swiotlb_nr_tbl(void) } EXPORT_SYMBOL_GPL(swiotlb_nr_tbl); -/* default to 64MB */ -#define IO_TLB_DEFAULT_SIZE (64UL<<20) +/* Pass from command line as swiotlb_sz=64M (for eg.)*/ +#define IO_TLB_DEFAULT_SIZE (swiotlb_sz<> 20, vstart, vend - 1); + bytes >> swiotlb_sz_shift, + swiotlb_sz_shift == 20 ? 'M' : 'K', + vstart, vend - 1); } int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) -- 1.7.9.5