From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA3C2C433EF for ; Wed, 9 Mar 2022 06:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229962AbiCIGSy (ORCPT ); Wed, 9 Mar 2022 01:18:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbiCIGSw (ORCPT ); Wed, 9 Mar 2022 01:18:52 -0500 Received: from out30-42.freemail.mail.aliyun.com (out30-42.freemail.mail.aliyun.com [115.124.30.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 759FF5FC5; Tue, 8 Mar 2022 22:17:49 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R621e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04407;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0V6hoZqR_1646806666; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0V6hoZqR_1646806666) by smtp.aliyun-inc.com(127.0.0.1); Wed, 09 Mar 2022 14:17:47 +0800 Message-ID: <1646806544.818761-1-xuanzhuo@linux.alibaba.com> Subject: Re: linux-next: build warning after merge of the vhost tree Date: Wed, 9 Mar 2022 14:15:44 +0800 From: Xuan Zhuo To: Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Michael S. Tsirkin" References: <20220307154011.6d456f28@canb.auug.org.au> <1646635600.9436276-1-xuanzhuo@linux.alibaba.com> <20220307211242.59fc0f0e@canb.auug.org.au> <20220307060012-mutt-send-email-mst@kernel.org> <20220309171300.0500a07e@canb.auug.org.au> In-Reply-To: <20220309171300.0500a07e@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 9 Mar 2022 17:13:00 +1100, Stephen Rothwell wrote: > Hi Michael, > > On Mon, 7 Mar 2022 06:00:27 -0500 "Michael S. Tsirkin" wrote: > > > > On Mon, Mar 07, 2022 at 09:12:42PM +1100, Stephen Rothwell wrote: > > > > > > On Mon, 7 Mar 2022 14:46:40 +0800 Xuan Zhuo wrote: > > > > > > > > Can you help me test this patch? I don't have an arm environment around me. > > > > > > > > Thanks > > > > > > > > > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > > index 1fa2d632a994..4d629d1ea894 100644 > > > > --- a/drivers/net/virtio_net.c > > > > +++ b/drivers/net/virtio_net.c > > > > @@ -1820,7 +1820,7 @@ static int virtnet_rx_vq_reset(struct virtnet_info *vi, > > > > > > > > err: > > > > netdev_err(vi->dev, > > > > - "reset rx reset vq fail: rx queue index: %ld err: %d\n", > > > > + "reset rx reset vq fail: rx queue index: %td err: %d\n", > > > > rq - vi->rq, err); > > > > virtnet_napi_enable(rq->vq, &rq->napi); > > > > return err; > > > > @@ -1870,7 +1870,7 @@ static int virtnet_tx_vq_reset(struct virtnet_info *vi, > > > > > > > > err: > > > > netdev_err(vi->dev, > > > > - "reset tx reset vq fail: tx queue index: %ld err: %d\n", > > > > + "reset tx reset vq fail: tx queue index: %td err: %d\n", > > > > sq - vi->sq, err); > > > > virtnet_napi_tx_enable(vi, sq->vq, &sq->napi); > > > > return err; > > > > > > I had to apply that by hand, but it does work. > > > > > > Tested-by: Stephen Rothwell > > > > OK, I squashed this into the problematic patch. Thanks a lot! > > The warnings have reappeared today :-( and this fixup is not applied. > Something got lost in the rebase/rewrite? Sorry for that. The patch of the fix I submitted before was not merged locally. When the patch set of v7 was released yesterday, this fix patch was not included. > -- > Cheers, > Stephen Rothwell >