From patchwork Fri Jul 21 17:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 124023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp351834vqg; Fri, 21 Jul 2023 10:16:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3DElgyxuFKUXg4aBKVICRWfrgM7V+MdEV/In+b8l8JvPOXLhkIDYM03bCY0FaNwEt8zSA X-Received: by 2002:a05:6a20:12cc:b0:134:9f4e:623f with SMTP id v12-20020a056a2012cc00b001349f4e623fmr2597598pzg.14.1689959763395; Fri, 21 Jul 2023 10:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959763; cv=none; d=google.com; s=arc-20160816; b=e40WNKlfou5JGKP9KFzSEqyBENkeIE62gl09sY/AseDJLQKeGKGDGEe3l28Xhc27Hd v5WcWSEj8h1wv6FoCvQyI5uYxel9kKI/NEoQaPpAt3G8e1jWU82rPBrnq/7EtzuSITv3 igTNTa/ZN5UytxE+rNZdZmIwxJybceCwycfFxQ5dw4CrGGcBJ8JHpGlJ/uHGBR6Plok6 plC3M2guLn8XfgTQEJQeHjae5+G+IvuPu+qQJvGv2N9zjzZzxkEv4XWBd0SBH3t+gcoj CUxYe5dmD+hE6SKnTIUGP8NuDnUqTDspCU6qLbc/5rV8kwDDj0UauONdPmzn0Kf5M+S4 QOYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NcX1azEZt6Ej43CM7san/gUib1PEOxT3D2PFEAzO2Qw=; fh=DccVgf296lzstxLxowd941ox6+yUkYgNGlfnJRKPjjQ=; b=apiTJLN9dhFwW4RAwS8bwFBU98KB02m0by84yO0XDZQCM6fXwUlKxq2EOZG855TmM6 RgvujdDwoQUQs6pTGVptmSRBYS0dY7q2ybm1Guh7HElekRQG/tXo5hFP61M/owKOB4iv 8NU7sUxqecIUCb7w97sKaNfX1A8DhVZT/aNLJl8XDXDmMlk1YBHWZ7ZYkQ1y6jXjoM3R wk4PZmtb2BL8Hvgmp07osgZar1+lUQCNZWGUkZ0yqcY7Z65HiUmh9/8zRVmyMGTvQvvF lxDoFrPMKEMNTkbZTn3UzYAxgmavkBtabPF4Yhabey/pqWQiPC5hcgoD0M92s+8+lhQw HjDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VRB7gyB3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a056a001d8a00b006866669fff8si1371499pfw.57.2023.07.21.10.15.50; Fri, 21 Jul 2023 10:16:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VRB7gyB3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230147AbjGURAh (ORCPT + 99 others); Fri, 21 Jul 2023 13:00:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbjGURAW (ORCPT ); Fri, 21 Jul 2023 13:00:22 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC29230D4; Fri, 21 Jul 2023 10:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689958821; x=1721494821; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RBL/WYJF2pgAGN2U87+I/5wNQ/TVlUj5uO/xGqVLkms=; b=VRB7gyB3WP63ltdkJPNxq6+iB0JxF+Egl+YWy/BCtKcDqmezHtU5B9yb 87gFMkbH39a7BUAn+SE37O8TyyS39ETbWOSwcSGgoJGO7S+9nQLQWlvHg s5k4w2EmZd/WLjy5umayzOFMmceeRRBZKpxJ+jcZXMc/UpCmCOLCV4uSr z9xln9UMrohsmmvR5JYouvQEUkvh8F59yH5sMYoWYanrL7LGSBTRkbXdI GVPj3HIsNXKGdKa6RCi9Vu4OLJKL8a7DN75vg822kO+E4MqcI1N39SPgu gG2KsNeaP4a8AxVKFYSDHQodsmNVDkg6klsyfw04LRCNv+0340LQPJeto Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="369739459" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="369739459" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 10:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="754540195" X-IronPort-AV: E=Sophos;i="6.01,222,1684825200"; d="scan'208";a="754540195" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 21 Jul 2023 10:00:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2ED1117D; Fri, 21 Jul 2023 20:00:23 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Nuno Sa Subject: [PATCH v2 1/8] iio: core: Add opaque_struct_size() helper and use it Date: Fri, 21 Jul 2023 20:00:15 +0300 Message-Id: <20230721170022.3461-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> References: <20230721170022.3461-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772051248900872922 X-GMAIL-MSGID: 1772051248900872922 Introduce opaque_struct_size() helper, which may be moved to overflow.h in the future, and use it in the IIO core. Cc: Uwe Kleine-König Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa --- drivers/iio/industrialio-core.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index c117f50d0cf3..6cca86fd0ef9 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1617,6 +1617,28 @@ const struct device_type iio_device_type = { .release = iio_dev_release, }; +/** + * opaque_struct_size() - Calculate size of opaque structure with trailing aligned data. + * @p: Pointer to the opaque structure. + * @a: Alignment in bytes before trailing data. + * @s: Data size in bytes (can be 0). + * + * Calculates size of memory needed for structure of @p followed by the aligned data + * of size @s. When @s is 0, the alignment @a is not taken into account and the result + * is an equivalent to sizeof(*(@p)). + * + * Returns: Number of bytes needed or SIZE_MAX on overflow. + */ +#define opaque_struct_size(p, a, s) ({ \ + size_t _psize = sizeof(*(p)); \ + size_t _asize = ALIGN(_psize, (a)); \ + size_t _ssize = s; \ + _ssize ? size_add(_asize, _ssize) : _psize; \ +}) + +#define opaque_struct_data(p, a) \ + ((void *)(p) + ALIGN(sizeof(*(p)), (a))) + /** * iio_device_alloc() - allocate an iio_dev from a driver * @parent: Parent device. @@ -1628,19 +1650,13 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) struct iio_dev *indio_dev; size_t alloc_size; - alloc_size = sizeof(struct iio_dev_opaque); - if (sizeof_priv) { - alloc_size = ALIGN(alloc_size, IIO_DMA_MINALIGN); - alloc_size += sizeof_priv; - } - + alloc_size = opaque_struct_size(iio_dev_opaque, IIO_DMA_MINALIGN, sizeof_priv); iio_dev_opaque = kzalloc(alloc_size, GFP_KERNEL); if (!iio_dev_opaque) return NULL; indio_dev = &iio_dev_opaque->indio_dev; - indio_dev->priv = (char *)iio_dev_opaque + - ALIGN(sizeof(struct iio_dev_opaque), IIO_DMA_MINALIGN); + indio_dev->priv = opaque_struct_data(iio_dev_opaque, IIO_DMA_MINALIGN); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type;