From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 68E2643C60 for ; Thu, 7 Mar 2024 02:33:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F8E742DD7; Thu, 7 Mar 2024 02:33:06 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 48B6C42E7D for ; Thu, 7 Mar 2024 02:33:04 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-33e2248948bso180807f8f.0 for ; Wed, 06 Mar 2024 17:33:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775184; x=1710379984; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LhQRP4hMIbF5lBEgVDVQHL8fbiNWKKhy4J+N9xORKgE=; b=PKnSJ4A96YdCGk8osvZT4T3y4FHK68gq+8OdFtuB6uzFkm0Wj1aokrZEEk0eVBwAne jwVFp0HGhCyHd7n/6WSLGD2Q8mND8tOmGDnhF22uCSsCLWZ+s+a1JJ7mwqCnDU+X5Y3s oUkR8vSfZK/Qnj5DaZALp3Es2iT+kgBgCj8zpUhLsgvq/JSUKqMTzW0da7NxZH8DQcwt ByBE7+Ml2FK8DTwnmwTY0jvESaVHO1U6lkLXhOKnBhIb9Ads++2pAcVYz2k7l5f48Uel PgccwjmIDBDsqqXxe7qF05/fp9vH8N8V/uq6Jcj7zQJD+/EV448sbbAP1sjI1Mnb3azt H2Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775184; x=1710379984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LhQRP4hMIbF5lBEgVDVQHL8fbiNWKKhy4J+N9xORKgE=; b=vP9CtFvxj2dgE6S1lAG8msaRRugS7VCmeeDswLyqGdIQMM9R/pj9dH0xXHZ2ji03j+ Y8i5PGP8IHuc7KPCe1Ki+5kO5IKCh3OH3g4rjS4okVv/EmgbQ0GhLrQZuHpkcpL1aYP+ l9heAWe59YdOd3AryCNtOSoiSAU5/IIhUXhT1mnW4p+C6F+poLdwJ0dj5RpCwaA6J+Fd z3+Sihu+7oZ+XkyaE1YUpii6ycbZ2ov+Qql3l1VlLv0vg9w0pts/o1p/sU3dxeawRKwY pypMeliC4U+Cy+CPqrekk7/Wpx3JiG5PVVwLjZbUmtVZy+6EPyZEiAnvI59nQN20jlBu xSFg== X-Forwarded-Encrypted: i=1; AJvYcCVtwvj+Yar8llj1K5zQV8nxTb1pZkg3mUGQKFxfcamhe9Fadm/ppTT460k4/rwMeHPQ5msZJfjolQafJPwMN7o= X-Gm-Message-State: AOJu0Yzmq1IiCRMb9QjGbzjf5oCqWe30oghcV+2q8SBZP6C3ohIpMSQ6 HthizH//oj/o7uB7mzxtoGhdiWtFHcu56Nu6218iYBfYE2xUmC1Z X-Google-Smtp-Source: AGHT+IHehSCSpd51bJvmYI4r6vbSBMQhaAhij9eXgIMd3e0W0NXYLxW0mqM2WJ8DU9MLeE2EygcJWg== X-Received: by 2002:a05:6000:11ce:b0:33d:a011:ae42 with SMTP id i14-20020a05600011ce00b0033da011ae42mr12143563wrx.38.1709775183910; Wed, 06 Mar 2024 17:33:03 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id w17-20020adfec51000000b0033cf60e268fsm18841828wrn.116.2024.03.06.17.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:03 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Daxue Gao , dpdk stable Subject: patch 'kernel/freebsd: fix module build on FreeBSD 14' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:31 +0000 Message-Id: <20240307013159.1735343-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7d1744b05c642bfecc2c7c70c40130ad8bb1b5d5 Thanks. Luca Boccassi --- >From 7d1744b05c642bfecc2c7c70c40130ad8bb1b5d5 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 19 Dec 2023 11:29:59 +0000 Subject: [PATCH] kernel/freebsd: fix module build on FreeBSD 14 [ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] When building nic_uio module on FreeBSD 14, a build error is given in the DRIVER_MODULE macro: nic_uio.c:84:81: error: too many arguments provided to function-like macro invocation DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); ^ On FreeBSD 14, the devclass parameter is dropped from the macro, so we conditionally compile a different invocation for BSD versions before/after v14. Bugzilla ID: 1335 Signed-off-by: Bruce Richardson Tested-by: Daxue Gao --- kernel/freebsd/nic_uio/nic_uio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/freebsd/nic_uio/nic_uio.c b/kernel/freebsd/nic_uio/nic_uio.c index 7a81694c92..0043892870 100644 --- a/kernel/freebsd/nic_uio/nic_uio.c +++ b/kernel/freebsd/nic_uio/nic_uio.c @@ -78,10 +78,14 @@ struct pci_bdf { uint32_t function; }; -static devclass_t nic_uio_devclass; - DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); + +#if __FreeBSD_version < 1400000 +static devclass_t nic_uio_devclass; DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); +#else +DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_modevent, 0); +#endif static int nic_uio_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:36.291658120 +0000 +++ 0014-kernel-freebsd-fix-module-build-on-FreeBSD-14.patch 2024-03-07 01:05:34.678937470 +0000 @@ -1 +1 @@ -From 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 Mon Sep 17 00:00:00 2001 +From 7d1744b05c642bfecc2c7c70c40130ad8bb1b5d5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org