From patchwork Mon Aug 27 11:02:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 145170 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4048096ljw; Mon, 27 Aug 2018 04:03:05 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZmDlYMs21Xp6TnHy0chGn/H1sjgDFPBJYq8MBsCUFELhR8e1JFK7LbpFE1xzhgRLRVelyP X-Received: by 2002:a62:9349:: with SMTP id b70-v6mr14005411pfe.193.1535367785356; Mon, 27 Aug 2018 04:03:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535367785; cv=none; d=google.com; s=arc-20160816; b=v+XzLf5KqdK3T4HSC0ynw/Sd37HW6/v1fb8T41zFkZafgQGryt9IH5ypJAUMLocX8s ugsm600WTJK4DIbRWFh1hu94MWXs6a2JNKxhoUWifh/JVsConiRSQSMC3bNw2xPqHoTs MQqwuiMqzuA6yQ4aIR9YWpX+AIh4dEa5vuygw1Xk94gSElqI5MQ5OGHykRCWk+E2vgbL kJ16QDGpPkLnrW9lzvMDtsov5aXvScqvYz5P5lNaGx36W97+gW/ep/LYLlfTtOgcpx2e zxoqU10gIUR55FhsLtJxqTrMY7PYhil+l9mUj2Fo4WT89rJujVPoMjrkaoXA4rhVw0A3 VwBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=oAg2MIWmTiuQXPRQuCyO90mfns13N4bEQB8aeiZWMRk=; b=A6NxuC7CSt5LYIx6IK1gaeGKxOuGfvex+k/u7BdVIebMXTtSKkcPtOl/D9etCbHRch B8UqUmL3lwjGoGzdrswMhgFz9rFkuOMP6QJ8a/N1aPEpxBhrdBMWObWV8a+iU913dZPO VjJTK6OzmOYGqZz8KM1aAVzamX4uKODdMUhyuMKHnPqlyqmoe7eqpO5Nj4b7xFIhF8bV NZFGtzEIrHaYAOSwROrkYk0acnsYP7FqJ73iHtwCUJn6c2uogrD/3FHKaqlv9ousxtzG W2SviKtSj0xuNxpmIosgz+HLhS4zt1WY4xDpOqIJdGBONVz91mc4EqqgiX42kZIcgrOP lMOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cG7Q1DVR; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a25-v6si12214110pga.235.2018.08.27.04.03.05; Mon, 27 Aug 2018 04:03:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cG7Q1DVR; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727094AbeH0OtN (ORCPT + 2 others); Mon, 27 Aug 2018 10:49:13 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45043 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726902AbeH0OtN (ORCPT ); Mon, 27 Aug 2018 10:49:13 -0400 Received: by mail-ed1-f65.google.com with SMTP id s10-v6so10115856edb.11 for ; Mon, 27 Aug 2018 04:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oAg2MIWmTiuQXPRQuCyO90mfns13N4bEQB8aeiZWMRk=; b=cG7Q1DVRhliFRC8rJwRTg+THv+BiFvRwXTWg1V/D5US8FJeQ4S8g1iZjRWiU1cB6Yg pnN/Eqx672jHY0XGP/sMDnYqgPKA+BeqiEppEibgXI/eilA6YfVG/MI3xdsKprL0hTIA Z2HFE6udh9LVAs+JAlXU8eVwDKuwVnhfdslLw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oAg2MIWmTiuQXPRQuCyO90mfns13N4bEQB8aeiZWMRk=; b=l4vm1hUMGIxCPmwx3ztSjgvfhg65ZEtY4MJvPaauMKe5nZhTWFeHVpPbWD3HwCI8gG NBaJtfTih5a0ISdgz5O7FbHQRDcDpoh3dCHgUOEevy+CysMhxk6b3aa0JFmLLajq/VdW fc4rcWwfqUp585whkKccfhQLHDIIVomB87i6syA6JkC20MTXUQNMvCFad6iTkJ+mifFB Gv0Ia9JcMcUrIQ1RHHzCbphiYLrkSCMfIXG+NHYHYsbpSsJj6k1SbyTDmnlocXwl+RIT SX1gn/vZlYN5gi/k/8TAnZ9MLfLJSy7Mtk2FlNIu/YMmz9sSnvSKpQRs+/5suiyy6qCJ 0MkQ== X-Gm-Message-State: APzg51DFuW/dWMsv9ANrCZEhJbYq9r+eXtIX4pk1ncDlX67cWOv0+Gff 72Ae4T0YVhTie5hM3XPV+Qdzmg== X-Received: by 2002:a50:a38a:: with SMTP id s10-v6mr16286374edb.99.1535367781188; Mon, 27 Aug 2018 04:03:01 -0700 (PDT) Received: from rev02.home ([2a02:a212:9283:9800:24b9:e2d6:9acc:50dd]) by smtp.gmail.com with ESMTPSA id r2-v6sm3114344eda.89.2018.08.27.04.03.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 04:03:00 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: will.deacon@arm.com, catalin.marinas@arm.com, herbert@gondor.apana.org.au, ebiggers@google.com, suzuki.poulose@arm.com, linux-kernel@vger.kernel.org, Ard Biesheuvel Subject: [PATCH 1/4] lib/crc32: make core crc32() routines weak so they can be overridden Date: Mon, 27 Aug 2018 13:02:42 +0200 Message-Id: <20180827110245.14812-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827110245.14812-1-ard.biesheuvel@linaro.org> References: <20180827110245.14812-1-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Allow architectures to drop in accelerated CRC32 routines by making the crc32_le/__crc32c_le entry points weak, and exposing non-weak aliases for them that may be used by the accelerated versions as fallbacks in case the instructions they rely upon are not available. Signed-off-by: Ard Biesheuvel --- lib/crc32.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.18.0 Acked-by: Herbert Xu diff --git a/lib/crc32.c b/lib/crc32.c index a6c9afafc8c8..45b1d67a1767 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -183,21 +183,21 @@ static inline u32 __pure crc32_le_generic(u32 crc, unsigned char const *p, } #if CRC_LE_BITS == 1 -u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len) +u32 __pure __weak crc32_le(u32 crc, unsigned char const *p, size_t len) { return crc32_le_generic(crc, p, len, NULL, CRC32_POLY_LE); } -u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len) +u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len) { return crc32_le_generic(crc, p, len, NULL, CRC32C_POLY_LE); } #else -u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len) +u32 __pure __weak crc32_le(u32 crc, unsigned char const *p, size_t len) { return crc32_le_generic(crc, p, len, (const u32 (*)[256])crc32table_le, CRC32_POLY_LE); } -u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len) +u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len) { return crc32_le_generic(crc, p, len, (const u32 (*)[256])crc32ctable_le, CRC32C_POLY_LE); @@ -206,6 +206,9 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len) EXPORT_SYMBOL(crc32_le); EXPORT_SYMBOL(__crc32c_le); +u32 crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le); +u32 __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le); + /* * This multiplies the polynomials x and y modulo the given modulus. * This follows the "little-endian" CRC convention that the lsbit