Page MenuHomeFreeBSD
Differential D17568

sysutils/s6: Update to 2.7.2.1
ClosedPublic
Actions

Authored by 0mp on Oct 15 2018, 4:01 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 6:20 AM
Unknown Object (File)
Fri, Apr 4, 4:32 PM
Unknown Object (File)
Sun, Mar 23, 5:15 PM
Unknown Object (File)
Thu, Mar 20, 3:39 PM
Unknown Object (File)
Mar 18 2025, 2:39 PM
Unknown Object (File)
Mar 17 2025, 7:31 AM
Unknown Object (File)
Mar 15 2025, 10:57 PM
Unknown Object (File)
Feb 22 2025, 6:01 AM
View All Files
Subscribers
crest_rlwinm.de

Details

Reviewers
mat
krion
crest_bultmann.eu
Commits
rP482158: sysutils/s6: Update to 2.7.2.1
Summary

While here, pet portlint:

  • Fix COMMENT
  • Fix order of variables

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232052

Test Plan
  • portlint
  • poudriere (amd64: 11.2, 12.0-ALPHA6) (i386: 12.0-ALPHA9)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

0mp created this revision.Oct 15 2018, 4:01 PM
Harbormaster completed remote builds in B20214: Diff 49170.Oct 15 2018, 4:01 PM
crest_bultmann.eu accepted this revision.Oct 15 2018, 4:02 PM
This revision is now accepted and ready to land.Oct 15 2018, 4:02 PM
0mp updated this revision to Diff 49171.Oct 15 2018, 4:03 PM

Capitalize COMMENT per maitainer's request.

This revision now requires review to proceed.Oct 15 2018, 4:03 PM
Harbormaster completed remote builds in B20215: Diff 49171.Oct 15 2018, 4:03 PM
krion accepted this revision.Oct 15 2018, 4:05 PM
This revision is now accepted and ready to land.Oct 15 2018, 4:05 PM
Closed by commit rP482158: sysutils/s6: Update to 2.7.2.1 (authored by 0mp). · Explain WhyOct 15 2018, 4:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sysutils/
s6/
7 lines
6 lines
2 lines

Diff 49172

View Options

head/sysutils/s6/Makefile

