From patchwork Wed May 12 14:51:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435618 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5071084jao; Wed, 12 May 2021 11:19:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmY6KfuCbF1jaGFJ211mOMVfpEAF2q/UfjHrgtxIlSgPXsQqSxwNTAv2uoYJxVmY/JrQN2 X-Received: by 2002:a05:6638:3708:: with SMTP id k8mr33665202jav.24.1620843574050; Wed, 12 May 2021 11:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843574; cv=none; d=google.com; s=arc-20160816; b=zU1eujdtsZT4H7/IdBOv/vBhQJXXQXZ67DxvqiXqhDKONriGAyB48/Bav2Ag7xBSzJ D9hU/+8EKwde27oPvYa73nTatfrk/Dh6anIeMepkfcd30lnOVlu4f2zeVaIrkDDFEp0O pUY5ALK1Lm2ytXcPb72SIwvntqmG6JyKf9K7cZvWOgOeVXQtx5W6dX4G7mdbMm4VwYva 1rLZ/wc6cCRFlNZDAdPqKAl7UWDzjgOgIeUQHc/3vyzrAeRTc3kegSMrpq8fEpFm3d7V K5o4y5J8Ljdt+8qhRE2y9iKck32YrKIkiwcxU+PD6/ILXO1G53su42eOLLtUvEbXx0tC 1atw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HnRZbM50I0esgD81k2QS8o11aK6RlUOtamfk9fLTnrU=; b=amzXYnK2D0b0mZFFzw1Am5S4wCyQP8teKHMPbOJQEqntMIOlHr68Gq2bFc64SIYg5J MKxp0EJOwSPdmAS2syQkuI9kIj+xhZdQTZh1VskJUOoW1LK7AXanT0mJpWYFIjqEAxMP tDtpJXQl/HWmsUOewIfDP/dHbdmkCNYp6SWsBKL3s8cOavcA44+p875Jk28OTZsVHcbq KCL9O0o64a0ixZQFay2Ri9u4nVM0gGUeIGZ1HNvtHdqNuoOPTKMI51BH5+2gCmgPO0s+ /MgTqBtgY5u8mdoFRMdXkBFWMPtA/VhYyXGPfH8wfui7Cw/jaER6N78QAqSVxd8nxxsm PWHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tDx3hmXW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.11.19.33; Wed, 12 May 2021 11:19:34 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tDx3hmXW; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233228AbhELQcH (ORCPT + 12 others); Wed, 12 May 2021 12:32:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:43414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241118AbhELQ0Z (ORCPT ); Wed, 12 May 2021 12:26:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2158861DB2; Wed, 12 May 2021 15:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834590; bh=KYjZRfCr3a3gEQmWBk32tJcCugeOR6+kdHR9uJKL2Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tDx3hmXWn+KgRCeYZYMXDo6O9u4ijeMiahZT2b5nfsDcJ3Rwoh2G1LSFp7BOjCke6 1K6WtQ+tV7cN9nCck6tD4eeDeOiOTusSl4bFkEMe3thdTYtSWT0eagiSE9XfQ4cw5g i7TikwuZe187G28EEfdfYrRyr1uA60S4rtDf0vvI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "Peter Zijlstra (Intel)" , Jens Axboe , Nathan Chancellor Subject: [PATCH 5.11 599/601] smp: Fix smp_call_function_single_async prototype Date: Wed, 12 May 2021 16:51:16 +0200 Message-Id: <20210512144847.584967972@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 1139aeb1c521eb4a050920ce6c64c36c4f2a3ab7 upstream. As of commit 966a967116e6 ("smp: Avoid using two cache lines for struct call_single_data"), the smp code prefers 32-byte aligned call_single_data objects for performance reasons, but the block layer includes an instance of this structure in the main 'struct request' that is more senstive to size than to performance here, see 4ccafe032005 ("block: unalign call_single_data in struct request"). The result is a violation of the calling conventions that clang correctly points out: block/blk-mq.c:630:39: warning: passing 8-byte aligned argument to 32-byte aligned parameter 2 of 'smp_call_function_single_async' may result in an unaligned pointer access [-Walign-mismatch] smp_call_function_single_async(cpu, &rq->csd); It does seem that the usage of the call_single_data without cache line alignment should still be allowed by the smp code, so just change the function prototype so it accepts both, but leave the default alignment unchanged for the other users. This seems better to me than adding a local hack to shut up an otherwise correct warning in the caller. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Acked-by: Jens Axboe Link: https://lkml.kernel.org/r/20210505211300.3174456-1-arnd@kernel.org [nc: Fix conflicts] Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- include/linux/smp.h | 2 +- kernel/smp.c | 20 ++++++++++---------- kernel/up.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -73,7 +73,7 @@ void on_each_cpu_cond(smp_cond_func_t co void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func, void *info, bool wait, const struct cpumask *mask); -int smp_call_function_single_async(int cpu, call_single_data_t *csd); +int smp_call_function_single_async(int cpu, struct __call_single_data *csd); #ifdef CONFIG_SMP --- a/kernel/smp.c +++ b/kernel/smp.c @@ -110,7 +110,7 @@ static DEFINE_PER_CPU(void *, cur_csd_in static atomic_t csd_bug_count = ATOMIC_INIT(0); /* Record current CSD work for current CPU, NULL to erase. */ -static void csd_lock_record(call_single_data_t *csd) +static void csd_lock_record(struct __call_single_data *csd) { if (!csd) { smp_mb(); /* NULL cur_csd after unlock. */ @@ -125,7 +125,7 @@ static void csd_lock_record(call_single_ /* Or before unlock, as the case may be. */ } -static __always_inline int csd_lock_wait_getcpu(call_single_data_t *csd) +static __always_inline int csd_lock_wait_getcpu(struct __call_single_data *csd) { unsigned int csd_type; @@ -140,7 +140,7 @@ static __always_inline int csd_lock_wait * the CSD_TYPE_SYNC/ASYNC types provide the destination CPU, * so waiting on other types gets much less information. */ -static __always_inline bool csd_lock_wait_toolong(call_single_data_t *csd, u64 ts0, u64 *ts1, int *bug_id) +static __always_inline bool csd_lock_wait_toolong(struct __call_single_data *csd, u64 ts0, u64 *ts1, int *bug_id) { int cpu = -1; int cpux; @@ -204,7 +204,7 @@ static __always_inline bool csd_lock_wai * previous function call. For multi-cpu calls its even more interesting * as we'll have to ensure no other cpu is observing our csd. */ -static __always_inline void csd_lock_wait(call_single_data_t *csd) +static __always_inline void csd_lock_wait(struct __call_single_data *csd) { int bug_id = 0; u64 ts0, ts1; @@ -219,17 +219,17 @@ static __always_inline void csd_lock_wai } #else -static void csd_lock_record(call_single_data_t *csd) +static void csd_lock_record(struct __call_single_data *csd) { } -static __always_inline void csd_lock_wait(call_single_data_t *csd) +static __always_inline void csd_lock_wait(struct __call_single_data *csd) { smp_cond_load_acquire(&csd->node.u_flags, !(VAL & CSD_FLAG_LOCK)); } #endif -static __always_inline void csd_lock(call_single_data_t *csd) +static __always_inline void csd_lock(struct __call_single_data *csd) { csd_lock_wait(csd); csd->node.u_flags |= CSD_FLAG_LOCK; @@ -242,7 +242,7 @@ static __always_inline void csd_lock(cal smp_wmb(); } -static __always_inline void csd_unlock(call_single_data_t *csd) +static __always_inline void csd_unlock(struct __call_single_data *csd) { WARN_ON(!(csd->node.u_flags & CSD_FLAG_LOCK)); @@ -276,7 +276,7 @@ void __smp_call_single_queue(int cpu, st * for execution on the given CPU. data must already have * ->func, ->info, and ->flags set. */ -static int generic_exec_single(int cpu, call_single_data_t *csd) +static int generic_exec_single(int cpu, struct __call_single_data *csd) { if (cpu == smp_processor_id()) { smp_call_func_t func = csd->func; @@ -542,7 +542,7 @@ EXPORT_SYMBOL(smp_call_function_single); * NOTE: Be careful, there is unfortunately no current debugging facility to * validate the correctness of this serialization. */ -int smp_call_function_single_async(int cpu, call_single_data_t *csd) +int smp_call_function_single_async(int cpu, struct __call_single_data *csd) { int err = 0; --- a/kernel/up.c +++ b/kernel/up.c @@ -25,7 +25,7 @@ int smp_call_function_single(int cpu, vo } EXPORT_SYMBOL(smp_call_function_single); -int smp_call_function_single_async(int cpu, call_single_data_t *csd) +int smp_call_function_single_async(int cpu, struct __call_single_data *csd) { unsigned long flags;