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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C70E1C3DA49 for ; Thu, 11 Jul 2024 13:24:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A74866B009C; Thu, 11 Jul 2024 09:24:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A25596B009D; Thu, 11 Jul 2024 09:24:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 878526B009E; Thu, 11 Jul 2024 09:24:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 691BF6B009C for ; Thu, 11 Jul 2024 09:24:36 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0DF0F1205CC for ; Thu, 11 Jul 2024 13:24:36 +0000 (UTC) X-FDA: 82327541352.26.559F1D6 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf26.hostedemail.com (Postfix) with ESMTP id B9F82140021 for ; Thu, 11 Jul 2024 13:24:33 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fnKlRyzT; spf=pass (imf26.hostedemail.com: domain of lkp@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=lkp@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720704242; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uD5F2KiZ8XLXHAGTMjuR6pDnMDoemCjCwFkeXsnWzb0=; b=wBtujaovyiiMTUyvRJujaLuJzDjn08TxRnXcaxgJOVgdgMO2eO4lxEe1iP53ms6boSHITh FBrgr4Yc+FxfybDn8NemASYYvco6tfptDLFlxCwW7GRha5gFytTBC+RDTB9YaDjD8dH6x6 veJb4PelwMauLZ7kNrbCmDlQFqFsa24= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720704242; a=rsa-sha256; cv=none; b=IDsOYzNGzYnHQzO2asCAYkl+b1GzVF9GnfS8aj0E6QtyLCKFn0aNNvxBpAiKvNTgyG/ltU KW4Ytw4N5yUCd03SmXjNRymj1f3GJSKJmEhgGUtCUMza8ksyWbIHU+n19Bd5y0ocSLCobW PoaEf3Fkqb8ggqRmqnwv8Qw4/e2g8Ic= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fnKlRyzT; spf=pass (imf26.hostedemail.com: domain of lkp@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=lkp@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720704274; x=1752240274; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=w1u81luxRSKXuuP8bL2ZtVySjx/0jxSrRzrfaS7TWpk=; b=fnKlRyzTMusmSQxIr//bTdOI1F6boLgTfbRyVQUJnNsQyZPOY7wrhGDR OVJhlorejfnUVWxDwHVLbCP2luSVg9K5/RGzYx5QYH2mknkAeEc2MKoZy 0iAzz6Q/jZPGk3T0DsDCqKdPbPiWnLEAJd2GEROsNHJj6UgdPqTFj1lwI /yHfD7OGTnXPVQ20SqJx4tCKwPNWJuKRX0zg5SyK+U8Acf1A12nqA/Jt0 fB2EOBEy4pxASqpJsvqgbMp95mmV2QpM3NypwPYC6hxJTAUcGWnq2lwvQ N/wylCQ9rNKZKOkFztasjAYZm2hYXjsckhqre+yEd1YAn+2Ll5+7/I8fS w==; X-CSE-ConnectionGUID: g3y3k/ePRMezJfI2qihiiQ== X-CSE-MsgGUID: wUZcimFUTDaF2V7fn8iJUw== X-IronPort-AV: E=McAfee;i="6700,10204,11130"; a="28676504" X-IronPort-AV: E=Sophos;i="6.09,200,1716274800"; d="scan'208";a="28676504" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2024 06:24:33 -0700 X-CSE-ConnectionGUID: w68rnNGyTX+raf3+ra/vZQ== X-CSE-MsgGUID: xfhpknJGQvakxEtM1SwOLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,200,1716274800"; d="scan'208";a="53376105" Received: from lkp-server01.sh.intel.com (HELO 68891e0c336b) ([10.239.97.150]) by orviesa003.jf.intel.com with ESMTP; 11 Jul 2024 06:24:27 -0700 Received: from kbuild by 68891e0c336b with local (Exim 4.96) (envelope-from ) id 1sRtmZ-000ZJz-2y; Thu, 11 Jul 2024 13:24:23 +0000 Date: Thu, 11 Jul 2024 21:23:54 +0800 From: kernel test robot To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org Cc: llvm@lists.linux.dev, oe-kbuild-all@lists.linux.dev, Alexander Duyck , Xuan Zhuo , Andrew Morton , Linux Memory Management List , David Hildenbrand , Richard Weinberger , Anton Ivanov , Johannes Berg , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Eric Farman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Jason Wang , Eugenio =?iso-8859-1?Q?P=E9rez?= , linux-um@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org Subject: Re: [PATCH v2 2/2] virtio: fix vq # for balloon Message-ID: <202407112113.SzSpdDLK-lkp@intel.com> References: <3d655be73ce220f176b2c163839d83699f8faf43.1720611677.git.mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3d655be73ce220f176b2c163839d83699f8faf43.1720611677.git.mst@redhat.com> X-Rspamd-Queue-Id: B9F82140021 X-Stat-Signature: ocdzd17fjfj6yf6dh388ikpksonwu9b7 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720704273-284745 X-HE-Meta: U2FsdGVkX1+D2/KBUf82hDe5rx2JcQlwx1Y2DEKbbn0Kb/UtjTT2m9VH138hYbQwWXeJrhkZRmoWse3xqnGnAhy4mI8V4rYpR2KPVGGN3FvUAtltrZH3kbBvaosfAAyvQYx7hbHr0w4kUWUQ8nmTQwFJnBghlF6qSxgn5icKjgOvGY+BdWcAjyE9QVAfgG4kaV93yf+J9uqwSUdq3TGRVQzX8mcpvWqN9G3hrwZfukuppKJO1DPEl6JqGM/C6fzxOFzTuW0ECvN3sCa9UzmifYjU3KmMWA+2a9btn14nSgdYhtyXVqya5qV5/1liX8EZAk/f+UP0u+KYPP93HG4LYpLDzO+ODOeGgpLyrdFJVtV/icqTasHXqr//dgDpzkEIOqHDerrHS2GZygVU8LyDACIJXCPbXZXNE4PNRcy9B0B28i44TsarBUWAu77ogSeau9hfxp4S/RRxRAaj/KDf/R799+5EWLwdSpXdt1sZyqJHrGt9Dv/WIGzac7XbcdyFiikauohmvC5K7GuWKINL/ujyur/KoGXR/xk6kqlSRM4L0c/Gmh0Fw4Kad6odcTTqaggPj+1k3Og1jPygoNC+LLMEfKHybtwVylwLHZ8taEX9LSzOcAJ4m/7SqmKism+Yyvh9ebLnj31HcxVFtDT2+T5tcg6Ze9rhUc3N7X6Py13my4ihE8WoZQM1tF0a11vvCMkX2Ze96RGMAROBrdYPxT7bYWcRzSfzFp6ls2FLvCNyt2gCB3b1Bav7fleZP6OkqN8TXiZXlzoXrpOJNkpRjoteDah3Ap+fDCp/WQwZCoYUlvxTeD0meVAxXfiEQFUfP4kdwSw/JBpYpT8bBiSWdnWtqmD/8RdkqyApVgOloJxgoIJZiQlf1YP56VImJixZVL5v9CW2FDMNJrFkrSD+7CMIvgvnGxYYkd44OeQbaJRQnNZTOKunvtxFxd8+EwmJaKyV7MJYRZH+cAdvhzZ XUPqrNu4 4SQSaeEQldJ03CUwEM5Dvl/YGu4iE9RQzLWlTxbU10hNIdWp7tNW9I9/A9wOtcnlRWW5+KKrl3qgN1D/B3Mbl+7cw8FsCfnMS+zec2+Kty8JgvbtcXaIroE+02OTeL1rt4DXCVZyTbfR9V6KkEucebWUO19OsnUuqj68csnEHkpbvJ3Mf4gJE5fOcF8NoDFYTJUkQjtNNQOxcsvxPHbWy5pSy3EMeru9Ed7TlO0puNtXLmRrv4xm/l47/0kRAWzkW71hqLZ84UPHFpkGKEhnhMzVB99fhRivbG4lsh5/jwyElTjt35muZk+bZZvXJ3NpGWNgkpXAJ16fPcbndbPCb7ENmi951WL25Wp/WHaiyFpfBADmJZnC+XM2292iE1Z4CCkq8wpmb6f/jA29C3Wwjq4UXEOBtKEowf3q+xenhkhjPiws= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Michael, kernel test robot noticed the following build errors: [auto build test ERROR on next-20240710] [cannot apply to uml/next remoteproc/rproc-next s390/features linus/master uml/fixes v6.10-rc7 v6.10-rc6 v6.10-rc5 v6.10-rc7] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Michael-S-Tsirkin/virtio_balloon-add-work-around-for-out-of-spec-QEMU/20240711-004346 base: next-20240710 patch link: https://lore.kernel.org/r/3d655be73ce220f176b2c163839d83699f8faf43.1720611677.git.mst%40redhat.com patch subject: [PATCH v2 2/2] virtio: fix vq # for balloon config: i386-randconfig-014-20240711 (https://download.01.org/0day-ci/archive/20240711/202407112113.SzSpdDLK-lkp@intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240711/202407112113.SzSpdDLK-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202407112113.SzSpdDLK-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/virtio/virtio_pci_common.c:391:1: error: version control conflict marker in file 391 | <<<<<<< HEAD | ^ >> drivers/virtio/virtio_pci_common.c:392:30: error: use of undeclared identifier 'queue_idx' 392 | vqs[i] = vp_setup_vq(vdev, queue_idx++, vqi->callback, | ^ 2 errors generated. vim +391 drivers/virtio/virtio_pci_common.c 365 366 static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs, 367 struct virtqueue *vqs[], 368 struct virtqueue_info vqs_info[]) 369 { 370 struct virtio_pci_device *vp_dev = to_vp_device(vdev); 371 int i, err; 372 373 vp_dev->vqs = kcalloc(nvqs, sizeof(*vp_dev->vqs), GFP_KERNEL); 374 if (!vp_dev->vqs) 375 return -ENOMEM; 376 377 err = request_irq(vp_dev->pci_dev->irq, vp_interrupt, IRQF_SHARED, 378 dev_name(&vdev->dev), vp_dev); 379 if (err) 380 goto out_del_vqs; 381 382 vp_dev->intx_enabled = 1; 383 vp_dev->per_vq_vectors = false; 384 for (i = 0; i < nvqs; ++i) { 385 struct virtqueue_info *vqi = &vqs_info[i]; 386 387 if (!vqi->name) { 388 vqs[i] = NULL; 389 continue; 390 } > 391 <<<<<<< HEAD > 392 vqs[i] = vp_setup_vq(vdev, queue_idx++, vqi->callback, 393 vqi->name, vqi->ctx, 394 ======= 395 vqs[i] = vp_setup_vq(vdev, i, callbacks[i], names[i], 396 ctx ? ctx[i] : false, 397 >>>>>>> f814759f80b7... virtio: fix vq # for balloon 398 VIRTIO_MSI_NO_VECTOR); 399 if (IS_ERR(vqs[i])) { 400 err = PTR_ERR(vqs[i]); 401 goto out_del_vqs; 402 } 403 } 404 405 return 0; 406 out_del_vqs: 407 vp_del_vqs(vdev); 408 return err; 409 } 410 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki