From patchwork Mon Dec 14 21:03:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 556655 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CE32A14032F for ; Tue, 15 Dec 2015 08:13:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=d2EWwYhU; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932429AbbLNVEf (ORCPT ); Mon, 14 Dec 2015 16:04:35 -0500 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33559 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932080AbbLNVEc (ORCPT ); Mon, 14 Dec 2015 16:04:32 -0500 Received: by pacwq6 with SMTP id wq6so11289945pac.0; Mon, 14 Dec 2015 13:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BlZlwV2BGyL6uToKDIZ1MCxzbOIyJfzXV7+Iix86Gok=; b=d2EWwYhUZ0qW+aHkIof6I4zyp2d0yIyNM+0UgMgMP+VD/i6+joqEI+YWTLv2LPRuGv prjx+IDIUaMp6cqlRpTwEQKwcmNUO3TBuq1+8FCMOpONFd9GyfT4nHM3GLDcpRlFp/Am DfrLHF0RWo3ZhHHAdxve8HyHXiQvbUJfxkEXWgSJ1I4AzVmgMR+HuiyvWzTVqKr4vzfP 3kPj+c0NRus2o+q2Oa2xJxRnPd/9soV4bryLSyiSdxpfOMyuA2JktjsZxJugoZUDDbyx qFeZrDxpRigvMvfF2PlvRVAITzdEZj+ON3kJxIRnD1dDRVwA6W3943ylOpFL8Kk7uP9i MgPg== X-Received: by 10.66.153.198 with SMTP id vi6mr48964467pab.37.1450127071879; Mon, 14 Dec 2015 13:04:31 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by smtp.gmail.com with ESMTPSA id 68sm13096148pfp.62.2015.12.14.13.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 13:04:31 -0800 (PST) From: David Decotigny To: "David S. Miller" , Ben Hutchings , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org, Andrew Morton , Tejun Heo Cc: Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Pravin B Shelar , Ed Swierk , Robert Love , "James E.J. Bottomley" , Yuval Mintz , Rasmus Villemoes , David Decotigny Subject: [PATCH net-next v5 01/19] lib/bitmap.c: conversion routines to/from u32 array Date: Mon, 14 Dec 2015 13:03:48 -0800 Message-Id: <1450127046-4573-2-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1450127046-4573-1-git-send-email-ddecotig@gmail.com> References: <1450127046-4573-1-git-send-email-ddecotig@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Decotigny Aimed at transferring bitmaps to/from user-space in a 32/64-bit agnostic way. Tested: unit tests (next patch) on qemu i386, x86_64, ppc, ppc64 BE and LE, ARM. Signed-off-by: David Decotigny --- include/linux/bitmap.h | 6 ++++ lib/bitmap.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 9653fdb..f7dc158 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -59,6 +59,8 @@ * bitmap_find_free_region(bitmap, bits, order) Find and allocate bit region * bitmap_release_region(bitmap, pos, order) Free specified bit region * bitmap_allocate_region(bitmap, pos, order) Allocate specified bit region + * bitmap_from_u32array(dst, nbits, buf, nwords) *dst = *buf (nwords 32b words) + * bitmap_to_u32array(buf, nwords, src, nbits) *buf = *dst (nwords 32b words) */ /* @@ -163,6 +165,10 @@ extern void bitmap_fold(unsigned long *dst, const unsigned long *orig, extern int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order); extern void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order); extern int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order); +extern void bitmap_from_u32array(unsigned long *bitmap, unsigned int nbits, + const u32 *buf, unsigned int nwords); +extern void bitmap_to_u32array(u32 *buf, unsigned int nwords, + const unsigned long *bitmap, unsigned int nbits); #ifdef __BIG_ENDIAN extern void bitmap_copy_le(unsigned long *dst, const unsigned long *src, unsigned int nbits); #else diff --git a/lib/bitmap.c b/lib/bitmap.c index 8148143..e1cc648 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include @@ -1060,6 +1062,90 @@ int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order) EXPORT_SYMBOL(bitmap_allocate_region); /** + * bitmap_from_u32array - copy the contents of a u32 array of bits to bitmap + * @bitmap: array of unsigned longs, the destination bitmap, non NULL + * @nbits: number of bits in @bitmap + * @buf: array of u32 (in host byte order), the source bitmap, non NULL + * @nwords: number of u32 words in @buf + * + * copy min(nbits, 32*nwords) bits from @buf to @bitmap, remaining + * bits between nword and nbits in @bitmap (if any) are cleared. In + * last word of @bitmap, the bits beyond nbits (if any) are kept + * unchanged. + */ +void bitmap_from_u32array(unsigned long *bitmap, unsigned int nbits, + const u32 *buf, unsigned int nwords) +{ + unsigned int k; + const u32 *src = buf; + + for (k = 0; k < BITS_TO_LONGS(nbits); ++k) { + unsigned long part = 0; + + if (nwords) { + part = *src++; + nwords--; + } + +#if BITS_PER_LONG == 64 + if (nwords) { + part |= ((unsigned long) *src++) << 32; + nwords--; + } +#endif + + if (k < nbits/BITS_PER_LONG) + bitmap[k] = part; + else { + unsigned long mask = BITMAP_LAST_WORD_MASK(nbits); + + bitmap[k] = (bitmap[k] & ~mask) | (part & mask); + } + } +} +EXPORT_SYMBOL(bitmap_from_u32array); + +/** + * bitmap_to_u32array - copy the contents of bitmap to a u32 array of bits + * @buf: array of u32 (in host byte order), the dest bitmap, non NULL + * @nwords: number of u32 words in @buf + * @bitmap: array of unsigned longs, the source bitmap, non NULL + * @nbits: number of bits in @bitmap + * + * copy min(nbits, 32*nwords) bits from @bitmap to @buf. Remaining + * bits after nbits in @buf (if any) are cleared. + */ +void bitmap_to_u32array(u32 *buf, unsigned int nwords, + const unsigned long *bitmap, unsigned int nbits) +{ + unsigned int k = 0; + u32 *dst = buf; + + while (nwords) { + unsigned long part = 0; + + if (k < BITS_TO_LONGS(nbits)) { + part = bitmap[k]; + if (k >= nbits/BITS_PER_LONG) + part &= BITMAP_LAST_WORD_MASK(nbits); + k++; + } + + *dst++ = part & 0xffffffffUL; + nwords--; + +#if BITS_PER_LONG == 64 + if (nwords) { + part >>= 32; + *dst++ = part & 0xffffffffUL; + nwords--; + } +#endif + } +} +EXPORT_SYMBOL(bitmap_to_u32array); + +/** * bitmap_copy_le - copy a bitmap, putting the bits into little-endian order. * @dst: destination buffer * @src: bitmap to copy