linux-kernel - Re: [PATCH v3 01/57] dmaengine: ioat: Free up _

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <cdd0b117-013a-8bc2-9cad-be8ac1a985f2@intel.com>
Date:   Fri, 16 Jun 2023 15:41:53 -0700
From:   Dave Jiang <dave.jiang@...el.com>
To:     Peter Zijlstra <peterz@...radead.org>,
        <torvalds@...ux-foundation.org>, <keescook@...omium.org>,
        <gregkh@...uxfoundation.org>, <pbonzini@...hat.com>
CC:     <masahiroy@...nel.org>, <nathan@...nel.org>,
        <ndesaulniers@...gle.com>, <nicolas@...sle.eu>,
        <catalin.marinas@....com>, <will@...nel.org>, <vkoul@...nel.org>,
        <trix@...hat.com>, <ojeda@...nel.org>, <mingo@...hat.com>,
        <longman@...hat.com>, <boqun.feng@...il.com>, <dennis@...nel.org>,
        <tj@...nel.org>, <cl@...ux.com>, <acme@...nel.org>,
        <mark.rutland@....com>, <alexander.shishkin@...ux.intel.com>,
        <jolsa@...nel.org>, <namhyung@...nel.org>, <irogers@...gle.com>,
        <adrian.hunter@...el.com>, <juri.lelli@...hat.com>,
        <vincent.guittot@...aro.org>, <dietmar.eggemann@....com>,
        <rostedt@...dmis.org>, <bsegall@...gle.com>, <mgorman@...e.de>,
        <bristot@...hat.com>, <vschneid@...hat.com>, <paulmck@...nel.org>,
        <frederic@...nel.org>, <quic_neeraju@...cinc.com>,
        <joel@...lfernandes.org>, <josh@...htriplett.org>,
        <mathieu.desnoyers@...icios.com>, <jiangshanlai@...il.com>,
        <rientjes@...gle.com>, <vbabka@...e.cz>,
        <roman.gushchin@...ux.dev>, <42.hyeyoo@...il.com>,
        <apw@...onical.com>, <joe@...ches.com>, <dwaipayanray1@...il.com>,
        <lukas.bulwahn@...il.com>, <john.johansen@...onical.com>,
        <paul@...l-moore.com>, <jmorris@...ei.org>, <serge@...lyn.com>,
        <linux-kbuild@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <dmaengine@...r.kernel.org>, <llvm@...ts.linux.dev>,
        <linux-perf-users@...r.kernel.org>, <rcu@...r.kernel.org>,
        <linux-security-module@...r.kernel.org>, <tglx@...utronix.de>,
        <ravi.bangoria@....com>, <error27@...il.com>,
        <luc.vanoostenryck@...il.com>
Subject: Re: [PATCH v3 01/57] dmaengine: ioat: Free up __cleanup() name



On 6/12/23 02:07, Peter Zijlstra wrote:
> In order to use __cleanup for __attribute__((__cleanup__(func))) the
> name must not be used for anything else. Avoid the conflict.
> 
> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>

Acked-by: Dave Jiang <dave.jiang@...el.com>

> ---
>   drivers/dma/ioat/dma.c |   12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> --- a/drivers/dma/ioat/dma.c
> +++ b/drivers/dma/ioat/dma.c
> @@ -584,11 +584,11 @@ desc_get_errstat(struct ioatdma_chan *io
>   }
>   
>   /**
> - * __cleanup - reclaim used descriptors
> + * __ioat_cleanup - reclaim used descriptors
>    * @ioat_chan: channel (ring) to clean
>    * @phys_complete: zeroed (or not) completion address (from status)
>    */
> -static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
> +static void __ioat_cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
>   {
>   	struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma;
>   	struct ioat_ring_ent *desc;
> @@ -675,7 +675,7 @@ static void ioat_cleanup(struct ioatdma_
>   	spin_lock_bh(&ioat_chan->cleanup_lock);
>   
>   	if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
> -		__cleanup(ioat_chan, phys_complete);
> +		__ioat_cleanup(ioat_chan, phys_complete);
>   
>   	if (is_ioat_halted(*ioat_chan->completion)) {
>   		u32 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
> @@ -712,7 +712,7 @@ static void ioat_restart_channel(struct
>   
>   	ioat_quiesce(ioat_chan, 0);
>   	if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
> -		__cleanup(ioat_chan, phys_complete);
> +		__ioat_cleanup(ioat_chan, phys_complete);
>   
>   	__ioat_restart_chan(ioat_chan);
>   }
> @@ -786,7 +786,7 @@ static void ioat_eh(struct ioatdma_chan
>   
>   	/* cleanup so tail points to descriptor that caused the error */
>   	if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
> -		__cleanup(ioat_chan, phys_complete);
> +		__ioat_cleanup(ioat_chan, phys_complete);
>   
>   	chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
>   	pci_read_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, &chanerr_int);
> @@ -943,7 +943,7 @@ void ioat_timer_event(struct timer_list
>   		/* timer restarted in ioat_cleanup_preamble
>   		 * and IOAT_COMPLETION_ACK cleared
>   		 */
> -		__cleanup(ioat_chan, phys_complete);
> +		__ioat_cleanup(ioat_chan, phys_complete);
>   		goto unlock_out;
>   	}
>   
> 
>