Show All 26 Lines
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "gve.h" #include "gve.h"
#include "gve_adminq.h" #include "gve_adminq.h"
#include "gve_dqo.h" #include "gve_dqo.h"
#define GVE_DRIVER_VERSION "GVE-FBSD-1.3.2\n" #define GVE_DRIVER_VERSION "GVE-FBSD-1.3.3\n"
#define GVE_VERSION_MAJOR 1 #define GVE_VERSION_MAJOR 1
#define GVE_VERSION_MINOR 3 #define GVE_VERSION_MINOR 3
#define GVE_VERSION_SUB 2 #define GVE_VERSION_SUB 3
#define GVE_DEFAULT_RX_COPYBREAK 256 #define GVE_DEFAULT_RX_COPYBREAK 256
/* Devices supported by this driver. */ /* Devices supported by this driver. */
static struct gve_dev { static struct gve_dev {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *name; const char *name;
▲ Show 20 Lines • Show All 206 Lines • ▼ Show 20 Linesgve_adjust_tx_queues(struct gve_priv *priv, uint16_t new_queue_cnt)
} }
priv->tx_cfg.num_queues = new_queue_cnt; priv->tx_cfg.num_queues = new_queue_cnt;
err = gve_up(priv); err = gve_up(priv);
if (err != 0) if (err != 0)
gve_schedule_reset(priv); gve_schedule_reset(priv);
return (err); return (err);
}
int
gve_adjust_ring_sizes(struct gve_priv *priv, uint16_t new_desc_cnt, bool is_rx)
{
int err;
uint16_t prev_desc_cnt;
GVE_IFACE_LOCK_ASSERT(priv->gve_iface_lock);
gve_down(priv);
if (is_rx) {
gve_free_rx_rings(priv, 0, priv->rx_cfg.num_queues);
prev_desc_cnt = priv->rx_desc_cnt;
priv->rx_desc_cnt = new_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->rx_desc_cnt = prev_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
}
} else {
gve_free_tx_rings(priv, 0, priv->tx_cfg.num_queues);
prev_desc_cnt = priv->tx_desc_cnt;
priv->tx_desc_cnt = new_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->tx_desc_cnt = prev_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
}
}
if (err != 0) {
device_printf(priv->dev, "Failed to allocate rings! Cannot start device back up!");
gve_down(priv);
markjUnsubmitted
Done
Inline Actions

Is this gve_down() call needed, given that we already bought the interface down?

markj: Is this gve_down() call needed, given that we already bought the interface down?
return (err);
}
err = gve_up(priv);
if (err != 0) {
gve_schedule_reset(priv);
return (err);
}
return (0);
} }
static int static int
gve_set_mtu(if_t ifp, uint32_t new_mtu) gve_set_mtu(if_t ifp, uint32_t new_mtu)
{ {
struct gve_priv *priv = if_getsoftc(ifp); struct gve_priv *priv = if_getsoftc(ifp);
const uint32_t max_problem_range = 8227; const uint32_t max_problem_range = 8227;
const uint32_t min_problem_range = 7822; const uint32_t min_problem_range = 7822;
▲ Show 20 Lines • Show All 755 Lines • Show Last 20 Lines
View Options

head/sysutils/s6/distinfo

Show All 26 Lines
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "gve.h" #include "gve.h"
#include "gve_adminq.h" #include "gve_adminq.h"
#include "gve_dqo.h" #include "gve_dqo.h"
#define GVE_DRIVER_VERSION "GVE-FBSD-1.3.2\n" #define GVE_DRIVER_VERSION "GVE-FBSD-1.3.3\n"
#define GVE_VERSION_MAJOR 1 #define GVE_VERSION_MAJOR 1
#define GVE_VERSION_MINOR 3 #define GVE_VERSION_MINOR 3
#define GVE_VERSION_SUB 2 #define GVE_VERSION_SUB 3
#define GVE_DEFAULT_RX_COPYBREAK 256 #define GVE_DEFAULT_RX_COPYBREAK 256
/* Devices supported by this driver. */ /* Devices supported by this driver. */
static struct gve_dev { static struct gve_dev {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *name; const char *name;
▲ Show 20 Lines • Show All 206 Lines • ▼ Show 20 Linesgve_adjust_tx_queues(struct gve_priv *priv, uint16_t new_queue_cnt)
} }
priv->tx_cfg.num_queues = new_queue_cnt; priv->tx_cfg.num_queues = new_queue_cnt;
err = gve_up(priv); err = gve_up(priv);
if (err != 0) if (err != 0)
gve_schedule_reset(priv); gve_schedule_reset(priv);
return (err); return (err);
}
int
gve_adjust_ring_sizes(struct gve_priv *priv, uint16_t new_desc_cnt, bool is_rx)
{
int err;
uint16_t prev_desc_cnt;
GVE_IFACE_LOCK_ASSERT(priv->gve_iface_lock);
gve_down(priv);
if (is_rx) {
gve_free_rx_rings(priv, 0, priv->rx_cfg.num_queues);
prev_desc_cnt = priv->rx_desc_cnt;
priv->rx_desc_cnt = new_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->rx_desc_cnt = prev_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
}
} else {
gve_free_tx_rings(priv, 0, priv->tx_cfg.num_queues);
prev_desc_cnt = priv->tx_desc_cnt;
priv->tx_desc_cnt = new_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->tx_desc_cnt = prev_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
}
}
if (err != 0) {
device_printf(priv->dev, "Failed to allocate rings! Cannot start device back up!");
gve_down(priv);
markjUnsubmitted
Done
Inline Actions

Is this gve_down() call needed, given that we already bought the interface down?

markj: Is this gve_down() call needed, given that we already bought the interface down?
return (err);
}
err = gve_up(priv);
if (err != 0) {
gve_schedule_reset(priv);
return (err);
}
return (0);
} }
static int static int
gve_set_mtu(if_t ifp, uint32_t new_mtu) gve_set_mtu(if_t ifp, uint32_t new_mtu)
{ {
struct gve_priv *priv = if_getsoftc(ifp); struct gve_priv *priv = if_getsoftc(ifp);
const uint32_t max_problem_range = 8227; const uint32_t max_problem_range = 8227;
const uint32_t min_problem_range = 7822; const uint32_t min_problem_range = 7822;
▲ Show 20 Lines • Show All 755 Lines • Show Last 20 Lines
View Options

head/sysutils/s6/pkg-plist

Show All 26 Lines
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "gve.h" #include "gve.h"
#include "gve_adminq.h" #include "gve_adminq.h"
#include "gve_dqo.h" #include "gve_dqo.h"
#define GVE_DRIVER_VERSION "GVE-FBSD-1.3.2\n" #define GVE_DRIVER_VERSION "GVE-FBSD-1.3.3\n"
#define GVE_VERSION_MAJOR 1 #define GVE_VERSION_MAJOR 1
#define GVE_VERSION_MINOR 3 #define GVE_VERSION_MINOR 3
#define GVE_VERSION_SUB 2 #define GVE_VERSION_SUB 3
#define GVE_DEFAULT_RX_COPYBREAK 256 #define GVE_DEFAULT_RX_COPYBREAK 256
/* Devices supported by this driver. */ /* Devices supported by this driver. */
static struct gve_dev { static struct gve_dev {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *name; const char *name;
▲ Show 20 Lines • Show All 206 Lines • ▼ Show 20 Linesgve_adjust_tx_queues(struct gve_priv *priv, uint16_t new_queue_cnt)
} }
priv->tx_cfg.num_queues = new_queue_cnt; priv->tx_cfg.num_queues = new_queue_cnt;
err = gve_up(priv); err = gve_up(priv);
if (err != 0) if (err != 0)
gve_schedule_reset(priv); gve_schedule_reset(priv);
return (err); return (err);
}
int
gve_adjust_ring_sizes(struct gve_priv *priv, uint16_t new_desc_cnt, bool is_rx)
{
int err;
uint16_t prev_desc_cnt;
GVE_IFACE_LOCK_ASSERT(priv->gve_iface_lock);
gve_down(priv);
if (is_rx) {
gve_free_rx_rings(priv, 0, priv->rx_cfg.num_queues);
prev_desc_cnt = priv->rx_desc_cnt;
priv->rx_desc_cnt = new_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->rx_desc_cnt = prev_desc_cnt;
err = gve_alloc_rx_rings(priv, 0, priv->rx_cfg.num_queues);
}
} else {
gve_free_tx_rings(priv, 0, priv->tx_cfg.num_queues);
prev_desc_cnt = priv->tx_desc_cnt;
priv->tx_desc_cnt = new_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
if (err != 0) {
device_printf(priv->dev,
"Failed to allocate rings. Trying to start back up with previous ring size.");
priv->tx_desc_cnt = prev_desc_cnt;
err = gve_alloc_tx_rings(priv, 0, priv->tx_cfg.num_queues);
}
}
if (err != 0) {
device_printf(priv->dev, "Failed to allocate rings! Cannot start device back up!");
gve_down(priv);
markjUnsubmitted
Done
Inline Actions

Is this gve_down() call needed, given that we already bought the interface down?

markj: Is this gve_down() call needed, given that we already bought the interface down?
return (err);
}
err = gve_up(priv);
if (err != 0) {
gve_schedule_reset(priv);
return (err);
}
return (0);
} }
static int static int
gve_set_mtu(if_t ifp, uint32_t new_mtu) gve_set_mtu(if_t ifp, uint32_t new_mtu)
{ {
struct gve_priv *priv = if_getsoftc(ifp); struct gve_priv *priv = if_getsoftc(ifp);
const uint32_t max_problem_range = 8227; const uint32_t max_problem_range = 8227;
const uint32_t min_problem_range = 7822; const uint32_t min_problem_range = 7822;
▲ Show 20 Lines • Show All 755 Lines • Show Last 20 Lines